diff --git a/package-lock.json b/package-lock.json
index bb3b6426cb7..0223c766df4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1175,13 +1175,13 @@
       }
     },
     "@ember-data/adapter": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/@ember-data/adapter/-/adapter-3.21.1.tgz",
-      "integrity": "sha512-eRHzmjbFH4ghPVZAjBYSQDeVXnMLVpbIzEDs9Fs/Asz8FUimnJ6hnVTc7SqetSJOZ7M39FxSw5O81IMSmnYyBA==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/@ember-data/adapter/-/adapter-3.21.2.tgz",
+      "integrity": "sha512-bqc+HaYEdwX4HYm9a0GE8hZ8sc51z35qLsRb97ziwFpA6hDXhZqMg6kdPymmUD6BBnN80Og7vH+OR6MdPkQDzA==",
       "dev": true,
       "requires": {
-        "@ember-data/private-build-infra": "3.21.1",
-        "@ember-data/store": "3.21.1",
+        "@ember-data/private-build-infra": "3.21.2",
+        "@ember-data/store": "3.21.2",
         "@ember/edition-utils": "^1.2.0",
         "ember-cli-babel": "^7.18.0",
         "ember-cli-test-info": "^1.0.0",
@@ -1200,12 +1200,12 @@
           }
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ember-cli-typescript": {
@@ -1314,9 +1314,9 @@
       }
     },
     "@ember-data/canary-features": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/@ember-data/canary-features/-/canary-features-3.21.1.tgz",
-      "integrity": "sha512-yA2p2rz6gKZBhIz2sHs0EXHyfEDZHkP6rWMQMiLhXI3xgavARxmyhnknAr/xrvdjHAdBzcLNmRcSgGqgRmQXKQ==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/@ember-data/canary-features/-/canary-features-3.21.2.tgz",
+      "integrity": "sha512-7iRqPGt4ccNquJ+oDEM66v3v/gLSdi0dKgej1YaG7iRqtsHS2ShojuQsAilZh4Rtmy/vv7bZFZjiBDz4bTf48A==",
       "dev": true,
       "requires": {
         "ember-cli-babel": "^7.18.0",
@@ -1335,12 +1335,12 @@
           }
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ember-cli-typescript": {
@@ -1449,12 +1449,12 @@
       }
     },
     "@ember-data/debug": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/@ember-data/debug/-/debug-3.21.1.tgz",
-      "integrity": "sha512-Q4ICzO8UTLW9sFlbn3K+zH/rnvRyJdtbaYjVsIOSMVZyYgHIFy2r7BsumQnCFBT/36P3X/V9HN+nmVVgNnQ/3w==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/@ember-data/debug/-/debug-3.21.2.tgz",
+      "integrity": "sha512-T17yTfrqLhP7ayzX8mat7yA4tFsxCW3k1E8nxuKFWsVfhMPUOKvnaS743VmJdWXmHdm4SuxD17t2ajGPAmz1Vw==",
       "dev": true,
       "requires": {
-        "@ember-data/private-build-infra": "3.21.1",
+        "@ember-data/private-build-infra": "3.21.2",
         "@ember/edition-utils": "^1.2.0",
         "ember-cli-babel": "^7.18.0",
         "ember-cli-test-info": "^1.0.0",
@@ -1473,12 +1473,12 @@
           }
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ember-cli-typescript": {
@@ -1587,14 +1587,14 @@
       }
     },
     "@ember-data/model": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/@ember-data/model/-/model-3.21.1.tgz",
