diff --git a/.changeset/nice-bags-type.md b/.changeset/nice-bags-type.md
new file mode 100644
index 00000000000..7fe01de1db2
--- /dev/null
+++ b/.changeset/nice-bags-type.md
@@ -0,0 +1,38 @@
+---
+'@keystonejs/fields': major
+'@keystonejs/keystone': major
+'@keystonejs/api-tests': patch
+'@keystonejs/demo-custom-fields': patch
+---
+
+Hooks no longer recieve a `{ query }` argument. This functionality has been superseded by `context.executeGraphQL()`.
+
+```
+{
+  ...
+  hooks: {
+    resolveInput: async ({ actions: { query } } ) => {
+      ...
+      const { data, errors } = await query(`{ ... }`);
+      ...
+    }
+  }
+}
+```
+
+should be changed to
+
+```
+{
+  ...
+  hooks: {
+    resolveInput: async ({ context } ) => {
+      ...
+      const { data, errors } = await context.executeGraphQL({ query: `{ ... }` });
+      ...
+    }
+  }
+}
+```
+
+See [the docs](/docs/discussions/server-side-graphql.md) for more details on how to use `context.executeGraphQL()`.
diff --git a/.changeset/popular-suns-move.md b/.changeset/popular-suns-move.md
deleted file mode 100644
index 2d091900a86..00000000000
--- a/.changeset/popular-suns-move.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@keystonejs/utils': patch
----
-
-Updated doc comments.
diff --git a/.changeset/red-months-lay.md b/.changeset/red-months-lay.md
deleted file mode 100644
index 8e46d43587d..00000000000
--- a/.changeset/red-months-lay.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@keystonejs/keystone': minor
----
-
-Support GraphQL AST input in `executeGraphQL`. This should be created with the `gql` template literal imported from `apollo-server-express`.
diff --git a/.changeset/spotty-news-carry.md b/.changeset/spotty-news-carry.md
deleted file mode 100644
index 0725f298b14..00000000000
--- a/.changeset/spotty-news-carry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@keystonejs/fields': patch
----
-
-Updated docs for `Virtual` field type to show how to execute server-side GraphQL operations.
diff --git a/api-tests/CHANGELOG.md b/api-tests/CHANGELOG.md
index a6251f9816c..7b8e4f4bd85 100644
--- a/api-tests/CHANGELOG.md
+++ b/api-tests/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @keystonejs/api-tests
 
