diff --git a/.changeset/clever-cows-invite.md b/.changeset/clever-cows-invite.md
new file mode 100644
index 00000000000..cef4afe25e0
--- /dev/null
+++ b/.changeset/clever-cows-invite.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/fields-document': patch
+---
+
+Fixed `fields.select` not passing options to the select
diff --git a/.changeset/cyan-carrots-protect.md b/.changeset/cyan-carrots-protect.md
new file mode 100644
index 00000000000..701f4a6e95f
--- /dev/null
+++ b/.changeset/cyan-carrots-protect.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/fields-document': major
+---
+
+Changed `NotEditable` component from rendering a div to a span so it can be used for inline elements
diff --git a/.changeset/gorgeous-pugs-occur.md b/.changeset/gorgeous-pugs-occur.md
new file mode 100644
index 00000000000..db6437cec50
--- /dev/null
+++ b/.changeset/gorgeous-pugs-occur.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/fields-document': minor
+---
+
+Added `fields.multiselect` prop field
diff --git a/.changeset/grumpy-paws-call.md b/.changeset/grumpy-paws-call.md
new file mode 100644
index 00000000000..bb8be71339d
--- /dev/null
+++ b/.changeset/grumpy-paws-call.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': patch
+---
+
+Updated `withItemData` to still return the rest of the `session` object if no item was found.
diff --git a/.changeset/little-cobras-repair.md b/.changeset/little-cobras-repair.md
new file mode 100644
index 00000000000..37af8a6b7de
--- /dev/null
+++ b/.changeset/little-cobras-repair.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/fields-document': patch
+---
+
+Fixed documentation in JSDocs for component blocks API
diff --git a/.changeset/unlucky-dragons-judge.md b/.changeset/unlucky-dragons-judge.md
new file mode 100644
index 00000000000..0a8d05bfe4a
--- /dev/null
+++ b/.changeset/unlucky-dragons-judge.md
@@ -0,0 +1,6 @@
+---
+'@keystone-next/keystone': major
+'@keystone-next/types': major
+---
+
+Removed `context.graphql.createContext` from `KeystoneContext`.
diff --git a/packages-next/fields-document/src/DocumentEditor/component-blocks/api.tsx b/packages-next/fields-document/src/DocumentEditor/component-blocks/api.tsx
index a47258d48f4..7827fddca43 100644
--- a/packages-next/fields-document/src/DocumentEditor/component-blocks/api.tsx
+++ b/packages-next/fields-document/src/DocumentEditor/component-blocks/api.tsx
@@ -1,6 +1,13 @@
 /** @jsx jsx */
 import { jsx } from '@keystone-ui/core';
-import { FieldContainer, FieldLabel, Select, TextInput, Checkbox } from '@keystone-ui/fields';
+import {
+  FieldContainer,
+  FieldLabel,
+  Select,
+  TextInput,
+  Checkbox,
+  MultiSelect,
+} from '@keystone-ui/fields';
 import { HTMLAttributes, ReactElement, ReactNode, useState } from 'react';
 import { isValidURL } from '../isValidURL';
 
@@ -16,6 +23,10 @@ export type FormField<Value, Options> = {
      */
     forceValidation: boolean;
   }): ReactElement | null;
+  /**
+   * The options are config about the field that are available on the
+   * preview props when rendering the toolbar and preview component
+   */
   options: Options;
   defaultValue: Value;
   /**
@@ -204,6 +215,7 @@ export const fields = {
                   onChange(option.value);
                 }
               }}
+              options={options}
             />
           </FieldContainer>
         );
@@ -215,6 +227,43 @@ export const fields = {
       },
     };
   },
+  multiselect<Option extends { label: string; value: string }>({
+    label,
+    options,
+    defaultValue,
+  }: {
+    label: string;
+    options: readonly Option[];
+    defaultValue: readonly Option['value'][];
+  }): FormField<readonly Option['value'][], readonly Option[]> {
+    const valuesToOption = new Map(options.map(x => [x.value, x]));
+    return {
+      kind: 'form',
+      Input({ value, onChange, autoFocus }) {
+        return (
+          <FieldContainer>
+            <FieldLabel>{label}</FieldLabel>
+            <MultiSelect
+              autoFocus={autoFocus}
+              value={value.map(x => valuesToOption.get(x)!)}
+              options={options}
+              onChange={options => {
+                onChange(options.map(x => x.value));
+              }}
+            />
+          </FieldContainer>
+        );
+      },
+      options,
+      defaultValue,
+      validate(value) {
+        return (
+          Array.isArray(value) &&
+          value.every(value => typeof value === 'string' && valuesToOption.has(value))
+        );
+      },
+    };
+  },
   checkbox({
     label,
     defaultValue = false,
@@ -470,14 +519,16 @@ export function component<
   }
 >(
   options: {
+    /** The preview component shown in the editor */
     component: (
       props: {
         [Key in keyof PropsOption]: ExtractPropFromComponentPropFieldForPreview<PropsOption[Key]>;
       }
     ) => ReactElement | null;