-      "integrity": "sha512-+UwR6wt086hSFPLC2gya5HuiZIIZ4Kec/UoC64IEgc7kYHeND9mHiFKjq4N0k5w4lFgITeuYDBf/a90GQ9Y+/Q==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/@ember-data/model/-/model-3.21.2.tgz",
+      "integrity": "sha512-+Z4inXkeNbz7tKI4EaiurN35yTJ/B6KTRIZyjx/cpULooJ9pyAYLsVHDYYqxw622izDQ9JWSftqJl8vhva5F3A==",
       "dev": true,
       "requires": {
-        "@ember-data/canary-features": "3.21.1",
-        "@ember-data/private-build-infra": "3.21.1",
-        "@ember-data/store": "3.21.1",
+        "@ember-data/canary-features": "3.21.2",
+        "@ember-data/private-build-infra": "3.21.2",
+        "@ember-data/store": "3.21.2",
         "@ember/edition-utils": "^1.2.0",
         "ember-cli-babel": "^7.18.0",
         "ember-cli-string-utils": "^1.1.0",
@@ -1616,12 +1616,12 @@
           }
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ember-cli-typescript": {
@@ -1730,13 +1730,13 @@
       }
     },
     "@ember-data/private-build-infra": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/@ember-data/private-build-infra/-/private-build-infra-3.21.1.tgz",
-      "integrity": "sha512-+JceQ5HAcJdlwFM6TA9iaFFHVLPgZzcjpApak7Ams5wwRQH5xY6i8cIsqsrfgCfn32ymiqlku4FaO9NHwpFcDg==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/@ember-data/private-build-infra/-/private-build-infra-3.21.2.tgz",
+      "integrity": "sha512-eg2M0IJYghdkNwnf9J/SF23pCh/hjun0dG9AfPJWUGpvJM4DlEAjex1Zh+JB71e7CVxx2a9yLsPuHe86R89jJg==",
       "dev": true,
       "requires": {
         "@babel/plugin-transform-block-scoping": "^7.8.3",
-        "@ember-data/canary-features": "3.21.1",
+        "@ember-data/canary-features": "3.21.2",
         "@ember/edition-utils": "^1.2.0",
         "babel-plugin-debug-macros": "^0.3.3",
         "babel-plugin-filter-imports": "^4.0.0",
@@ -1835,12 +1835,12 @@
           "dev": true
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ember-cli-typescript": {
@@ -1987,14 +1987,14 @@
       }
     },
     "@ember-data/record-data": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/@ember-data/record-data/-/record-data-3.21.1.tgz",
-      "integrity": "sha512-NMHH0NSWKaW1JVzWGDdulbdYH21lQ6BRP6xKIACoExgMX4GYuZdL+x2mzWzYF0rdpG2zGABIG3RkZG8MzjvX1g==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/@ember-data/record-data/-/record-data-3.21.2.tgz",
+      "integrity": "sha512-MJKvsHNIrHVJze3iQdlHfsCGRwrm4WbI6qlh9ecTOMhrhjLQufJCW+Ea2mLNg8pB9rNhhL4tqTNUByNc6DtmGw==",
       "dev": true,
       "requires": {
-        "@ember-data/canary-features": "3.21.1",
-        "@ember-data/private-build-infra": "3.21.1",
-        "@ember-data/store": "3.21.1",
+        "@ember-data/canary-features": "3.21.2",
+        "@ember-data/private-build-infra": "3.21.2",
+        "@ember-data/store": "3.21.2",
         "@ember/edition-utils": "^1.2.0",
         "@ember/ordered-set": "^2.0.3",
         "ember-cli-babel": "^7.18.0",
@@ -2014,12 +2014,12 @@
           }
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ember-cli-typescript": {
@@ -2134,13 +2134,13 @@
       "dev": true
     },
     "@ember-data/serializer": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/@ember-data/serializer/-/serializer-3.21.1.tgz",
