diff --git a/package-lock.json b/package-lock.json
index a5fdd2ff901..d43ced41e9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15174,9 +15174,9 @@
       }
     },
     "mongodb-data-service": {
-      "version": "16.5.6",
-      "resolved": "https://registry.npmjs.org/mongodb-data-service/-/mongodb-data-service-16.5.6.tgz",
-      "integrity": "sha512-cjJ1rd8iY84Cv3hbb2gAR6RcEk56vQ+/j2cBHTOVW+pNPbN+deQ8Ebq1NkV4gj1KPjD0OIuDMqlKek/zfpMQtQ==",
+      "version": "16.5.7",
+      "resolved": "https://registry.npmjs.org/mongodb-data-service/-/mongodb-data-service-16.5.7.tgz",
+      "integrity": "sha512-F1asgYXdOqGQG0ZyFWew2HvMGrC0N5XyfB0qn59JblD+B9sIjhU3M/MJrIGr4r7BCDjx1R1yhdnqYQt1/JOrTg==",
       "requires": {
         "async": "^3.2.0",
         "debug": "^4.1.1",
@@ -15184,7 +15184,7 @@
         "mongodb": "^3.5.4",
         "mongodb-collection-sample": "^4.5.1",
         "mongodb-connection-model": "^14.6.2",
-        "mongodb-index-model": "^2.6.0",
+        "mongodb-index-model": "^2.6.1",
         "mongodb-js-errors": "^0.5.0",
         "mongodb-ns": "^2.2.0",
         "mongodb-security": "^0.2.0",
@@ -15353,9 +15353,9 @@
           }
         },
         "yargs": {
-          "version": "15.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
-          "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
+          "version": "15.3.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+          "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
           "optional": true,
           "requires": {
             "cliui": "^6.0.0",
@@ -15368,13 +15368,13 @@
             "string-width": "^4.2.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
-            "yargs-parser": "^16.1.0"
+            "yargs-parser": "^18.1.1"
           }
         },
         "yargs-parser": {
-          "version": "16.1.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
-          "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
+          "version": "18.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
+          "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
           "optional": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -15542,14 +15542,14 @@
       }
     },
     "mongodb-index-model": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mongodb-index-model/-/mongodb-index-model-2.6.0.tgz",
-      "integrity": "sha512-CS1kgCxLoya1ywgE85zHuvxQEo7cj934OZI4baNdahfWxo0L9CXzCVGZQdUcOW1r6y2dYk3heN8f5/d8rPYCWA==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/mongodb-index-model/-/mongodb-index-model-2.6.1.tgz",
+      "integrity": "sha512-F6CktBkd0U2uV1y8r6PhZQiKqAUND0HmZvlFMRqXnhPqGSI+SbiTaKxcwPUbXPzikGBSL8KaAujFGf/y41N0Tw==",
       "requires": {
         "@mongodb-js/triejs": "^0.1.5",
         "ampersand-collection": "^1.6.1",
         "ampersand-model": "^6.0.2",
-        "ampersand-rest-collection": "^5.0.0",
+        "ampersand-rest-collection": "^6.0.0",
         "async": "^3.2.0",
         "lodash": "^4.17.15",
         "mongodb": "^3.5.4",
@@ -15557,6 +15557,30 @@
         "mongodb-ns": "^2.2.0"
       },
       "dependencies": {
+        "ampersand-rest-collection": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/ampersand-rest-collection/-/ampersand-rest-collection-6.0.0.tgz",
+          "integrity": "sha1-oFEmeXmyz3YGo4OD2e6W0SGmKPM=",
+          "requires": {
+            "ampersand-collection": "^2.0.0",
+            "ampersand-collection-lodash-mixin": "^4.0.0",
+            "ampersand-collection-rest-mixin": "^6.0.0",
+            "ampersand-version": "^1.0.2"
+          },
+          "dependencies": {
+            "ampersand-collection": {
+              "version": "2.0.2",
+              "resolved": "https://registry.npmjs.org/ampersand-collection/-/ampersand-collection-2.0.2.tgz",
+              "integrity": "sha512-IjDa4HTL/tdQDDL0SGyWk4AHD02iNtUSLRWkAsJ2biPvapljW9HNgIEIdbPnnR+7Gb9BJkjesaLNjVZfAMzeuA==",
+              "requires": {
+                "ampersand-class-extend": "^2.0.0",
+                "ampersand-events": "^2.0.1",
+                "ampersand-version": "^1.0.2",
+                "lodash": "^4.11.1"
+              }
+            }
+          }
+        },
         "async": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
diff --git a/package.json b/package.json
index 01cbd4b0af1..302365e04d3 100644
--- a/package.json
+++ b/package.json
@@ -371,11 +371,11 @@
     "mongodb-ace-theme-query": "^0.0.2",
     "mongodb-collection-model": "^3.1.0",
     "mongodb-connection-model": "^14.6.2",
-    "mongodb-data-service": "^16.5.6",
+    "mongodb-data-service": "^16.5.7",
     "mongodb-database-model": "^0.1.3",
     "mongodb-explain-plan-model": "^0.2.3",
     "mongodb-extended-json": "^1.11.0",
-    "mongodb-index-model": "^2.6.0",
+    "mongodb-index-model": "^2.6.1",
     "mongodb-instance-model": "^10.0.0",
     "mongodb-js-metrics": "^5.0.1",
     "mongodb-language-model": "^1.6.1",