diff --git a/packages/web-components/fast-foundation/docs/api-report.md b/packages/web-components/fast-foundation/docs/api-report.md
index 2f911d7778b..171ff0c75c6 100644
--- a/packages/web-components/fast-foundation/docs/api-report.md
+++ b/packages/web-components/fast-foundation/docs/api-report.md
@@ -264,12 +264,12 @@ export function checkboxTemplate<T extends FASTCheckbox>(options?: CheckboxOptio
 
 // @public
 export interface ColumnDefinition {
-    cellFocusTargetCallback?: (cell: FASTDataGridCell) => HTMLElement;
+    cellFocusTargetCallback?: (cell: FASTDataGridCell) => HTMLElement | null;
     cellInternalFocusQueue?: boolean;
     cellTemplate?: ViewTemplate | SyntheticViewTemplate;
     columnDataKey: string;
     gridColumn?: string;
-    headerCellFocusTargetCallback?: (cell: FASTDataGridCell) => HTMLElement;
+    headerCellFocusTargetCallback?: (cell: FASTDataGridCell) => HTMLElement | null;
     headerCellInternalFocusQueue?: boolean;
     headerCellTemplate?: ViewTemplate | SyntheticViewTemplate;
     isRowHeader?: boolean;
@@ -412,6 +412,9 @@ export const DayFormat: {
 // @public
 export type DayFormat = ValuesOf<typeof DayFormat>;
 
+// @public (undocumented)
+export const defaultCellFocusTargetCallback: (cell: FASTDataGridCell) => HTMLElement | null;
+
 // Warning: (ae-different-release-tags) This symbol has another declaration with a different release tag
 // Warning: (ae-internal-mixed-release-tag) Mixed release tags are not allowed for "DelegatesARIAButton" because one of its declarations is marked as @internal
 //
diff --git a/packages/web-components/fast-foundation/src/data-grid/README.md b/packages/web-components/fast-foundation/src/data-grid/README.md
index 4942e54290e..102235a5a7d 100644
--- a/packages/web-components/fast-foundation/src/data-grid/README.md
+++ b/packages/web-components/fast-foundation/src/data-grid/README.md
@@ -144,6 +144,14 @@ export const myDataGrid = DataGrid.compose({
 
 <hr/>
 
+### Functions
+
+| Name                             | Description | Parameters               | Return                |
+| -------------------------------- | ----------- | ------------------------ | --------------------- |
+| `defaultCellFocusTargetCallback` |             | `cell: FASTDataGridCell` | `HTMLElement or null` |
+
+<hr/>
+
 
 
 ### class: `FASTDataGridRow`
@@ -281,6 +289,44 @@ export const myDataGrid = DataGrid.compose({
 <hr/>
 
 
+
+### class: `ComplexCell`
+
+#### Superclass
+
+| Name          | Module | Package                 |
+| ------------- | ------ | ----------------------- |
+| `FASTElement` |        | @microsoft/fast-element |
+
+#### Fields
+
+| Name            | Privacy | Type                | Default | Description | Inherited From |
+| --------------- | ------- | ------------------- | ------- | ----------- | -------------- |
+| `buttonA`       | public  | `HTMLButtonElement` |         |             |                |
+| `buttonB`       | public  | `HTMLButtonElement` |         |             |                |
+| `handleFocus`   | public  |                     |         |             |                |
+| `handleKeyDown` | public  |                     |         |             |                |
+
+<hr/>
+
+### Variables
+
+| Name                | Description | Type |
+| ------------------- | ----------- | ---- |
+| `complexCellStyles` |             |      |
+
+<hr/>
+
+### Functions
+
+| Name                  | Description | Parameters | Return                   |
+| --------------------- | ----------- | ---------- | ------------------------ |
+| `registerComplexCell` |             |            |                          |
+| `complexCellTemplate` |             |            | `ElementViewTemplate<T>` |
+
+<hr/>
+
+
 ## Additional resources
 
 * [Component explorer examples](https://explore.fast.design/components/fast-data-grid)