-      "integrity": "sha512-7+PsHFAsnlUZjDW0twn+SfdeaCGKgJWdO48sPd4KfAQ1m9a+8fb6iKtVbkKtvKkUGptGhJaryqOW5xX7Wqg55g==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/@ember-data/serializer/-/serializer-3.21.2.tgz",
+      "integrity": "sha512-rjdLMNg8j+pNpTgNT0SIFM6mLYYWeMEMt7sIU1Cz7sRi/Wg37lomo3WJ2V3BoS/TEXKqzv30Ibjr7tfIJgCsUg==",
       "dev": true,
       "requires": {
-        "@ember-data/private-build-infra": "3.21.1",
-        "@ember-data/store": "3.21.1",
+        "@ember-data/private-build-infra": "3.21.2",
+        "@ember-data/store": "3.21.2",
         "ember-cli-babel": "^7.18.0",
         "ember-cli-test-info": "^1.0.0",
         "ember-cli-typescript": "^3.1.3"
@@ -2158,12 +2158,12 @@
           }
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ember-cli-typescript": {
@@ -2272,13 +2272,13 @@
       }
     },
     "@ember-data/store": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/@ember-data/store/-/store-3.21.1.tgz",
-      "integrity": "sha512-Pdew7/XWTSuE22Kss9jca3q9TM72NQQN3K/bz5inBD9ct5bd6DNvbFYz/Y2wxQzbyQ5VvMfg/2kNlv+q8iYPwg==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/@ember-data/store/-/store-3.21.2.tgz",
+      "integrity": "sha512-aA9SogU8OZsKSoKuh7qgvSqSM9uAdumGWhaPQEgXhIp5EKB5TVK4COHUSG9AWY/4DMOq95xEsu/4+d03jnakBg==",
       "dev": true,
       "requires": {
-        "@ember-data/canary-features": "3.21.1",
-        "@ember-data/private-build-infra": "3.21.1",
+        "@ember-data/canary-features": "3.21.2",
+        "@ember-data/private-build-infra": "3.21.2",
         "ember-cli-babel": "^7.18.0",
         "ember-cli-path-utils": "^1.0.0",
         "ember-cli-typescript": "^3.1.3",
@@ -2297,12 +2297,12 @@
           }
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ember-cli-typescript": {
@@ -13901,18 +13901,18 @@
       }
     },
     "ember-data": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/ember-data/-/ember-data-3.21.1.tgz",
-      "integrity": "sha512-aSks8/kW92BR6T2jGKAtg2ECar54mEJPlY92rod6RV5JYU7URQ3kJUdR0K94GwguNmmaEi2dQww2RJOgyNfcCg==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/ember-data/-/ember-data-3.21.2.tgz",
+      "integrity": "sha512-Z+DCWczMBC04ahANj+AqOwXeXrqPmtwaJ+2SnomM9s8PaUcILVZPToTudUBU2rdnS2MjkpmcUVIIYiXEvAetgg==",
       "dev": true,
       "requires": {
-        "@ember-data/adapter": "3.21.1",
-        "@ember-data/debug": "3.21.1",
-        "@ember-data/model": "3.21.1",
-        "@ember-data/private-build-infra": "3.21.1",
-        "@ember-data/record-data": "3.21.1",
-        "@ember-data/serializer": "3.21.1",
-        "@ember-data/store": "3.21.1",
+        "@ember-data/adapter": "3.21.2",
+        "@ember-data/debug": "3.21.2",
+        "@ember-data/model": "3.21.2",
+        "@ember-data/private-build-infra": "3.21.2",
+        "@ember-data/record-data": "3.21.2",
+        "@ember-data/serializer": "3.21.2",
+        "@ember-data/store": "3.21.2",
         "@ember/edition-utils": "^1.2.0",
         "@ember/ordered-set": "^2.0.3",
         "@glimmer/env": "^0.1.7",
@@ -13959,12 +13959,12 @@
           }
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ember-cli-typescript": {
diff --git a/package.json b/package.json
index 6761e1129b5..b37c980140c 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "ember-click-outside": "1.3.0",
     "ember-concurrency": "1.3.0",
     "ember-css-modules": "1.3.2",
-    "ember-data": "3.21.1",
+    "ember-data": "3.21.2",
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-exam": "5.0.1",
     "ember-export-application-global": "2.0.1",