+## 6.0.0
+
+### Major Changes
+
+- [`4ddc3dc6f`](https://github.com/keystonejs/keystone/commit/4ddc3dc6f87c192627d00db85a1080411400eeb5) [#3212](https://github.com/keystonejs/keystone/pull/3212) Thanks [@timleslie](https://github.com/timleslie)! - Removed the `name` argument to `setupServer`. This value will now be autogenerated by the test system. If you would like to use a specific name you can still pass through `{ keystoneOptions: { name: '...' } }` to retain the original behaviour.
+
+  ```
+  setupServer({ name: 'foo', adapterName, createLists, ... });
+  ```
+
+  can now be written as
+
+  ```
+  setupServer({ adapterName, createLists, ... })
+  ```
+
+  or, if you would like the `Keystone` instance to have a specific name,
+
+  ```
+  setupServer({ adapterName, createLists, keystoneOptions: { name: 'foo' }, ... })
+  ```
+
+### Patch Changes
+
+- Updated dependencies [[`4ddc3dc6f`](https://github.com/keystonejs/keystone/commit/4ddc3dc6f87c192627d00db85a1080411400eeb5), [`69d7f2e50`](https://github.com/keystonejs/keystone/commit/69d7f2e50ef2325c0d3b02b8bb5c310590796fed), [`f296866df`](https://github.com/keystonejs/keystone/commit/f296866dfab3af54381fd527473e3dc98425b3b9), [`2806a0bdf`](https://github.com/keystonejs/keystone/commit/2806a0bdfd65429e7c44ed070983f121d6934955), [`3adb2ac2a`](https://github.com/keystonejs/keystone/commit/3adb2ac2ac4ab65636ffea1b2b1f7044410c2b8b), [`9ab6961e0`](https://github.com/keystonejs/keystone/commit/9ab6961e0202277a980bd60a323a1c599f1dd085)]:
+  - @keystonejs/fields@13.0.2
+  - @keystonejs/test-utils@7.0.1
+  - @keystonejs/utils@5.4.2
+  - @keystonejs/keystone@11.2.0
+  - @keystonejs/session@7.0.1
+  - @keystonejs/app-graphql@5.1.9
+
 ## 5.4.9
 
 ### Patch Changes
diff --git a/api-tests/CalendarDay.test.js b/api-tests/CalendarDay.test.js
index 2f0df6a0ce1..a984473a8ab 100644
--- a/api-tests/CalendarDay.test.js
+++ b/api-tests/CalendarDay.test.js
@@ -1,12 +1,10 @@
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const { CalendarDay } = require('@keystonejs/fields');
-const cuid = require('cuid');
 
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('User', {
         fields: {
diff --git a/api-tests/DateTime.test.js b/api-tests/DateTime.test.js
index 1b0bf2ea97f..86fdba5af75 100644
--- a/api-tests/DateTime.test.js
+++ b/api-tests/DateTime.test.js
@@ -1,11 +1,9 @@
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 const { Text, DateTime } = require('@keystonejs/fields');
-const cuid = require('cuid');
 
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Post', {
         fields: {
diff --git a/api-tests/Virtual.test.js b/api-tests/Virtual.test.js
index a333fea5d28..9cc42b85932 100644
--- a/api-tests/Virtual.test.js
+++ b/api-tests/Virtual.test.js
@@ -1,12 +1,10 @@
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 const { Integer, Virtual } = require('@keystonejs/fields');
-const cuid = require('cuid');
 
 function makeSetupKeystone(fields) {
   return function setupKeystone(adapterName) {
     return setupServer({
       adapterName,
-      name: `ks5-testdb-${cuid()}`,
       createLists: keystone => {
         keystone.createList('Post', {
           fields: {
diff --git a/api-tests/access-control/utils.js b/api-tests/access-control/utils.js
index 188cc32fae2..5ec9f57d57a 100644
--- a/api-tests/access-control/utils.js
+++ b/api-tests/access-control/utils.js
@@ -1,4 +1,3 @@
-const cuid = require('cuid');
 const { setupServer } = require('@keystonejs/test-utils');
 const { Text } = require('@keystonejs/fields');
 const { objMerge } = require('@keystonejs/utils');
@@ -102,7 +101,6 @@ const createFieldImperative = fieldAccess => ({
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('User', { fields: { name: { type: Text } } });
 
diff --git a/api-tests/auth-header.test.js b/api-tests/auth-header.test.js
index 5e630609ba0..40097b7b5b3 100644
--- a/api-tests/auth-header.test.js
+++ b/api-tests/auth-header.test.js
@@ -2,7 +2,6 @@ const { PasswordAuthStrategy } = require('@keystonejs/auth-password');
 const { Text, Password, DateTime } = require('@keystonejs/fields');
 const { multiAdapterRunners, networkedGraphqlRequest } = require('@keystonejs/test-utils');
 const { setupServer } = require('@keystonejs/test-utils');
-const cuid = require('cuid');
 
 const initialData = {
   User: [
@@ -25,7 +24,6 @@ const defaultAccess = ({ authentication: { item } }) => !!item;
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `Jest Test Project For Login Auth ${cuid()}`,
     createLists: keystone => {
       keystone.createList('Post', {
         fields: {
diff --git a/api-tests/default-value/defaults.test.js b/api-tests/default-value/defaults.test.js
index 69c0fe800e8..81d91cc511e 100644
--- a/api-tests/default-value/defaults.test.js
+++ b/api-tests/default-value/defaults.test.js
@@ -1,10 +1,8 @@
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 const { Text } = require('@keystonejs/fields');
-const cuid = require('cuid');
 
 const setupList = (adapterName, fields) =>
   setupServer({
-    name: `ks5-testdb-${cuid()}`,
     adapterName,
     createLists: keystone => {
       keystone.createList('User', { fields });
@@ -146,7 +144,6 @@ describe('defaultValue field config', () => {
                 expect.objectContaining({
                   context: expect.any(Object),
                   originalInput: expect.any(Object),
-                  actions: expect.any(Object),
                 })
               );
             })
@@ -174,7 +171,6 @@ describe('defaultValue field config', () => {
                   originalInput: {
                     salutation: 'Doctor',
                   },
-                  actions: expect.any(Object),
                 })
               );
               expect(data.createUser).toMatchObject({
diff --git a/api-tests/extend-graphql-schema/extend-graphql-schema.test.js b/api-tests/extend-graphql-schema/extend-graphql-schema.test.js
index 85e9ea9cf4a..8ce4d0f0607 100644
--- a/api-tests/extend-graphql-schema/extend-graphql-schema.test.js
+++ b/api-tests/extend-graphql-schema/extend-graphql-schema.test.js
@@ -5,14 +5,12 @@ const {
   graphqlRequest,
   networkedGraphqlRequest,
 } = require('@keystonejs/test-utils');
-const cuid = require('cuid');
 
 const falseFn = () => false;
 
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('User', {
         fields: { name: { type: Text } },
diff --git a/api-tests/fields.test.js b/api-tests/fields.test.js
index 2f0a3c5c1a6..1747c4ac223 100644
--- a/api-tests/fields.test.js
+++ b/api-tests/fields.test.js
@@ -1,6 +1,5 @@
 const globby = require('globby');
 const path = require('path');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer } = require('@keystonejs/test-utils');
 
 // `mongodb-memory-server` downloads a binary on first run in CI, which can take
@@ -20,14 +19,13 @@ describe('Fields', () => {
         const keystoneTestWrapper = (testFn = () => {}) =>
           runner(
             () => {
-              const name = `Field tests for ${mod.name} ${cuid()}`;
               const createLists = keystone => {
                 // Create a list with all the fields required for testing
                 const fields = mod.getTestFields();
 
                 keystone.createList(listName, { fields });
               };
-              return setupServer({ name, adapterName, createLists });
+              return setupServer({ adapterName, createLists });
             },
             async ({ keystone, ...rest }) => {
               // Populate the database before running the tests
diff --git a/api-tests/hooks/list-hooks.test.js b/api-tests/hooks/list-hooks.test.js
index 005641bc98b..185c000bc5e 100644
--- a/api-tests/hooks/list-hooks.test.js
+++ b/api-tests/hooks/list-hooks.test.js
@@ -1,11 +1,9 @@
 const { Text } = require('@keystonejs/fields');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
-const cuid = require('cuid');
 
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('User', {
         fields: {
diff --git a/api-tests/package.json b/api-tests/package.json
index 4faec57f4b9..b4bdf15b246 100644
--- a/api-tests/package.json
+++ b/api-tests/package.json
@@ -2,7 +2,7 @@
   "name": "@keystonejs/api-tests",
   "description": "A set of tests for running against the KeystoneJS API.",
   "private": true,
-  "version": "5.4.9",
+  "version": "6.0.0",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "engines": {
@@ -24,10 +24,9 @@
   },
   "dependencies": {
     "@keystonejs/auth-password": "^5.1.10",
-    "@keystonejs/fields": "^13.0.1",
-    "@keystonejs/test-utils": "^7.0.0",
-    "@keystonejs/utils": "^5.4.1",
-    "cuid": "^2.1.8",
+    "@keystonejs/fields": "^13.0.2",
+    "@keystonejs/test-utils": "^7.0.1",
+    "@keystonejs/utils": "^5.4.2",
     "date-fns": "^2.14.0",
     "express": "^4.17.1"
   }
diff --git a/api-tests/queries-access-control/meta.test.js b/api-tests/queries-access-control/meta.test.js
index d33fb8c5a32..3fb1c628ccd 100644
--- a/api-tests/queries-access-control/meta.test.js
+++ b/api-tests/queries-access-control/meta.test.js
@@ -1,11 +1,9 @@
 const { Text, Relationship } = require('@keystonejs/fields');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
-const cuid = require('cuid');
 
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('User', {
         fields: {
diff --git a/api-tests/queries/cache-hints.test.js b/api-tests/queries/cache-hints.test.js
index b350dfd345b..8bbc9b64e72 100644
--- a/api-tests/queries/cache-hints.test.js
+++ b/api-tests/queries/cache-hints.test.js
@@ -5,12 +5,9 @@ const {
   networkedGraphqlRequest,
 } = require('@keystonejs/test-utils');
 
-const cuid = require('cuid');
-
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Post', {
         fields: {
diff --git a/api-tests/queries/limits.test.js b/api-tests/queries/limits.test.js
index 3dfe3953535..7bc3c8aeb77 100644
--- a/api-tests/queries/limits.test.js
+++ b/api-tests/queries/limits.test.js
@@ -9,12 +9,9 @@ const {
   validation: { depthLimit, definitionLimit, fieldLimit },
 } = require('@keystonejs/app-graphql');
 
-const cuid = require('cuid');
-
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Post', {
         fields: {
diff --git a/api-tests/queries/meta.test.js b/api-tests/queries/meta.test.js
index 565bc537f8a..c7c5124ac31 100644
--- a/api-tests/queries/meta.test.js
+++ b/api-tests/queries/meta.test.js
@@ -1,11 +1,9 @@
 const { Text, Relationship } = require('@keystonejs/fields');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
-const cuid = require('cuid');
 
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('User', {
         fields: {
diff --git a/api-tests/queries/relationships.test.js b/api-tests/queries/relationships.test.js
index a1522b5134f..2c7544e8f19 100644
--- a/api-tests/queries/relationships.test.js
+++ b/api-tests/queries/relationships.test.js
@@ -4,12 +4,10 @@ const { Text, Relationship } = require('@keystonejs/fields');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
-const cuid = require('cuid');
 
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Post', {
         fields: {
diff --git a/api-tests/queries/search.test.js b/api-tests/queries/search.test.js
index 58ac5b18168..4445f5f636a 100644
--- a/api-tests/queries/search.test.js
+++ b/api-tests/queries/search.test.js
@@ -1,12 +1,9 @@
 const { Text, Integer } = require('@keystonejs/fields');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
-const cuid = require('cuid');
-
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Test', {
         fields: {
diff --git a/api-tests/relationships/crud-self-ref/many-to-many-one-sided.test.js b/api-tests/relationships/crud-self-ref/many-to-many-one-sided.test.js
index 9cb20a24886..5aa8b0ec744 100644
--- a/api-tests/relationships/crud-self-ref/many-to-many-one-sided.test.js
+++ b/api-tests/relationships/crud-self-ref/many-to-many-one-sided.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
@@ -113,11 +112,7 @@ multiAdapterRunners().map(({ runner, adapterName }) =>
 
     describe(`Many-to-many relationships`, () => {
       function setupKeystone(adapterName) {
-        return setupServer({
-          adapterName,
-          name: `ks5-testdb-${cuid()}`,
-          createLists,
-        });
+        return setupServer({ adapterName, createLists });
       }
 
       describe('Read', () => {
diff --git a/api-tests/relationships/crud-self-ref/many-to-many.test.js b/api-tests/relationships/crud-self-ref/many-to-many.test.js
index d7aca30988e..1b6d7a90d4b 100644
--- a/api-tests/relationships/crud-self-ref/many-to-many.test.js
+++ b/api-tests/relationships/crud-self-ref/many-to-many.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
@@ -127,11 +126,7 @@ multiAdapterRunners().map(({ runner, adapterName }) =>
     ].forEach(([createLists, order]) => {
       describe(`Many-to-many relationships - ${order}`, () => {
         function setupKeystone(adapterName) {
-          return setupServer({
-            adapterName,
-            name: `ks5-testdb-${cuid()}`,
-            createLists,
-          });
+          return setupServer({ adapterName, createLists });
         }
 
         describe('Read', () => {
diff --git a/api-tests/relationships/crud-self-ref/one-to-many-one-sided.test.js b/api-tests/relationships/crud-self-ref/one-to-many-one-sided.test.js
index b845a52a633..ceaf229ab41 100644
--- a/api-tests/relationships/crud-self-ref/one-to-many-one-sided.test.js
+++ b/api-tests/relationships/crud-self-ref/one-to-many-one-sided.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
@@ -118,11 +117,7 @@ multiAdapterRunners().map(({ runner, adapterName }) =>
 
     describe(`One-to-many relationships `, () => {
       function setupKeystone(adapterName) {
-        return setupServer({
-          adapterName,
-          name: `ks5-testdb-${cuid()}`,
-          createLists,
-        });
+        return setupServer({ adapterName, createLists });
       }
 
       describe('Count', () => {
diff --git a/api-tests/relationships/crud-self-ref/one-to-many.test.js b/api-tests/relationships/crud-self-ref/one-to-many.test.js
index 2be78780d10..9ddbe8eedec 100644
--- a/api-tests/relationships/crud-self-ref/one-to-many.test.js
+++ b/api-tests/relationships/crud-self-ref/one-to-many.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
@@ -124,11 +123,7 @@ multiAdapterRunners().map(({ runner, adapterName }) =>
     ].forEach(([createLists, order]) => {
       describe(`One-to-many relationships - ${order}`, () => {
         function setupKeystone(adapterName) {
-          return setupServer({
-            adapterName,
-            name: `ks5-testdb-${cuid()}`,
-            createLists,
-          });
+          return setupServer({ adapterName, createLists });
         }
 
         describe('Read', () => {
diff --git a/api-tests/relationships/crud-self-ref/one-to-one.test.js b/api-tests/relationships/crud-self-ref/one-to-one.test.js
index b3279bc2e99..bc13ca966f6 100644
--- a/api-tests/relationships/crud-self-ref/one-to-one.test.js
+++ b/api-tests/relationships/crud-self-ref/one-to-one.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
@@ -90,11 +89,7 @@ multiAdapterRunners().map(({ runner, adapterName }) =>
     ].forEach(([createLists, order]) => {
       describe(`One-to-one relationships - ${order}`, () => {
         function setupKeystone(adapterName) {
-          return setupServer({
-            adapterName,
-            name: `ks5-testdb-${cuid()}`,
-            createLists,
-          });
+          return setupServer({ adapterName, createLists });
         }
 
         describe('Read', () => {
diff --git a/api-tests/relationships/crud/many-to-many-one-sided.test.js b/api-tests/relationships/crud/many-to-many-one-sided.test.js
index 64db2ef67c3..d4cd6226742 100644
--- a/api-tests/relationships/crud/many-to-many-one-sided.test.js
+++ b/api-tests/relationships/crud/many-to-many-one-sided.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
@@ -136,11 +135,7 @@ multiAdapterRunners().map(({ runner, adapterName }) =>
     ].forEach(([createLists, order]) => {
       describe(`Many-to-many relationships - ${order}`, () => {
         function setupKeystone(adapterName) {
-          return setupServer({
-            adapterName,
-            name: `ks5-testdb-${cuid()}`,
-            createLists,
-          });
+          return setupServer({ adapterName, createLists });
         }
 
         describe('Read', () => {
diff --git a/api-tests/relationships/crud/many-to-many.test.js b/api-tests/relationships/crud/many-to-many.test.js
index cc53c4bd0fa..93fe771017b 100644
--- a/api-tests/relationships/crud/many-to-many.test.js
+++ b/api-tests/relationships/crud/many-to-many.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
@@ -138,11 +137,7 @@ multiAdapterRunners().map(({ runner, adapterName }) =>
     ].forEach(([createLists, order]) => {
       describe(`Many-to-many relationships - ${order}`, () => {
         function setupKeystone(adapterName) {
-          return setupServer({
-            adapterName,
-            name: `ks5-testdb-${cuid()}`,
-            createLists,
-          });
+          return setupServer({ adapterName, createLists });
         }
 
         describe('Read', () => {
diff --git a/api-tests/relationships/crud/one-to-many-one-sided.test.js b/api-tests/relationships/crud/one-to-many-one-sided.test.js
index 50635503a0e..d626f26b23b 100644
--- a/api-tests/relationships/crud/one-to-many-one-sided.test.js
+++ b/api-tests/relationships/crud/one-to-many-one-sided.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
@@ -146,11 +145,7 @@ multiAdapterRunners().map(({ runner, adapterName }) =>
     ].forEach(([createLists, order]) => {
       describe(`One-to-many relationships - ${order}`, () => {
         function setupKeystone(adapterName) {
-          return setupServer({
-            adapterName,
-            name: `ks5-testdb-${cuid()}`,
-            createLists,
-          });
+          return setupServer({ adapterName, createLists });
         }
 
         describe('Count', () => {
diff --git a/api-tests/relationships/crud/one-to-many.test.js b/api-tests/relationships/crud/one-to-many.test.js
index 55fdcef73c6..90cd41148b5 100644
--- a/api-tests/relationships/crud/one-to-many.test.js
+++ b/api-tests/relationships/crud/one-to-many.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
@@ -134,11 +133,7 @@ multiAdapterRunners().map(({ runner, adapterName }) =>
     ].forEach(([createLists, order]) => {
       describe(`One-to-many relationships - ${order}`, () => {
         function setupKeystone(adapterName) {
-          return setupServer({
-            adapterName,
-            name: `ks5-testdb-${cuid()}`,
-            createLists,
-          });
+          return setupServer({ adapterName, createLists });
         }
 
         describe('Read', () => {
diff --git a/api-tests/relationships/crud/one-to-one.test.js b/api-tests/relationships/crud/one-to-one.test.js
index 9ade5101c50..239cd162471 100644
--- a/api-tests/relationships/crud/one-to-one.test.js
+++ b/api-tests/relationships/crud/one-to-one.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
@@ -130,11 +129,7 @@ multiAdapterRunners().map(({ runner, adapterName }) =>
     ].forEach(([createLists, order]) => {
       describe(`One-to-one relationships - ${order}`, () => {
         function setupKeystone(adapterName) {
-          return setupServer({
-            adapterName,
-            name: `ks5-testdb-${cuid()}`,
-            createLists,
-          });
+          return setupServer({ adapterName, createLists });
         }
 
         describe('Read', () => {
diff --git a/api-tests/relationships/filtering/access-control.test.js b/api-tests/relationships/filtering/access-control.test.js
index 1b1a051dfc9..c74fb7a3bd6 100644
--- a/api-tests/relationships/filtering/access-control.test.js
+++ b/api-tests/relationships/filtering/access-control.test.js
@@ -5,7 +5,6 @@ const {
   setupServer,
   networkedGraphqlRequest,
 } = require('@keystonejs/test-utils');
-const cuid = require('cuid');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
 
@@ -14,7 +13,6 @@ const postNames = ['Post 1', 'Post 2', 'Post 3'];
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('UserToPostLimitedRead', {
         fields: {
diff --git a/api-tests/relationships/filtering/filtering.test.js b/api-tests/relationships/filtering/filtering.test.js
index 0e8eb7c7059..c11a148b7f9 100644
--- a/api-tests/relationships/filtering/filtering.test.js
+++ b/api-tests/relationships/filtering/filtering.test.js
@@ -1,11 +1,9 @@
 const { Text, Relationship } = require('@keystonejs/fields');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
-const cuid = require('cuid');
 
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('User', {
         fields: {
diff --git a/api-tests/relationships/filtering/nested.test.js b/api-tests/relationships/filtering/nested.test.js
index dcbdea6ccb3..f66da58600b 100644
--- a/api-tests/relationships/filtering/nested.test.js
+++ b/api-tests/relationships/filtering/nested.test.js
@@ -1,11 +1,9 @@
 const { Text, Relationship } = require('@keystonejs/fields');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
-const cuid = require('cuid');
 
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('User', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/connect-many.test.js b/api-tests/relationships/nested-mutations/connect-many.test.js
index 5c9c1c5947b..261186401e8 100644
--- a/api-tests/relationships/nested-mutations/connect-many.test.js
+++ b/api-tests/relationships/nested-mutations/connect-many.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const {
   multiAdapterRunners,
   setupServer,
@@ -13,7 +12,6 @@ const alphanumGenerator = gen.alphaNumString.notEmpty();
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Note', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/connect-singular.test.js b/api-tests/relationships/nested-mutations/connect-singular.test.js
index bd7edf10cae..18fabaaddbe 100644
--- a/api-tests/relationships/nested-mutations/connect-singular.test.js
+++ b/api-tests/relationships/nested-mutations/connect-singular.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const {
   multiAdapterRunners,
   setupServer,
@@ -11,7 +10,6 @@ const {
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Group', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/create-and-connect-many.test.js b/api-tests/relationships/nested-mutations/create-and-connect-many.test.js
index da4e1d2c580..fb3fd792c15 100644
--- a/api-tests/relationships/nested-mutations/create-and-connect-many.test.js
+++ b/api-tests/relationships/nested-mutations/create-and-connect-many.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const {
   multiAdapterRunners,
   setupServer,
@@ -13,7 +12,6 @@ const alphanumGenerator = gen.alphaNumString.notEmpty();
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Note', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/create-and-connect-singular.test.js b/api-tests/relationships/nested-mutations/create-and-connect-singular.test.js
index 42012a88c4f..28a26bf5bdc 100644
--- a/api-tests/relationships/nested-mutations/create-and-connect-singular.test.js
+++ b/api-tests/relationships/nested-mutations/create-and-connect-singular.test.js
@@ -1,11 +1,9 @@
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Group', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/create-many.test.js b/api-tests/relationships/nested-mutations/create-many.test.js
index 7de1415040c..fe52d3f443b 100644
--- a/api-tests/relationships/nested-mutations/create-many.test.js
+++ b/api-tests/relationships/nested-mutations/create-many.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const {
   multiAdapterRunners,
   setupServer,
@@ -13,7 +12,6 @@ const alphanumGenerator = gen.alphaNumString.notEmpty();
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Note', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/create-singular.test.js b/api-tests/relationships/nested-mutations/create-singular.test.js
index 2e622c31e89..00220844135 100644
--- a/api-tests/relationships/nested-mutations/create-singular.test.js
+++ b/api-tests/relationships/nested-mutations/create-singular.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const {
   multiAdapterRunners,
   setupServer,
@@ -11,7 +10,6 @@ const {
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Group', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/disconnect-all-many.test.js b/api-tests/relationships/nested-mutations/disconnect-all-many.test.js
index 515be32bbab..9e4a2515421 100644
--- a/api-tests/relationships/nested-mutations/disconnect-all-many.test.js
+++ b/api-tests/relationships/nested-mutations/disconnect-all-many.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const {
   setupServer,
   graphqlRequest,
@@ -13,7 +12,6 @@ const alphanumGenerator = gen.alphaNumString.notEmpty();
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Note', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/disconnect-all-singular.test.js b/api-tests/relationships/nested-mutations/disconnect-all-singular.test.js
index 2563c2d16b0..3d6cd8c3b96 100644
--- a/api-tests/relationships/nested-mutations/disconnect-all-singular.test.js
+++ b/api-tests/relationships/nested-mutations/disconnect-all-singular.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const {
   multiAdapterRunners,
   setupServer,
@@ -13,7 +12,6 @@ const alphanumGenerator = gen.alphaNumString.notEmpty();
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Group', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/disconnect-many.test.js b/api-tests/relationships/nested-mutations/disconnect-many.test.js
index e17b75e4499..d2d38cb32f3 100644
--- a/api-tests/relationships/nested-mutations/disconnect-many.test.js
+++ b/api-tests/relationships/nested-mutations/disconnect-many.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const {
   multiAdapterRunners,
   setupServer,
@@ -13,7 +12,6 @@ const alphanumGenerator = gen.alphaNumString.notEmpty();
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Note', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/disconnect-singular.test.js b/api-tests/relationships/nested-mutations/disconnect-singular.test.js
index 6d599fa8bc9..d29003b164f 100644
--- a/api-tests/relationships/nested-mutations/disconnect-singular.test.js
+++ b/api-tests/relationships/nested-mutations/disconnect-singular.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const {
   multiAdapterRunners,
   setupServer,
@@ -13,7 +12,6 @@ const alphanumGenerator = gen.alphaNumString.notEmpty();
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Group', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/reconnect-many-to-one.test.js b/api-tests/relationships/nested-mutations/reconnect-many-to-one.test.js
index 67af3eb767c..a354d5f401b 100644
--- a/api-tests/relationships/nested-mutations/reconnect-many-to-one.test.js
+++ b/api-tests/relationships/nested-mutations/reconnect-many-to-one.test.js
@@ -1,11 +1,9 @@
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Note', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/two-way-backreference/to-many.test.js b/api-tests/relationships/nested-mutations/two-way-backreference/to-many.test.js
index d8b36ad6dd0..b5221efbb45 100644
--- a/api-tests/relationships/nested-mutations/two-way-backreference/to-many.test.js
+++ b/api-tests/relationships/nested-mutations/two-way-backreference/to-many.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
@@ -14,7 +13,6 @@ jest.setTimeout(60000);
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Student', {
         fields: {
diff --git a/api-tests/relationships/nested-mutations/two-way-backreference/to-one-required.test.js b/api-tests/relationships/nested-mutations/two-way-backreference/to-one-required.test.js
index b6001053e8e..5ceac163e3b 100644
--- a/api-tests/relationships/nested-mutations/two-way-backreference/to-one-required.test.js
+++ b/api-tests/relationships/nested-mutations/two-way-backreference/to-one-required.test.js
@@ -1,6 +1,5 @@
 const { gen, sampleOne } = require('testcheck');
 const { Text, Relationship } = require('@keystonejs/fields');
-const cuid = require('cuid');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 
 const alphanumGenerator = gen.alphaNumString.notEmpty();
@@ -10,7 +9,6 @@ jest.setTimeout(6000000);
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('Company', {
         fields: {
diff --git a/api-tests/required.test.js b/api-tests/required.test.js
index 0b2dd2768bf..51a68aefc0d 100644
--- a/api-tests/required.test.js
+++ b/api-tests/required.test.js
@@ -1,4 +1,3 @@
-const cuid = require('cuid');
 const globby = require('globby');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 const { Text } = require('@keystonejs/fields');
@@ -17,7 +16,6 @@ describe('Test isRequired flag for all field types', () => {
             runner(
               () =>
                 setupServer({
-                  name: `Field tests for ${type.type} ${cuid()}`,
                   adapterName,
                   createLists: keystone => {
                     if (type.type === 'Select') {
diff --git a/api-tests/uniqueness/unique.test.js b/api-tests/uniqueness/unique.test.js
index c03b35b2634..406a680fede 100644
--- a/api-tests/uniqueness/unique.test.js
+++ b/api-tests/uniqueness/unique.test.js
@@ -1,11 +1,9 @@
 const { Text } = require('@keystonejs/fields');
 const { multiAdapterRunners, setupServer, graphqlRequest } = require('@keystonejs/test-utils');
-const cuid = require('cuid');
 
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('User', {
         fields: {
diff --git a/benchmarks/CHANGELOG.md b/benchmarks/CHANGELOG.md
index 555fbeda7c2..6d873898c1a 100644
--- a/benchmarks/CHANGELOG.md
+++ b/benchmarks/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @keystonejs/benchmarks
 
+## 5.1.14
+
+### Patch Changes
+
+- [`4ddc3dc6f`](https://github.com/keystonejs/keystone/commit/4ddc3dc6f87c192627d00db85a1080411400eeb5) [#3212](https://github.com/keystonejs/keystone/pull/3212) Thanks [@timleslie](https://github.com/timleslie)! - Removed `name` argument from calls to `setupServer` in tests.
+
+- Updated dependencies [[`4ddc3dc6f`](https://github.com/keystonejs/keystone/commit/4ddc3dc6f87c192627d00db85a1080411400eeb5), [`f296866df`](https://github.com/keystonejs/keystone/commit/f296866dfab3af54381fd527473e3dc98425b3b9), [`2806a0bdf`](https://github.com/keystonejs/keystone/commit/2806a0bdfd65429e7c44ed070983f121d6934955), [`3adb2ac2a`](https://github.com/keystonejs/keystone/commit/3adb2ac2ac4ab65636ffea1b2b1f7044410c2b8b), [`9ab6961e0`](https://github.com/keystonejs/keystone/commit/9ab6961e0202277a980bd60a323a1c599f1dd085)]:
+  - @keystonejs/fields@13.0.2
+  - @keystonejs/test-utils@7.0.1
+  - @keystonejs/keystone@11.2.0
+  - @keystonejs/session@7.0.1
+  - @keystonejs/app-graphql@5.1.9
+
 ## 5.1.13
 
 ### Patch Changes
diff --git a/benchmarks/fixtures/create-related.js b/benchmarks/fixtures/create-related.js
index f2c1800a06c..a46a840e4a0 100644
--- a/benchmarks/fixtures/create-related.js
+++ b/benchmarks/fixtures/create-related.js
@@ -1,4 +1,3 @@
-const cuid = require('cuid');
 const { Text, Relationship } = require('@keystonejs/fields');
 const { setupServer } = require('@keystonejs/test-utils');
 const { FixtureGroup, timeQuery, populate, range } = require('../lib/utils');
@@ -6,7 +5,6 @@ const { FixtureGroup, timeQuery, populate, range } = require('../lib/utils');
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('User', {
         fields: {
diff --git a/benchmarks/fixtures/create.js b/benchmarks/fixtures/create.js
index 1207fb6fac7..d2d94dce08a 100644
--- a/benchmarks/fixtures/create.js
+++ b/benchmarks/fixtures/create.js
@@ -1,4 +1,3 @@
-const cuid = require('cuid');
 const { Text } = require('@keystonejs/fields');
 const { setupServer } = require('@keystonejs/test-utils');
 const { FixtureGroup, timeQuery, populate, range } = require('../lib/utils');
@@ -6,7 +5,6 @@ const { FixtureGroup, timeQuery, populate, range } = require('../lib/utils');
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('User', {
         fields: {
diff --git a/benchmarks/fixtures/query.js b/benchmarks/fixtures/query.js
index 9f5c7a022d6..793b2e122b0 100644
--- a/benchmarks/fixtures/query.js
+++ b/benchmarks/fixtures/query.js
@@ -1,4 +1,3 @@
-const cuid = require('cuid');
 const { Text, Relationship } = require('@keystonejs/fields');
 const { setupServer, graphqlRequest } = require('@keystonejs/test-utils');
 const { FixtureGroup, timeQuery, populate, range } = require('../lib/utils');
@@ -6,7 +5,6 @@ const { FixtureGroup, timeQuery, populate, range } = require('../lib/utils');
 function setupKeystone(adapterName) {
   return setupServer({
     adapterName,
-    name: `ks5-testdb-${cuid()}`,
     createLists: keystone => {
       keystone.createList('User', {
         fields: {
diff --git a/benchmarks/package.json b/benchmarks/package.json
index 2ddb404e423..a86cb5f0c03 100644
--- a/benchmarks/package.json
+++ b/benchmarks/package.json
@@ -2,7 +2,7 @@
   "name": "@keystonejs/benchmarks",
   "description": "A set of benchmarks for running against the KeystoneJS API.",
   "private": true,
-  "version": "5.1.13",
+  "version": "5.1.14",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "engines": {
@@ -16,14 +16,13 @@
   "dependencies": {
     "@keystonejs/adapter-knex": "^10.1.0",
     "@keystonejs/adapter-mongoose": "^8.1.3",
-    "@keystonejs/app-graphql": "^5.1.8",
-    "@keystonejs/fields": "^13.0.1",
-    "@keystonejs/keystone": "^11.1.1",
-    "@keystonejs/session": "^7.0.0",
-    "@keystonejs/test-utils": "^7.0.0",
+    "@keystonejs/app-graphql": "^5.1.9",
+    "@keystonejs/fields": "^13.0.2",
+    "@keystonejs/keystone": "^11.2.0",
+    "@keystonejs/session": "^7.0.1",
+    "@keystonejs/test-utils": "^7.0.1",
     "body-parser": "^1.18.2",
     "cookie-signature": "^1.1.0",
-    "cuid": "^2.1.8",
     "supertest-light": "^1.0.3",
     "testcheck": "^1.0.0-rc.2"
   }
diff --git a/demo-projects/custom-fields/fields/MultiCheck/Implementation.js b/demo-projects/custom-fields/fields/MultiCheck/Implementation.js
index 47895223eb8..c0473ea3c77 100644
--- a/demo-projects/custom-fields/fields/MultiCheck/Implementation.js
+++ b/demo-projects/custom-fields/fields/MultiCheck/Implementation.js
@@ -35,11 +35,11 @@ class MultiCheck extends Text.implementation {
     ];
   }
 
-  getDefaultValue({ context, originalInput, actions }) {
+  getDefaultValue({ context, originalInput }) {
     let result;
     if (typeof this.defaultValue !== 'undefined') {
       if (typeof this.defaultValue === 'function') {
-        result = this.defaultValue({ context, originalInput, actions });
+        result = this.defaultValue({ context, originalInput });
       } else {
         result = this.defaultValue;
       }
diff --git a/docs/api/hooks.md b/docs/api/hooks.md
index 67d9f166051..ee6aa64eb8f 100644
--- a/docs/api/hooks.md
+++ b/docs/api/hooks.md
@@ -133,7 +133,6 @@ The result is passed to [the next function in the execution order](/docs/guides/
 | `originalInput` | `Object`                | The data received by the GraphQL mutation                                                                                    |
 | `resolvedData`  | `Object`                | The data received by the GraphQL mutation plus defaults values                                                               |
 | `context`       | `Apollo Context`        | The [Apollo `context` object](https://www.apollographql.com/docs/apollo-server/data/data/#context-argument) for this request |
-| `actions`       | `Object`                | Contains a `query` functions that queries the list within the current operations context, see [Query Helper](#query-helper)  |
 
 #### Usage
 
@@ -146,7 +145,6 @@ const resolveInput = ({
   originalInput,
   resolvedData,
   context,
-  actions,
 }) => {
   // Input resolution logic. Object returned is used in place of `resolvedData`.
   return resolvedData;
@@ -172,7 +170,6 @@ Return values are ignored.
 | `originalInput`           | `Object`                | The data received by the GraphQL mutation                                                                                    |
 | `resolvedData`            | `Object`                | The data received by the GraphQL mutation plus defaults values                                                               |
 | `context`                 | `Apollo Context`        | The [Apollo `context` object](https://www.apollographql.com/docs/apollo-server/data/data/#context-argument) for this request |
-| `actions`                 | `Object`                | Contains a `query` functions that queries the list within the current operations context, see [Query Helper](#query-helper)  |
 | `addFieldValidationError` | `Function`              | Used to set a field validation error; accepts a `String`                                                                     |
 
 #### Usage
@@ -186,7 +183,6 @@ const validateInput = ({
   originalInput,
   resolvedData,
   context,
-  actions,
   addFieldValidationError,
 }) => {
   // Throw error objects or register validation errors with addFieldValidationError(<String>)
@@ -213,7 +209,6 @@ Return values are ignored.
 | `originalInput` | `Object`                | The data received by the GraphQL mutation                                                                                    |
 | `resolvedData`  | `Object`                | The data received by the GraphQL mutation plus defaults values                                                               |
 | `context`       | `Apollo Context`        | The [Apollo `context` object](https://www.apollographql.com/docs/apollo-server/data/data/#context-argument) for this request |
-| `actions`       | `Object`                | Contains a `query` functions that queries the list within the current operations context, see [Query Helper](#query-helper)  |
 
 #### Usage
 
@@ -226,7 +221,6 @@ const beforeChange = ({
   originalInput,
   resolvedData,
   context,
-  actions,
 }) => {
   // Perform side effects
   // Return values ignored
@@ -256,7 +250,6 @@ Return values are ignored.
 | `originalInput` | `Object`                | The data received by the GraphQL mutation                                                                                    |
 | `updatedItem`   | `Object`                | The new/currently stored item                                                                                                |
 | `context`       | `Apollo Context`        | The [Apollo `context` object](https://www.apollographql.com/docs/apollo-server/data/data/#context-argument) for this request |
-| `actions`       | `Object`                | Contains a `query` functions that queries the list within the current operations context, see [Query Helper](#query-helper)  |
 
 #### Usage
 
@@ -269,7 +262,6 @@ const afterChange = ({
   originalInput,
   updatedItem,
   context,
-  actions,
 }) => {
   // Perform side effects
   // Return values ignored
@@ -292,7 +284,6 @@ Should throw or register errors with `addFieldValidationError(<String>)` if the
 | `operation`               | `String`         | The operation being performed (`delete` in this case)                                                                        |
 | `existingItem`            | `Object`         | The current stored item                                                                                                      |
 | `context`                 | `Apollo Context` | The [Apollo `context` object](https://www.apollographql.com/docs/apollo-server/data/data/#context-argument) for this request |
-| `actions`                 | `Object`         | Contains a `query` functions that queries the list within the current operations context, see [Query Helper](#query-helper)  |
 | `addFieldValidationError` | `Function`       | Used to set a field validation error; accepts a `String`                                                                     |
 
 #### Usage
@@ -304,7 +295,6 @@ const validateDelete = ({
   operation,
   existingItem,
   context,
-  actions,
   addFieldValidationError,
 }) => {
   // Throw error objects or register validation errors with addFieldValidationError(<String>)
@@ -329,7 +319,6 @@ Return values are ignored.
 | `operation`    | `String`         | The operation being performed (`delete` in this case)                                                                        |
 | `existingItem` | `Object`         | The current stored item                                                                                                      |
 | `context`      | `Apollo Context` | The [Apollo `context` object](https://www.apollographql.com/docs/apollo-server/data/data/#context-argument) for this request |
-| `actions`      | `Object`         | Contains a `query` functions that queries the list within the current operations context, see [Query Helper](#query-helper)  |
 
 #### Usage
 
@@ -340,7 +329,6 @@ const beforeDelete = ({
   operation,
   existingItem,
   context,
-  actions,
 }) => {
   // Perform side effects
   // Return values ignored
@@ -366,7 +354,6 @@ Return values are ignored.
 | `operation`    | `String`         | The operation being performed (`delete` in this case)                                                                        |
 | `existingItem` | `Object`         | The previously stored item, now deleted                                                                                      |
 | `context`      | `Apollo Context` | The [Apollo `context` object](https://www.apollographql.com/docs/apollo-server/data/data/#context-argument) for this request |
-| `actions`      | `Object`         | Contains a `query` functions that queries the list within the current operations context, see [Query Helper](#query-helper)  |
 
 #### Usage
 
@@ -377,55 +364,13 @@ const afterDelete = ({
   operation,
   existingItem,
   context,
-  actions,
 }) => {
   // Perform side effects
   // Return values ignored
 };
 ```
 
-## The `actions` argument
+### Running GraphQL Queries From Hook
 
-All hooks receive an `actions` object as an argument.
-
-It contains helper functionality for accessing the GraphQL schema, optionally _within_ the context of the current request.
-When used, this context reuse causes access control to be applied as though the caller themselves initiated an operation.
-It can therefore be useful for performing additional operations on behalf of the caller.
-
-The `actions` object currently contains a single function: `query`.
-
-### Query helper
-
-Perform a GraphQL query, optionally _within_ the context of the current request.
-It returns a `Promise<Object>` containing the standard GraphQL `errors` and `data` properties.
-
-#### Argument
-
-| Argument                    | Type      | Description                                                                                                                          |
-| :-------------------------- | :-------- | :----------------------------------------------------------------------------------------------------------------------------------- |
-| `queryString`               | `String`  | A graphQL query string                                                                                                               |
-| `options`                   | `Object`  | Config for the query                                                                                                                 |
-| `options.skipAccessControl` | `Boolean` | By default access control _of the user making the initial request_ is still tested. Pass as `true` to disable access control checks. |
-| `options.variables`         | `Object`  | The variables passed to the graphql query for the given queryString                                                                  |
-
-#### Usage
-
-```js
-const myHook = ({
-  actions: { query },
-}) => {
-  const queryString = `
-    query {
-      # GraphQL query here...
-    }
-  `;
-  const options = {
-    skipAccessControl: false,
-    variables: { /* GraphQL variables here.. */ },
-  };
-  const { errors, data } = await query(queryString, options);
-
-  // Check for errors
-  // Do something with data
-};
-```
+If you need to execute a GraphQL query from within your hook function you can use `context.executeGraphQL()`.
+See the docs on [server-side graphql operations](/docs/discussions/server-side-graphql.md) for more details.
diff --git a/packages/app-admin-ui/CHANGELOG.md b/packages/app-admin-ui/CHANGELOG.md
index 7d297477195..d537d20cf4b 100644
--- a/packages/app-admin-ui/CHANGELOG.md
+++ b/packages/app-admin-ui/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @keystonejs/app-admin-ui
 
+## 7.0.5
+
+### Patch Changes
+
+- Updated dependencies [[`887ad8199`](https://github.com/keystonejs/keystone/commit/887ad8199aa5c32a3db8588104f4548c90aa106c), [`4ddc3dc6f`](https://github.com/keystonejs/keystone/commit/4ddc3dc6f87c192627d00db85a1080411400eeb5), [`69d7f2e50`](https://github.com/keystonejs/keystone/commit/69d7f2e50ef2325c0d3b02b8bb5c310590796fed), [`2806a0bdf`](https://github.com/keystonejs/keystone/commit/2806a0bdfd65429e7c44ed070983f121d6934955), [`3adb2ac2a`](https://github.com/keystonejs/keystone/commit/3adb2ac2ac4ab65636ffea1b2b1f7044410c2b8b)]:
+  - @arch-ui/pagination@0.0.23
+  - @keystonejs/fields@13.0.2
+  - @keystonejs/utils@5.4.2
+  - @keystonejs/session@7.0.1
+
 ## 7.0.4
 
 ### Patch Changes
diff --git a/packages/app-admin-ui/package.json b/packages/app-admin-ui/package.json
index 3cd629e9441..e82437a5e88 100644
--- a/packages/app-admin-ui/package.json
+++ b/packages/app-admin-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@keystonejs/app-admin-ui",
   "description": "KeystoneJS Admin UI App.",
-  "version": "7.0.4",
+  "version": "7.0.5",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "engines": {
@@ -29,7 +29,7 @@
     "@arch-ui/lozenge": "^0.0.16",
     "@arch-ui/navbar": "^0.1.11",
     "@arch-ui/options": "^0.0.21",
-    "@arch-ui/pagination": "^0.0.22",
+    "@arch-ui/pagination": "^0.0.23",
     "@arch-ui/pill": "^0.1.15",
     "@arch-ui/popout": "^0.0.19",
     "@arch-ui/select": "^0.1.8",
@@ -41,9 +41,9 @@
     "@emotion/core": "^10.0.28",
     "@keystonejs/build-field-types": "^5.2.9",
     "@keystonejs/field-views-loader": "^6.0.0",
-    "@keystonejs/fields": "^13.0.0",
-    "@keystonejs/session": "^7.0.0",
-    "@keystonejs/utils": "^5.4.1",
+    "@keystonejs/fields": "^13.0.2",
+    "@keystonejs/session": "^7.0.1",
+    "@keystonejs/utils": "^5.4.2",
     "@types/react": "^16.8.12",
     "apollo-cache-inmemory": "^1.6.6",
     "apollo-client": "^2.6.10",
diff --git a/packages/app-graphql/CHANGELOG.md b/packages/app-graphql/CHANGELOG.md
index 9dfe536c5cc..ba4d47feab4 100644
--- a/packages/app-graphql/CHANGELOG.md
+++ b/packages/app-graphql/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @keystonejs/app-graphql
 
+## 5.1.9
+
+### Patch Changes
+
+- [`9ab6961e0`](https://github.com/keystonejs/keystone/commit/9ab6961e0202277a980bd60a323a1c599f1dd085) [#3217](https://github.com/keystonejs/keystone/pull/3217) Thanks [@Vultraz](https://github.com/Vultraz)! - Updated apollo-server-express dependency to 2.15.1.
+
+- Updated dependencies [[`69d7f2e50`](https://github.com/keystonejs/keystone/commit/69d7f2e50ef2325c0d3b02b8bb5c310590796fed), [`2806a0bdf`](https://github.com/keystonejs/keystone/commit/2806a0bdfd65429e7c44ed070983f121d6934955)]:
+  - @keystonejs/utils@5.4.2
+  - @keystonejs/session@7.0.1
+
 ## 5.1.8
 
 ### Patch Changes
diff --git a/packages/app-graphql/package.json b/packages/app-graphql/package.json
index 5b41db398f5..0e6e557c25f 100644
--- a/packages/app-graphql/package.json
+++ b/packages/app-graphql/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@keystonejs/app-graphql",
   "description": "KeystoneJS GraphQL App.",
-  "version": "5.1.8",
+  "version": "5.1.9",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "engines": {
@@ -10,10 +10,10 @@
   "dependencies": {
     "@keystonejs/app-graphql-playground": "^5.1.4",
     "@keystonejs/logger": "^5.1.2",
-    "@keystonejs/session": "^7.0.0",
-    "@keystonejs/utils": "^5.4.1",
+    "@keystonejs/session": "^7.0.1",
+    "@keystonejs/utils": "^5.4.2",
     "apollo-errors": "^1.9.0",
-    "apollo-server-express": "^2.13.1",
+    "apollo-server-express": "^2.15.1",
     "cuid": "^2.1.8",
     "ensure-error": "^2.0.0",
     "graphql": "^14.6.0",
diff --git a/packages/arch/docs/CHANGELOG.md b/packages/arch/docs/CHANGELOG.md
index 50443a23750..dc93bb31482 100644
--- a/packages/arch/docs/CHANGELOG.md
+++ b/packages/arch/docs/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @arch-ui/docs
 
+## 1.1.24
+
+### Patch Changes
+
+- Updated dependencies [[`887ad8199`](https://github.com/keystonejs/keystone/commit/887ad8199aa5c32a3db8588104f4548c90aa106c)]:
+  - @arch-ui/pagination@0.0.23
+
 ## 1.1.23
 
 ### Patch Changes
diff --git a/packages/arch/docs/package.json b/packages/arch/docs/package.json
index 3a263e799f6..9e2876efc19 100644
--- a/packages/arch/docs/package.json
+++ b/packages/arch/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@arch-ui/docs",
-  "version": "1.1.23",
+  "version": "1.1.24",
   "private": true,
   "license": "MIT",
   "dependencies": {
@@ -17,7 +17,7 @@
     "@arch-ui/loading": "^0.0.17",
     "@arch-ui/lozenge": "^0.0.16",
     "@arch-ui/navbar": "^0.1.11",
-    "@arch-ui/pagination": "^0.0.22",
+    "@arch-ui/pagination": "^0.0.23",
     "@arch-ui/pill": "^0.1.15",
     "@arch-ui/popout": "^0.0.19",
     "@arch-ui/select": "^0.1.8",
diff --git a/packages/arch/packages/pagination/CHANGELOG.md b/packages/arch/packages/pagination/CHANGELOG.md
index 09870aaf7cb..860d34f79c8 100644
--- a/packages/arch/packages/pagination/CHANGELOG.md
+++ b/packages/arch/packages/pagination/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @arch-ui/pagination
 
+## 0.0.23
+
+### Patch Changes
+
+- [`887ad8199`](https://github.com/keystonejs/keystone/commit/887ad8199aa5c32a3db8588104f4548c90aa106c) [#3178](https://github.com/keystonejs/keystone/pull/3178) Thanks [@Vultraz](https://github.com/Vultraz)! - Redesigned Pagination display.
+
 ## 0.0.22
 
 ### Patch Changes
diff --git a/packages/arch/packages/pagination/package.json b/packages/arch/packages/pagination/package.json
index 6c0b36606e6..93c7eae89b9 100644
--- a/packages/arch/packages/pagination/package.json
+++ b/packages/arch/packages/pagination/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@arch-ui/pagination",
   "description": "Pagination UI as used in @keystonejs Admin UI.",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "author": "Jed Watson",
   "license": "MIT",
   "main": "dist/pagination.cjs.js",
diff --git a/packages/arch/packages/pagination/src/Page.js b/packages/arch/packages/pagination/src/Page.js
index f796651b84e..630684a74b1 100644
--- a/packages/arch/packages/pagination/src/Page.js
+++ b/packages/arch/packages/pagination/src/Page.js
@@ -15,6 +15,7 @@ const Page = props => {
   return (
     <Button
       {...props}
+      variant="nuance"
       onClick={handleClick}
       css={isSelected ? { backgroundColor: colors.primary, color: 'white' } : {}}
     />
diff --git a/packages/arch/packages/pagination/src/Pagination.js b/packages/arch/packages/pagination/src/Pagination.js
index 82ec3eb3432..807913399ae 100644
--- a/packages/arch/packages/pagination/src/Pagination.js
+++ b/packages/arch/packages/pagination/src/Pagination.js
@@ -2,7 +2,7 @@
 
 import { jsx } from '@emotion/core';
 import { useEffect, useState } from 'react';
-import { ChevronLeftIcon, ChevronRightIcon, ListOrderedIcon } from '@arch-ui/icons';
+import { ChevronLeftIcon, ChevronRightIcon, KebabHorizontalIcon } from '@arch-ui/icons';
 import { FlexGroup } from '@arch-ui/layout';
 import { LoadingSpinner } from '@arch-ui/loading';
 
@@ -46,91 +46,84 @@ const Pagination = ({
   onChange,
   ...props
 }) => {
-  const [allPagesVisible, setAllPagesVisible] = useState(false);
+  if (total <= pageSize) return null;
 
-  const toggleAllPages = () => {
-    setAllPagesVisible(wereAllPagesVisible => !wereAllPagesVisible);
-  };
+  const pages = [];
+  const totalPages = Math.ceil(total / pageSize);
 
-  const renderPages = () => {
-    if (total <= pageSize) return [];
-
-    let pages = [];
-    let totalPages = Math.ceil(total / pageSize);
-    let minPage = 1;
-    let maxPage = totalPages;
-    const moreCharacter = <span>&hellip;</span>;
-
-    if (limit && limit < totalPages) {
-      let rightLimit = Math.floor(limit / 2);
-      let leftLimit = rightLimit + (limit % 2) - 1;
-      minPage = currentPage - leftLimit;
-      maxPage = currentPage + rightLimit;
-
-      if (minPage < 1) {
-        maxPage = limit;
-        minPage = 1;
-      }
-      if (maxPage > totalPages) {
-        minPage = totalPages - limit + 1;
-        maxPage = totalPages;
-      }
-    }
+  let minPage = 1;
+  let maxPage = totalPages;
 
-    const handleChange = page => {
-      if (onChange) {
-        setAllPagesVisible(false);
-        onChange(page, {
-          pageSize,
-          total,
-          minPage,
-          maxPage,
-        });
-      }
-    };
-
-    // go to first
-    if (minPage > 1) {
-      pages.push(
-        <Page aria-label={ariaPageLabel(1)} key="page_start" onClick={handleChange} value={1}>
-          {moreCharacter}
-        </Page>
-      );
-    }
+  if (limit && limit < totalPages) {
+    const rightLimit = Math.floor(limit / 2);
+    const leftLimit = rightLimit + (limit % 2) - 1;
+    minPage = currentPage - leftLimit;
+    maxPage = currentPage + rightLimit;
 
-    // loop over range
-    for (let page = minPage; page <= maxPage; page++) {
-      const isSelected = page === currentPage;
-      pages.push(
-        <Page
-          aria-label={ariaPageLabel(page)}
-          aria-current={isSelected ? 'page' : null}
-          key={`page_${page}`}
-          isSelected={isSelected}
-          onClick={handleChange}
-          value={page}
-        >
-          <PageChildren isLoading={isLoading} page={page} isSelected={isSelected} />
-        </Page>
-      );
+    if (minPage < 1) {
+      maxPage = limit;
+      minPage = 1;
     }
 
-    // go to last
-    if (maxPage < totalPages) {
-      pages.push(
-        <Page
-          aria-label={ariaPageLabel(totalPages)}
-          key="page_end"
-          onClick={handleChange}
-          value={totalPages}
-        >
-          {moreCharacter}
-        </Page>
-      );
+    if (maxPage > totalPages) {
+      minPage = totalPages - limit + 1;
+      maxPage = totalPages;
+    }
+  }
+
+  const handleChange = page => {
+    if (onChange) {
+      onChange(page, {
+        pageSize,
+        total,
+        minPage,
+        maxPage,
+      });
     }
+  };
+
+  // go to first
+  if (minPage > 1) {
+    pages.push(
+      <Page aria-label={ariaPageLabel(1)} key="page_start" onClick={handleChange} value={1}>
+        <KebabHorizontalIcon />
+      </Page>
+    );
+  }
+
+  // loop over range
+  for (let page = minPage; page <= maxPage; page++) {
+    const isSelected = page === currentPage;
+    pages.push(
+      <Page
+        aria-label={ariaPageLabel(page)}
+        aria-current={isSelected ? 'page' : null}
+        key={`page_${page}`}
+        isSelected={isSelected}
+        onClick={handleChange}
+        value={page}
+      >
+        <PageChildren isLoading={isLoading} page={page} isSelected={isSelected} />
+      </Page>
+    );
+  }
+
+  // go to last
+  if (maxPage < totalPages) {
+    pages.push(
+      <Page
+        aria-label={ariaPageLabel(totalPages)}
+        key="page_end"
+        onClick={handleChange}
+        value={totalPages}
+      >
+        <KebabHorizontalIcon />
+      </Page>
+    );
+  }
 
-    // return pages;
-    return [
+  return (
+    <FlexGroup as="nav" align="center" aria-label="Pagination" isInline {...props}>
       <Page
         aria-label="Go to previous page"
         key="page_prev"
@@ -139,20 +132,8 @@ const Pagination = ({
         isDisabled={currentPage === 1}
       >
         <ChevronLeftIcon />
-      </Page>,
-      allPagesVisible ? (
-        pages
-      ) : (
-        <Page
-          aria-label="Click to show all pages"
-          key="page_dot"
-          onClick={toggleAllPages}
-          id="ks-pagination-show-pages"
-          value={1} // needs value for flow...
-        >
-          <ListOrderedIcon />
-        </Page>
-      ),
+      </Page>
+      {pages}
       <Page
         aria-label="Go to next page"
         key="page_next"
@@ -161,13 +142,7 @@ const Pagination = ({
         isDisabled={currentPage === totalPages}
       >
         <ChevronRightIcon />
-      </Page>,
-    ];
-  };
-
-  return (
-    <FlexGroup as="nav" align="center" aria-label="Pagination" isContiguous isInline {...props}>
-      {renderPages()}
+      </Page>
     </FlexGroup>
   );
 };
diff --git a/packages/auth-passport/CHANGELOG.md b/packages/auth-passport/CHANGELOG.md
index d8dd62251c5..a464254c7cb 100644
--- a/packages/auth-passport/CHANGELOG.md
+++ b/packages/auth-passport/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @keystonejs/auth-passport
 
+## 5.2.3
+
+### Patch Changes
+
+- [`5a757119d`](https://github.com/keystonejs/keystone/commit/5a757119d7042bf13242f3a92fdde5b34ea1f71d) [#3219](https://github.com/keystonejs/keystone/pull/3219) Thanks [@rubenamorim](https://github.com/rubenamorim)! - Fix invalid query result destructuring.
+  These changes correct the regression introduced by the latest version (`5.2.2`).
+- Updated dependencies [[`4ddc3dc6f`](https://github.com/keystonejs/keystone/commit/4ddc3dc6f87c192627d00db85a1080411400eeb5), [`2806a0bdf`](https://github.com/keystonejs/keystone/commit/2806a0bdfd65429e7c44ed070983f121d6934955), [`3adb2ac2a`](https://github.com/keystonejs/keystone/commit/3adb2ac2ac4ab65636ffea1b2b1f7044410c2b8b)]:
+  - @keystonejs/fields@13.0.2
+  - @keystonejs/session@7.0.1
+
 ## 5.2.2
 
 ### Patch Changes
diff --git a/packages/auth-passport/lib/Passport.js b/packages/auth-passport/lib/Passport.js
index 32216b58715..05debfa9d65 100644
--- a/packages/auth-passport/lib/Passport.js
+++ b/packages/auth-passport/lib/Passport.js
@@ -477,7 +477,7 @@ class PassportAuthStrategy {
 
     // Here we create both the Passport Session Item and the User Item
     // in KS5 as a single, nested mutation.
-    const { sessionItem } = await this._executeQuery({
+    const data = await this._executeQuery({
       query: `
         mutation($id: ID!, $data: ${passportSessionMutationInputName}) {
           session: ${passportSessionMutationName}(id: $id , data: $data) {
@@ -491,7 +491,7 @@ class PassportAuthStrategy {
       variables: { id: passportSessionInfo.id, data: { item: { [operation]: itemData } } },
     });
 
-    return sessionItem.session.item;
+    return data.session.item;
   }
 
   async _authenticateItem(item, accessToken, isNewItem, req, res, next) {
diff --git a/packages/auth-passport/package.json b/packages/auth-passport/package.json
index 8147b7e591e..3fc30901416 100644
--- a/packages/auth-passport/package.json
+++ b/packages/auth-passport/package.json
@@ -1,15 +1,15 @@
 {
   "name": "@keystonejs/auth-passport",
   "description": "Provides Social Authentication Strategies based on PassportJS.",
-  "version": "5.2.2",
+  "version": "5.2.3",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "engines": {
     "node": ">=10.0.0"
   },
   "dependencies": {
-    "@keystonejs/fields": "^13.0.1",
-    "@keystonejs/session": "^7.0.0",
+    "@keystonejs/fields": "^13.0.2",
+    "@keystonejs/session": "^7.0.1",
     "express": "^4.17.1",
     "nanoassert": "^2.0.0",
     "passport": "^0.4.0",
diff --git a/packages/fields-wysiwyg-tinymce/CHANGELOG.md b/packages/fields-wysiwyg-tinymce/CHANGELOG.md
index a8fe6195da3..dc97ae0ff30 100644
--- a/packages/fields-wysiwyg-tinymce/CHANGELOG.md
+++ b/packages/fields-wysiwyg-tinymce/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @keystonejs/fields-wysiwyg-tinymce
 
+## 5.3.2
+
+### Patch Changes
+
+- [`4ddc3dc6f`](https://github.com/keystonejs/keystone/commit/4ddc3dc6f87c192627d00db85a1080411400eeb5) [#3212](https://github.com/keystonejs/keystone/pull/3212) Thanks [@timleslie](https://github.com/timleslie)! - Removed `name` argument from calls to `setupServer` in tests.
+
+- Updated dependencies [[`4ddc3dc6f`](https://github.com/keystonejs/keystone/commit/4ddc3dc6f87c192627d00db85a1080411400eeb5), [`3adb2ac2a`](https://github.com/keystonejs/keystone/commit/3adb2ac2ac4ab65636ffea1b2b1f7044410c2b8b)]:
+  - @keystonejs/fields@13.0.2
+
 ## 5.3.1
 
 ### Patch Changes
diff --git a/packages/fields-wysiwyg-tinymce/package.json b/packages/fields-wysiwyg-tinymce/package.json
index 936b1a546b1..9016a3c7c99 100644
--- a/packages/fields-wysiwyg-tinymce/package.json
+++ b/packages/fields-wysiwyg-tinymce/package.json
@@ -3,7 +3,7 @@
   "description": "KeystoneJS WYSIWYG HTML Field Type, powered by TinyMCE",
   "homepage": "https://github.com/keystonejs/keystone",
   "repository": "https://github.com/keystonejs/keystone/tree/master/packages/fields-wysiwyg-tinymce",
-  "version": "5.3.1",
+  "version": "5.3.2",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "engines": {
@@ -17,9 +17,8 @@
     "@babel/runtime": "^7.8.4",
     "@emotion/core": "^10.0.28",
     "@keystonejs/build-field-types": "^5.2.8",
-    "@keystonejs/fields": "^13.0.0",
+    "@keystonejs/fields": "^13.0.2",
     "@tinymce/tinymce-react": "^3.5.0",
-    "cuid": "^2.1.8",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "tinymce": "^5.2.2"
diff --git a/packages/fields/CHANGELOG.md b/packages/fields/CHANGELOG.md
index 31936e8d0dd..4a8953752b8 100644
--- a/packages/fields/CHANGELOG.md
+++ b/packages/fields/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @keystonejs/fields
 
+## 13.0.2
+
+### Patch Changes
+
+- [`4ddc3dc6f`](https://github.com/keystonejs/keystone/commit/4ddc3dc6f87c192627d00db85a1080411400eeb5) [#3212](https://github.com/keystonejs/keystone/pull/3212) Thanks [@timleslie](https://github.com/timleslie)! - Removed `name` argument from calls to `setupServer` in tests.
+
+* [`3adb2ac2a`](https://github.com/keystonejs/keystone/commit/3adb2ac2ac4ab65636ffea1b2b1f7044410c2b8b) [#3176](https://github.com/keystonejs/keystone/pull/3176) Thanks [@timleslie](https://github.com/timleslie)! - Updated docs for `Virtual` field type to show how to execute server-side GraphQL operations.
+
+* Updated dependencies [[`4ddc3dc6f`](https://github.com/keystonejs/keystone/commit/4ddc3dc6f87c192627d00db85a1080411400eeb5), [`69d7f2e50`](https://github.com/keystonejs/keystone/commit/69d7f2e50ef2325c0d3b02b8bb5c310590796fed)]:
+  - @keystonejs/test-utils@7.0.1
+  - @keystonejs/utils@5.4.2
+  - @keystonejs/app-admin-ui@7.0.5
+
 ## 13.0.1
 
 ### Patch Changes
diff --git a/packages/fields/README.md b/packages/fields/README.md
index 36d48d2cf1d..9c64fa065e4 100644
--- a/packages/fields/README.md
+++ b/packages/fields/README.md
@@ -124,7 +124,7 @@ keystone.createList('Post', {
   fields: {
     title: {
       type: Text,
-      defaultValue: ({ context, originalInput, actions }) => {
+      defaultValue: ({ context, originalInput }) => {
         /**/
       },
     },
diff --git a/packages/fields/package.json b/packages/fields/package.json
index 9c9c781ea1d..5b32ed7d00b 100644
--- a/packages/fields/package.json
+++ b/packages/fields/package.json
@@ -3,7 +3,7 @@
   "description": "KeystoneJS Field Types including Text, Password, DateTime, Integer, and more.",
   "homepage": "https://github.com/keystonejs/keystone",
   "repository": "https://github.com/keystonejs/keystone/tree/master/packages/fields",
-  "version": "13.0.1",
+  "version": "13.0.2",
   "main": "dist/fields.cjs.js",
   "module": "dist/fields.esm.js",
   "author": "The KeystoneJS Development Team",
@@ -36,10 +36,10 @@
     "@keystonejs/access-control": "^6.2.0",
     "@keystonejs/adapter-knex": "^10.0.2",
     "@keystonejs/adapter-mongoose": "^8.1.2",
-    "@keystonejs/app-admin-ui": "^7.0.3",
+    "@keystonejs/app-admin-ui": "^7.0.5",
     "@keystonejs/build-field-types": "^5.2.8",
     "@keystonejs/field-content": "^7.0.1",
-    "@keystonejs/utils": "^5.4.1",
+    "@keystonejs/utils": "^5.4.2",
     "@sindresorhus/slugify": "^0.11.0",
     "apollo-errors": "^1.9.0",
     "bcryptjs": "^2.4.3",
diff --git a/packages/fields/src/Implementation.js b/packages/fields/src/Implementation.js
index 7904f99f8d0..b2a7d468fdc 100644
--- a/packages/fields/src/Implementation.js
+++ b/packages/fields/src/Implementation.js
@@ -104,9 +104,6 @@ class Field {
    * request
    * @param {Object} data.originalInput The raw incoming item from the mutation
    * (no relationships or defaults resolved)
-   * @param {Object} data.actions
-   * @param {Function} data.actions.query Perform a graphQl query
-   * programmatically
    */
   async resolveInput({ resolvedData }) {
     return resolvedData[this.path];
@@ -201,10 +198,10 @@ class Field {
   extendAdminViews(views) {
     return views;
   }
-  getDefaultValue({ context, originalInput, actions }) {
+  getDefaultValue({ context, originalInput }) {
     if (typeof this.defaultValue !== 'undefined') {
       if (typeof this.defaultValue === 'function') {
-        return this.defaultValue({ context, originalInput, actions });
+        return this.defaultValue({ context, originalInput });
       } else {
         return this.defaultValue;
       }
diff --git a/packages/fields/src/types/Slug/Implementation.test.js b/packages/fields/src/types/Slug/Implementation.test.js
index a69d10e5a83..24ab559c24c 100644
--- a/packages/fields/src/types/Slug/Implementation.test.js
+++ b/packages/fields/src/types/Slug/Implementation.test.js
@@ -21,7 +21,6 @@ const generateListName = () =>
 
 const setupList = (adapterName, fields) =>
   setupServer({
-    name: 'Slug Tests',
     adapterName,
     createLists: keystone => {
       keystone.createList(generateListName(), { fields });
diff --git a/packages/fields/tests/Implementation.test.js b/packages/fields/tests/Implementation.test.js
index e84f7356110..fa70d0063d1 100644
--- a/packages/fields/tests/Implementation.test.js
+++ b/packages/fields/tests/Implementation.test.js
@@ -186,13 +186,12 @@ describe('getDefaultValue()', () => {
     const defaultValue = jest.fn(() => 'foobar');
     const context = {};
     const originalInput = {};
-    const actions = {};
 
     const impl = new Field('path', { defaultValue }, args);
 
-    const value = impl.getDefaultValue({ context, originalInput, actions });
+    const value = impl.getDefaultValue({ context, originalInput });
     expect(value).toEqual('foobar');
     expect(defaultValue).toHaveBeenCalledTimes(1);
-    expect(defaultValue).toHaveBeenCalledWith({ context, originalInput, actions });
+    expect(defaultValue).toHaveBeenCalledWith({ context, originalInput });
   });
 });
diff --git a/packages/file-adapters/CHANGELOG.md b/packages/file-adapters/CHANGELOG.md
index 63c4d6e104a..1d385deb8ad 100644
--- a/packages/file-adapters/CHANGELOG.md
+++ b/packages/file-adapters/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @keystonejs/file-adapters
 
+## 7.0.1
+
+### Patch Changes
+
+- [`25921ebe4`](https://github.com/keystonejs/keystone/commit/25921ebe4d06652b03299fe4a516bd3d01de1800) [#3220](https://github.com/keystonejs/keystone/pull/3220) Thanks [@singhArmani](https://github.com/singhArmani)! - **Fix**: delete function not passing required config params
+
+  We are not setting global configuration (api_key, api_secret, and cloud_name) in our cloudinary SDK.
+  We are relying on passing these mandatory config settings in the options param of the upload API.
+  But in the case of destroy method, we are omitting them and passing ondefault empty options object as an argument.
+  This results in a rejected promise. To fix this issue, we are now injecting these values in the provided options object.
+
+  NOTE: User can still override these values if required.
+
 ## 7.0.0
 
 ### Major Changes
diff --git a/packages/file-adapters/lib/cloudinary.js b/packages/file-adapters/lib/cloudinary.js
index 814e1849497..ceee70d30e9 100644
--- a/packages/file-adapters/lib/cloudinary.js
+++ b/packages/file-adapters/lib/cloudinary.js
@@ -51,9 +51,17 @@ module.exports = class CloudinaryAdapter {
    *                For available options refer to the [Cloudinary destroy API](https://cloudinary.com/documentation/image_upload_api_reference#destroy_method).
    */
   delete(file, options = {}) {
+    const destroyOptions = {
+      // Auth
+      api_key: this.apiKey,
+      api_secret: this.apiSecret,
+      cloud_name: this.cloudName,
+      ...options,
+    };
+
     return new Promise((resolve, reject) => {
       if (file) {
-        cloudinary.v2.uploader.destroy(file.id, options, (error, result) => {
+        cloudinary.v2.uploader.destroy(file.id, destroyOptions, (error, result) => {
           if (error) {
             reject(error);
           } else {
diff --git a/packages/file-adapters/package.json b/packages/file-adapters/package.json
index bee6060c957..d98e0e57ef5 100644
--- a/packages/file-adapters/package.json
+++ b/packages/file-adapters/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@keystonejs/file-adapters",
   "description": "Adapters for handling storage of the File type",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "main": "index.js",
   "repository": "https://github.com/keystonejs/keystone/tree/master/packages/file-adapters",
   "homepage": "https://github.com/keystonejs/keystone",
diff --git a/packages/keystone/CHANGELOG.md b/packages/keystone/CHANGELOG.md
index a71805d7398..c98bf29f57e 100644
--- a/packages/keystone/CHANGELOG.md
+++ b/packages/keystone/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @keystonejs/keystone
 
+## 11.2.0
+
+### Minor Changes
+
+- [`f296866df`](https://github.com/keystonejs/keystone/commit/f296866dfab3af54381fd527473e3dc98425b3b9) [#3199](https://github.com/keystonejs/keystone/pull/3199) Thanks [@Vultraz](https://github.com/Vultraz)! - Support GraphQL AST input in `executeGraphQL`. This should be created with the `gql` template literal imported from `apollo-server-express`.
+
+### Patch Changes
+
+- Updated dependencies [[`4ddc3dc6f`](https://github.com/keystonejs/keystone/commit/4ddc3dc6f87c192627d00db85a1080411400eeb5), [`69d7f2e50`](https://github.com/keystonejs/keystone/commit/69d7f2e50ef2325c0d3b02b8bb5c310590796fed), [`2806a0bdf`](https://github.com/keystonejs/keystone/commit/2806a0bdfd65429e7c44ed070983f121d6934955), [`3adb2ac2a`](https://github.com/keystonejs/keystone/commit/3adb2ac2ac4ab65636ffea1b2b1f7044410c2b8b)]:
+  - @keystonejs/fields@13.0.2
+  - @keystonejs/test-utils@7.0.1
+  - @keystonejs/utils@5.4.2
+  - @keystonejs/session@7.0.1
+
 ## 11.1.3
 
 ### Patch Changes
diff --git a/packages/keystone/lib/Keystone/index.js b/packages/keystone/lib/Keystone/index.js
index 8c881418862..b8c7fe13360 100644
--- a/packages/keystone/lib/Keystone/index.js
+++ b/packages/keystone/lib/Keystone/index.js
@@ -363,7 +363,6 @@ module.exports = class Keystone {
       composePlugins(config.plugins || [])(config, { listKey: key, keystone: this }),
       {
         getListByKey,
-        queryHelper: this._buildQueryHelper.bind(this),
         adapter: adapters[adapterName],
         defaultAccess: this.defaultAccess,
         registerType: type => this.registeredTypes.add(type),
diff --git a/packages/keystone/lib/ListTypes/list.js b/packages/keystone/lib/ListTypes/list.js
index c458d139509..8e9da992091 100644
--- a/packages/keystone/lib/ListTypes/list.js
+++ b/packages/keystone/lib/ListTypes/list.js
@@ -129,16 +129,7 @@ module.exports = class List {
       queryLimits = {},
       cacheHint,
     },
-    {
-      getListByKey,
-      queryHelper,
-      adapter,
-      defaultAccess,
-      registerType,
-      createAuxList,
-      isAuxList,
-      schemaNames,
-    }
+    { getListByKey, adapter, defaultAccess, registerType, createAuxList, isAuxList, schemaNames }
   ) {
     this.key = key;
     this._fields = fields;
@@ -229,20 +220,6 @@ module.exports = class List {
     }
     this.cacheHint = cacheHint;
 
-    this.hooksActions = {
-      /**
-       * @param queryString String A graphQL query string
-       * @param options.skipAccessControl Boolean By default access control _of
-       * the user making the initial request_ is still tested. Disable all
-       * Access Control checks with this flag
-       * @param options.variables Object The variables passed to the graphql
-       * query for the given queryString.
-       *
-       * @return Promise<Object> The graphql query response
-       */
-      query: queryHelper,
-    };
-
     // Tell Keystone about all the types we've seen
     Object.values(fields).forEach(({ type }) => registerType(type));
 
@@ -771,23 +748,8 @@ module.exports = class List {
     };
   }
 
-  _buildActions(context) {
-    return mapKeys(this.hooksActions, buildQuery => {
-      const _query = buildQuery(context);
-      return (...args) => {
-        console.warn(`query() is deprecated and will be removed in a future release.
-Please use context.executeGraphQL() instead. See https://www.keystonejs.com/discussions/server-side-graphql for details.`);
-        return _query(...args);
-      };
-    });
-  }
-
   async _resolveDefaults({ context, originalInput }) {
-    const args = {
-      context,
-      originalInput,
-      actions: this._buildActions(context),
-    };
+    const args = { context, originalInput };
 
     const fieldsWithoutValues = this.fields.filter(
       field => typeof originalInput[field.path] === 'undefined'
@@ -804,14 +766,7 @@ Please use context.executeGraphQL() instead. See https://www.keystonejs.com/disc
   }
 
   async _resolveInput(resolvedData, existingItem, context, operation, originalInput) {
-    const args = {
-      resolvedData,
-      existingItem,
-      context,
-      originalInput,
-      actions: this._buildActions(context),
-      operation,
-    };
+    const args = { resolvedData, existingItem, context, originalInput, operation };
 
     // First we run the field type hooks
     // NOTE: resolveInput is run on _every_ field, regardless if it has a value
@@ -852,14 +807,7 @@ Please use context.executeGraphQL() instead. See https://www.keystonejs.com/disc
   }
 
   async _validateInput(resolvedData, existingItem, context, operation, originalInput) {
-    const args = {
-      resolvedData,
-      existingItem,
-      context,
-      originalInput,
-      actions: this._buildActions(context),
-      operation,
-    };
+    const args = { resolvedData, existingItem, context, originalInput, operation };
     // Check for isRequired
     const fieldValidationErrors = this.fields
       .filter(
@@ -886,12 +834,7 @@ Please use context.executeGraphQL() instead. See https://www.keystonejs.com/disc
   }
 
   async _validateDelete(existingItem, context, operation) {
-    const args = {
-      existingItem,
-      context,
-      actions: this._buildActions(context),
-      operation,
-    };
+    const args = { existingItem, context, operation };
     const fields = this.fields;
     await this._validateHook(args, fields, operation, 'validateDelete');
   }
@@ -925,46 +868,22 @@ Please use context.executeGraphQL() instead. See https://www.keystonejs.com/disc
   }
 
   async _beforeChange(resolvedData, existingItem, context, operation, originalInput) {
-    const args = {
-      resolvedData,
-      existingItem,
-      context,
-      originalInput,
-      actions: this._buildActions(context),
-      operation,
-    };
+    const args = { resolvedData, existingItem, context, originalInput, operation };
     await this._runHook(args, resolvedData, 'beforeChange');
   }
 
   async _beforeDelete(existingItem, context, operation) {
-    const args = {
-      existingItem,
-      context,
-      actions: this._buildActions(context),
-      operation,
-    };
+    const args = { existingItem, context, operation };
     await this._runHook(args, existingItem, 'beforeDelete');
   }
 
   async _afterChange(updatedItem, existingItem, context, operation, originalInput) {
-    const args = {
-      updatedItem,
-      originalInput,
-      existingItem,
-      context,
-      actions: this._buildActions(context),
-      operation,
-    };
+    const args = { updatedItem, originalInput, existingItem, context, operation };
     await this._runHook(args, updatedItem, 'afterChange');
   }
 
   async _afterDelete(existingItem, context, operation) {
-    const args = {
-      existingItem,
-      context,
-      actions: this._buildActions(context),
-      operation,
-    };
+    const args = { existingItem, context, operation };
     await this._runHook(args, existingItem, 'afterDelete');
   }
 
diff --git a/packages/keystone/package.json b/packages/keystone/package.json
index 1f5207ca906..8bc32ce5eaa 100644
--- a/packages/keystone/package.json
+++ b/packages/keystone/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@keystonejs/keystone",
   "description": "The main @keystonejs class & CLI. This is where the magic happens.",
-  "version": "11.1.3",
+  "version": "11.2.0",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "engines": {
@@ -13,10 +13,10 @@
   "dependencies": {
     "@keystonejs/access-control": "^6.2.0",
     "@keystonejs/app-version": "^1.0.2",
-    "@keystonejs/fields": "^13.0.1",
+    "@keystonejs/fields": "^13.0.2",
     "@keystonejs/logger": "^5.1.2",
-    "@keystonejs/session": "^7.0.0",
-    "@keystonejs/utils": "^5.4.1",
+    "@keystonejs/session": "^7.0.1",
+    "@keystonejs/utils": "^5.4.2",
     "apollo-errors": "^1.9.0",
     "arg": "^4.1.1",
     "chalk": "^2.4.2",
diff --git a/packages/keystone/tests/List.test.js b/packages/keystone/tests/List.test.js
index 863d56464b5..bd98a331ece 100644
--- a/packages/keystone/tests/List.test.js
+++ b/packages/keystone/tests/List.test.js
@@ -67,19 +67,16 @@ const getListByKey = listKey => {
   }
 };
 
-const listExtras = (queryMethod = undefined) => ({
+const listExtras = () => ({
   getListByKey,
   adapter: new MockAdapter(),
   defaultAccess: { list: true, field: true },
-  queryHelper: context => (queryString, { variables } = {}) => {
-    return queryMethod(queryString, context, variables);
-  },
   registerType: () => {},
   schemaNames: ['public'],
 });
 
-const setup = (extraConfig, queryMethod) => {
-  const list = new List('Test', { ...config, ...extraConfig }, listExtras(queryMethod));
+const setup = extraConfig => {
+  const list = new List('Test', { ...config, ...extraConfig }, listExtras());
   list.initFields();
   return list;
 };
@@ -1183,75 +1180,11 @@ describe('List Hooks', () => {
           await action(list);
 
           Object.keys(hooks).forEach(hook => {
-            expect(hooks[hook]).toHaveBeenCalledWith(
-              expect.objectContaining({
-                actions: {
-                  query: expect.any(Function),
-                },
-              })
-            );
+            expect(hooks[hook]).toHaveBeenCalledWith(expect.objectContaining({}));
           });
         })
       );
     });
-
-    test('can execute a query from within a hook', () => {
-      return Promise.all(
-        [
-          list => list.createMutation({ name: 'test', email: 'test@example.com' }, context),
-          list => list.updateMutation(1, { name: 'update', email: 'update@example.com' }, context),
-        ].map(async action => {
-          const queryMethod = jest.fn(() => ({ data: { hello: 'world' } }));
-          const queryString = 'query { /* Fake query string */ }';
-
-          const hooks = {
-            beforeChange: jest.fn(async ({ actions: { query } }) => {
-              await query(queryString);
-            }),
-          };
-
-          const list = setup({ hooks }, queryMethod);
-          await action(list);
-
-          expect(queryMethod).toHaveBeenCalledWith(
-            queryString,
-            // The context object
-            expect.any(Object),
-            // no variables
-            undefined
-          );
-        })
-      );
-    });
-
-    test('can execute a query with variables from within a hook', () => {
-      return Promise.all(
-        [
-          list => list.createMutation({ name: 'test', email: 'test@example.com' }, context),
-          list => list.updateMutation(1, { name: 'update', email: 'update@example.com' }, context),
-        ].map(async action => {
-          const queryMethod = jest.fn(() => ({ data: { hello: 'world' } }));
-          const queryString = 'query { /* Fake query string */ }';
-          const variables = { id: 'abc123' };
-
-          const hooks = {
-            beforeChange: jest.fn(async ({ actions: { query } }) => {
-              await query(queryString, { variables });
-            }),
-          };
-
-          const list = setup({ hooks }, queryMethod);
-          await action(list);
-
-          expect(queryMethod).toHaveBeenCalledWith(
-            queryString,
-            // The context object
-            expect.any(Object),
-            expect.objectContaining(variables)
-          );
-        })
-      );
-    });
   });
 
   describe('delete mutation', () => {
@@ -1265,13 +1198,7 @@ describe('List Hooks', () => {
       await list.deleteMutation(1, context);
 
       Object.keys(hooks).forEach(hook => {
-        expect(hooks[hook]).toHaveBeenCalledWith(
-          expect.objectContaining({
-            actions: {
-              query: expect.any(Function),
-            },
-          })
-        );
+        expect(hooks[hook]).toHaveBeenCalledWith(expect.objectContaining({}));
       });
     });
   });
diff --git a/packages/session/CHANGELOG.md b/packages/session/CHANGELOG.md
index 0656b4cad98..e49a751526a 100644
--- a/packages/session/CHANGELOG.md
+++ b/packages/session/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @keystonejs/session
 
+## 7.0.1
+
+### Patch Changes
+
+- [`2806a0bdf`](https://github.com/keystonejs/keystone/commit/2806a0bdfd65429e7c44ed070983f121d6934955) [#3182](https://github.com/keystonejs/keystone/pull/3182) Thanks [@Vultraz](https://github.com/Vultraz)! - Updated express-session to 1.17.1.
+
 ## 7.0.0
 
 ### Major Changes
diff --git a/packages/session/package.json b/packages/session/package.json
index 373518ca64f..2d02ea76c17 100644
--- a/packages/session/package.json
+++ b/packages/session/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@keystonejs/session",
   "description": "Tools to assist with setting up session management in your Keystone system.",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "engines": {
@@ -12,7 +12,7 @@
     "cookie": "^0.3.1",
     "cookie-signature": "^1.1.0",
     "express": "^4.17.1",
-    "express-session": "^1.16.2"
+    "express-session": "^1.17.1"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/master/packages/session"
 }
diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md
index ccd68ef71c6..87855f12366 100644
--- a/packages/test-utils/CHANGELOG.md
+++ b/packages/test-utils/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @keystonejs/test-utils
 
+## 7.0.1
+
+### Patch Changes
+
+- [`4ddc3dc6f`](https://github.com/keystonejs/keystone/commit/4ddc3dc6f87c192627d00db85a1080411400eeb5) [#3212](https://github.com/keystonejs/keystone/pull/3212) Thanks [@timleslie](https://github.com/timleslie)! - Removed `name` argument from calls to `setupServer` in tests.
+
+- Updated dependencies [[`f296866df`](https://github.com/keystonejs/keystone/commit/f296866dfab3af54381fd527473e3dc98425b3b9), [`9ab6961e0`](https://github.com/keystonejs/keystone/commit/9ab6961e0202277a980bd60a323a1c599f1dd085)]:
+  - @keystonejs/keystone@11.2.0
+  - @keystonejs/app-graphql@5.1.9
+
 ## 7.0.0
 
 ### Major Changes
diff --git a/packages/test-utils/lib/test-utils.js b/packages/test-utils/lib/test-utils.js
index d51d26a7721..f36c70f53fb 100644
--- a/packages/test-utils/lib/test-utils.js
+++ b/packages/test-utils/lib/test-utils.js
@@ -9,7 +9,6 @@ const { KnexAdapter } = require('@keystonejs/adapter-knex');
 const { MongooseAdapter } = require('@keystonejs/adapter-mongoose');
 
 async function setupServer({
-  name,
   adapterName,
   schemaName = 'testing',
   schemaNames = ['testing'],
@@ -28,7 +27,7 @@ async function setupServer({
   }[adapterName];
 
   const keystone = new Keystone({
-    name,
+    name: 'keystone-test-server',
     adapter: new Adapter(await argGenerator()),
     defaultAccess: { list: true, field: true },
     schemaNames,
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 9c58f46c7b5..6c5db431dd6 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@keystonejs/test-utils",
   "description": "Common utilities used while testing @keystonejs/* packages.",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "engines": {
@@ -10,8 +10,8 @@
   "dependencies": {
     "@keystonejs/adapter-knex": "^10.1.0",
     "@keystonejs/adapter-mongoose": "^8.1.3",
-    "@keystonejs/app-graphql": "^5.1.8",
-    "@keystonejs/keystone": "^11.1.1",
+    "@keystonejs/app-graphql": "^5.1.9",
+    "@keystonejs/keystone": "^11.2.0",
     "express": "^4.17.1",
     "mongodb-memory-server-core": "^6.5.2",
     "p-finally": "^2.0.1",
diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
index e942e1b88f5..f70d661ccd0 100644
--- a/packages/utils/CHANGELOG.md
+++ b/packages/utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @keystonejs/utils
 
+## 5.4.2
+
+### Patch Changes
+
+- [`69d7f2e50`](https://github.com/keystonejs/keystone/commit/69d7f2e50ef2325c0d3b02b8bb5c310590796fed) [#3183](https://github.com/keystonejs/keystone/pull/3183) Thanks [@Vultraz](https://github.com/Vultraz)! - Updated doc comments.
+
 ## 5.4.1
 
 ### Patch Changes
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 78c29fea2d4..b4abd9463a8 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@keystonejs/utils",
   "description": "Common utility functions used throughout @keystonejs packages.",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "author": "The KeystoneJS Development Team",
   "license": "MIT",
   "homepage": "https://github.com/keystonejs/keystone",
diff --git a/test-projects/basic/cypress/integration/list-view-url-state_spec.js b/test-projects/basic/cypress/integration/list-view-url-state_spec.js
index b798a743cf5..b7f38c2e010 100644
--- a/test-projects/basic/cypress/integration/list-view-url-state_spec.js
+++ b/test-projects/basic/cypress/integration/list-view-url-state_spec.js
@@ -5,9 +5,6 @@ describe('List view URL state', () => {
     // Loading at page 3
     cy.visit('/admin/posts?currentPage=3');
 
-    // expand all pages first
-    cy.get('#ks-pagination-show-pages').click({ force: true });
-
     cy.get('[aria-label="Go to page 3"]')
       .should('have.attr', 'aria-current', 'page')
       .should('contain', '3');
@@ -20,9 +17,6 @@ describe('List view URL state', () => {
 
     cy.wait(500);
 
-    // expand all pages first
-    cy.get('#ks-pagination-show-pages').click({ force: true });
-
     // Navigate to page 1 - this is the default so it should remove the search string
     cy.get('[aria-label="Go to page 1"]')
       .should('contain', '1')
@@ -41,9 +35,6 @@ describe('List view URL state', () => {
     cy.get('#ks-pagination-count').should('contain', 'Showing 1 to 75 of');
     cy.get('#ks-list-table tbody tr').should('have.lengthOf', 75);
 
-    // expand all pages first
-    cy.get('#ks-pagination-show-pages').click({ force: true });
-
     // click on a page button - to make sure we do not loose the page size
     cy.get('[aria-label="Go to page 2"]').click({ force: true });
     cy.location('search')
@@ -167,9 +158,6 @@ describe('List view URL state', () => {
     ];
     cy.visit(`/admin/posts?${params.join('&')}`);
 
-    // expand all pages first
-    cy.get('#ks-pagination-show-pages').click({ force: true });
-
     cy.get('[aria-label="Go to page 2"]').should('have.attr', 'aria-current', 'page');
     // Has the correct number of items per page (pageSize)
     cy.get('#ks-pagination-count').should('contain', 'Showing 11 to 20 of');
diff --git a/yarn.lock b/yarn.lock
index 9dc7731c5dd..ea10d19e756 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -111,7 +111,14 @@
   dependencies:
     apollo-env "^0.6.1"
 
-"@apollographql/graphql-playground-html@1.6.24", "@apollographql/graphql-playground-html@^1.6.24":
+"@apollographql/graphql-playground-html@1.6.26":
+  version "1.6.26"
+  resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.26.tgz#2f7b610392e2a872722912fc342b43cf8d641cb3"
+  integrity sha512-XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ==
+  dependencies:
+    xss "^1.0.6"
+
+"@apollographql/graphql-playground-html@^1.6.24":
   version "1.6.24"
   resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz#3ce939cb127fb8aaa3ffc1e90dff9b8af9f2e3dc"
   integrity sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ==
@@ -5039,13 +5046,13 @@ anymatch@^3.0.3, anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-apollo-cache-control@^0.10.1-alpha.0:
-  version "0.10.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.10.1-alpha.0.tgz#3547ebb1a6a49dd822800b86c3bf27c618abdf20"
-  integrity sha512-wg2OwsHC8NoBT4XRblqYznlfMoP7+mzp3frFn8jUwrrNAG1rIKUWgCCIwEKXJ34XDl+q8iMVYzwQ73jb6PC9Ng==
+apollo-cache-control@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.11.1.tgz#3bce0924ae7322a8b9f7ca1e2fb036d1fc9f1df5"
+  integrity sha512-6iHa8TkcKt4rx5SKRzDNjUIpCQX+7/FlZwD7vRh9JDnM4VH8SWhpj8fUR3CiEY8Kuc4ChXnOY8bCcMju5KPnIQ==
   dependencies:
-    apollo-server-env "^2.4.4-alpha.0"
-    graphql-extensions "^0.12.1-alpha.0"
+    apollo-server-env "^2.4.5"
+    apollo-server-plugin-base "^0.9.1"
 
 apollo-cache-inmemory@^1.6.6:
   version "1.6.6"
@@ -5080,34 +5087,35 @@ apollo-client@^2.6.10:
     tslib "^1.10.0"
     zen-observable "^0.8.0"
 
-apollo-datasource@^0.7.1-alpha.0:
-  version "0.7.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.7.1-alpha.0.tgz#2e8f3b1b0846a8bc13bca614185a552eda03152b"
-  integrity sha512-i8/YALvDtbxsvSkmc/wMdGIXzj/fv7iFPNYPE9QUwylzOhuVV2jw0N69QCHWr7Ws69Sk4UpXGmUnWxc/qPiTOQ==
+apollo-datasource@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.7.2.tgz#1662ee93453a9b89af6f73ce561bde46b41ebf31"
+  integrity sha512-ibnW+s4BMp4K2AgzLEtvzkjg7dJgCaw9M5b5N0YKNmeRZRnl/I/qBTQae648FsRKgMwTbRQIvBhQ0URUFAqFOw==
   dependencies:
-    apollo-server-caching "^0.5.1"
-    apollo-server-env "^2.4.4-alpha.0"
+    apollo-server-caching "^0.5.2"
+    apollo-server-env "^2.4.5"
 
-apollo-engine-reporting-protobuf@^0.5.1-alpha.0:
-  version "0.5.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1-alpha.0.tgz#685b090e961b9b3a25b3ada0017d44098a1f17ce"
-  integrity sha512-gRIi8GAIQy0jJJqePtQtS8+/aYxhugDvCvi2K1T7jhRkVUJVZAEurp9+62+II0XitDrMraJYxwNi0jom4qfL5w==
+apollo-engine-reporting-protobuf@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.2.tgz#b01812508a1c583328a8dc603769bc63b8895e7e"
+  integrity sha512-4wm9FR3B7UvJxcK/69rOiS5CAJPEYKufeRWb257ZLfX7NGFTMqvbc1hu4q8Ch7swB26rTpkzfsftLED9DqH9qg==
   dependencies:
     "@apollo/protobufjs" "^1.0.3"
 
-apollo-engine-reporting@^1.8.1-alpha.0:
-  version "1.8.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.8.1-alpha.0.tgz#1499ae467e4d713bad31479172daa9e9c2cf35d8"
-  integrity sha512-zprDnHUhhyc5EktCgBOdjEqlxo/OGsg4rvp/y74BOAYwJ/RGs2wsxqSxcpSz8twOai/AeR3y4t7gMrtd1m2TfQ==
+apollo-engine-reporting@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-2.2.1.tgz#d6e4677af3c6859d5d9ab6ccba2312c1de7f691b"
+  integrity sha512-HPwf70p4VbxKEagHYWTwldqfYNekBE33BXcryHI9owxMm5B8/vutQfx67+4Bf351kOpndCG9I91aOiFBfC2/iQ==
   dependencies:
-    apollo-engine-reporting-protobuf "^0.5.1-alpha.0"
+    apollo-engine-reporting-protobuf "^0.5.2"
     apollo-graphql "^0.4.0"
-    apollo-server-caching "^0.5.1"
-    apollo-server-env "^2.4.4-alpha.0"
-    apollo-server-errors "^2.4.1"
-    apollo-server-types "^0.4.1-alpha.0"
+    apollo-server-caching "^0.5.2"
+    apollo-server-env "^2.4.5"
+    apollo-server-errors "^2.4.2"
+    apollo-server-plugin-base "^0.9.1"
+    apollo-server-types "^0.5.1"
     async-retry "^1.2.1"
-    graphql-extensions "^0.12.1-alpha.0"
+    uuid "^8.0.0"
 
 apollo-env@^0.6.1:
   version "0.6.1"
@@ -5208,33 +5216,33 @@ apollo-link@^1.2.14:
     tslib "^1.9.3"
     zen-observable-ts "^0.8.21"
 
-apollo-server-caching@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.5.1.tgz#5cd0536ad5473abb667cc82b59bc56b96fb35db6"
-  integrity sha512-L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw==
+apollo-server-caching@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz#bef5d5e0d48473a454927a66b7bb947a0b6eb13e"
+  integrity sha512-HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.13.1:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.13.1.tgz#eac223696ae9da5f4990273ea89c74b77af0e156"
-  integrity sha512-4jKF0VbpoxprhcruaGoHG5ScrquSSkQ/LVFrOLp/ukUFuooLEMb1O18tAQdgVahkNgLkRKdNJYLLyoQoj+i3dA==
+apollo-server-core@^2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.15.1.tgz#3a6871c2a47a3240639b2a970f25c9f457a1ed07"
+  integrity sha512-ZRSK3uVPS6YkIV3brm2CjzVphg6NHY0PRhFojZD8BjoQlGo3+pPRP1IHFDvC3UzybGWfyCelcfF4YiVqh4GJHw==
   dependencies:
     "@apollographql/apollo-tools" "^0.4.3"
-    "@apollographql/graphql-playground-html" "1.6.24"
+    "@apollographql/graphql-playground-html" "1.6.26"
     "@types/graphql-upload" "^8.0.0"
     "@types/ws" "^7.0.0"
-    apollo-cache-control "^0.10.1-alpha.0"
-    apollo-datasource "^0.7.1-alpha.0"
-    apollo-engine-reporting "^1.8.1-alpha.0"
-    apollo-server-caching "^0.5.1"
-    apollo-server-env "^2.4.4-alpha.0"
-    apollo-server-errors "^2.4.1"
-    apollo-server-plugin-base "^0.8.1-alpha.0"
-    apollo-server-types "^0.4.1-alpha.0"
-    apollo-tracing "^0.10.1-alpha.0"
+    apollo-cache-control "^0.11.1"
+    apollo-datasource "^0.7.2"
+    apollo-engine-reporting "^2.2.1"
+    apollo-server-caching "^0.5.2"
+    apollo-server-env "^2.4.5"
+    apollo-server-errors "^2.4.2"
+    apollo-server-plugin-base "^0.9.1"
+    apollo-server-types "^0.5.1"
+    apollo-tracing "^0.11.1"
     fast-json-stable-stringify "^2.0.0"
-    graphql-extensions "^0.12.1-alpha.0"
+    graphql-extensions "^0.12.4"
     graphql-tag "^2.9.2"
     graphql-tools "^4.0.0"
     graphql-upload "^8.0.2"
@@ -5243,32 +5251,32 @@ apollo-server-core@^2.13.1:
     subscriptions-transport-ws "^0.9.11"
     ws "^6.0.0"
 
-apollo-server-env@^2.4.4-alpha.0:
-  version "2.4.4-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.4-alpha.0.tgz#56e860b6af116cdbd05fc4bfe51d5851bde2413e"
-  integrity sha512-KoxYIYCZWh3oXDrsh/V43DVgTIo02XGEaLlNuwPMzPxwRA7id1wxcNInqISvd8Os8uoJSGuxkMCCs21UMOpnFw==
+apollo-server-env@^2.4.5:
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.5.tgz#73730b4f0439094a2272a9d0caa4079d4b661d5f"
+  integrity sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==
   dependencies:
     node-fetch "^2.1.2"
     util.promisify "^1.0.0"
 
-apollo-server-errors@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz#16ad49de6c9134bfb2b7dede9842e73bb239dbe2"
-  integrity sha512-7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg==
+apollo-server-errors@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.4.2.tgz#1128738a1d14da989f58420896d70524784eabe5"
+  integrity sha512-FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ==
 
-apollo-server-express@^2.13.1:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.13.1.tgz#a51bbfb0544e6bb397592674b975d86c0771bfa9"
-  integrity sha512-B/EZnGhhOTVwNXJR7lIiZzci1md4N/DsVin0lg4UoW7DUtKZYOdaXj2LMb6HzoeIwembvLegpgyFHUDGweeI1Q==
+apollo-server-express@^2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.15.1.tgz#e7d0b3462439a3101d3c8bd14e2cc9ca00d30dc6"
+  integrity sha512-anNb9HJo+KTpgvUqiPOjEl4wPq8y8NmWaIUz/QqPZlhIEDdf7wd/kQo3Sdbov++7J9JNJx6Ownnvw+wxfogUgA==
   dependencies:
-    "@apollographql/graphql-playground-html" "1.6.24"
+    "@apollographql/graphql-playground-html" "1.6.26"
     "@types/accepts" "^1.3.5"
     "@types/body-parser" "1.19.0"
     "@types/cors" "^2.8.4"
     "@types/express" "4.17.4"
     accepts "^1.3.5"
-    apollo-server-core "^2.13.1"
-    apollo-server-types "^0.4.1-alpha.0"
+    apollo-server-core "^2.15.1"
+    apollo-server-types "^0.5.1"
     body-parser "^1.18.3"
     cors "^2.8.4"
     express "^4.17.1"
@@ -5278,29 +5286,29 @@ apollo-server-express@^2.13.1:
     subscriptions-transport-ws "^0.9.16"
     type-is "^1.6.16"
 
-apollo-server-plugin-base@^0.8.1-alpha.0:
-  version "0.8.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.8.1-alpha.0.tgz#79dc1e7996a9cfc627d89b7f24d29b6174c5cd2e"
-  integrity sha512-7itTcglQoVQfHPfITwuCJQMrTMsFsqdIJ02F5FyiMq3FwscStCfKhRu0c+uwdeipMNx8CDuAnjssfPYGc7CQkQ==
+apollo-server-plugin-base@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.1.tgz#a62ae9ab4e89790fd4cc5d123bb616da34e8e5fb"
+  integrity sha512-kvrX4Z3FdpjrZdHkyl5iY2A1Wvp4b6KQp00DeZqss7GyyKNUBKr80/7RQgBLEw7EWM7WB19j459xM/TjvW0FKQ==
   dependencies:
-    apollo-server-types "^0.4.1-alpha.0"
+    apollo-server-types "^0.5.1"
 
-apollo-server-types@^0.4.1-alpha.0:
-  version "0.4.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.4.1-alpha.0.tgz#b74b8ebc85d4ffb62c083b1628199e57aa1e9b51"
-  integrity sha512-ta2hAE2x4gVq0m+r0yT2d0hn4SCTa5LiClM+ugfETs06KHWoTqQ0QN2NHX2jKWh97GGx856EBZ4LMQEbVtS2+w==
+apollo-server-types@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.5.1.tgz#091c09652894d6532db9ba873574443adabf85b9"
+  integrity sha512-my2cPw+DAb2qVnIuBcsRKGyS28uIc2vjFxa1NpRoJZe9gK0BWUBk7wzXnIzWy3HZ5Er11e/40MPTUesNfMYNVA==
   dependencies:
-    apollo-engine-reporting-protobuf "^0.5.1-alpha.0"
-    apollo-server-caching "^0.5.1"
-    apollo-server-env "^2.4.4-alpha.0"
+    apollo-engine-reporting-protobuf "^0.5.2"
+    apollo-server-caching "^0.5.2"
+    apollo-server-env "^2.4.5"
 
-apollo-tracing@^0.10.1-alpha.0:
-  version "0.10.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.10.1-alpha.0.tgz#c59443a7c39d84eed1fa3ad3b9be12d115c02f8a"
-  integrity sha512-DEVHP4niQRxAEgp5FajotioXzpzNdBcqCfjBWAvF++yCHzYVasFQe0qwMw3uadi46xvPaX2hG5gTrSCiMgdqUA==
+apollo-tracing@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.11.1.tgz#3e3a4ce4b21e57dcc57b10bbd539db243b752606"
+  integrity sha512-l7g+uILw7v32GA46IRXIx5XXbZhFI96BhSqrGK9yyvfq+NMcvVZrj3kIhRImPGhAjMdV+5biA/jztabElAbDjg==
   dependencies:
-    apollo-server-env "^2.4.4-alpha.0"
-    graphql-extensions "^0.12.1-alpha.0"
+    apollo-server-env "^2.4.5"
+    apollo-server-plugin-base "^0.9.1"
 
 apollo-upload-client@^13.0.0:
   version "13.0.0"
@@ -7517,6 +7525,11 @@ commander@^2.11.0, commander@^2.15.1, commander@^2.18.0, commander@^2.19.0, comm
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
+commander@^2.20.3:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 commander@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c"
@@ -8287,6 +8300,11 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
+cssfilter@0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
+  integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=
+
 cssnano-preset-default@^4.0.7:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"
@@ -10277,18 +10295,18 @@ express-react-views@^0.11.0:
     lodash.escaperegexp "^4.1.2"
     object-assign "^4.1.1"
 
-express-session@^1.16.2:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.16.2.tgz#59f36d7770e94872d19b163b6708a2d16aa6848c"
-  integrity sha512-oy0sRsdw6n93E9wpCNWKRnSsxYnSDX9Dnr9mhZgqUEEorzcq5nshGYSZ4ZReHFhKQ80WI5iVUUSPW7u3GaKauw==
+express-session@^1.17.1:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.1.tgz#36ecbc7034566d38c8509885c044d461c11bf357"
+  integrity sha512-UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q==
   dependencies:
-    cookie "0.3.1"
+    cookie "0.4.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "~2.0.0"
     on-headers "~1.0.2"
     parseurl "~1.3.3"
-    safe-buffer "5.1.2"
+    safe-buffer "5.2.0"
     uid-safe "~2.1.5"
 
 express@^4.16.2, express@^4.16.3, express@^4.17.1:
@@ -12170,14 +12188,14 @@ graphql-config@^2.0.1:
     lodash "^4.17.4"
     minimatch "^3.0.4"
 
-graphql-extensions@^0.12.1-alpha.0:
-  version "0.12.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.12.1-alpha.0.tgz#ee6017440e55b6b84bcf2cef746c0df19886e48e"
-  integrity sha512-EmqWxJh0m6d5Hqxg0QVe5VRyihYefnYzA7+E9ejh7BiQ7NzEkX7P820LC4lt9gcQIqnZxNCqvMNyvBZxHnubVg==
+graphql-extensions@^0.12.4:
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.12.4.tgz#c0aa49a20f983a2da641526d1e505996bd2b4188"
+  integrity sha512-GnR4LiWk3s2bGOqIh6V1JgnSXw2RCH4NOgbCFEWvB6JqWHXTlXnLZ8bRSkCiD4pltv7RHUPWqN/sGh8R6Ae/ag==
   dependencies:
     "@apollographql/apollo-tools" "^0.4.3"
-    apollo-server-env "^2.4.4-alpha.0"
-    apollo-server-types "^0.4.1-alpha.0"
+    apollo-server-env "^2.4.5"
+    apollo-server-types "^0.5.1"
 
 graphql-import@^0.4.4:
   version "0.4.5"
@@ -21776,7 +21794,7 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, s
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@^5.1.1, safe-buffer@^5.1.2:
+safe-buffer@5.2.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
@@ -24909,6 +24927,11 @@ uuid@^7.0.2, uuid@^7.0.3:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
   integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
 
+uuid@^8.0.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.2.0.tgz#cb10dd6b118e2dada7d0cd9730ba7417c93d920e"
+  integrity sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q==
+
 v8-compile-cache@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz#8d32e4f16974654657e676e0e467a348e89b0dc4"
@@ -25887,6 +25910,14 @@ xregexp@4.0.0:
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
   integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
+xss@^1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.7.tgz#a554cbd5e909324bd6893fb47fff441ad54e2a95"
+  integrity sha512-A9v7tblGvxu8TWXQC9rlpW96a+LN1lyw6wyhpTmmGW+FwRMactchBR3ROKSi33UPCUcUHSu8s9YP6F+K3Mw//w==
+  dependencies:
+    commander "^2.20.3"
+    cssfilter "0.0.10"
+
 xstate@^3.1.0:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/xstate/-/xstate-3.3.3.tgz#64177cd4473d4c2424b3df7d2434d835404b09a9"