+    /** The props that the preview component, toolbar and rendered component will receive */
     props: PropsOption;
+    /** The label to show in the insert menu and chrome around the block if chromeless is false */
     label: string;
-    // icon?: ReactElement;
   } & (
     | {
         chromeless: true;
@@ -508,9 +559,9 @@ export function component<
 }
 
 export const NotEditable = ({ children, ...props }: HTMLAttributes<HTMLDivElement>) => (
-  <div css={{ userSelect: 'none' }} contentEditable={false} {...props}>
+  <span css={{ userSelect: 'none' }} contentEditable={false} {...props}>
     {children}
-  </div>
+  </span>
 );
 
 type Comp<Props> = (props: Props) => ReactElement | null;
diff --git a/packages-next/keystone/src/lib/createContext.ts b/packages-next/keystone/src/lib/createContext.ts
index 89bfdf28dc5..159d489deaa 100644
--- a/packages-next/keystone/src/lib/createContext.ts
+++ b/packages-next/keystone/src/lib/createContext.ts
@@ -65,12 +65,7 @@ export function makeCreateContext({
       knex: keystone.adapter.knex,
       mongoose: keystone.adapter.mongoose,
       prisma: keystone.adapter.prisma,
-      graphql: {
-        createContext,
-        raw: rawGraphQL,
-        run: runGraphQL,
-        schema: graphQLSchema,
-      } as KeystoneGraphQLAPI<any>,
+      graphql: { raw: rawGraphQL, run: runGraphQL, schema: graphQLSchema },
       maxTotalResults: keystone.queryLimits.maxTotalResults,
       sudo: () => createContext({ sessionContext, skipAccessControl: true, req }),
       exitSudo: () => createContext({ sessionContext, skipAccessControl: false, req }),
diff --git a/packages-next/keystone/src/session/index.ts b/packages-next/keystone/src/session/index.ts
index c26ce65c2b1..dfc12c6d034 100644
--- a/packages-next/keystone/src/session/index.ts
+++ b/packages-next/keystone/src/session/index.ts
@@ -81,7 +81,7 @@ export function withItemData<T extends { listKey: string; itemId: string }>(
           !session.itemId ||
           !sudoContext.lists[session.listKey]
         ) {
-          return;
+          return session;
         }
 
         // NOTE: This is wrapped in a try-catch block because a "not found" result will currently
@@ -94,15 +94,15 @@ export function withItemData<T extends { listKey: string; itemId: string }>(
             where: { id: session.itemId },
             resolveFields: fieldSelections[session.listKey] || 'id',
           });
-          // If there is no matching item found, return no session
+          // If there is no matching item found, return the session without a `data value
           if (!item) {
-            return;
+            return session;
           }
           return { ...session, data: item };
         } catch (e) {
           // TODO: This swallows all errors, we need a way to differentiate between "not found" and
           // actual exceptions that should be thrown
-          return;
+          return session;
         }
       },
     };
diff --git a/packages-next/types/src/core.ts b/packages-next/types/src/core.ts
index fd72a628eeb..0296d01f19a 100644
--- a/packages-next/types/src/core.ts
+++ b/packages-next/types/src/core.ts
@@ -87,7 +87,6 @@ export type KeystoneGraphQLAPI<
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   KeystoneListsTypeInfo extends Record<string, BaseGeneratedListTypes>
 > = {
-  createContext: CreateContext;
   schema: GraphQLSchema;
 
   run: (args: GraphQLExecutionArguments) => Promise<Record<string, any>>;