Merge branch 'master' into feat/remove-jquery

Author: jenweber

package.json

@@ -117,7 +117,7 @@
   "engines": {
     "node": "10.* || 12.* || 14.*",
     "npm": "7",
-    "yarn": "1.22.10"
+    "yarn": "1.22.11"
   },
   "ember": {
     "edition": "octane"
@@ -133,6 +133,6 @@
   ],
   "volta": {
     "node": "14.17.0",
-    "yarn": "1.22.10"
+    "yarn": "1.22.11"
   }
 }