diff --git a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-advanced/main.ts b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-advanced/main.ts
index a0e9712ecb5..b0a6be13837 100644
--- a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-advanced/main.ts
+++ b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-advanced/main.ts
@@ -1,4 +1,4 @@
-import type { ColDef, GridOptions, ValueFormatterParams } from 'ag-grid-community';
+import type { ColDef, GridOptions, ValueFormatterLiteParams } from 'ag-grid-community';
 import {
     ClientSideRowModelModule,
     ModuleRegistry,
@@ -28,7 +28,7 @@ type SalesRow = {
     cost: number;
 };
 
-const formatter = (params: ValueFormatterParams<SalesRow, number>, formattedString: string): string => {
+const formatter = (params: ValueFormatterLiteParams<SalesRow, number>, format: (value: number) => string): string => {
     const { value } = params;
     if (value == null) {
         return '';
@@ -38,42 +38,40 @@ const formatter = (params: ValueFormatterParams<SalesRow, number>, formattedStri
         return String(value);
     }
 
-    return formattedString;
+    return format(value);
 };
 
-const currencyFormatter = (params: ValueFormatterParams<SalesRow, number>) =>
-    formatter(params, `$${(params.value ?? '').toLocaleString()}`);
+const currencyFormatter = (params: ValueFormatterLiteParams<SalesRow, number>) =>
+    formatter(params, (value) => `$${value.toLocaleString()}`);
 
-const percentageFormatter = (params: ValueFormatterParams<SalesRow, number>) =>
-    formatter(params, `${Math.round((params.value ?? 0) * 100)}%`);
+const percentageFormatter = (params: ValueFormatterLiteParams<SalesRow, number>) =>
+    formatter(params, (value) => `${Math.round(value * 100)}%`);
 
 const columnDefs: ColDef<SalesRow>[] = [
     { field: 'account', flex: 1.4 },
     {
         field: 'revenue',
-        valueFormatter: currencyFormatter,
+        cellDataType: 'currency',
     },
     {
         field: 'cost',
-        valueFormatter: currencyFormatter,
+        cellDataType: 'currency',
     },
     {
         colId: 'profit',
         headerName: 'Profit',
         calculatedExpression: '[revenue] - [cost]',
-        cellDataType: 'number',
+        cellDataType: 'currency',
         sortable: true,
         filter: 'agNumberColumnFilter',
-        valueFormatter: currencyFormatter,
     },
     {
         colId: 'margin',
         headerName: 'Margin',
         calculatedExpression: '[profit] / [revenue]',
-        cellDataType: 'number',
+        cellDataType: 'percentage',
         sortable: true,
         filter: 'agNumberColumnFilter',
-        valueFormatter: percentageFormatter,
     },
     {
         colId: 'status',
@@ -111,7 +109,21 @@ const rowData: SalesRow[] = [
 const gridOptions: GridOptions<SalesRow> = {
     columnDefs,
     rowData,
-    calculatedColumns: true,
+    dataTypeDefinitions: {
+        currency: {
+            baseDataType: 'number',
+            extendsDataType: 'number',
+            valueFormatter: currencyFormatter,
+        },
+        percentage: {
+            baseDataType: 'number',
+            extendsDataType: 'number',
+            valueFormatter: percentageFormatter,
+        },
+    },
+    calculatedColumns: {
+        dataTypes: ['currency', 'percentage', 'number', 'text', 'boolean'],
+    },
     defaultColDef: {
         flex: 1,
         minWidth: 130,
diff --git a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-api/main.ts b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-api/main.ts
index b28c7bc336c..778e22c0233 100644
--- a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-api/main.ts
+++ b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-api/main.ts
@@ -1,4 +1,4 @@
-import type { ColDef, GridApi, GridOptions, ValueFormatterParams } from 'ag-grid-community';
+import type { ColDef, GridApi, GridOptions, ValueFormatterLiteParams } from 'ag-grid-community';
 import {
     ClientSideRowModelModule,
     ColumnApiModule,
@@ -27,30 +27,28 @@ type SalesRow = {
     cost: number;
 };
 
-const currencyFormatter = (params: ValueFormatterParams<SalesRow, number>) =>
+const currencyFormatter = (params: ValueFormatterLiteParams<SalesRow, number>) =>
     params.value == null ? '' : `$${params.value.toLocaleString()}`;
 
-const percentFormatter = (params: ValueFormatterParams<SalesRow, number>) =>
+const percentFormatter = (params: ValueFormatterLiteParams<SalesRow, number>) =>
     params.value == null ? '' : `${(params.value * 100).toFixed(1)}%`;
 
 const marginColumn: ColDef<SalesRow> = {
     colId: 'profitMargin',
     headerName: 'Profit Margin',
     calculatedExpression: '([revenue] - [cost]) / [revenue]',
-    cellDataType: 'number',
-    valueFormatter: percentFormatter,
+    cellDataType: 'percentage',
 };
 
 const columnDefs: ColDef<SalesRow>[] = [
     { field: 'product', flex: 1 },
-    { field: 'revenue', valueFormatter: currencyFormatter },
-    { field: 'cost', valueFormatter: currencyFormatter },
+    { field: 'revenue', cellDataType: 'currency' },
+    { field: 'cost', cellDataType: 'currency' },
     {
         colId: 'profit',
         headerName: 'Profit',
         calculatedExpression: '[revenue] - [cost]',
-        cellDataType: 'number',
-        valueFormatter: currencyFormatter,
+        cellDataType: 'currency',
     },
 ];
 
@@ -82,6 +80,18 @@ let gridApi: GridApi<SalesRow>;
 const gridOptions: GridOptions<SalesRow> = {
     columnDefs,
     rowData,
+    dataTypeDefinitions: {
+        currency: {
+            baseDataType: 'number',
+            extendsDataType: 'number',
+            valueFormatter: currencyFormatter,
+        },
+        percentage: {
+            baseDataType: 'number',
+            extendsDataType: 'number',
+            valueFormatter: percentFormatter,
+        },
+    },
     calculatedColumns: true,
     defaultColDef: {
         flex: 1,
diff --git a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-apply-mode/main.ts b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-apply-mode/main.ts
index d424faf6258..1be63f99279 100644
--- a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-apply-mode/main.ts
+++ b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-apply-mode/main.ts
@@ -1,4 +1,4 @@
-import type { ColDef, GridOptions, ValueFormatterParams } from 'ag-grid-community';
+import type { ColDef, GridOptions, ValueFormatterLiteParams } from 'ag-grid-community';
 import {
     ClientSideRowModelModule,
     ModuleRegistry,
@@ -28,7 +28,7 @@ type SalesRow = {
     cost: number;
 };
 
-const formatter = (params: ValueFormatterParams<SalesRow, number>, formattedString: string): string => {
+const currencyFormatter = (params: ValueFormatterLiteParams<SalesRow, number>): string => {
     const { value } = params;
     if (value == null) {
         return '';
@@ -38,32 +38,28 @@ const formatter = (params: ValueFormatterParams<SalesRow, number>, formattedStri
         return String(value);
     }
 
-    return formattedString;
+    return `$${value.toLocaleString()}`;
 };
 
-const currencyFormatter = (params: ValueFormatterParams<SalesRow, number>) =>
-    formatter(params, `$${(params.value ?? '').toLocaleString()}`);
-
 const columnDefs: ColDef<SalesRow>[] = [
     { field: 'product', flex: 1 },
     {
         field: 'revenue',
         editable: true,
-        valueFormatter: currencyFormatter,
+        cellDataType: 'currency',
     },
     {
         field: 'cost',
         editable: true,
-        valueFormatter: currencyFormatter,
+        cellDataType: 'currency',
     },
     {
         colId: 'profit',
         headerName: 'Profit',
         calculatedExpression: '[revenue] - [cost]',
-        cellDataType: 'number',
+        cellDataType: 'currency',
         sortable: true,
         filter: 'agNumberColumnFilter',
-        valueFormatter: currencyFormatter,
     },
 ];
 
@@ -93,8 +89,16 @@ const rowData: SalesRow[] = [
 const gridOptions: GridOptions<SalesRow> = {
     columnDefs,
     rowData,
+    dataTypeDefinitions: {
+        currency: {
+            baseDataType: 'number',
+            extendsDataType: 'number',
+            valueFormatter: currencyFormatter,
+        },
+    },
     calculatedColumns: {
         applyMode: 'deferred',
+        dataTypes: ['currency', 'number', 'text', 'boolean'],
     },
     defaultColDef: {
         flex: 1,
diff --git a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-column-groups/main.ts b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-column-groups/main.ts
index a9a9474d850..b189dd38520 100644
--- a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-column-groups/main.ts
+++ b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-column-groups/main.ts
@@ -1,4 +1,4 @@
-import type { ColDef, ColGroupDef, GridOptions, ValueFormatterParams } from 'ag-grid-community';
+import type { ColDef, ColGroupDef, GridOptions, ValueFormatterLiteParams } from 'ag-grid-community';
 import {
     ClientSideRowModelModule,
     ModuleRegistry,
@@ -34,7 +34,10 @@ type QuarterlyRevenueRow = {
 
 type QuarterField = Exclude<keyof QuarterlyRevenueRow, 'product'>;
 
-const formatter = (params: ValueFormatterParams<QuarterlyRevenueRow, number>, formattedString: string): string => {
+const formatter = (
+    params: ValueFormatterLiteParams<QuarterlyRevenueRow, number>,
+    format: (value: number) => string
+): string => {
     const { value } = params;
     if (value == null) {
         return '';
@@ -44,22 +47,21 @@ const formatter = (params: ValueFormatterParams<QuarterlyRevenueRow, number>, fo
         return String(value);
     }
 
-    return formattedString;
+    return format(value);
 };
 
-const currencyFormatter = (params: ValueFormatterParams<QuarterlyRevenueRow, number>) =>
-    formatter(params, `$${(params.value ?? '').toLocaleString()}`);
+const currencyFormatter = (params: ValueFormatterLiteParams<QuarterlyRevenueRow, number>) =>
+    formatter(params, (value) => `$${value.toLocaleString()}`);
 
-const percentageFormatter = (params: ValueFormatterParams<QuarterlyRevenueRow, number>) =>
-    formatter(params, `${(params.value ?? 0).toLocaleString(undefined, { maximumFractionDigits: 1 })}%`);
+const percentageFormatter = (params: ValueFormatterLiteParams<QuarterlyRevenueRow, number>) =>
+    formatter(params, (value) => `${(value * 100).toLocaleString(undefined, { maximumFractionDigits: 1 })}%`);
 
 const quarterColumn = (field: QuarterField): ColDef<QuarterlyRevenueRow, number> => ({
     field,
     colId: field,
     headerName: field.slice(0, 2).toUpperCase(),
     columnGroupShow: 'open',
-    cellDataType: 'number',
-    valueFormatter: currencyFormatter,
+    cellDataType: 'currency',
 });
 
 const columnDefs: (ColDef<QuarterlyRevenueRow> | ColGroupDef<QuarterlyRevenueRow>)[] = [
@@ -77,8 +79,7 @@ const columnDefs: (ColDef<QuarterlyRevenueRow> | ColGroupDef<QuarterlyRevenueRow
                 headerName: 'Total',
                 columnGroupShow: 'closed',
                 calculatedExpression: '[q1_2025] + [q2_2025] + [q3_2025] + [q4_2025]',
-                cellDataType: 'number',
-                valueFormatter: currencyFormatter,
+                cellDataType: 'currency',
             },
         ],
     },
@@ -95,8 +96,7 @@ const columnDefs: (ColDef<QuarterlyRevenueRow> | ColGroupDef<QuarterlyRevenueRow
                 headerName: 'Total',
                 columnGroupShow: 'closed',
                 calculatedExpression: '[q1_2026] + [q2_2026] + [q3_2026] + [q4_2026]',
-                cellDataType: 'number',
-                valueFormatter: currencyFormatter,
+                cellDataType: 'currency',
             },
         ],
     },
@@ -106,21 +106,19 @@ const columnDefs: (ColDef<QuarterlyRevenueRow> | ColGroupDef<QuarterlyRevenueRow
             {
                 colId: 'q4Change',
                 headerName: 'Q4 Change',
-                calculatedExpression: 'ROUND((([q4_2026] - [q4_2025]) / [q4_2025]) * 100, 1)',
-                cellDataType: 'number',
+                calculatedExpression: '([q4_2026] - [q4_2025]) / [q4_2025]',
+                cellDataType: 'percentage',
                 sortable: true,
                 filter: 'agNumberColumnFilter',
-                valueFormatter: percentageFormatter,
             },
             {
                 colId: 'yearChange',
                 headerName: 'Year Change',
                 calculatedExpression:
                     '([q1_2026] + [q2_2026] + [q3_2026] + [q4_2026]) - ([q1_2025] + [q2_2025] + [q3_2025] + [q4_2025])',
-                cellDataType: 'number',
+                cellDataType: 'currency',
                 sortable: true,
                 filter: 'agNumberColumnFilter',
-                valueFormatter: currencyFormatter,
             },
         ],
     },
@@ -352,7 +350,21 @@ const rowData: QuarterlyRevenueRow[] = [
 const gridOptions: GridOptions<QuarterlyRevenueRow> = {
     columnDefs,
     rowData,
-    calculatedColumns: true,
+    dataTypeDefinitions: {
+        currency: {
+            baseDataType: 'number',
+            extendsDataType: 'number',
+            valueFormatter: currencyFormatter,
+        },
+        percentage: {
+            baseDataType: 'number',
+            extendsDataType: 'number',
+            valueFormatter: percentageFormatter,
+        },
+    },
+    calculatedColumns: {
+        dataTypes: ['currency', 'percentage', 'number', 'text', 'boolean'],
+    },
     defaultColDef: {
         minWidth: 120,
         flex: 1,
diff --git a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-dialog-data-types/main.ts b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-dialog-data-types/main.ts
index b56064baa9f..223044a4877 100644
--- a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-dialog-data-types/main.ts
+++ b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-dialog-data-types/main.ts
@@ -1,4 +1,4 @@
-import type { ColDef, GridOptions, ValueFormatterParams } from 'ag-grid-community';
+import type { ColDef, GridOptions, ValueFormatterLiteParams } from 'ag-grid-community';
 import {
     ClientSideRowModelModule,
     ModuleRegistry,
@@ -26,7 +26,7 @@ type SalesRow = {
     cost: number;
 };
 
-const currencyFormatter = (params: ValueFormatterParams<SalesRow, number>): string => {
+const currencyFormatter = (params: ValueFormatterLiteParams<SalesRow, number>): string => {
     const { value } = params;
     if (value == null) {
         return '';
diff --git a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-dialog-helper-lists/main.ts b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-dialog-helper-lists/main.ts
index 1476c76f615..48b609efd4c 100644
--- a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-dialog-helper-lists/main.ts
+++ b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-dialog-helper-lists/main.ts
@@ -1,4 +1,4 @@
-import type { ColDef, GridOptions, ValueFormatterParams } from 'ag-grid-community';
+import type { ColDef, GridOptions, ValueFormatterLiteParams } from 'ag-grid-community';
 import {
     ClientSideRowModelModule,
     ModuleRegistry,
@@ -26,7 +26,7 @@ type SalesRow = {
     cost: number;
 };
 
-const formatter = (params: ValueFormatterParams<SalesRow, number>, formattedString: string): string => {
+const currencyFormatter = (params: ValueFormatterLiteParams<SalesRow, number>): string => {
     const { value } = params;
     if (value == null) {
         return '';
@@ -36,23 +36,19 @@ const formatter = (params: ValueFormatterParams<SalesRow, number>, formattedStri
         return String(value);
     }
 
-    return formattedString;
+    return `$${value.toLocaleString()}`;
 };
 
-const currencyFormatter = (params: ValueFormatterParams<SalesRow, number>) =>
-    formatter(params, `$${(params.value ?? '').toLocaleString()}`);
-
 const columnDefs: ColDef<SalesRow>[] = [
     { field: 'product', flex: 1.3 },
-    { field: 'revenue', valueFormatter: currencyFormatter },
-    { field: 'cost', valueFormatter: currencyFormatter },
+    { field: 'revenue', cellDataType: 'currency' },
+    { field: 'cost', cellDataType: 'currency' },
     {
         colId: 'profit',
         headerName: 'Profit',
         calculatedExpression: '[revenue] - [cost]',
-        cellDataType: 'number',
+        cellDataType: 'currency',
         filter: 'agNumberColumnFilter',
-        valueFormatter: currencyFormatter,
     },
 ];
 
@@ -82,8 +78,16 @@ const rowData: SalesRow[] = [
 const gridOptions: GridOptions<SalesRow> = {
     columnDefs,
     rowData,
+    dataTypeDefinitions: {
+        currency: {
+            baseDataType: 'number',
+            extendsDataType: 'number',
+            valueFormatter: currencyFormatter,
+        },
+    },
     calculatedColumns: {
         expressionPickers: ['columns'],
+        dataTypes: ['currency', 'number', 'text', 'boolean'],
     },
     defaultColDef: {
         flex: 1,
diff --git a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-dialog-highlighting/main.ts b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-dialog-highlighting/main.ts
index 68019800bcc..f53e27fbf18 100644
--- a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-dialog-highlighting/main.ts
+++ b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-dialog-highlighting/main.ts
@@ -1,4 +1,4 @@
-import type { ColDef, GridOptions, ValueFormatterParams } from 'ag-grid-community';
+import type { ColDef, GridOptions, ValueFormatterLiteParams } from 'ag-grid-community';
 import {
     ClientSideRowModelModule,
     ModuleRegistry,
@@ -26,7 +26,7 @@ type SalesRow = {
     cost: number;
 };
 
-const formatter = (params: ValueFormatterParams<SalesRow, number>, formattedString: string): string => {
+const currencyFormatter = (params: ValueFormatterLiteParams<SalesRow, number>): string => {
     const { value } = params;
     if (value == null) {
         return '';
@@ -36,23 +36,19 @@ const formatter = (params: ValueFormatterParams<SalesRow, number>, formattedStri
         return String(value);
     }
 
-    return formattedString;
+    return `$${value.toLocaleString()}`;
 };
 
-const currencyFormatter = (params: ValueFormatterParams<SalesRow, number>) =>
-    formatter(params, `$${(params.value ?? '').toLocaleString()}`);
-
 const columnDefs: ColDef<SalesRow>[] = [
     { field: 'product', flex: 1.3 },
-    { field: 'revenue', valueFormatter: currencyFormatter },
-    { field: 'cost', valueFormatter: currencyFormatter },
+    { field: 'revenue', cellDataType: 'currency' },
+    { field: 'cost', cellDataType: 'currency' },
     {
         colId: 'profit',
         headerName: 'Profit',
         calculatedExpression: '[revenue] - [cost]',
-        cellDataType: 'number',
+        cellDataType: 'currency',
         filter: 'agNumberColumnFilter',
-        valueFormatter: currencyFormatter,
     },
 ];
 
@@ -82,8 +78,16 @@ const rowData: SalesRow[] = [
 const gridOptions: GridOptions<SalesRow> = {
     columnDefs,
     rowData,
+    dataTypeDefinitions: {
+        currency: {
+            baseDataType: 'number',
+            extendsDataType: 'number',
+            valueFormatter: currencyFormatter,
+        },
+    },
     calculatedColumns: {
         suppressColumnHighlighting: true,
+        dataTypes: ['currency', 'number', 'text', 'boolean'],
     },
     defaultColDef: {
         flex: 1,
diff --git a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-row-groups/main.ts b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-row-groups/main.ts
index 8868eda8225..7b5b7550375 100644
--- a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-row-groups/main.ts
+++ b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns-row-groups/main.ts
@@ -1,4 +1,4 @@
-import type { ColDef, GridOptions, ValueFormatterParams } from 'ag-grid-community';
+import type { ColDef, GridOptions, ValueFormatterLiteParams } from 'ag-grid-community';
 import {
     ClientSideRowModelModule,
     ModuleRegistry,
@@ -28,7 +28,7 @@ type SalesRow = {
     cost: number;
 };
 
-const formatter = (params: ValueFormatterParams<SalesRow, number>, formattedString: string): string => {
+const formatter = (params: ValueFormatterLiteParams<SalesRow, number>, format: (value: number) => string): string => {
     const { value } = params;
     if (value == null) {
         return '';
@@ -38,14 +38,14 @@ const formatter = (params: ValueFormatterParams<SalesRow, number>, formattedStri
         return String(value);
     }
 
-    return formattedString;
+    return format(value);
 };
 
-const currencyFormatter = (params: ValueFormatterParams<SalesRow, number>) =>
-    formatter(params, `$${(params.value ?? '').toLocaleString()}`);
+const currencyFormatter = (params: ValueFormatterLiteParams<SalesRow, number>) =>
+    formatter(params, (value) => `$${value.toLocaleString()}`);
 
-const percentageFormatter = (params: ValueFormatterParams<SalesRow, number>) =>
-    formatter(params, `${Math.round((params.value ?? 0) * 100)}%`);
+const percentageFormatter = (params: ValueFormatterLiteParams<SalesRow, number>) =>
+    formatter(params, (value) => `${Math.round(value * 100)}%`);
 
 const columnDefs: ColDef<SalesRow>[] = [
     { field: 'productType', rowGroup: true, hide: true },
@@ -53,12 +53,12 @@ const columnDefs: ColDef<SalesRow>[] = [
     {
         field: 'revenue',
         aggFunc: 'sum',
-        valueFormatter: currencyFormatter,
+        cellDataType: 'currency',
     },
     {
         field: 'cost',
         aggFunc: 'sum',
-        valueFormatter: currencyFormatter,
+        cellDataType: 'currency',
     },
     {
         colId: 'profit',
@@ -66,17 +66,15 @@ const columnDefs: ColDef<SalesRow>[] = [
         calculatedExpression: '[revenue] - [cost]',
         // aggFunc lets the calculated column aggregate its per-leaf results onto group rows.
         aggFunc: 'sum',
-        cellDataType: 'number',
+        cellDataType: 'currency',
         filter: 'agNumberColumnFilter',
-        valueFormatter: currencyFormatter,
     },
     {
         colId: 'margin',
         headerName: 'Margin',
         // No aggFunc: a ratio does not aggregate, so margin evaluates on leaf rows and is blank on groups.
         calculatedExpression: '[profit] / [revenue]',
-        cellDataType: 'number',
-        valueFormatter: percentageFormatter,
+        cellDataType: 'percentage',
     },
 ];
 
@@ -106,7 +104,21 @@ const rowData: SalesRow[] = [
 const gridOptions: GridOptions<SalesRow> = {
     columnDefs,
     rowData,
-    calculatedColumns: true,
+    dataTypeDefinitions: {
+        currency: {
+            baseDataType: 'number',
+            extendsDataType: 'number',
+            valueFormatter: currencyFormatter,
+        },
+        percentage: {
+            baseDataType: 'number',
+            extendsDataType: 'number',
+            valueFormatter: percentageFormatter,
+        },
+    },
+    calculatedColumns: {
+        dataTypes: ['currency', 'percentage', 'number', 'text', 'boolean'],
+    },
     defaultColDef: {
         flex: 1,
         minWidth: 130,
diff --git a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns/main.ts b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns/main.ts
index f9764fb1d2a..2a851e8913c 100644
--- a/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns/main.ts
+++ b/documentation/ag-grid-docs/src/content/docs/calculated-columns/_examples/calculated-columns/main.ts
@@ -1,4 +1,4 @@
-import type { ColDef, GridOptions, ValueFormatterParams } from 'ag-grid-community';
+import type { ColDef, GridOptions, ValueFormatterLiteParams } from 'ag-grid-community';
 import {
     ClientSideRowModelModule,
     ModuleRegistry,
@@ -28,7 +28,7 @@ type SalesRow = {
     cost: number;
 };
 
-const formatter = (params: ValueFormatterParams<SalesRow, number>, formattedString: string): string => {
+const currencyFormatter = (params: ValueFormatterLiteParams<SalesRow, number>): string => {
     const { value } = params;
     if (value == null) {
         return '';
@@ -38,32 +38,28 @@ const formatter = (params: ValueFormatterParams<SalesRow, number>, formattedStri
         return String(value);
     }
 
-    return formattedString;
+    return `$${value.toLocaleString()}`;
 };
 
-const currencyFormatter = (params: ValueFormatterParams<SalesRow, number>) =>
-    formatter(params, `$${(params.value ?? '').toLocaleString()}`);
-
 const columnDefs: ColDef<SalesRow>[] = [
     { field: 'product', flex: 1 },
     {
         field: 'revenue',
         editable: true,
-        valueFormatter: currencyFormatter,
+        cellDataType: 'currency',
     },
     {
         field: 'cost',
         editable: true,
-        valueFormatter: currencyFormatter,
+        cellDataType: 'currency',
     },
     {
         colId: 'profit',
         headerName: 'Profit',
         calculatedExpression: '[revenue] - [cost]',
-        cellDataType: 'number',
+        cellDataType: 'currency',
         sortable: true,
         filter: 'agNumberColumnFilter',
-        valueFormatter: currencyFormatter,
     },
 ];
 
@@ -93,7 +89,16 @@ const rowData: SalesRow[] = [
 const gridOptions: GridOptions<SalesRow> = {
     columnDefs,
     rowData,
-    calculatedColumns: true,
+    dataTypeDefinitions: {
+        currency: {
+            baseDataType: 'number',
+            extendsDataType: 'number',
+            valueFormatter: currencyFormatter,
+        },
+    },
+    calculatedColumns: {
+        dataTypes: ['currency', 'number', 'text', 'boolean'],
+    },
     defaultColDef: {
         flex: 1,
         minWidth: 130,
diff --git a/documentation/ag-grid-docs/src/content/docs/calculated-columns/index.mdoc b/documentation/ag-grid-docs/src/content/docs/calculated-columns/index.mdoc
index 243d53e5507..fa8a9221626 100644
--- a/documentation/ag-grid-docs/src/content/docs/calculated-columns/index.mdoc
+++ b/documentation/ag-grid-docs/src/content/docs/calculated-columns/index.mdoc
@@ -32,6 +32,8 @@ Application-declared calculated columns must define a `colId` explicitly.
 
 {% gridExampleRunner title="Calculated Columns" name="calculated-columns" /%}
 
+Register [Cell Data Types](./cell-data-types/) to give users formatting options to pick from when they create a column. The example above provides a `currency` type — see [dataTypes](#datatypes).
+
 Calculated expressions do not need a leading equals sign (`=`). The value inside brackets must match a column `colId`, which defaults to the `field` when no explicit `colId` is provided.
 
 Calculated Columns are supported with all row models. Same-row bracket references are reliable everywhere. Cross-row and range references depend on the referenced rows being loaded in the current row model.
@@ -91,9 +93,21 @@ const gridOptions = {
     calculatedColumns: {
         dataTypes: ['currency', 'number', 'boolean'],
     },
+    columnDefs: [
+        { field: 'revenue', cellDataType: 'currency' },
+        { field: 'cost', cellDataType: 'currency' },
+        {
+            colId: 'profit',
+            headerName: 'Profit',
+            calculatedExpression: '[revenue] - [cost]',
+            cellDataType: 'currency',
+        },
+    ],
 };
 ```
 
+Applying the type to your own columns as well means a user who picks **Currency** in the dialog gets the same formatting as the columns you declared. A `valueFormatter` on a column definition cannot be selected in the dialog, so it is not available to users.
+
 Built-in types use the grid's locale text, while custom type names are converted to readable labels in the dialog. If a selected value does not match a registered [Cell Data Type](./cell-data-types/), the grid's normal `cellDataType` validation applies when the calculated column is created.
 
 {% gridExampleRunner title="Dialog Data Types" name="calculated-columns-dialog-data-types" /%}
@@ -162,13 +176,12 @@ const gridOptions = {
         {
             colId: 'profit',
             calculatedExpression: '[revenue] - [cost]',
-            cellDataType: 'number',
+            cellDataType: 'currency',
         },
         {
             colId: 'margin',
             calculatedExpression: '[profit] / [revenue]',
-            cellDataType: 'number',
-            valueFormatter: params => `${Math.round(params.value * 100)}%`,
+            cellDataType: 'percentage',
         },
         {
             colId: 'status',
@@ -179,6 +192,8 @@ const gridOptions = {
 };
 ```
 
+The `currency` and `percentage` types are registered with `dataTypeDefinitions`, as shown in [dataTypes](#datatypes).
+
 {% gridExampleRunner title="Advanced Calculated Columns" name="calculated-columns-advanced" /%}
 
 Header cells and grid cells for calculated columns include the `ag-calculated-column` CSS class; use it for custom styling.
diff --git a/documentation/ag-grid-docs/src/content/docs/column-headers/index.mdoc b/documentation/ag-grid-docs/src/content/docs/column-headers/index.mdoc
index 05bc50ac975..f79327cdefa 100644
--- a/documentation/ag-grid-docs/src/content/docs/column-headers/index.mdoc
+++ b/documentation/ag-grid-docs/src/content/docs/column-headers/index.mdoc
@@ -50,6 +50,8 @@ Editable columns can be renamed via:
 
 Editable column groups can be renamed via the **Edit Column Name** item in the group header right-click menu or the Columns Tool Panel context menu.
 
+The **Edit Column Name** item is never offered for [calculated columns](./calculated-columns/), even when `headerNameEditable` is set; rename a calculated column from its **Edit Calculated Column** dialog instead.
+
 Committing an empty value sets an empty header name; the header reverts to its Column Definition default only when the edit is cleared programmatically, such as `resetColumnState()`. Edited column names are persisted as part of [Column State](./column-state/) and [Grid State](./grid-state/); edited group names are persisted as part of Grid State. Both survive save and restore.
 
 {% note %}
diff --git a/documentation/ag-grid-docs/src/content/docs/column-menu/index.mdoc b/documentation/ag-grid-docs/src/content/docs/column-menu/index.mdoc
index 707806e0b43..8482ecde72e 100644
--- a/documentation/ag-grid-docs/src/content/docs/column-menu/index.mdoc
+++ b/documentation/ag-grid-docs/src/content/docs/column-menu/index.mdoc
@@ -74,6 +74,7 @@ The following is a list of all the default built-in menu items with the rules ab
 - `sortDescending`: Sort the column in descending order. Not shown when `columnMenu = 'legacy'` or the column is already sorted in descending order.
 - `sortUnSort`: Clear the sort on the column. Not shown when `columnMenu = 'legacy'` or the column is not sorted.
 - `calculatedColumn`: Show the Calculated Columns options. If the column selected is a Calculated Column, the menu will show options to edit and remove the column.
+- `editColumnName`: Rename the column header. Only shown when `headerNameEditable` is set on the column, and never on a calculated column, which is renamed via its **Edit Calculated Column** dialog instead.
 - `columnFilter`: Show the column filter. Not shown when `columnMenu = 'legacy'`, a filter is not enabled, or the header filter button or floating filter button are displayed.
 - `columnChooser`: Show the column chooser. Not shown when `columnMenu = 'legacy'`.
 - `pinSubMenu`: Sub-menu for pinning. Always shown.
diff --git a/documentation/ag-grid-docs/src/content/docs/filter-advanced/index.mdoc b/documentation/ag-grid-docs/src/content/docs/filter-advanced/index.mdoc
index 8be328b2673..e04e74647f4 100644
--- a/documentation/ag-grid-docs/src/content/docs/filter-advanced/index.mdoc
+++ b/documentation/ag-grid-docs/src/content/docs/filter-advanced/index.mdoc
@@ -275,7 +275,7 @@ All of the [Cell Data Types](./cell-data-types) are supported in the Advanced Fi
 
 - **Text** - The value in the input is compared against the cell value before any [Value Formatters](./value-formatters/) are applied (similar to the [Text Filter](./filter-text/)). To change the value being compared against, a [Filter Value Getter](./filter-text/#text-filter-values) can be used.
 - **Number** - The value in the input is compared against the cell value (like in the [Number Filter](./filter-number/)).
-- **BigInt** - The value in the input is parsed as a `bigint` (decimal integer syntax only, optional trailing `n`) and compared against the cell value (like in the [BigInt Filter](./filter-bigint/)). A column's [`bigintParser`](./filter-bigint/#custom-parsing) is used here too, so custom formats such as hexadecimal are also accepted.
+- **BigInt** - The value in the input is parsed as a `bigint` (decimal integer syntax only, optional trailing `n`) and compared against the cell value (like in the [BigInt Filter](./filter-bigint/)). A column's [`bigintParser`](./filter-bigint/#custom-parsing) is used here too, so custom formats such as hexadecimal are also accepted, and its `bigintFormatter` is used to display a stored operand in the filter expression and the Filter Builder.
 - **Boolean** - No values are displayed for booleans as the filter option is used instead.
 - **Date** and **Date Time** - The value in the input is converted to a `Date` via the [Value Parser](./value-parsers/#value-parser).
 - **Date String** and **Date Time String** - The value in the input is converted to a `Date` using the [Value Parser](./value-parsers/#value-parser) and the [Date Parser](./cell-data-types/#date-as-string). This is compared against the cell values, which are also converted using the Date Parser.
diff --git a/documentation/ag-grid-docs/src/content/docs/filter-bigint/index.mdoc b/documentation/ag-grid-docs/src/content/docs/filter-bigint/index.mdoc
index 1a1da04627d..a5bb780c95e 100644
--- a/documentation/ag-grid-docs/src/content/docs/filter-bigint/index.mdoc
+++ b/documentation/ag-grid-docs/src/content/docs/filter-bigint/index.mdoc
@@ -46,6 +46,8 @@ The BigInt Filter accepts decimal integer syntax only:
 
 To accept other formats, such as hexadecimal, provide a `bigintParser` that converts the entered text to a `bigint` (return `null` for values it cannot parse). Pair it with `allowedCharPattern` so the extra characters can be typed into the filter input. The parsed value is what gets applied to filtering, and the same parser is used by the [Advanced Filter](./filter-advanced/) for `bigint` operands.
 
+The filter model always stores the parsed value as a canonical decimal string, so provide a `bigintFormatter` — the inverse of the parser — to display stored values back in your own format. It is used by the [Floating Filter](./floating-filters/) and by the [Advanced Filter](./filter-advanced/) when displaying an operand, which means an entered value is echoed back in the formatter's format rather than exactly as typed.
+
 ```{% frameworkTransform=true %}
 const gridOptions = {
     columnDefs: [
diff --git a/documentation/ag-grid-docs/src/content/docs/formulas/index.mdoc b/documentation/ag-grid-docs/src/content/docs/formulas/index.mdoc
index 1e541759b77..fcec58e8ac0 100644
--- a/documentation/ag-grid-docs/src/content/docs/formulas/index.mdoc
+++ b/documentation/ag-grid-docs/src/content/docs/formulas/index.mdoc
@@ -134,6 +134,25 @@ If the formula store is mutated outside the grid (for example, syncing from a ba
 
 During a [CSV Export](./csv-export), the grid exports the evaluated values of any formulas. During an [Excel Export](./excel-export), the grid exports the formulas themselves so Excel can evaluate them.
 
+## Calculated Columns
+
+Formulas apply to individual cells: a user types an expression into one cell, and only that cell is affected.
+
+To derive a value for every row instead, use [Calculated Columns](./calculated-columns/). A calculated column defines one expression that evaluates against each row, referencing other columns by `colId`. Users can add their own calculated columns at runtime through the Column Menu.
+
+```{% frameworkTransform=true %}
+const gridOptions = {
+    calculatedColumns: true,
+    columnDefs: [
+        { field: 'revenue' },
+        { field: 'cost' },
+        { colId: 'profit', headerName: 'Profit', calculatedExpression: '[revenue] - [cost]' },
+    ],
+};
+```
+
+Use Formulas for ad-hoc, per-cell expressions; use [Calculated Columns](./calculated-columns/) for a derived value that applies to every row.
+
 ## See also
 
 - [Formula Editor Component](./formula-editor-component/) – The rich editing experience for formula cells, including autocomplete and range selection tools.
diff --git a/external/ag-website-shared/src/components/consent-fields/ConsentCheckbox.tsx b/external/ag-website-shared/src/components/consent-fields/ConsentCheckbox.tsx
index d37868a1144..0a41bf568a7 100644
--- a/external/ag-website-shared/src/components/consent-fields/ConsentCheckbox.tsx
+++ b/external/ag-website-shared/src/components/consent-fields/ConsentCheckbox.tsx
@@ -14,13 +14,27 @@ interface Props {
 }
 
 export const ConsentCheckbox: FunctionComponent<Props> = ({ id, label, error, nested, inputProps }: Props) => {
+    const errorId = `${id}-error`;
+
     return (
         <div className={classnames('input-field', { 'input-error': error }, { [styles.nested]: nested })}>
             <label className={styles.consentLabel} htmlFor={id}>
-                <input type="checkbox" id={id} {...inputProps} />
+                <input
+                    type="checkbox"
+                    id={id}
+                    aria-invalid={error ? true : undefined}
+                    aria-describedby={error ? errorId : undefined}
+                    {...inputProps}
+                />
                 <span>{label}</span>
             </label>
-            <div className={styles.errorContainer}>{error && <p className="error">{error}</p>}</div>
+            <div className={styles.errorContainer}>
+                {error && (
+                    <p className="error" id={errorId} role="alert">
+                        {error}
+                    </p>
+                )}
+            </div>
         </div>
     );
 };
diff --git a/external/ag-website-shared/src/components/contact-form/ContactForm.tsx b/external/ag-website-shared/src/components/contact-form/ContactForm.tsx
index f23f810d5e2..bf23f098b9e 100644
--- a/external/ag-website-shared/src/components/contact-form/ContactForm.tsx
+++ b/external/ag-website-shared/src/components/contact-form/ContactForm.tsx
@@ -99,7 +99,10 @@ export const ContactForm: FunctionComponent<Props> = ({
         setValue,
         formState: { errors },
     } = useForm<FormValues>({
-        mode: 'onBlur',
+        // Validate on first blur, then re-validate on every change, so a message
+        // clears the moment the field is corrected. Plain 'onBlur' only re-validates
+        // on the next blur, which leaves a stale error next to a ticked checkbox.
+        mode: 'onTouched',
     });
 
     // Email tracking consent only applies to France and Italy, so hiding it must also
diff --git a/external/ag-website-shared/src/components/product-dropdown/ProductDropdown.module.scss b/external/ag-website-shared/src/components/product-dropdown/ProductDropdown.module.scss
index 0dc3f7bf443..d5c3a576d72 100644
--- a/external/ag-website-shared/src/components/product-dropdown/ProductDropdown.module.scss
+++ b/external/ag-website-shared/src/components/product-dropdown/ProductDropdown.module.scss
@@ -130,7 +130,7 @@
         left: 0;
         // Fixed width gives each product row enough room for its title and
         // description without truncation.
-        width: 720px;
+        width: 800px;
         display: grid;
         grid-template-columns: repeat(2, minmax(0, 1fr));
     }
diff --git a/external/ag-website-shared/src/components/trial-licence-form/TrialLicenceForm.tsx b/external/ag-website-shared/src/components/trial-licence-form/TrialLicenceForm.tsx
index f2fc8d4eab3..f8288076478 100644
--- a/external/ag-website-shared/src/components/trial-licence-form/TrialLicenceForm.tsx
+++ b/external/ag-website-shared/src/components/trial-licence-form/TrialLicenceForm.tsx
@@ -254,6 +254,7 @@ function useTrialForm({ submitUrl }: Props) {
             }
         },
         [
+            submitUrl,
             validatedEmailError,
             validatedFirstNameError,
             validatedLastNameError,
@@ -292,7 +293,7 @@ function useTrialForm({ submitUrl }: Props) {
     };
 }
 
-export const TrialLicenceForm: FunctionComponent = ({ submitUrl }: Props) => {
+export const TrialLicenceForm: FunctionComponent<Props> = ({ submitUrl }: Props) => {
     const {
         formState,
         formError,
diff --git a/external/ag-website-shared/src/components/trial-licence-form/TrialLicenceFormStudio.tsx b/external/ag-website-shared/src/components/trial-licence-form/TrialLicenceFormStudio.tsx
index d76f77d2e1e..81aff8990d0 100644
--- a/external/ag-website-shared/src/components/trial-licence-form/TrialLicenceFormStudio.tsx
+++ b/external/ag-website-shared/src/components/trial-licence-form/TrialLicenceFormStudio.tsx
@@ -1,3 +1,8 @@
+import { ConsentCheckbox } from '@ag-website-shared/components/consent-fields/ConsentCheckbox';
+import {
+    CONSENT_LABELS,
+    DATA_PROCESSING_CONSENT_REQUIRED,
+} from '@ag-website-shared/components/consent-fields/consentMessages';
 import { Icon } from '@ag-website-shared/components/icon/Icon';
 import { TRIAL_LICENCE_FORM_URL, ZI_FORM_ID } from '@constants';
 import { trackTrialLicenseFormError, trackTrialLicenseFormSuccess } from '@utils/analytics';
@@ -90,22 +95,55 @@ function useRequiredValidation(initialValue: string = '') {
     };
 }
 
+function useCheckbox(initialValue: boolean = false) {
+    const [checked, setChecked] = useState<boolean>(initialValue);
+
+    const handleCheckedChange: ChangeEventHandler<HTMLInputElement> = useCallback((e) => {
+        setChecked(e.target.checked);
+    }, []);
+
+    return {
+        checked,
+        setChecked,
+        handleCheckedChange,
+    };
+}
+
 async function submitTrialLicenceFormData({
     submitUrl = TRIAL_LICENCE_FORM_URL,
     firstName,
     lastName,
     email,
     company,
+    dataProcessingConsent,
+    marketingEmailConsent,
+    emailTrackingConsent,
+    franceOrItaly,
 }: {
     submitUrl?: string;
     firstName: string;
     lastName: string;
     email: string;
     company: string;
+    dataProcessingConsent: boolean;
+    marketingEmailConsent: boolean;
+    emailTrackingConsent: boolean;
+    franceOrItaly: boolean;
 }) {
     const response = await fetch(submitUrl, {
         method: 'POST',
-        body: JSON.stringify({ data: { firstName, lastName, email, company } }),
+        body: JSON.stringify({
+            data: {
+                firstName,
+                lastName,
+                email,
+                company,
+                dataProcessingConsent,
+                marketingEmailConsent,
+                emailTrackingConsent,
+                franceOrItaly,
+            },
+        }),
         headers: {
             'Content-Type': 'application/json',
         },
@@ -136,12 +174,35 @@ function useTrialForm({ submitUrl }: Props) {
     } = useRequiredValidation();
     const lastNameError = wasValidated && validatedLastNameError ? validatedLastNameError : '';
 
+    const { checked: dataProcessingConsent, handleCheckedChange: handleDataProcessingConsentChange } = useCheckbox();
+    const dataProcessingConsentError = wasValidated && !dataProcessingConsent ? DATA_PROCESSING_CONSENT_REQUIRED : '';
+
+    const { checked: marketingEmailConsent, handleCheckedChange: handleMarketingEmailConsentChange } = useCheckbox();
+
+    const {
+        checked: emailTrackingConsent,
+        setChecked: setEmailTrackingConsent,
+        handleCheckedChange: handleEmailTrackingConsentChange,
+    } = useCheckbox();
+
+    const { checked: isFranceOrItaly, setChecked: setIsFranceOrItaly } = useCheckbox();
+
+    // Email tracking consent only applies to France and Italy, so hiding it must also
+    // withdraw it — never submit a consent the visitor can no longer see
+    const handleFranceOrItalyChange: ChangeEventHandler<HTMLInputElement> = useCallback((e) => {
+        const { checked } = e.target;
+        setIsFranceOrItaly(checked);
+        if (!checked) {
+            setEmailTrackingConsent(false);
+        }
+    }, []);
+
     const handleFormSubmit: FormEventHandler<HTMLFormElement> = useCallback(
         async (e) => {
             e.preventDefault();
             setWasValidated(true);
 
-            if (validatedEmailError || validatedFirstNameError || validatedLastNameError) {
+            if (validatedEmailError || validatedFirstNameError || validatedLastNameError || !dataProcessingConsent) {
                 setFormState('error');
                 return;
             }
@@ -153,7 +214,17 @@ function useTrialForm({ submitUrl }: Props) {
 
             try {
                 const company = (document.getElementById('company') as HTMLInputElement)?.value || '';
-                const response = await submitTrialLicenceFormData({ submitUrl, firstName, lastName, email, company });
+                const response = await submitTrialLicenceFormData({
+                    submitUrl,
+                    firstName,
+                    lastName,
+                    email,
+                    company,
+                    dataProcessingConsent,
+                    marketingEmailConsent,
+                    emailTrackingConsent,
+                    franceOrItaly: isFranceOrItaly,
+                });
 
                 if (response.error) {
                     setFormState('error');
@@ -182,7 +253,19 @@ function useTrialForm({ submitUrl }: Props) {
                 setFormState('error');
             }
         },
-        [validatedEmailError, validatedFirstNameError, validatedLastNameError, firstName, lastName, email]
+        [
+            submitUrl,
+            validatedEmailError,
+            validatedFirstNameError,
+            validatedLastNameError,
+            firstName,
+            lastName,
+            email,
+            dataProcessingConsent,
+            marketingEmailConsent,
+            emailTrackingConsent,
+            isFranceOrItaly,
+        ]
     );
 
     return {
@@ -197,11 +280,20 @@ function useTrialForm({ submitUrl }: Props) {
         lastName,
         lastNameError,
         handleLastNameChange,
+        dataProcessingConsent,
+        dataProcessingConsentError,
+        handleDataProcessingConsentChange,
+        marketingEmailConsent,
+        handleMarketingEmailConsentChange,
+        emailTrackingConsent,
+        handleEmailTrackingConsentChange,
+        isFranceOrItaly,
+        handleFranceOrItalyChange,
         handleFormSubmit,
     };
 }
 
-export const TrialLicenceFormStudio: FunctionComponent = ({ submitUrl }: Props) => {
+export const TrialLicenceFormStudio: FunctionComponent<Props> = ({ submitUrl }: Props) => {
     const {
         formState,
         formError,
@@ -214,9 +306,18 @@ export const TrialLicenceFormStudio: FunctionComponent = ({ submitUrl }: Props)
         lastName,
         lastNameError,
         handleLastNameChange,
+        dataProcessingConsent,
+        dataProcessingConsentError,
+        handleDataProcessingConsentChange,
+        marketingEmailConsent,
+        handleMarketingEmailConsentChange,
+        emailTrackingConsent,
+        handleEmailTrackingConsentChange,
+        isFranceOrItaly,
+        handleFranceOrItalyChange,
         handleFormSubmit,
     } = useTrialForm({ submitUrl });
-    const hasFormError = Boolean(emailError || firstNameError || lastNameError);
+    const hasFormError = Boolean(emailError || firstNameError || lastNameError || dataProcessingConsentError);
 
     return (
         <form id={ZI_FORM_ID} noValidate className={styles.trialForm} onSubmit={handleFormSubmit}>
@@ -271,6 +372,53 @@ export const TrialLicenceFormStudio: FunctionComponent = ({ submitUrl }: Props)
                 <p className="error">{emailError ? emailError : 'Email required'}</p>
             </div>
 
+            <div className={styles.consents}>
+                <ConsentCheckbox
+                    id="data-processing-consent"
+                    label={CONSENT_LABELS.dataProcessing}
+                    error={dataProcessingConsentError}
+                    inputProps={{
+                        name: 'data-processing-consent',
+                        checked: dataProcessingConsent,
+                        onChange: handleDataProcessingConsentChange,
+                        required: true,
+                    }}
+                />
+
+                <ConsentCheckbox
+                    id="marketing-email-consent"
+                    label={CONSENT_LABELS.marketingEmail}
+                    inputProps={{
+                        name: 'marketing-email-consent',
+                        checked: marketingEmailConsent,
+                        onChange: handleMarketingEmailConsentChange,
+                    }}
+                />
+
+                <ConsentCheckbox
+                    id="france-or-italy"
+                    label={CONSENT_LABELS.franceOrItaly}
+                    inputProps={{
+                        name: 'france-or-italy',
+                        checked: isFranceOrItaly,
+                        onChange: handleFranceOrItalyChange,
+                    }}
+                />
+
+                {isFranceOrItaly && (
+                    <ConsentCheckbox
+                        id="email-tracking-consent"
+                        label={CONSENT_LABELS.emailTracking}
+                        nested
+                        inputProps={{
+                            name: 'email-tracking-consent',
+                            checked: emailTrackingConsent,
+                            onChange: handleEmailTrackingConsentChange,
+                        }}
+                    />
+                )}
+            </div>
+
             <div className={classnames(styles.actions, 'trial-licence-actions')}>
                 <button
                     id="submit-trial-licence"
diff --git a/external/ag-website-shared/src/constants.ts b/external/ag-website-shared/src/constants.ts
index 37b68476bc6..ea408b80faa 100644
--- a/external/ag-website-shared/src/constants.ts
+++ b/external/ag-website-shared/src/constants.ts
@@ -12,10 +12,10 @@ export const RECAPTCHA_URL = 'https://www.google.com/recaptcha/api.js';
  */
 export const CONSENT_FIELD_IDS = {
     default: {
-        dataProcessingConsentId: '00NQ500000IfxTS',
-        marketingEmailConsentId: '00NS900000KOnU0',
-        emailTrackingConsentId: '00NS900000KQ3GT',
-        franceOrItalyId: '00NS900000KYN3V',
+        dataProcessingConsentId: '00NS900000KbwBF',
+        marketingEmailConsentId: '00NS900000KbwBI',
+        emailTrackingConsentId: '00NS900000KbwBG',
+        franceOrItalyId: '00NS900000KbwBH',
     },
     production: {
         dataProcessingConsentId: '00NQ500000IfxTS',
diff --git a/packages/ag-grid-community/src/gridBodyComp/fakeHScrollComp.ts b/packages/ag-grid-community/src/gridBodyComp/fakeHScrollComp.ts
index d1dd073d493..d2e082270b9 100644
--- a/packages/ag-grid-community/src/gridBodyComp/fakeHScrollComp.ts
+++ b/packages/ag-grid-community/src/gridBodyComp/fakeHScrollComp.ts
@@ -111,6 +111,9 @@ export class FakeHScrollComp extends AbstractFakeScrollComp {
         // a scrollbar, give a little time for the grid to resize, after which a
         // scrollbar may no longer be required
         const apply = () => {
+            if (!this.isAlive()) {
+                return;
+            }
             this.setScrollVisibleDebounce = 0;
             this.toggleCss('ag-scrollbar-invisible', invisibleScrollbar);
             _setFixedHeight(this.getGui(), scrollContainerSize);
diff --git a/packages/ag-grid-community/src/interfaces/columnHeaderEdit.ts b/packages/ag-grid-community/src/interfaces/columnHeaderEdit.ts
index 07865df8726..0f2f0cd4982 100644
--- a/packages/ag-grid-community/src/interfaces/columnHeaderEdit.ts
+++ b/packages/ag-grid-community/src/interfaces/columnHeaderEdit.ts
@@ -7,6 +7,8 @@ import type { MenuItemDef } from './menuItem';
 export interface IColumnHeaderEditService extends Bean {
     /** The "Edit Column Name" menu item for the column or group, or `null` when it is not editable. */
     getEditColumnNameMenuItem(target: AgColumn | AgProvidedColumnGroup): MenuItemDef | null;
+    /** Whether the column or group's header name can be edited inline. */
+    isEditable(target: AgColumn | AgProvidedColumnGroup): boolean;
     /** Open the header-name editor for the given column or column group. */
     showHeaderNameEditor(target: AgColumn | AgProvidedColumnGroup): void;
     /** Whether the column's header is currently being edited and should be highlighted. */
diff --git a/packages/ag-grid-enterprise/src/advancedFilter/advancedFilterExpressionService.ts b/packages/ag-grid-enterprise/src/advancedFilter/advancedFilterExpressionService.ts
index fd7880d79e9..1667bce2cec 100644
--- a/packages/ag-grid-enterprise/src/advancedFilter/advancedFilterExpressionService.ts
+++ b/packages/ag-grid-enterprise/src/advancedFilter/advancedFilterExpressionService.ts
@@ -168,6 +168,20 @@ export class AdvancedFilterExpressionService extends BeanStub implements NamedBe
         return this.operandModelValueGetters[baseCellDataType](operand, column, baseCellDataType);
     }
 
+    /**
+     * Whether a stored operand is itself valid input for its data type, i.e. whether feeding the model
+     * value back into the expression or the builder editor yields the same value again.
+     *
+     * True for most types: text and number model values are their input form, and dates store the iso
+     * string the editor expects. It is false only for `bigint`, where the model holds the canonical
+     * decimal while input goes through the column's `bigintParser` - so a parser reading a non-decimal
+     * syntax would reinterpret that decimal as a different number. Those operands have to be presented
+     * through `getOperandDisplayValue` (the `bigintFormatter`) or kept as the text the user typed.
+     */
+    public isOperandModelValueEditable(baseCellDataType: BaseCellDataType): boolean {
+        return baseCellDataType !== 'bigint';
+    }
+
     public getOperandDisplayValue(model: ColumnAdvancedFilterModel, skipFormatting?: boolean): string {
         const { filter, filterType } = model as Exclude<ColumnAdvancedFilterModel, BooleanAdvancedFilterModel>;
 
diff --git a/packages/ag-grid-enterprise/src/advancedFilter/advancedFilterService.ts b/packages/ag-grid-enterprise/src/advancedFilter/advancedFilterService.ts
index 2f61b0d7221..f900e9f9526 100644
--- a/packages/ag-grid-enterprise/src/advancedFilter/advancedFilterService.ts
+++ b/packages/ag-grid-enterprise/src/advancedFilter/advancedFilterService.ts
@@ -94,9 +94,21 @@ export class AdvancedFilterService extends BeanStub implements NamedBean, IAdvan
     }
 
     public getModel(): AdvancedFilterModel | null {
+        return this.parseAppliedExpressionModel(false);
+    }
+
+    /**
+     * As `getModel`, but with operands in the form the builder should edit rather than canonical model
+     * form, so a value typed in a syntax the model cannot reproduce survives the round-trip.
+     */
+    public getBuilderModel(): AdvancedFilterModel | null {
+        return this.parseAppliedExpressionModel(true);
+    }
+
+    private parseAppliedExpressionModel(forBuilder: boolean): AdvancedFilterModel | null {
         const expressionParser = this.createExpressionParser(this.appliedExpression);
         expressionParser?.parseExpression();
-        return expressionParser?.getModel() ?? null;
+        return expressionParser?.getModel(forBuilder) ?? null;
     }
 
     public setModel(model: AdvancedFilterModel | null): void {
diff --git a/packages/ag-grid-enterprise/src/advancedFilter/builder/advancedFilterBuilderComp.ts b/packages/ag-grid-enterprise/src/advancedFilter/builder/advancedFilterBuilderComp.ts
index a54db858321..cd4ab9f35dd 100644
--- a/packages/ag-grid-enterprise/src/advancedFilter/builder/advancedFilterBuilderComp.ts
+++ b/packages/ag-grid-enterprise/src/advancedFilter/builder/advancedFilterBuilderComp.ts
@@ -290,7 +290,7 @@ export class AdvancedFilterBuilderComp extends Component<AdvancedFilterBuilderEv
     }
 
     private setupFilterModel(): AdvancedFilterModel {
-        const filterModel = this.formatFilterModel(this.advancedFilter.getModel());
+        const filterModel = this.formatFilterModel(this.advancedFilter.getBuilderModel());
         this.stringifiedModel = JSON.stringify(filterModel);
         return filterModel;
     }
diff --git a/packages/ag-grid-enterprise/src/advancedFilter/builder/advancedFilterBuilderItemComp.ts b/packages/ag-grid-enterprise/src/advancedFilter/builder/advancedFilterBuilderItemComp.ts
index e08f50713e7..4d24eddac2e 100644
--- a/packages/ag-grid-enterprise/src/advancedFilter/builder/advancedFilterBuilderItemComp.ts
+++ b/packages/ag-grid-enterprise/src/advancedFilter/builder/advancedFilterBuilderItemComp.ts
@@ -417,11 +417,12 @@ export class AdvancedFilterBuilderItemComp extends TabGuardComp<AdvancedFilterBu
             });
             return comp;
         } else {
-            const { baseCellDataType, valueFormatter } = params;
+            const { baseCellDataType, valueFormatter, editValueFormatter } = params;
             const comp = this.createBean(
                 new InputPillComp({
                     value: key,
                     valueFormatter,
+                    editValueFormatter,
                     cssClass,
                     type: baseCellDataType,
                     ariaLabel,
diff --git a/packages/ag-grid-enterprise/src/advancedFilter/builder/conditionPillWrapperComp.ts b/packages/ag-grid-enterprise/src/advancedFilter/builder/conditionPillWrapperComp.ts
index 41e723a6272..b8d294253b9 100644
--- a/packages/ag-grid-enterprise/src/advancedFilter/builder/conditionPillWrapperComp.ts
+++ b/packages/ag-grid-enterprise/src/advancedFilter/builder/conditionPillWrapperComp.ts
@@ -119,12 +119,18 @@ export class ConditionPillWrapperComp extends Component<AdvancedFilterBuilderEve
         // Date inputs want iso string, so read straight from model. For numbers, convert to string
         const { filter } = this.filterModel as Exclude<ColumnAdvancedFilterModel, BooleanAdvancedFilterModel>;
         const key = (typeof filter === 'number' || typeof filter === 'bigint' ? _toStringOrNull(filter) : filter) ?? '';
+        const valueFormatter = (value: string) =>
+            this.advFilterExpSvc.getOperandDisplayValue({ ...this.filterModel, filter: value } as any, true);
         this.eOperandPill = this.createPill({
             key,
             // Convert from the input format to display format.
             // Input format matches model format except for numbers, but these get stringified anyway
-            valueFormatter: (value) =>
-                this.advFilterExpSvc.getOperandDisplayValue({ ...this.filterModel, filter: value } as any, true),
+            valueFormatter,
+            // Where the stored operand is not valid input for its type, edit the displayed text instead:
+            // the display value is produced by the same formatter whose output that type's parser accepts.
+            editValueFormatter: this.advFilterExpSvc.isOperandModelValueEditable(this.baseCellDataType)
+                ? undefined
+                : valueFormatter,
             baseCellDataType: this.baseCellDataType,
             cssClass: 'ag-advanced-filter-builder-value-pill',
             isSelect: false,
diff --git a/packages/ag-grid-enterprise/src/advancedFilter/builder/iAdvancedFilterBuilder.ts b/packages/ag-grid-enterprise/src/advancedFilter/builder/iAdvancedFilterBuilder.ts
index ea4611257bc..2ebf87050d4 100644
--- a/packages/ag-grid-enterprise/src/advancedFilter/builder/iAdvancedFilterBuilder.ts
+++ b/packages/ag-grid-enterprise/src/advancedFilter/builder/iAdvancedFilterBuilder.ts
@@ -27,6 +27,8 @@ export type CreatePillParams = CreateInputPillParams | CreateSelectPillParams;
 interface CreateInputPillParams extends BaseCreatePillParams {
     isSelect: false;
     valueFormatter: (value: string) => string;
+    /** Converts the stored value into the text the editor opens with. Defaults to the stored value. */
+    editValueFormatter?: (value: string) => string;
     baseCellDataType: BaseCellDataType;
 }
 
diff --git a/packages/ag-grid-enterprise/src/advancedFilter/builder/inputPillComp.ts b/packages/ag-grid-enterprise/src/advancedFilter/builder/inputPillComp.ts
index 0218e2c3387..d685d740694 100644
--- a/packages/ag-grid-enterprise/src/advancedFilter/builder/inputPillComp.ts
+++ b/packages/ag-grid-enterprise/src/advancedFilter/builder/inputPillComp.ts
@@ -79,6 +79,7 @@ export class InputPillComp extends Component<InputPillCompEvent> {
         private readonly params: {
             value: string;
             valueFormatter: (value: string) => string;
+            editValueFormatter?: (value: string) => string;
             cssClass: string;
             type: BaseCellDataType;
             ariaLabel: string;
@@ -128,7 +129,10 @@ export class InputPillComp extends Component<InputPillCompEvent> {
         }
         _setDisplayed(this.ePill, false);
         this.eEditor = this.createEditorComp(this.params.type);
-        this.eEditor.setValue(this.value);
+        const { editValueFormatter } = this.params;
+        // Edit the value as it is displayed, so a formatted operand does not flip back to the raw
+        // model value when the editor opens.
+        this.eEditor.setValue(editValueFormatter?.(this.value) ?? this.value);
         const eEditorGui = this.eEditor.getGui();
         this.eEditor.addManagedElementListeners(eEditorGui, {
             keydown: (event: KeyboardEvent) => {
diff --git a/packages/ag-grid-enterprise/src/advancedFilter/colFilterExpressionParser.ts b/packages/ag-grid-enterprise/src/advancedFilter/colFilterExpressionParser.ts
index df3b3719916..cda76fa88dc 100644
--- a/packages/ag-grid-enterprise/src/advancedFilter/colFilterExpressionParser.ts
+++ b/packages/ag-grid-enterprise/src/advancedFilter/colFilterExpressionParser.ts
@@ -275,6 +275,16 @@ class OperandParser implements Parser {
         return this.modelValue;
     }
 
+    /**
+     * The operand the builder should present and edit: the model value where that is valid input,
+     * otherwise the text the user typed, which the model value cannot be turned back into.
+     */
+    public getBuilderValue(): string | number {
+        return this.params.advFilterExpSvc.isOperandModelValueEditable(this.baseCellDataType)
+            ? this.modelValue
+            : this.operand;
+    }
+
     private parseOperand(fromComplete: boolean, position: number): void {
         const { advFilterExpSvc } = this.params;
         this.endPosition = position;
@@ -500,7 +510,7 @@ export class ColFilterExpressionParser {
         return null;
     }
 
-    public getModel(): AdvancedFilterModel {
+    public getModel(forBuilder?: boolean): AdvancedFilterModel {
         const colId = this.columnParser!.getColId();
         const model = {
             filterType: this.columnParser!.baseCellDataType,
@@ -508,7 +518,8 @@ export class ColFilterExpressionParser {
             type: this.operatorParser!.getOperatorKey(),
         };
         if (this.operatorParser!.expectedNumOperands) {
-            (model as any).filter = this.operandParser!.getModelValue();
+            const operandParser = this.operandParser!;
+            (model as any).filter = forBuilder ? operandParser.getBuilderValue() : operandParser.getModelValue();
         }
         return model as AdvancedFilterModel;
     }
diff --git a/packages/ag-grid-enterprise/src/advancedFilter/filterExpressionParser.ts b/packages/ag-grid-enterprise/src/advancedFilter/filterExpressionParser.ts
index 811a9e77e2c..95cda2a3c7b 100644
--- a/packages/ag-grid-enterprise/src/advancedFilter/filterExpressionParser.ts
+++ b/packages/ag-grid-enterprise/src/advancedFilter/filterExpressionParser.ts
@@ -59,8 +59,8 @@ export class FilterExpressionParser {
         return this.joinExpressionParser.updateExpression(position, updateEntry, type)!;
     }
 
-    public getModel(): AdvancedFilterModel | null {
-        return this.isValid() ? this.joinExpressionParser.getModel() : null;
+    public getModel(forBuilder?: boolean): AdvancedFilterModel | null {
+        return this.isValid() ? this.joinExpressionParser.getModel(forBuilder) : null;
     }
 
     private createFunctionParams(): FilterExpressionFunctionParams {
diff --git a/packages/ag-grid-enterprise/src/advancedFilter/joinFilterExpressionParser.ts b/packages/ag-grid-enterprise/src/advancedFilter/joinFilterExpressionParser.ts
index 41b04476832..2fabcf3db96 100644
--- a/packages/ag-grid-enterprise/src/advancedFilter/joinFilterExpressionParser.ts
+++ b/packages/ag-grid-enterprise/src/advancedFilter/joinFilterExpressionParser.ts
@@ -360,15 +360,15 @@ export class JoinFilterExpressionParser {
         return updatedExpression;
     }
 
-    public getModel(): AdvancedFilterModel {
+    public getModel(forBuilder?: boolean): AdvancedFilterModel {
         if (this.expressionParsers.length > 1) {
             return {
                 filterType: 'join',
                 type: this.operatorParser.getModel(),
-                conditions: this.expressionParsers.map((parser) => parser.getModel()),
+                conditions: this.expressionParsers.map((parser) => parser.getModel(forBuilder)),
             };
         } else {
-            return this.expressionParsers[0].getModel();
+            return this.expressionParsers[0].getModel(forBuilder);
         }
     }
 
diff --git a/packages/ag-grid-enterprise/src/columnHeaderEdit/columnHeaderEditService.ts b/packages/ag-grid-enterprise/src/columnHeaderEdit/columnHeaderEditService.ts
index 664e46c060c..3668ddcdf06 100644
--- a/packages/ag-grid-enterprise/src/columnHeaderEdit/columnHeaderEditService.ts
+++ b/packages/ag-grid-enterprise/src/columnHeaderEdit/columnHeaderEditService.ts
@@ -62,10 +62,13 @@ export class ColumnHeaderEditService extends BeanStub implements NamedBean, ICol
         }
     }
 
-    private isEditable(target: EditTarget): boolean {
-        return isProvidedColumnGroup(target)
-            ? !!target.colGroupDef?.headerNameEditable
-            : !!target.colDef.headerNameEditable;
+    public isEditable(target: EditTarget): boolean {
+        if (isProvidedColumnGroup(target)) {
+            return !!target.colGroupDef?.headerNameEditable;
+        }
+        // Calculated columns are renamed via their own modal, so the inline editor must not be a second
+        // source of truth for the header name.
+        return !!target.colDef.headerNameEditable && !target.isCalculatedCol;
     }
 
     private getEditableHeaderName(target: EditTarget): string {
diff --git a/packages/ag-grid-enterprise/src/columnToolPanel/agPrimaryColsHeader.ts b/packages/ag-grid-enterprise/src/columnToolPanel/agPrimaryColsHeader.ts
index d2389c2451d..bddbc337bf3 100644
--- a/packages/ag-grid-enterprise/src/columnToolPanel/agPrimaryColsHeader.ts
+++ b/packages/ag-grid-enterprise/src/columnToolPanel/agPrimaryColsHeader.ts
@@ -37,6 +37,8 @@ export class AgPrimaryColsHeader extends Component<AgPrimaryColsHeaderEvent> {
     private selectState?: boolean;
 
     private onFilterTextChangedDebounced: () => void;
+    private filterChangePending = false;
+    private composing = false;
 
     private params: ToolPanelColumnCompParams;
 
@@ -61,6 +63,18 @@ export class AgPrimaryColsHeader extends Component<AgPrimaryColsHeaderEvent> {
         this.addManagedPropertyListener('functionsReadOnly', () => this.onFunctionsReadOnlyPropChanged());
 
         this.eFilterTextField.setAutoComplete(false).onValueChange(() => this.onFilterTextChanged());
+        this.addManagedElementListeners(this.eFilterTextField.getInputElement(), {
+            keydown: (e) => this.onFilterKeyDown(e!),
+        });
+        // Safari reports the composition-confirming Enter keydown with isComposing already false, so track composition explicitly.
+        this.addManagedElementListeners(this.eFilterTextField.getInputElement(), {
+            compositionstart: () => {
+                this.composing = true;
+            },
+            compositionend: () => {
+                this.composing = false;
+            },
+        });
 
         this.addManagedEventListeners({ newColumnsLoaded: this.showOrHideOptions.bind(this) });
 
@@ -119,19 +133,31 @@ export class AgPrimaryColsHeader extends Component<AgPrimaryColsHeaderEvent> {
 
     private onFilterTextChanged(): void {
         if (!this.onFilterTextChangedDebounced) {
-            this.onFilterTextChangedDebounced = _debounce(
-                this,
-                () => {
-                    const filterText = this.eFilterTextField.getValue();
-                    this.dispatchLocalEvent({ type: 'filterChanged', filterText: filterText });
-                },
-                DEBOUNCE_DELAY
-            );
+            this.onFilterTextChangedDebounced = _debounce(this, () => this.dispatchFilterChanged(), DEBOUNCE_DELAY);
         }
 
+        this.filterChangePending = true;
         this.onFilterTextChangedDebounced();
     }
 
+    private dispatchFilterChanged(): void {
+        if (!this.filterChangePending) {
+            return;
+        }
+        this.filterChangePending = false;
+        const filterText = this.eFilterTextField.getValue();
+        this.dispatchLocalEvent({ type: 'filterChanged', filterText: filterText });
+    }
+
+    private onFilterKeyDown(e: KeyboardEvent): void {
+        if (e.key === KeyCode.ENTER && !e.isComposing && !this.composing && !this.params.suppressColumnSelectAll) {
+            // Stop Enter from submitting an enclosing form, and flush any pending debounced filter change so the toggle acts on the settled set.
+            e.preventDefault();
+            this.dispatchFilterChanged();
+            this.onSelectClicked();
+        }
+    }
+
     private onSelectClicked(): void {
         this.dispatchLocalEvent({ type: this.selectState ? 'unselectAll' : 'selectAll' });
     }
diff --git a/packages/ag-grid-enterprise/src/columnToolPanel/toolPanelContextMenu.ts b/packages/ag-grid-enterprise/src/columnToolPanel/toolPanelContextMenu.ts
index 2eebfdae7a6..d50ab48483b 100644
--- a/packages/ag-grid-enterprise/src/columnToolPanel/toolPanelContextMenu.ts
+++ b/packages/ag-grid-enterprise/src/columnToolPanel/toolPanelContextMenu.ts
@@ -173,10 +173,8 @@ export class ToolPanelContextMenu extends Component {
         this.allowGrouping = columns.some((col) => col.primary && col.isAllowRowGroup());
         this.allowValues = columns.some((col) => col.primary && col.isAllowValue());
         this.allowPivoting = isPivotMode && columns.some((col) => col.isPrimary() && col.isAllowPivot());
-        const headerNameEditable = isProvidedColumnGroup(column)
-            ? !!column.colGroupDef?.headerNameEditable
-            : !!column.colDef.headerNameEditable;
-        this.allowEditHeaderName = !!this.beans.colHeaderEditSvc && headerNameEditable;
+        const colHeaderEditSvc = this.beans.colHeaderEditSvc;
+        this.allowEditHeaderName = !!colHeaderEditSvc?.isEditable(column);
     }
 
     private buildMenuItemMap(): void {
diff --git a/packages/ag-grid-enterprise/src/menu/columnMenuFactory.ts b/packages/ag-grid-enterprise/src/menu/columnMenuFactory.ts
index 07f1bcfd068..f025af22e28 100644
--- a/packages/ag-grid-enterprise/src/menu/columnMenuFactory.ts
+++ b/packages/ag-grid-enterprise/src/menu/columnMenuFactory.ts
@@ -97,7 +97,7 @@ export class ColumnMenuFactory extends BeanStub implements NamedBean {
         };
 
         if (!column) {
-            if (beans.colHeaderEditSvc && columnGroup?.colGroupDef?.headerNameEditable) {
+            if (columnGroup && beans.colHeaderEditSvc?.isEditable(columnGroup)) {
                 result.push('editColumnName');
                 result.push(MENU_ITEM_SEPARATOR);
             }
@@ -179,7 +179,7 @@ export class ColumnMenuFactory extends BeanStub implements NamedBean {
             result.push(MENU_ITEM_SEPARATOR);
         }
 
-        if (beans.colHeaderEditSvc && colDef.headerNameEditable) {
+        if (column && beans.colHeaderEditSvc?.isEditable(column)) {
             result.push(MENU_ITEM_SEPARATOR);
             result.push('editColumnName');
             result.push(MENU_ITEM_SEPARATOR);
diff --git a/testing/behavioural/src/columnToolPanel/enter-toggles-filtered-columns.test.ts b/testing/behavioural/src/columnToolPanel/enter-toggles-filtered-columns.test.ts
new file mode 100644
index 00000000000..927b6596c21
--- /dev/null
+++ b/testing/behavioural/src/columnToolPanel/enter-toggles-filtered-columns.test.ts
@@ -0,0 +1,136 @@
+import type { ColDef, GridApi } from 'ag-grid-community';
+import { getGridElement } from 'ag-grid-community';
+import { AllEnterpriseModule } from 'ag-grid-enterprise';
+
+import { TestGridsManager } from '../test-utils';
+
+describe('Columns Tool Panel — Enter in filter input toggles matching columns', () => {
+    const gridMgr = new TestGridsManager({
+        modules: [AllEnterpriseModule],
+    });
+
+    afterEach(() => {
+        gridMgr.reset();
+    });
+
+    const columnDefs: ColDef[] = [
+        { field: 'goldMedals', headerName: 'Gold Medals' },
+        { field: 'silverMedals', headerName: 'Silver Medals' },
+        { field: 'athlete', headerName: 'Athlete' },
+        { field: 'country', headerName: 'Country' },
+    ];
+
+    const rowData = [Object.fromEntries(columnDefs.map((c) => [c.field!, `val_${c.field}`]))];
+
+    async function createGrid(toolPanelParams?: Record<string, unknown>): Promise<GridApi> {
+        return gridMgr.createGridAndWait('myGrid', {
+            columnDefs,
+            rowData,
+            sideBar: {
+                toolPanels: [
+                    {
+                        id: 'columns',
+                        labelDefault: 'Columns',
+                        labelKey: 'columns',
+                        iconKey: 'columns',
+                        toolPanel: 'agColumnsToolPanel',
+                        toolPanelParams,
+                    },
+                ],
+                defaultToolPanel: 'columns',
+            },
+        });
+    }
+
+    function forceVirtualListRender(api: GridApi): void {
+        const gridEl = getGridElement(api)! as HTMLElement;
+        const viewport = gridEl.querySelector('.ag-column-select-virtual-list-viewport') as HTMLElement;
+        // jsdom has no layout engine so offsetHeight returns 0, which prevents the
+        // virtual list from rendering items. Override it on the instance.
+        Object.defineProperty(viewport, 'offsetHeight', { value: 200, configurable: true });
+        viewport.dispatchEvent(new Event('scroll'));
+    }
+
+    function getFilterInput(api: GridApi): HTMLInputElement {
+        const gridEl = getGridElement(api)! as HTMLElement;
+        const input = gridEl.querySelector<HTMLInputElement>('.ag-column-select-header-filter-wrapper input');
+        if (!input) {
+            throw new Error('Columns tool panel filter input not found');
+        }
+        return input;
+    }
+
+    function setNativeInputValue(input: HTMLInputElement, value: string): void {
+        const setter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')!.set!;
+        setter.call(input, value);
+        input.dispatchEvent(new Event('input', { bubbles: true }));
+        input.dispatchEvent(new Event('change', { bubbles: true }));
+    }
+
+    test('pressing Enter toggles visibility of columns matching the filter text only', async () => {
+        const api = await createGrid();
+        forceVirtualListRender(api);
+
+        // all columns start visible
+        expect(api.getColumn('goldMedals')!.isVisible()).toBe(true);
+        expect(api.getColumn('silverMedals')!.isVisible()).toBe(true);
+        expect(api.getColumn('athlete')!.isVisible()).toBe(true);
+        expect(api.getColumn('country')!.isVisible()).toBe(true);
+
+        const input = getFilterInput(api);
+        setNativeInputValue(input, 'medals');
+
+        // Press Enter immediately, without waiting for the debounced filter to settle.
+        // Enter must flush the pending filter and then toggle synchronously, so the
+        // visibility change is observable with no await — this is what distinguishes the
+        // event-driven flush from the previous deferred-timer implementation.
+        input.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
+
+        // Enter toggles the matching (visible) columns off — equivalent to clicking
+        // "Select All" for the filtered set — and leaves non-matching columns alone.
+        expect(api.getColumn('goldMedals')!.isVisible()).toBe(false);
+        expect(api.getColumn('silverMedals')!.isVisible()).toBe(false);
+        expect(api.getColumn('athlete')!.isVisible()).toBe(true);
+        expect(api.getColumn('country')!.isVisible()).toBe(true);
+    });
+
+    test('Enter does not toggle while an IME composition is active (Safari reports isComposing=false)', async () => {
+        const api = await createGrid();
+        forceVirtualListRender(api);
+
+        const input = getFilterInput(api);
+        setNativeInputValue(input, 'medals');
+
+        // Safari fires the composition-confirming Enter keydown with isComposing already
+        // false, before compositionend. Explicit composition tracking must still suppress
+        // the toggle — asserting via isComposing=false here is what discriminates the
+        // tracked-state guard from the isComposing-only guard.
+        input.dispatchEvent(new CompositionEvent('compositionstart', { bubbles: true }));
+        input.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
+
+        expect(api.getColumn('goldMedals')!.isVisible()).toBe(true);
+        expect(api.getColumn('silverMedals')!.isVisible()).toBe(true);
+
+        // Once composition ends, Enter confirms and toggles the matching set as usual.
+        input.dispatchEvent(new CompositionEvent('compositionend', { bubbles: true }));
+        input.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
+
+        expect(api.getColumn('goldMedals')!.isVisible()).toBe(false);
+        expect(api.getColumn('silverMedals')!.isVisible()).toBe(false);
+    });
+
+    test('Enter does not toggle when suppressColumnSelectAll hides the select-all capability', async () => {
+        const api = await createGrid({ suppressColumnSelectAll: true });
+        forceVirtualListRender(api);
+
+        const input = getFilterInput(api);
+        setNativeInputValue(input, 'medals');
+
+        input.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
+
+        // Select-all is suppressed, so the Enter shortcut must not perform the bulk
+        // toggle it would otherwise dispatch.
+        expect(api.getColumn('goldMedals')!.isVisible()).toBe(true);
+        expect(api.getColumn('silverMedals')!.isVisible()).toBe(true);
+    });
+});
diff --git a/testing/behavioural/src/columnToolPanel/tool-panel-context-menu.test.ts b/testing/behavioural/src/columnToolPanel/tool-panel-context-menu.test.ts
index 1520553068d..cac29781934 100644
--- a/testing/behavioural/src/columnToolPanel/tool-panel-context-menu.test.ts
+++ b/testing/behavioural/src/columnToolPanel/tool-panel-context-menu.test.ts
@@ -572,4 +572,48 @@ describe('ToolPanelContextMenu', () => {
             expect(gridApi.getValueColumns().map((col) => col.getColId())).not.toContain('age');
         });
     });
+
+    describe('calculated columns', () => {
+        async function createGrid(cols: ColDef[]): Promise<{ gridDiv: HTMLElement; toolPanel: any }> {
+            const gridApi = await gridMgr.createGridAndWait('myGrid', {
+                columnDefs: cols,
+                rowData,
+                calculatedColumns: true,
+                defaultColDef: { flex: 1, minWidth: 100, enableRowGroup: true, headerNameEditable: true },
+                sideBar: {
+                    toolPanels: [
+                        {
+                            id: 'columns',
+                            labelDefault: 'Columns',
+                            labelKey: 'columns',
+                            iconKey: 'columns',
+                            toolPanel: 'agColumnsToolPanel',
+                        },
+                    ],
+                    defaultToolPanel: 'columns',
+                },
+            });
+            await asyncSetTimeout(1);
+            return {
+                gridDiv: getGridElement(gridApi)! as HTMLElement,
+                toolPanel: gridApi.getToolPanelInstance('columns') as any,
+            };
+        }
+
+        test('tool panel context menu omits Edit Column Name on a calculated column but keeps it elsewhere', async () => {
+            const { gridDiv, toolPanel } = await createGrid([
+                { field: 'athlete', minWidth: 200 },
+                { colId: 'ageDoubled', headerName: 'Age Doubled', calculatedExpression: '[age] * 2' },
+            ]);
+
+            // Calculated column: the menu still opens (Group by is offered) but the inline rename is gone.
+            await openContextMenu(toolPanel, gridDiv, 'Age Doubled');
+            await findByText(gridDiv, 'Group by Age Doubled');
+            expect(queryByText(gridDiv, 'Edit Column Name')).toBeNull();
+
+            // Non-calculated column with the same headerNameEditable keeps the inline rename item.
+            await openContextMenu(toolPanel, gridDiv, 'Athlete');
+            await findByText(gridDiv, 'Edit Column Name');
+        });
+    });
 });
diff --git a/testing/behavioural/src/filters/advanced-filter/advanced-filter-bigint-custom-parser.test.ts b/testing/behavioural/src/filters/advanced-filter/advanced-filter-bigint-custom-parser.test.ts
index 972562bfe0d..777320af5b6 100644
--- a/testing/behavioural/src/filters/advanced-filter/advanced-filter-bigint-custom-parser.test.ts
+++ b/testing/behavioural/src/filters/advanced-filter/advanced-filter-bigint-custom-parser.test.ts
@@ -196,4 +196,134 @@ describe('Advanced Filter - bigint custom parser and formatter', () => {
             └── LEAF id:2 value:"1000n"
         `);
     });
+
+    test('builder decimal operand is stored canonically, matches, and displays via the formatter', async () => {
+        const api = gridsManager.createGrid('grid4', {
+            columnDefs: withParser,
+            rowData: [{ value: 10n }, { value: 255n }, { value: 1000n }, { value: 65535n }],
+            enableAdvancedFilter: true,
+        });
+        await asyncSetTimeout(0);
+        api.setAdvancedFilterModel({ filterType: 'bigint', colId: 'value', type: 'equals', filter: '1000' } as any);
+        await asyncSetTimeout(0);
+
+        const builder = await AdvancedFilterBuilderHarness.open(api);
+        const [condition] = await builder.conditionItems();
+
+        // The builder editor presents the stored operand through the formatter, not as the canonical
+        // decimal it is stored as — assert that here, while the builder is still open, so a
+        // regression showing `1000`/`255` in the editor cannot hide behind the applied expression.
+        expect(valuePillText(condition)).toBe('0x3E8');
+
+        await builder.setValue(condition, '255');
+        // Re-query: committing the edit re-renders the condition row, detaching the earlier element.
+        const [editedCondition] = await builder.conditionItems();
+        expect(valuePillText(editedCondition)).toBe('0xFF');
+
+        await builder.apply();
+        await asyncSetTimeout(0);
+
+        expect(api.getAdvancedFilterModel()).toEqual({
+            filterType: 'bigint',
+            colId: 'value',
+            type: 'equals',
+            filter: '255',
+        });
+        await new GridRows(api, 'builder decimal operand matches only 255').check(`
+            ROOT id:ROOT_NODE_ID
+            └── LEAF id:1 value:"255n"
+        `);
+        // The formatter is the canonical presentation of a stored operand, whatever syntax was typed.
+        expect(getService(api).getExpressionDisplayValue()).toBe('[Value] = 0xFF');
+    });
+
+    test('builder value editor opens with the formatted operand, not the underlying decimal', async () => {
+        const api = gridsManager.createGrid('grid5', {
+            columnDefs: withParser,
+            rowData: [{ value: 10n }, { value: 255n }, { value: 1000n }],
+            enableAdvancedFilter: true,
+        });
+        await asyncSetTimeout(0);
+        api.setAdvancedFilterModel({ filterType: 'bigint', colId: 'value', type: 'equals', filter: '1000' } as any);
+        await asyncSetTimeout(0);
+
+        const builder = await AdvancedFilterBuilderHarness.open(api);
+        const [condition] = await builder.conditionItems();
+        expect(valuePillText(condition)).toBe('0x3E8');
+
+        // Editing must start from the value shown on the pill (the formatter's output, which the
+        // column's parser accepts), not the canonical decimal the model stores.
+        expect((await builder.openValueEditor(condition)).value).toBe('0x3E8');
+    });
+
+    test('builder keeps the typed operand syntax across apply when no formatter can reproduce it', async () => {
+        const api = gridsManager.createGrid('grid7', {
+            columnDefs: [
+                {
+                    field: 'value',
+                    headerName: 'Value',
+                    cellDataType: 'bigint',
+                    filter: 'agBigIntColumnFilter',
+                    filterParams: { allowedCharPattern: 'n0-9a-fA-FxX+\\-', bigintParser: parseBigInt },
+                },
+            ],
+            rowData: [{ value: 10n }, { value: 255n }, { value: 1000n }],
+            enableAdvancedFilter: true,
+        });
+        await asyncSetTimeout(0);
+        const gridDiv = getGridElement(api)! as HTMLElement;
+
+        // Without a bigintFormatter the model's canonical `255` cannot be turned back into `0xff`,
+        // so the builder must carry the typed text rather than fall back to the decimal.
+        applyExpression(gridDiv, '[Value] = 0xff');
+        await asyncSetTimeout(0);
+
+        const builder = await AdvancedFilterBuilderHarness.open(api);
+        const [condition] = await builder.conditionItems();
+        expect(valuePillText(condition)).toBe('0xff');
+        expect((await builder.openValueEditor(condition)).value).toBe('0xff');
+
+        // Applying from the builder round-trips the operand through the expression text, so the
+        // typed syntax must survive a re-open too - and must still filter on the parsed value.
+        await builder.apply();
+        await asyncSetTimeout(0);
+        await builder.close();
+
+        const reopened = await AdvancedFilterBuilderHarness.open(api);
+        expect(valuePillText((await reopened.conditionItems())[0])).toBe('0xff');
+        expect(api.getAdvancedFilterModel()).toEqual({
+            filterType: 'bigint',
+            colId: 'value',
+            type: 'equals',
+            filter: '255',
+        });
+        await new GridRows(api, 'typed hex still matches only 255').check(`
+            ROOT id:ROOT_NODE_ID
+            └── LEAF id:1 value:"255n"
+        `);
+    });
+
+    test('builder value editor opens with the decimal operand when no formatter is provided', async () => {
+        const api = gridsManager.createGrid('grid6', {
+            columnDefs: [
+                {
+                    field: 'value',
+                    headerName: 'Value',
+                    cellDataType: 'bigint',
+                    filter: 'agBigIntColumnFilter',
+                    filterParams: { allowedCharPattern: 'n0-9a-fA-FxX+\\-', bigintParser: parseBigInt },
+                },
+            ],
+            rowData: [{ value: 10n }, { value: 255n }, { value: 1000n }],
+            enableAdvancedFilter: true,
+        });
+        await asyncSetTimeout(0);
+        api.setAdvancedFilterModel({ filterType: 'bigint', colId: 'value', type: 'equals', filter: '1000' } as any);
+        await asyncSetTimeout(0);
+
+        const builder = await AdvancedFilterBuilderHarness.open(api);
+        const [condition] = await builder.conditionItems();
+        expect(valuePillText(condition)).toBe('1000');
+        expect((await builder.openValueEditor(condition)).value).toBe('1000');
+    });
 });
diff --git a/testing/behavioural/src/filters/filter-behaviour/bigint-filter-custom-parser.test.ts b/testing/behavioural/src/filters/filter-behaviour/bigint-filter-custom-parser.test.ts
index 0b43c35071d..e5e23326ed5 100644
--- a/testing/behavioural/src/filters/filter-behaviour/bigint-filter-custom-parser.test.ts
+++ b/testing/behavioural/src/filters/filter-behaviour/bigint-filter-custom-parser.test.ts
@@ -55,4 +55,40 @@ describe('BigInt Filter — custom bigintParser', () => {
             └── LEAF id:0 val:"255n"
         `);
     });
+
+    test('hex from/to values are both parsed for a range condition', async () => {
+        const api: GridApi = await gridsManager.createGridAndWait('grid2', {
+            columnDefs: [
+                {
+                    field: 'val',
+                    cellDataType: 'bigint',
+                    filter: 'agBigIntColumnFilter',
+                    filterParams: {
+                        debounceMs: 0,
+                        allowedCharPattern: '[\\dxXa-fA-F]',
+                        bigintParser: (text: string | null) =>
+                            text == null || text.trim() === '' ? null : BigInt(text),
+                    },
+                },
+            ],
+            rowData: [{ val: 1n }, { val: 16n }, { val: 100n }, { val: 255n }],
+        });
+
+        const filter = await ColumnFilterHarness.open(api, 'val');
+        await filter.selectOperator('Between');
+        await filter.setText('0x10', 0);
+        await filter.setText('0xFF', 1);
+        await asyncSetTimeout(0);
+
+        expect(filter.getModel()).toEqual({
+            filterType: 'bigint',
+            type: 'inRange',
+            filter: '16',
+            filterTo: '255',
+        });
+        await new GridRows(api, 'hex range bounds filter to the row inside the range').check(`
+            ROOT id:ROOT_NODE_ID
+            └── LEAF id:2 val:"100n"
+        `);
+    });
 });
diff --git a/testing/behavioural/src/formulas/calculated-columns.test.ts b/testing/behavioural/src/formulas/calculated-columns.test.ts
index cd47ed2080c..52e69080b29 100644
--- a/testing/behavioural/src/formulas/calculated-columns.test.ts
+++ b/testing/behavioural/src/formulas/calculated-columns.test.ts
@@ -19,6 +19,7 @@ import {
 import {
     CalculatedColumnsModule,
     ClipboardModule,
+    ColumnHeaderEditModule,
     ColumnMenuModule,
     ContextMenuModule,
     FormulaModule,
@@ -56,6 +57,7 @@ describe('ag-grid calculated columns', () => {
             ViewportRowModelModule,
             CalculatedColumnsModule,
             ClipboardModule,
+            ColumnHeaderEditModule,
             ColumnMenuModule,
             ContextMenuModule,
             RowGroupingModule,
@@ -874,6 +876,108 @@ describe('ag-grid calculated columns', () => {
             `);
     });
 
+    test('calculated column menu omits Edit Column Name even with headerNameEditable', async () => {
+        const api = createGrid('calculated-menu-omits-edit-column-name', {
+            rowData: [{ id: 'r1', revenue: 10, cost: 3 }],
+            defaultColDef: { headerNameEditable: true },
+            columnDefs: [
+                { field: 'revenue' },
+                { field: 'cost' },
+                { colId: 'profit', headerName: 'Profit', calculatedExpression: '[revenue] - [cost]' },
+            ],
+        });
+        await asyncSetTimeout(1);
+
+        showColumnMenu(api, 'profit');
+        await asyncSetTimeout(10);
+        const entries = getOpenMenuEntries();
+        expect(entries).not.toContain('Edit Column Name');
+        expect(entries).toEqual(expect.arrayContaining(['Edit Calculated Column', 'Remove Calculated Column']));
+    });
+
+    test('non-calculated column with headerNameEditable still offers Edit Column Name', async () => {
+        const api = createGrid('calculated-menu-keeps-edit-column-name', {
+            rowData: [{ id: 'r1', revenue: 10, cost: 3 }],
+            defaultColDef: { headerNameEditable: true },
+            columnDefs: [
+                { field: 'revenue' },
+                { field: 'cost' },
+                { colId: 'profit', headerName: 'Profit', calculatedExpression: '[revenue] - [cost]' },
+            ],
+        });
+        await asyncSetTimeout(1);
+
+        showColumnMenu(api, 'revenue');
+        await asyncSetTimeout(10);
+        expect(getOpenMenuEntries()).toContain('Edit Column Name');
+    });
+
+    test('dynamically created calculated column omits Edit Column Name', async () => {
+        const api = createGrid('calculated-menu-dynamic-edit-column-name', {
+            calculatedColumns: { applyMode: 'deferred' },
+            rowData: [{ id: 'r1', revenue: 10, cost: 3 }],
+            defaultColDef: { headerNameEditable: true },
+            columnDefs: [{ field: 'revenue' }, { field: 'cost' }],
+        });
+        await asyncSetTimeout(1);
+
+        showColumnMenu(api, 'revenue');
+        await asyncSetTimeout(10);
+        await clickColumnMenuItem('Add Calculated Column');
+        await asyncSetTimeout(1);
+        setExpression('[Revenue] - [Cost]');
+        clickDialogButton('Apply');
+        await asyncSetTimeout(1);
+
+        // defaultColDef.headerNameEditable merges onto the modal-generated calc colDef, so the inline
+        // rename item is eligible here and its absence proves suppression rather than ineligibility.
+        expect(api.getColumn('calculated_1')!.getColDef().headerNameEditable).toBe(true);
+
+        showColumnMenu(api, 'calculated_1');
+        await asyncSetTimeout(10);
+        const entries = getOpenMenuEntries();
+        expect(entries).not.toContain('Edit Column Name');
+        expect(entries).toEqual(expect.arrayContaining(['Edit Calculated Column', 'Remove Calculated Column']));
+    });
+
+    test('explicit mainMenuItems editColumnName is still suppressed on a calculated column', async () => {
+        const api = createGrid('calculated-menu-explicit-edit-column-name', {
+            rowData: [{ id: 'r1', revenue: 10, cost: 3 }],
+            defaultColDef: { headerNameEditable: true },
+            columnDefs: [
+                // Same explicit opt-in on a non-calc column: positive control that the token is honoured.
+                { field: 'revenue', mainMenuItems: ['editColumnName', { name: 'Sentinel', action: () => {} }] },
+                { field: 'cost' },
+                {
+                    colId: 'profit',
+                    headerName: 'Profit',
+                    calculatedExpression: '[revenue] - [cost]',
+                    // Opting in explicitly must not override the default of hiding the inline rename on
+                    // a calculated column — the modal remains the single source of truth for its name.
+                    // The custom 'Sentinel' item keeps the menu non-empty so its absence proves suppression.
+                    mainMenuItems: ['editColumnName', { name: 'Sentinel', action: () => {} }],
+                },
+            ],
+        });
+        await asyncSetTimeout(1);
+
+        showColumnMenu(api, 'profit');
+        await asyncSetTimeout(10);
+        const profitEntries = getOpenMenuEntries();
+        // The menu opened (has the sibling item) but the explicitly-requested rename is gone.
+        expect(profitEntries).toContain('Sentinel');
+        expect(profitEntries).not.toContain('Edit Column Name');
+
+        // Close the calc-column menu before opening the next — showColumnMenu no-ops while a menu is
+        // open, so getOpenMenuEntries would otherwise still read the profit menu.
+        api.hidePopupMenu();
+        await asyncSetTimeout(10);
+
+        // Positive control: the same explicit opt-in on a non-calc column does surface the item.
+        showColumnMenu(api, 'revenue');
+        await waitFor(() => expect(getOpenMenuEntries()).toContain('Edit Column Name'));
+    });
+
     test('reset column state removes dynamic calculated columns and restores provided calculated columns', async () => {
         const removed = vi.fn();
         const api = createGrid('calculated-reset-column-state', {
diff --git a/testing/behavioural/src/test-utils/filters/advancedFilterBuilderHarness.ts b/testing/behavioural/src/test-utils/filters/advancedFilterBuilderHarness.ts
index 58faedd476c..246445187dd 100644
--- a/testing/behavioural/src/test-utils/filters/advancedFilterBuilderHarness.ts
+++ b/testing/behavioural/src/test-utils/filters/advancedFilterBuilderHarness.ts
@@ -100,8 +100,8 @@ export class AdvancedFilterBuilderHarness {
         return this;
     }
 
-    /** Clicks the value pill on `item`, types `value` into the editor it opens, and commits (Enter). */
-    public async setValue(item: HTMLElement, value: string): Promise<this> {
+    /** Clicks the value pill on `item` and returns the editor input it opens. */
+    public async openValueEditor(item: HTMLElement): Promise<HTMLInputElement> {
         const pill = item.querySelector<HTMLElement>(VALUE_PILL);
         if (!pill) {
             throw new Error('Value pill not found on builder item');
@@ -109,7 +109,7 @@ export class AdvancedFilterBuilderHarness {
         await firePointerLikeClick(pill);
         // The column/operator pills carry hidden rich-select inputs; the value editor is the only
         // visible one, and it mounts a macrotask or two after the click — poll rather than guess a delay.
-        const editor = await waitFor(() => {
+        return waitFor(() => {
             const input = Array.from(item.querySelectorAll<HTMLInputElement>('input.ag-text-field-input')).find(
                 (candidate) => !candidate.closest('.ag-hidden')
             );
@@ -118,6 +118,11 @@ export class AdvancedFilterBuilderHarness {
             }
             return input;
         });
+    }
+
+    /** Clicks the value pill on `item`, types `value` into the editor it opens, and commits (Enter). */
+    public async setValue(item: HTMLElement, value: string): Promise<this> {
+        const editor = await this.openValueEditor(item);
         const setter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')!.set!;
         setter.call(editor, value);
         editor.dispatchEvent(new Event('input', { bubbles: true }));