diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2c3df5e7..0538be7d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -98,10 +98,31 @@ jobs:
       - name: Run main tests without minio and redis
         if: contains(matrix.tests, ':nbrowser-')
         run: |
+          mkdir -p $MOCHA_WEBDRIVER_LOGDIR
           export GREP_TESTS=$(echo $TESTS | sed "s/.*:nbrowser-\([^:]*\).*/\1/")
           MOCHA_WEBDRIVER_SKIP_CLEANUP=1 MOCHA_WEBDRIVER_HEADLESS=1 yarn run test:nbrowser --parallel --jobs 3
         env:
           TESTS: ${{ matrix.tests }}
+          MOCHA_WEBDRIVER_LOGDIR: ${{ runner.temp }}/test-logs/webdriver
+          TESTDIR: ${{ runner.temp }}/test-logs
+
+      - name: Prepare for saving artifact
+        if: failure()
+        run: |
+          ARTIFACT_NAME=logs-$(echo $TESTS | sed 's/[^-a-zA-Z0-9]/_/g')
+          echo "Artifact name is '$ARTIFACT_NAME'"
+          echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV
+          find $TESTDIR -iname "*.socket" -exec rm {} \;
+        env:
+          TESTS: ${{ matrix.tests }}
+          TESTDIR: ${{ runner.temp }}/test-logs
+
+      - name: Save artifacts on failure
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.ARTIFACT_NAME }}
+          path: ${{ runner.temp }}/test-logs  # only exists for webdriver tests
 
     services:
       # https://github.com/bitnami/bitnami-docker-minio/issues/16
diff --git a/app/client/accountMain.ts b/app/client/accountMain.ts
deleted file mode 100644
index ed4b2da1..00000000
--- a/app/client/accountMain.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import {AccountPage} from 'app/client/ui/AccountPage';
-import {setupPage} from 'app/client/ui/setupPage';
-import {dom} from 'grainjs';
-
-setupPage((appModel) => dom.create(AccountPage, appModel));
diff --git a/app/client/activationMain.ts b/app/client/activationMain.ts
deleted file mode 100644
index 33a56d32..00000000
--- a/app/client/activationMain.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import {ActivationPage} from 'app/client/ui/ActivationPage';
-import {setupPage} from 'app/client/ui/setupPage';
-import {dom} from 'grainjs';
-
-setupPage((appModel) => dom.create(ActivationPage, appModel));
diff --git a/app/client/components/ActionLog.ts b/app/client/components/ActionLog.ts
index 46553a53..3c68fb72 100644
--- a/app/client/components/ActionLog.ts
+++ b/app/client/components/ActionLog.ts
@@ -6,7 +6,6 @@ import * as dispose from 'app/client/lib/dispose';
 import dom from 'app/client/lib/dom';
 import {timeFormat} from 'app/common/timeFormat';
 import * as ko from 'knockout';
-import map = require('lodash/map');
 
 import koArray from 'app/client/lib/koArray';
 import {KoArray} from 'app/client/lib/koArray';
@@ -17,8 +16,8 @@ import {GristDoc} from 'app/client/components/GristDoc';
 import {ActionGroup} from 'app/common/ActionGroup';
 import {ActionSummary, asTabularDiffs, defunctTableName, getAffectedTables,
         LabelDelta} from 'app/common/ActionSummary';
-import {CellDelta} from 'app/common/TabularDiff';
-import {IDomComponent} from 'grainjs';
+import {CellDelta, TabularDiff} from 'app/common/TabularDiff';
+import {DomContents, IDomComponent} from 'grainjs';
 import {makeT} from 'app/client/lib/localization';
 
 /**
@@ -79,12 +78,13 @@ export class ActionLog extends dispose.Disposable implements IDomComponent {
     this._displayStack = koArray<ActionGroupWithState>();
 
     // Computed for the tableId of the table currently being viewed.
-    if (!this._gristDoc) {
-      this._selectedTableId = this.autoDispose(ko.computed(() => ""));
-    } else {
-      this._selectedTableId = this.autoDispose(ko.computed(
-        () => this._gristDoc!.viewModel.activeSection().table().tableId()));
-    }
+    this._selectedTableId = this.autoDispose(ko.computed(() => {
+      if (!this._gristDoc || this._gristDoc.viewModel.isDisposed()) { return ""; }
+      const section = this._gristDoc.viewModel.activeSection();
+      if (!section || section.isDisposed()) { return ""; }
+      const table = section.table();
+      return table && !table.isDisposed() ? table.tableId() : "";
+    }));
   }
 
   public buildDom() {
@@ -141,12 +141,12 @@ export class ActionLog extends dispose.Disposable implements IDomComponent {
    * @param {string} txt - a textual description of the action
    * @param {ActionGroupWithState} ag - the full action information we have
    */
-  public renderTabularDiffs(sum: ActionSummary, txt: string, ag?: ActionGroupWithState) {
+  public renderTabularDiffs(sum: ActionSummary, txt: string, ag?: ActionGroupWithState): HTMLElement {
     const act = asTabularDiffs(sum);
     const editDom = dom('div',
       this._renderTableSchemaChanges(sum, ag),
       this._renderColumnSchemaChanges(sum, ag),
-      map(act, (tdiff, table) => {
+      Object.entries(act).map(([table, tdiff]: [string, TabularDiff]) => {
         if (tdiff.cells.length === 0) { return dom('div'); }
         return dom('table.action_log_table',
           koDom.show(() => this._showForTable(table, ag)),
@@ -227,8 +227,9 @@ export class ActionLog extends dispose.Disposable implements IDomComponent {
   }
 
   private _buildLogDom() {
-    this._loadActionSummaries().catch((error) => gristNotify(t("Action Log failed to load")));
+    this._loadActionSummaries().catch(() => gristNotify(t("Action Log failed to load")));
     return dom('div.action_log',
+        {tabIndex: '-1'},
         dom('div.preference_item',
             koForm.checkbox(this._showAllTables,
                             dom.testId('ActionLog_allTables'),
@@ -238,7 +239,7 @@ export class ActionLog extends dispose.Disposable implements IDomComponent {
           'Loading...'),
         koDom.foreach(this._displayStack, (ag: ActionGroupWithState) => {
         const timestamp = ag.time ? timeFormat("D T", new Date(ag.time)) : "";
-        let desc = ag.desc || "";
+        let desc: DomContents = ag.desc || "";
         if (ag.actionSummary) {
           desc = this.renderTabularDiffs(ag.actionSummary, desc, ag);
         }
diff --git a/app/client/components/BaseView.js b/app/client/components/BaseView.js
index 391eb3ed..43406dc0 100644
--- a/app/client/components/BaseView.js
+++ b/app/client/components/BaseView.js
@@ -3,7 +3,6 @@
 const _ = require('underscore');
 const ko = require('knockout');
 const moment = require('moment-timezone');
-const {getSelectionDesc} = require('app/common/DocActions');
 const {nativeCompare, roundDownToMultiple, waitObs} = require('app/common/gutil');
 const gutil = require('app/common/gutil');
 const MANUALSORT  = require('app/common/gristTypes').MANUALSORT;
@@ -646,20 +645,7 @@ BaseView.prototype.sendPasteActions = function(cutCallback, actions) {
     // If the cut occurs on an edit restricted cell, there may be no cut action.
     if (cutAction) { actions.unshift(cutAction); }
   }
-  return this.gristDoc.docData.sendActions(actions,
-    this._getPasteDesc(actions[actions.length - 1], cutAction));
-};
-
-/**
- * Returns a string which describes a cut/copy action.
- */
-BaseView.prototype._getPasteDesc = function(pasteAction, optCutAction) {
-  if (optCutAction) {
-    return `Moved ${getSelectionDesc(optCutAction, true)} to ` +
-      `${getSelectionDesc(pasteAction, true)}.`;
-  } else {
-    return `Pasted data to ${getSelectionDesc(pasteAction, true)}.`;
-  }
+  return this.gristDoc.docData.sendActions(actions);
 };
 
 BaseView.prototype.buildDom = function() {
diff --git a/app/client/components/BehavioralPromptsManager.ts b/app/client/components/BehavioralPromptsManager.ts
index c086f7ac..3cfa95b7 100644
--- a/app/client/components/BehavioralPromptsManager.ts
+++ b/app/client/components/BehavioralPromptsManager.ts
@@ -83,21 +83,7 @@ export class BehavioralPromptsManager extends Disposable {
   }
 
   private _queueTip(refElement: Element, prompt: BehavioralPrompt, options: AttachOptions) {
-    if (
-      this._isDisabled ||
-      // Don't show tips if surveying is disabled.
-      // TODO: Move this into a dedicated variable - this is only a short-term fix for hiding
-      // tips in grist-core.
-      (!getGristConfig().survey && prompt !== 'rickRow') ||
-      // Or if this tip shouldn't be shown on mobile.
-      (isNarrowScreen() && !options.showOnMobile) ||
-      // Or if "Don't show tips" was checked in the past.
-      (this._prefs.get().dontShowTips && !options.forceShow) ||
-      // Or if this tip has been shown and dismissed in the past.
-      this.hasSeenTip(prompt)
-    ) {
-      return;
-    }
+    if (!this._shouldQueueTip(prompt, options)) { return; }
 
     this._queuedTips.push({prompt, refElement, options});
     if (this._queuedTips.length > 1) {
@@ -156,4 +142,26 @@ export class BehavioralPromptsManager extends Disposable {
     this._prefs.set({...this._prefs.get(), dontShowTips: true});
     this._queuedTips = [];
   }
+
+  private _shouldQueueTip(prompt: BehavioralPrompt, options: AttachOptions) {
+    if (
+      this._isDisabled ||
+      (isNarrowScreen() && !options.showOnMobile) ||
+      (this._prefs.get().dontShowTips && !options.forceShow) ||
+      this.hasSeenTip(prompt)
+    ) {
+      return false;
+    }
+
+    const {deploymentType} = getGristConfig();
+    const {deploymentTypes} = GristBehavioralPrompts[prompt];
+    if (
+      deploymentTypes !== '*' &&
+      (!deploymentType || !deploymentTypes.includes(deploymentType))
+    ) {
+      return false;
+    }
+
+    return true;
+  }
 }
diff --git a/app/client/components/CopySelection.ts b/app/client/components/CopySelection.ts
index 87b5692f..d2bce441 100644
--- a/app/client/components/CopySelection.ts
+++ b/app/client/components/CopySelection.ts
@@ -1,7 +1,6 @@
 import type {ViewFieldRec} from 'app/client/models/entities/ViewFieldRec';
 import type {CellValue} from 'app/common/DocActions';
-import type {TableData} from 'app/common/TableData';
-import type {UIRowId} from 'app/common/UIRowId';
+import type {TableData, UIRowId} from 'app/common/TableData';
 
 /**
  * The CopySelection class is an abstraction for a subset of currently selected cells.
diff --git a/app/client/components/Cursor.ts b/app/client/components/Cursor.ts
index 4b486eaf..1f9f1f03 100644
--- a/app/client/components/Cursor.ts
+++ b/app/client/components/Cursor.ts
@@ -8,12 +8,12 @@ import BaseView from 'app/client/components/BaseView';
 import * as commands from 'app/client/components/commands';
 import BaseRowModel from 'app/client/models/BaseRowModel';
 import {LazyArrayModel} from 'app/client/models/DataTableModel';
-import type {RowId} from 'app/client/models/rowset';
+import type {UIRowId} from 'app/common/TableData';
 import {Disposable} from 'grainjs';
 import * as ko from 'knockout';
 
 export interface CursorPos {
-  rowId?: RowId;
+  rowId?: UIRowId;
   rowIndex?: number;
   fieldIndex?: number;
   sectionId?: number;
@@ -60,7 +60,7 @@ export class Cursor extends Disposable {
   public rowIndex: ko.Computed<number|null>;     // May be null when there are no rows.
   public fieldIndex: ko.Observable<number>;
 
-  private _rowId: ko.Observable<RowId|null>;     // May be null when there are no rows.
+  private _rowId: ko.Observable<UIRowId|null>;     // May be null when there are no rows.
 
   // The cursor's _rowId property is always fixed across data changes. When isLive is true,
   // the rowIndex of the cursor is recalculated to match _rowId. When false, they will
@@ -68,13 +68,15 @@ export class Cursor extends Disposable {
   private _isLive: ko.Observable<boolean> = ko.observable(true);
   private _sectionId: ko.Computed<number>;
 
+  private _properRowId: ko.Computed<UIRowId|null>;
+
   constructor(baseView: BaseView, optCursorPos?: CursorPos) {
     super();
     optCursorPos = optCursorPos || {};
     this.viewData = baseView.viewData;
 
     this._sectionId = this.autoDispose(ko.computed(() => baseView.viewSection.id()));
-    this._rowId = ko.observable<RowId|null>(optCursorPos.rowId || 0);
+    this._rowId = ko.observable<UIRowId|null>(optCursorPos.rowId || 0);
     this.rowIndex = this.autoDispose(ko.computed({
       read: () => {
         if (!this._isLive()) { return this.rowIndex.peek(); }
@@ -82,7 +84,7 @@ export class Cursor extends Disposable {
         return rowId == null ? null : this.viewData.clampIndex(this.viewData.getRowIndexWithSub(rowId));
       },
       write: (index) => {
-        const rowIndex = this.viewData.clampIndex(index!);
+        const rowIndex = index === null ? null : this.viewData.clampIndex(index);
         this._rowId(rowIndex == null ? null : this.viewData.getRowId(rowIndex));
       },
     }));
@@ -90,8 +92,16 @@ export class Cursor extends Disposable {
     this.fieldIndex = baseView.viewSection.viewFields().makeLiveIndex(optCursorPos.fieldIndex || 0);
     this.autoDispose(commands.createGroup(Cursor.editorCommands, this, baseView.viewSection.hasFocus));
 
-    // Update the section's activeRowId when the cursor's rowId changes.
-    this.autoDispose(this._rowId.subscribe((rowId) => baseView.viewSection.activeRowId(rowId)));
+    // RowId might diverge from the one stored in _rowId when the data changes (it is filtered out). So here
+    // we will calculate rowId based on rowIndex (so in reverse order), to have a proper value.
+    this._properRowId = this.autoDispose(ko.computed(() => {
+      const rowIndex = this.rowIndex();
+      const rowId = rowIndex === null ? null : this.viewData.getRowId(rowIndex);
+      return rowId;
+    }));
+
+    // Update the section's activeRowId when the cursor's rowIndex is changed.
+    this.autoDispose(this._properRowId.subscribe((rowId) => baseView.viewSection.activeRowId(rowId)));
 
     // On dispose, save the current cursor position to the section model.
     this.onDispose(() => { baseView.viewSection.lastCursorPos = this.getCursorPos(); });
@@ -103,7 +113,7 @@ export class Cursor extends Disposable {
   // Returns the cursor position with rowId, rowIndex, and fieldIndex.
   public getCursorPos(): CursorPos {
     return {
-      rowId: nullAsUndefined(this._rowId()),
+      rowId: nullAsUndefined(this._properRowId()),
       rowIndex: nullAsUndefined(this.rowIndex()),
       fieldIndex: this.fieldIndex(),
       sectionId: this._sectionId()
@@ -117,7 +127,7 @@ export class Cursor extends Disposable {
    */
   public setCursorPos(cursorPos: CursorPos): void {
     if (cursorPos.rowId !== undefined && this.viewData.getRowIndex(cursorPos.rowId) >= 0) {
-      this._rowId(cursorPos.rowId);
+      this.rowIndex(this.viewData.getRowIndex(cursorPos.rowId) );
     } else if (cursorPos.rowIndex !== undefined && cursorPos.rowIndex >= 0) {
       this.rowIndex(cursorPos.rowIndex);
     } else {
diff --git a/app/client/components/DocComm.ts b/app/client/components/DocComm.ts
index 1a0dfe37..fc211c24 100644
--- a/app/client/components/DocComm.ts
+++ b/app/client/components/DocComm.ts
@@ -32,7 +32,6 @@ export class DocComm extends Disposable implements ActiveDocAPI {
   public addAttachments = this._wrapMethod("addAttachments");
   public findColFromValues = this._wrapMethod("findColFromValues");
   public getFormulaError = this._wrapMethod("getFormulaError");
-  public getAssistance = this._wrapMethod("getAssistance");
   public fetchURL = this._wrapMethod("fetchURL");
   public autocomplete = this._wrapMethod("autocomplete");
   public removeInstanceFromDoc = this._wrapMethod("removeInstanceFromDoc");
diff --git a/app/client/components/GridView.js b/app/client/components/GridView.js
index 0ad54d9c..45dd5d56 100644
--- a/app/client/components/GridView.js
+++ b/app/client/components/GridView.js
@@ -1233,9 +1233,11 @@ GridView.prototype.buildDom = function() {
         kd.style("width", ROW_NUMBER_WIDTH + 'px'),
         dom('div.gridview_data_row_info',
           kd.toggleClass('linked_dst', () => {
+            const myRowId = row.id();
+            const linkedRowId = self.linkedRowId();
             // Must ensure that linkedRowId is not null to avoid drawing on rows whose
             // row ids are null.
-            return self.linkedRowId() && self.linkedRowId() === row.getRowId();
+            return linkedRowId && linkedRowId === myRowId;
           })
         ),
         kd.text(function() { return row._index() + 1; }),
diff --git a/app/client/components/GristDoc.ts b/app/client/components/GristDoc.ts
index 3f43ffbc..6ef365bd 100644
--- a/app/client/components/GristDoc.ts
+++ b/app/client/components/GristDoc.ts
@@ -185,6 +185,10 @@ export class GristDoc extends DisposableWithEvents {
 
   public readonly currentTheme = this.docPageModel.appModel.currentTheme;
 
+  public get docApi() {
+    return this.docPageModel.appModel.api.getDocAPI(this.docPageModel.currentDocId.get()!);
+  }
+
   private _actionLog: ActionLog;
   private _undoStack: UndoStack;
   private _lastOwnActionGroup: ActionGroupWithCursorPos|null = null;
@@ -476,6 +480,7 @@ export class GristDoc extends DisposableWithEvents {
       const viewId = toKo(ko, this.activeViewId)();
       if (!isViewDocPage(viewId)) { return null; }
       const section = this.viewModel.activeSection();
+      if (section?.isDisposed()) { return null; }
       const view = section.viewInstance();
       return view;
     })));
@@ -620,6 +625,11 @@ export class GristDoc extends DisposableWithEvents {
   public async setCursorPos(cursorPos: CursorPos) {
     if (cursorPos.sectionId && cursorPos.sectionId !== this.externalSectionId.get()) {
       const desiredSection: ViewSectionRec = this.docModel.viewSections.getRowModel(cursorPos.sectionId);
+      // If the section id is 0, the section doesn't exist (can happen during undo/redo), and should
+      // be fixed there. For now ignore it, to not create empty sections or views (peeking a view will create it).
+      if (!desiredSection.id.peek()) {
+        return;
+      }
       // If this is completely unknown section (without a parent), it is probably an import preview.
       if (!desiredSection.parentId.peek() && !desiredSection.isRaw.peek()) {
         const view = desiredSection.viewInstance.peek();
@@ -1578,13 +1588,14 @@ async function finalizeAnchor() {
 }
 
 const cssViewContentPane = styled('div', `
+  --view-content-page-margin: 12px;
   flex: auto;
   display: flex;
   flex-direction: column;
   overflow: visible;
   position: relative;
   min-width: 240px;
-  margin: 12px;
+  margin: var(--view-content-page-margin, 12px);
   @media ${mediaSmall} {
     & {
       margin: 4px;
diff --git a/app/client/components/LayoutTray.ts b/app/client/components/LayoutTray.ts
index e6f49367..8b0bcdae 100644
--- a/app/client/components/LayoutTray.ts
+++ b/app/client/components/LayoutTray.ts
@@ -1164,7 +1164,7 @@ const cssFloaterWrapper = styled('div', `
   max-width: 140px;
   background: ${theme.tableBodyBg};
   border: 1px solid ${theme.widgetBorder};
-  border-radius: 3px;
+  border-radius: 4px;
   -webkit-transform: rotate(5deg) scale(0.8) translate(-10px, 0px);
   transform: rotate(5deg) scale(0.8) translate(-10px, 0px);
   & .mini_section_container {
@@ -1174,16 +1174,17 @@ const cssFloaterWrapper = styled('div', `
 `);
 
 const cssCollapsedTray = styled('div.collapsed_layout', `
-  border-radius: 3px;
   display: flex;
   flex-direction: column;
-  border-radius: 3px;
-  display: flex;
   overflow: hidden;
   transition: height 0.2s;
   position: relative;
-  margin-bottom: 10px;
+  margin: calc(-1 * var(--view-content-page-margin, 12px));
+  margin-bottom: 0;
   user-select: none;
+  background-color: ${theme.pageBg};
+  border-bottom: 1px solid ${theme.pagePanelsBorder};
+  outline-offset: -1px;
 
   &-is-active {
     outline: 2px dashed ${theme.widgetBorder};
@@ -1197,8 +1198,9 @@ const cssCollapsedTray = styled('div.collapsed_layout', `
 
 const cssRow = styled('div', `display: flex`);
 const cssLayout = styled(cssRow, `
-  padding: 12px;
-  gap: 10px;
+  padding: 8px 24px;
+  column-gap: 16px;
+  row-gap: 8px;
   flex-wrap: wrap;
   position: relative;
 `);
diff --git a/app/client/components/LinkingState.ts b/app/client/components/LinkingState.ts
index 1d92280e..d978f6f3 100644
--- a/app/client/components/LinkingState.ts
+++ b/app/client/components/LinkingState.ts
@@ -4,7 +4,7 @@ import {DocModel} from 'app/client/models/DocModel';
 import {ColumnRec} from "app/client/models/entities/ColumnRec";
 import {TableRec} from "app/client/models/entities/TableRec";
 import {ViewSectionRec} from "app/client/models/entities/ViewSectionRec";
-import {RowId} from "app/client/models/rowset";
+import {UIRowId} from "app/common/TableData";
 import {LinkConfig} from "app/client/ui/selectBy";
 import {ClientQuery, QueryOperation} from "app/common/ActiveDocAPI";
 import {isList, isListType, isRefListType} from "app/common/gristTypes";
@@ -62,7 +62,7 @@ export type FilterColValues = Pick<ClientQuery, "filters" | "operations">;
  */
 export class LinkingState extends Disposable {
   // If linking affects target section's cursor, this will be a computed for the cursor rowId.
-  public readonly cursorPos?: ko.Computed<RowId>;
+  public readonly cursorPos?: ko.Computed<UIRowId>;
 
   // If linking affects filtering, this is a computed for the current filtering state, as a
   // {[colId]: colValues} mapping, with a dependency on srcSection.activeRowId()
@@ -136,7 +136,7 @@ export class LinkingState extends Disposable {
       const srcValueFunc = srcColId ? this._makeSrcCellGetter() : identity;
       if (srcValueFunc) {
         this.cursorPos = this.autoDispose(ko.computed(() =>
-          srcValueFunc(srcSection.activeRowId()) as RowId
+          srcValueFunc(srcSection.activeRowId()) as UIRowId
         ));
       }
 
@@ -172,7 +172,7 @@ export class LinkingState extends Disposable {
 
   // Value for this.filterColValues filtering based on a single column
   private _simpleFilter(
-    colId: string, operation: QueryOperation, valuesFunc: (rowId: RowId|null) => any[]
+    colId: string, operation: QueryOperation, valuesFunc: (rowId: UIRowId|null) => any[]
   ): ko.Computed<FilterColValues> {
     return this.autoDispose(ko.computed(() => {
       const srcRowId = this._srcSection.activeRowId();
@@ -226,7 +226,7 @@ export class LinkingState extends Disposable {
     if (!srcCellObs) {
       return null;
     }
-    return (rowId: RowId | null) => {
+    return (rowId: UIRowId | null) => {
       srcRowModel.assign(rowId);
       if (rowId === 'new') {
         return 'new';
diff --git a/app/client/components/buildViewSectionDom.ts b/app/client/components/buildViewSectionDom.ts
index 77bbb9bb..fc57b8bd 100644
--- a/app/client/components/buildViewSectionDom.ts
+++ b/app/client/components/buildViewSectionDom.ts
@@ -1,6 +1,7 @@
 import BaseView from 'app/client/components/BaseView';
 import {GristDoc} from 'app/client/components/GristDoc';
 import {ViewRec, ViewSectionRec} from 'app/client/models/DocModel';
+import {makeT} from 'app/client/lib/localization';
 import {filterBar} from 'app/client/ui/FilterBar';
 import {cssIcon} from 'app/client/ui/RightPanelStyles';
 import {makeCollapsedLayoutMenu} from 'app/client/ui/ViewLayoutMenu';
@@ -13,6 +14,7 @@ import {menu} from 'app/client/ui2018/menus';
 import {Computed, dom, DomElementArg, Observable, styled} from 'grainjs';
 import {defaultMenuOptions} from 'popweasel';
 
+const t = makeT('ViewSection');
 
 export function buildCollapsedSectionDom(options: {
   gristDoc: GristDoc,
@@ -69,8 +71,13 @@ export function buildViewSectionDom(options: {
 
   // Creating normal section dom
   const vs: ViewSectionRec = gristDoc.docModel.viewSections.getRowModel(sectionRowId);
+  const selectedBySectionTitle = Computed.create(null, (use) => {
+    if (!use(vs.linkSrcSectionRef)) { return null; }
+    return use(use(vs.linkSrcSection).titleDef);
+  });
   return dom('div.view_leaf.viewsection_content.flexvbox.flexauto',
     testId(`viewlayout-section-${sectionRowId}`),
+    dom.autoDispose(selectedBySectionTitle),
     !options.isResizing ? dom.autoDispose(isResizing) : null,
     cssViewLeaf.cls(''),
     cssViewLeafInactive.cls('', (use) => !vs.isDisposed() && !use(vs.hasFocus)),
@@ -96,10 +103,14 @@ export function buildViewSectionDom(options: {
       dom('div.view_data_pane_container.flexvbox',
         cssResizing.cls('', isResizing),
         dom.maybe(viewInstance.disableEditing, () =>
-          dom('div.disable_viewpane.flexvbox', 'No data')
+          dom('div.disable_viewpane.flexvbox',
+            dom.domComputed(selectedBySectionTitle, (title) => title
+              ? t(`No row selected in {{title}}`, {title})
+              : t('No data')),
+          )
         ),
         dom.maybe(viewInstance.isTruncated, () =>
-          dom('div.viewsection_truncated', 'Not all data is shown')
+          dom('div.viewsection_truncated', t('Not all data is shown'))
         ),
         dom.cls((use) => 'viewsection_type_' + use(vs.parentKey)),
         viewInstance.viewPane
@@ -195,7 +206,6 @@ const cssResizing = styled('div', `
 const cssMiniSection = styled('div.mini_section_container', `
   --icon-color: ${colors.lightGreen};
   display: flex;
-  background: ${theme.mainPanelBg};
   align-items: center;
   padding-right: 8px;
 `);
diff --git a/app/client/lib/imports.d.ts b/app/client/lib/imports.d.ts
index 39e3438a..4691bef6 100644
--- a/app/client/lib/imports.d.ts
+++ b/app/client/lib/imports.d.ts
@@ -1,4 +1,7 @@
+import * as AccountPageModule from 'app/client/ui/AccountPage';
+import * as ActivationPageModule from 'app/client/ui/ActivationPage';
 import * as BillingPageModule from 'app/client/ui/BillingPage';
+import * as SupportGristPageModule from 'app/client/ui/SupportGristPage';
 import * as GristDocModule from 'app/client/components/GristDoc';
 import * as ViewPane from 'app/client/components/ViewPane';
 import * as UserManagerModule from 'app/client/ui/UserManager';
@@ -9,7 +12,10 @@ import * as plotly from 'plotly.js';
 export type PlotlyType = typeof plotly;
 export type MomentTimezone = typeof momentTimezone;
 
+export function loadAccountPage(): Promise<typeof AccountPageModule>;
+export function loadActivationPage(): Promise<typeof ActivationPageModule>;
 export function loadBillingPage(): Promise<typeof BillingPageModule>;
+export function loadSupportGristPage(): Promise<typeof SupportGristPageModule>;
 export function loadGristDoc(): Promise<typeof GristDocModule>;
 export function loadMomentTimezone(): Promise<MomentTimezone>;
 export function loadPlotly(): Promise<PlotlyType>;
diff --git a/app/client/lib/imports.js b/app/client/lib/imports.js
index a42a4662..b5d6f428 100644
--- a/app/client/lib/imports.js
+++ b/app/client/lib/imports.js
@@ -6,7 +6,10 @@
  *
  */
 
+exports.loadAccountPage = () => import('app/client/ui/AccountPage' /* webpackChunkName: "AccountPage" */);
+exports.loadActivationPage = () => import('app/client/ui/ActivationPage' /* webpackChunkName: "ActivationPage" */);
 exports.loadBillingPage = () => import('app/client/ui/BillingPage' /* webpackChunkName: "BillingModule" */);
+exports.loadSupportGristPage = () => import('app/client/ui/SupportGristPage' /* webpackChunkName: "SupportGristPage" */);
 exports.loadGristDoc = () => import('app/client/components/GristDoc' /* webpackChunkName: "GristDoc" */);
 // When importing this way, the module is under the "default" member, not sure why (maybe
 // esbuild-loader's doing).
diff --git a/app/client/lib/sortUtil.ts b/app/client/lib/sortUtil.ts
index 693c29dc..5618332c 100644
--- a/app/client/lib/sortUtil.ts
+++ b/app/client/lib/sortUtil.ts
@@ -5,6 +5,7 @@ import * as rowset from 'app/client/models/rowset';
 import { MANUALSORT } from 'app/common/gristTypes';
 import { SortFunc } from 'app/common/SortFunc';
 import { Sort } from 'app/common/SortSpec';
+import { UIRowId } from 'app/common/TableData';
 import * as ko from 'knockout';
 import range = require('lodash/range');
 
@@ -44,7 +45,7 @@ export async function updatePositions(gristDoc: GristDoc, section: ViewSectionRe
   sortFunc.updateSpec(section.activeDisplaySortSpec.peek());
   const sortedRows = rowset.SortedRowSet.create(
     null,
-    (a: rowset.RowId, b: rowset.RowId) => sortFunc.compare(a as number, b as number),
+    (a: UIRowId, b: UIRowId) => sortFunc.compare(a as number, b as number),
     tableModel.tableData
   );
   sortedRows.subscribeTo(tableModel);
diff --git a/app/client/lib/tableUtil.ts b/app/client/lib/tableUtil.ts
index 64d15395..5db8153a 100644
--- a/app/client/lib/tableUtil.ts
+++ b/app/client/lib/tableUtil.ts
@@ -8,7 +8,6 @@ import {safeJsonParse} from 'app/common/gutil';
 import type {TableData} from 'app/common/TableData';
 import {tsvEncode} from 'app/common/tsvFormat';
 import {dom} from 'grainjs';
-import map = require('lodash/map');
 import zipObject = require('lodash/zipObject');
 
 const G = getBrowserGlobals('document', 'DOMParser');
@@ -134,8 +133,11 @@ export function parsePasteHtml(data: string): RichPasteObject[][] {
 }
 
 // Helper function to add css style properties to an html tag
-function _styleAttr(style: object) {
-  return map(style, (value, prop) => `${prop}: ${value};`).join(' ');
+function _styleAttr(style: object|undefined) {
+  if (typeof style !== 'object') {
+    return '';
+  }
+  return Object.entries(style).map(([prop, value]) => `${prop}: ${value};`).join(' ');
 }
 
 /**
diff --git a/app/client/models/AppModel.ts b/app/client/models/AppModel.ts
index 0b5d24d2..bd4c20f3 100644
--- a/app/client/models/AppModel.ts
+++ b/app/client/models/AppModel.ts
@@ -9,6 +9,7 @@ import {urlState} from 'app/client/models/gristUrlState';
 import {Notifier} from 'app/client/models/NotifyModel';
 import {getFlavor, ProductFlavor} from 'app/client/ui/CustomThemes';
 import {buildNewSiteModal, buildUpgradeModal} from 'app/client/ui/ProductUpgrades';
+import {SupportGristNudge} from 'app/client/ui/SupportGristNudge';
 import {attachCssThemeVars, prefersDarkModeObs} from 'app/client/ui2018/cssVars';
 import {OrgUsageSummary} from 'app/common/DocUsage';
 import {Features, isLegacyPlan, Product} from 'app/common/Features';
@@ -31,7 +32,15 @@ const t = makeT('AppModel');
 // Reexported for convenience.
 export {reportError} from 'app/client/models/errors';
 
-export type PageType = "doc" | "home" | "billing" | "welcome";
+export type PageType =
+  | "doc"
+  | "home"
+  | "billing"
+  | "welcome"
+  | "account"
+  | "support-grist"
+  | "activation";
+
 const G = getBrowserGlobals('document', 'window');
 
 // TopAppModel is the part of the app model that persists across org and user switches.
@@ -107,6 +116,8 @@ export interface AppModel {
 
   behavioralPromptsManager: BehavioralPromptsManager;
 
+  supportGristNudge: SupportGristNudge;
+
   refreshOrgUsage(): Promise<void>;
   showUpgradeModal(): void;
   showNewSiteModal(): void;
@@ -253,11 +264,33 @@ export class AppModelImpl extends Disposable implements AppModel {
 
   // Get the current PageType from the URL.
   public readonly pageType: Observable<PageType> = Computed.create(this, urlState().state,
-    (use, state) => (state.doc ? "doc" : (state.billing ? "billing" : (state.welcome ? "welcome" : "home"))));
+    (_use, state) => {
+      if (state.doc) {
+        return 'doc';
+      } else if (state.billing) {
+        return 'billing';
+      } else if (state.welcome) {
+        return 'welcome';
+      } else if (state.account) {
+        return 'account';
+      } else if (state.supportGrist) {
+        return 'support-grist';
+      } else if (state.activation) {
+        return 'activation';
+      } else {
+        return 'home';
+      }
+    });
 
   public readonly needsOrg: Observable<boolean> = Computed.create(
     this, urlState().state, (use, state) => {
-      return !(Boolean(state.welcome) || state.billing === 'scheduled');
+      return !(
+        Boolean(state.welcome) ||
+        state.billing === 'scheduled' ||
+        Boolean(state.account) ||
+        Boolean(state.activation) ||
+        Boolean(state.supportGrist)
+      );
     });
 
   public readonly notifier = this.topAppModel.notifier;
@@ -265,6 +298,8 @@ export class AppModelImpl extends Disposable implements AppModel {
   public readonly behavioralPromptsManager: BehavioralPromptsManager =
     BehavioralPromptsManager.create(this, this);
 
+  public readonly supportGristNudge: SupportGristNudge = SupportGristNudge.create(this, this);
+
   constructor(
     public readonly topAppModel: TopAppModel,
     public readonly currentUser: FullUser|null,
diff --git a/app/client/models/DocModel.ts b/app/client/models/DocModel.ts
index 9efd1d18..e3e30510 100644
--- a/app/client/models/DocModel.ts
+++ b/app/client/models/DocModel.ts
@@ -29,8 +29,7 @@ import {isHiddenTable, isSummaryTable} from 'app/common/isHiddenTable';
 import {canEdit} from 'app/common/roles';
 import {RowFilterFunc} from 'app/common/RowFilterFunc';
 import {schema, SchemaTypes} from 'app/common/schema';
-import {UIRowId} from 'app/common/UIRowId';
-
+import {UIRowId} from 'app/common/TableData';
 import {ACLRuleRec, createACLRuleRec} from 'app/client/models/entities/ACLRuleRec';
 import {ColumnRec, createColumnRec} from 'app/client/models/entities/ColumnRec';
 import {createDocInfoRec, DocInfoRec} from 'app/client/models/entities/DocInfoRec';
@@ -318,7 +317,7 @@ export class DocModel {
  */
 function createTablesArray(
   tablesModel: MetaTableModel<TableRec>,
-  filterFunc: RowFilterFunc<rowset.RowId> = (_row) => true
+  filterFunc: RowFilterFunc<UIRowId> = (_row) => true
 ) {
   const rowSource = new rowset.FilteredRowSource(filterFunc);
   rowSource.subscribeTo(tablesModel);
diff --git a/app/client/models/NotifyModel.ts b/app/client/models/NotifyModel.ts
index 81f8b56b..40bcfb66 100644
--- a/app/client/models/NotifyModel.ts
+++ b/app/client/models/NotifyModel.ts
@@ -43,8 +43,8 @@ export interface CustomAction { label: string, action: () => void }
  */
 export type MessageType = string | (() => DomElementArg);
 // Identifies supported actions. These are implemented in NotifyUI.
-export type NotifyAction = 'upgrade' | 'renew' | 'personal' | 'report-problem' | 'ask-for-help' | CustomAction;
-
+export type NotifyAction = 'upgrade' | 'renew' | 'personal' | 'report-problem'
+                           | 'ask-for-help' | 'manage' | CustomAction;
 export interface INotifyOptions {
   message: MessageType;     // A string, or a function that builds dom.
   timestamp?: number;
diff --git a/app/client/models/QuerySet.ts b/app/client/models/QuerySet.ts
index 7f5ed5ac..ee1b04f4 100644
--- a/app/client/models/QuerySet.ts
+++ b/app/client/models/QuerySet.ts
@@ -28,7 +28,7 @@
  */
 import DataTableModel from 'app/client/models/DataTableModel';
 import {DocModel} from 'app/client/models/DocModel';
-import {BaseFilteredRowSource, RowId, RowList, RowSource} from 'app/client/models/rowset';
+import {BaseFilteredRowSource, RowList, RowSource} from 'app/client/models/rowset';
 import {TableData} from 'app/client/models/TableData';
 import {ActiveDocAPI, ClientQuery, QueryOperation} from 'app/common/ActiveDocAPI';
 import {CellValue, TableDataAction} from 'app/common/DocActions';
@@ -37,7 +37,7 @@ import {isList} from "app/common/gristTypes";
 import {nativeCompare} from 'app/common/gutil';
 import {IRefCountSub, RefCountMap} from 'app/common/RefCountMap';
 import {RowFilterFunc} from 'app/common/RowFilterFunc';
-import {TableData as BaseTableData} from 'app/common/TableData';
+import {TableData as BaseTableData, UIRowId} from 'app/common/TableData';
 import {tbind} from 'app/common/tbind';
 import {decodeObject} from "app/plugin/objtypes";
 import {Disposable, Holder, IDisposableOwnerT} from 'grainjs';
@@ -303,7 +303,7 @@ export class TableQuerySets {
 /**
  * Returns a filtering function which tells whether a row matches the given query.
  */
-export function getFilterFunc(docData: DocData, query: ClientQuery): RowFilterFunc<RowId> {
+export function getFilterFunc(docData: DocData, query: ClientQuery): RowFilterFunc<UIRowId> {
   // NOTE we rely without checking on tableId and colIds being valid.
   const tableData: BaseTableData = docData.getTable(query.tableId)!;
   const colFuncs = Object.keys(query.filters).sort().map(
@@ -312,22 +312,22 @@ export function getFilterFunc(docData: DocData, query: ClientQuery): RowFilterFu
       const values = new Set(query.filters[colId]);
       switch (query.operations[colId]) {
         case "intersects":
-          return (rowId: RowId) => {
+          return (rowId: UIRowId) => {
             const value = getter(rowId) as CellValue;
             return isList(value) &&
               (decodeObject(value) as unknown[]).some(v => values.has(v));
           };
         case "empty":
-          return (rowId: RowId) => {
+          return (rowId: UIRowId) => {
             const value = getter(rowId);
             // `isList(value) && value.length === 1` means `value == ['L']` i.e. an empty list
             return !value || isList(value) && value.length === 1;
           };
         case "in":
-          return (rowId: RowId) => values.has(getter(rowId));
+          return (rowId: UIRowId) => values.has(getter(rowId));
       }
     });
-  return (rowId: RowId) => colFuncs.every(f => f(rowId));
+  return (rowId: UIRowId) => colFuncs.every(f => f(rowId));
 }
 
 /**
diff --git a/app/client/models/SectionFilter.ts b/app/client/models/SectionFilter.ts
index 713fdf00..a858c319 100644
--- a/app/client/models/SectionFilter.ts
+++ b/app/client/models/SectionFilter.ts
@@ -1,9 +1,9 @@
 import {ColumnFilter} from 'app/client/models/ColumnFilter';
 import {ColumnRec, ViewFieldRec, ViewSectionRec} from 'app/client/models/DocModel';
-import {RowId} from 'app/client/models/rowset';
 import {TableData} from 'app/client/models/TableData';
 import {buildColFilter, ColumnFilterFunc} from 'app/common/ColumnFilterFunc';
 import {buildRowFilter, RowFilterFunc, RowValueFunc } from 'app/common/RowFilterFunc';
+import {UIRowId} from 'app/common/TableData';
 import {Computed, Disposable, MutableObsArray, obsArray, Observable, UseCB} from 'grainjs';
 
 export type {ColumnFilterFunc};
@@ -26,10 +26,10 @@ type ColFilterCB = (fieldOrColumn: ViewFieldRec|ColumnRec, colFilter: ColumnFilt
  * results in their being displayed (obviating the need to maintain their rowId explicitly).
  */
 export class SectionFilter extends Disposable {
-  public readonly sectionFilterFunc: Observable<RowFilterFunc<RowId>>;
+  public readonly sectionFilterFunc: Observable<RowFilterFunc<UIRowId>>;
 
   private _openFilterOverride: Observable<OpenColumnFilter|null> = Observable.create(this, null);
-  private _tempRows: MutableObsArray<RowId> = obsArray();
+  private _tempRows: MutableObsArray<UIRowId> = obsArray();
 
   constructor(public viewSection: ViewSectionRec, private _tableData: TableData) {
     super();
@@ -89,8 +89,8 @@ export class SectionFilter extends Disposable {
     return this._addRowsToFilter(this._buildPlainFilterFunc(getFilterFunc, use), this._tempRows.get());
   }
 
-  private _addRowsToFilter(filterFunc: RowFilterFunc<RowId>, rows: RowId[]) {
-    return (rowId: RowId) => rows.includes(rowId) || (typeof rowId !== 'number') || filterFunc(rowId);
+  private _addRowsToFilter(filterFunc: RowFilterFunc<UIRowId>, rows: UIRowId[]) {
+    return (rowId: UIRowId) => rows.includes(rowId) || (typeof rowId !== 'number') || filterFunc(rowId);
   }
 
   /**
@@ -98,9 +98,9 @@ export class SectionFilter extends Disposable {
    * columns. You can use `getFilterFunc(column, colFilter)` to customize the filter func for each
    * column. It calls `getFilterFunc` right away.
    */
-  private _buildPlainFilterFunc(getFilterFunc: ColFilterCB, use: UseCB): RowFilterFunc<RowId> {
+  private _buildPlainFilterFunc(getFilterFunc: ColFilterCB, use: UseCB): RowFilterFunc<UIRowId> {
     const filters = use(this.viewSection.filters);
-    const funcs: Array<RowFilterFunc<RowId> | null> = filters.map(({filter, fieldOrColumn}) => {
+    const funcs: Array<RowFilterFunc<UIRowId> | null> = filters.map(({filter, fieldOrColumn}) => {
       const colFilter = buildColFilter(use(filter), use(use(fieldOrColumn.origCol).type));
       const filterFunc = getFilterFunc(fieldOrColumn, colFilter);
 
@@ -108,9 +108,9 @@ export class SectionFilter extends Disposable {
 
       if (!filterFunc || !getter) { return null; }
 
-      return buildRowFilter(getter as RowValueFunc<RowId>, filterFunc);
+      return buildRowFilter(getter as RowValueFunc<UIRowId>, filterFunc);
     }).filter(f => f !== null); // Filter out columns that don't have a filter
 
-    return (rowId: RowId) => funcs.every(f => Boolean(f && f(rowId)));
+    return (rowId: UIRowId) => funcs.every(f => Boolean(f && f(rowId)));
   }
 }
diff --git a/app/client/models/TelemetryModel.ts b/app/client/models/TelemetryModel.ts
new file mode 100644
index 00000000..5d7af638
--- /dev/null
+++ b/app/client/models/TelemetryModel.ts
@@ -0,0 +1,32 @@
+import {AppModel, getHomeUrl} from 'app/client/models/AppModel';
+import {TelemetryPrefs} from 'app/common/Install';
+import {InstallAPI, InstallAPIImpl, TelemetryPrefsWithSources} from 'app/common/InstallAPI';
+import {bundleChanges, Disposable, Observable} from 'grainjs';
+
+export interface TelemetryModel {
+  /** Telemetry preferences (e.g. the current telemetry level). */
+  readonly prefs: Observable<TelemetryPrefsWithSources | null>;
+  fetchTelemetryPrefs(): Promise<void>;
+  updateTelemetryPrefs(prefs: Partial<TelemetryPrefs>): Promise<void>;
+}
+
+export class TelemetryModelImpl extends Disposable implements TelemetryModel {
+  public readonly prefs: Observable<TelemetryPrefsWithSources | null> = Observable.create(this, null);
+  private readonly _installAPI: InstallAPI = new InstallAPIImpl(getHomeUrl());
+
+  constructor(_appModel: AppModel) {
+    super();
+  }
+
+  public async fetchTelemetryPrefs(): Promise<void> {
+    const prefs = await this._installAPI.getInstallPrefs();
+    bundleChanges(() => {
+      this.prefs.set(prefs.telemetry);
+    });
+  }
+
+  public async updateTelemetryPrefs(prefs: Partial<TelemetryPrefs>): Promise<void> {
+    await this._installAPI.updateInstallPrefs({telemetry: prefs});
+    await this.fetchTelemetryPrefs();
+  }
+}
diff --git a/app/client/models/entities/ViewRec.ts b/app/client/models/entities/ViewRec.ts
index 29f5cff4..a1fcf808 100644
--- a/app/client/models/entities/ViewRec.ts
+++ b/app/client/models/entities/ViewRec.ts
@@ -62,8 +62,9 @@ export function createViewRec(this: ViewRec, docModel: DocModel): void {
     // Default to the first leaf from layoutSpec (which corresponds to the top-left section), or
     // fall back to the first item in the list if anything goes wrong (previous behavior).
     const firstLeaf = getFirstLeaf(this.layoutSpecObj.peek());
-    return visible.find(s => s.getRowId() === firstLeaf) ? firstLeaf as number :
-      (visible[0]?.getRowId() || 0);
+    const result = visible.find(s => s.id() === firstLeaf) ? firstLeaf as number :
+      (visible[0]?.id() || 0);
+    return result;
   });
 
   this.activeSection = refRecord(docModel.viewSections, this.activeSectionId);
diff --git a/app/client/models/entities/ViewSectionRec.ts b/app/client/models/entities/ViewSectionRec.ts
index cfe0bca4..47a2bf84 100644
--- a/app/client/models/entities/ViewSectionRec.ts
+++ b/app/client/models/entities/ViewSectionRec.ts
@@ -15,13 +15,13 @@ import {
   ViewRec
 } from 'app/client/models/DocModel';
 import * as modelUtil from 'app/client/models/modelUtil';
-import {RowId} from 'app/client/models/rowset';
 import {LinkConfig} from 'app/client/ui/selectBy';
 import {getWidgetTypes} from 'app/client/ui/widgetTypes';
 import {AccessLevel, ICustomWidget} from 'app/common/CustomWidget';
 import {UserAction} from 'app/common/DocActions';
 import {arrayRepeat} from 'app/common/gutil';
 import {Sort} from 'app/common/SortSpec';
+import {UIRowId} from 'app/common/TableData';
 import {ColumnsToMap, WidgetColumnMap} from 'app/plugin/CustomSectionAPI';
 import {ColumnToMapImpl} from 'app/client/models/ColumnToMap';
 import {BEHAVIOR} from 'app/client/models/entities/ColumnRec';
@@ -120,19 +120,30 @@ export interface ViewSectionRec extends IRowModel<"_grist_Views_section">, RuleO
 
   hasFocus: ko.Computed<boolean>;
 
-  activeLinkSrcSectionRef: modelUtil.CustomComputed<number>;
-  activeLinkSrcColRef: modelUtil.CustomComputed<number>;
-  activeLinkTargetColRef: modelUtil.CustomComputed<number>;
-
-  // Whether current linking state is as saved. It may be different during editing.
-  isActiveLinkSaved: ko.Computed<boolean>;
-
   // Section-linking affects table if linkSrcSection is set. The controller value of the
   // link is the value of srcCol at activeRowId of linkSrcSection, or activeRowId itself when
   // srcCol is unset. If targetCol is set, we filter for all rows whose targetCol is equal to
   // the controller value. Otherwise, the controller value determines the rowId of the cursor.
+
+  /**
+   * Section selected in the `Select By` dropdown. Used for filtering this section.
+   */
   linkSrcSection: ko.Computed<ViewSectionRec>;
+  /**
+   * Column selected in the `Select By` dropdown in the remote section. It points to a column in remote section
+   * that contains a reference to this table (or common table - because we can be linked by having the same reference
+   * to some other section).
+   * Used for filtering this section. Can be empty as user can just link by section.
+   * Watch out, it is not cleared, so it is only valid when we have linkSrcSection.
+   * In UI it is shown as Target Section (dot) Target Column.
+   */
   linkSrcCol: ko.Computed<ColumnRec>;
+  /**
+   * In case we have multiple reference columns, that are shown as
+   *   Target Section -> My Column or
+   *   Target Section . Target Column -> My Column
+   * store the reference to the column (my column) to use.
+   */
   linkTargetCol: ko.Computed<ColumnRec>;
 
   // Linking state maintains .filterFunc and .cursorPos observables which we use for
@@ -142,7 +153,7 @@ export interface ViewSectionRec extends IRowModel<"_grist_Views_section">, RuleO
 
   linkingFilter: ko.Computed<FilterColValues>;
 
-  activeRowId: ko.Observable<RowId | null>;     // May be null when there are no rows.
+  activeRowId: ko.Observable<UIRowId | null>;     // May be null when there are no rows.
 
   // If the view instance for section is instantiated, it will be accessible here.
   viewInstance: ko.Observable<BaseView | null>;
@@ -594,30 +605,20 @@ export function createViewSectionRec(this: ViewSectionRec, docModel: DocModel):
     write: (val) => { this.view().activeSectionId(val ? this.id() : 0); }
   });
 
-  this.activeLinkSrcSectionRef = modelUtil.customValue(this.linkSrcSectionRef);
-  this.activeLinkSrcColRef = modelUtil.customValue(this.linkSrcColRef);
-  this.activeLinkTargetColRef = modelUtil.customValue(this.linkTargetColRef);
-
-  // Whether current linking state is as saved. It may be different during editing.
-  this.isActiveLinkSaved = this.autoDispose(ko.pureComputed(() =>
-    this.activeLinkSrcSectionRef.isSaved() &&
-    this.activeLinkSrcColRef.isSaved() &&
-    this.activeLinkTargetColRef.isSaved()));
-
   // Section-linking affects this table if linkSrcSection is set. The controller value of the
   // link is the value of srcCol at activeRowId of linkSrcSection, or activeRowId itself when
   // srcCol is unset. If targetCol is set, we filter for all rows whose targetCol is equal to
   // the controller value. Otherwise, the controller value determines the rowId of the cursor.
-  this.linkSrcSection = refRecord(docModel.viewSections, this.activeLinkSrcSectionRef);
-  this.linkSrcCol = refRecord(docModel.columns, this.activeLinkSrcColRef);
-  this.linkTargetCol = refRecord(docModel.columns, this.activeLinkTargetColRef);
+  this.linkSrcSection = refRecord(docModel.viewSections, this.linkSrcSectionRef);
+  this.linkSrcCol = refRecord(docModel.columns, this.linkSrcColRef);
+  this.linkTargetCol = refRecord(docModel.columns, this.linkTargetColRef);
 
-  this.activeRowId = ko.observable<RowId|null>(null);
+  this.activeRowId = ko.observable<UIRowId|null>(null);
 
   this._linkingState = Holder.create(this);
   this.linkingState = this.autoDispose(ko.pureComputed(() => {
-    if (!this.activeLinkSrcSectionRef()) {
-      // This view section isn't selecting by anything.
+    if (!this.linkSrcSectionRef()) {
+      // This view section isn't selected by anything.
       return null;
     }
     try {
diff --git a/app/client/models/errors.ts b/app/client/models/errors.ts
index 219f047a..ad39f368 100644
--- a/app/client/models/errors.ts
+++ b/app/client/models/errors.ts
@@ -121,7 +121,7 @@ export function reportError(err: Error|string, ev?: ErrorEvent): void {
       const options: Partial<INotifyOptions> = {
         title: "Reached plan limit",
         key: `limit:${details.limit.quantity || message}`,
-        actions: ['upgrade'],
+        actions: details.tips?.some(t => t.action === 'manage') ? ['manage'] : ['upgrade'],
       };
       if (details.tips && details.tips.some(tip => tip.action === 'add-members')) {
         // When adding members would fix a problem, give more specific advice.
diff --git a/app/client/models/gristUrlState.ts b/app/client/models/gristUrlState.ts
index 0295b5f8..4e1523fe 100644
--- a/app/client/models/gristUrlState.ts
+++ b/app/client/models/gristUrlState.ts
@@ -156,7 +156,8 @@ export class UrlStateImpl {
    */
   public updateState(prevState: IGristUrlState, newState: IGristUrlState): IGristUrlState {
     const keepState = (newState.org || newState.ws || newState.homePage || newState.doc || isEmpty(newState) ||
-                       newState.account || newState.billing  || newState.activation || newState.welcome) ?
+                       newState.account || newState.billing  || newState.activation || newState.welcome ||
+                       newState.supportGrist) ?
       (prevState.org ? {org: prevState.org} : {}) :
       prevState;
     return {...keepState, ...newState};
@@ -186,8 +187,11 @@ export class UrlStateImpl {
     // Reload when moving to/from the Grist sign-up page.
     const signupReload = [prevState.login, newState.login].includes('signup')
       && prevState.login !== newState.login;
-    return Boolean(orgReload || accountReload || billingReload || activationReload
-      || gristConfig.errPage || docReload || welcomeReload || linkKeysReload || signupReload);
+    // Reload when moving to/from the support Grist page.
+    const supportGristReload = Boolean(prevState.supportGrist) !== Boolean(newState.supportGrist);
+    return Boolean(orgReload || accountReload || billingReload || activationReload ||
+      gristConfig.errPage || docReload || welcomeReload || linkKeysReload || signupReload ||
+      supportGristReload);
   }
 
   /**
diff --git a/app/client/models/rowset.ts b/app/client/models/rowset.ts
index 0f4ab32c..bbae95ab 100644
--- a/app/client/models/rowset.ts
+++ b/app/client/models/rowset.ts
@@ -24,7 +24,7 @@
 import koArray, {KoArray} from 'app/client/lib/koArray';
 import {DisposableWithEvents} from 'app/common/DisposableWithEvents';
 import {CompareFunc, sortedIndex} from 'app/common/gutil';
-import {SkippableRows} from 'app/common/TableData';
+import {SkippableRows, UIRowId} from 'app/common/TableData';
 import {RowFilterFunc} from "app/common/RowFilterFunc";
 import {Observable} from 'grainjs';
 
@@ -36,8 +36,7 @@ export const ALL: unique symbol = Symbol("ALL");
 
 export type ChangeType = 'add' | 'remove' | 'update';
 export type ChangeMethod = 'onAddRows' | 'onRemoveRows' | 'onUpdateRows';
-export type RowId = number | 'new';
-export type RowList = Iterable<RowId>;
+export type RowList = Iterable<UIRowId>;
 export type RowsChanged = RowList | typeof ALL;
 
 // ----------------------------------------------------------------------
@@ -132,7 +131,7 @@ export class RowListener extends DisposableWithEvents {
  * A trivial RowSource returning a fixed list of rows.
  */
 export abstract class ArrayRowSource extends RowSource {
-  constructor(private _rows: RowId[]) { super(); }
+  constructor(private _rows: UIRowId[]) { super(); }
   public getAllRows(): RowList { return this._rows; }
   public getNumRows(): number { return this._rows.length; }
 }
@@ -146,11 +145,11 @@ export abstract class ArrayRowSource extends RowSource {
  * TODO: This class is not used anywhere at the moment, and is a candidate for removal.
  */
 export class MappedRowSource extends RowSource {
-  private _mapperFunc: (row: RowId) => RowId;
+  private _mapperFunc: (row: UIRowId) => UIRowId;
 
   constructor(
     public parentRowSource: RowSource,
-    mapperFunc: (row: RowId) => RowId,
+    mapperFunc: (row: UIRowId) => UIRowId,
   ) {
     super();
 
@@ -182,7 +181,7 @@ export class ExtendedRowSource extends RowSource {
 
   constructor(
     public parentRowSource: RowSource,
-    public extras: RowId[]
+    public extras: UIRowId[]
   ) {
     super();
 
@@ -209,9 +208,9 @@ export class ExtendedRowSource extends RowSource {
 // ----------------------------------------------------------------------
 
 interface FilterRowChanges {
-  adds?: RowId[];
-  updates?: RowId[];
-  removes?: RowId[];
+  adds?: UIRowId[];
+  updates?: UIRowId[];
+  removes?: UIRowId[];
 }
 
 /**
@@ -219,9 +218,9 @@ interface FilterRowChanges {
  * does not maintain excluded rows, and does not allow changes to filterFunc.
  */
 export class BaseFilteredRowSource extends RowListener implements RowSource {
-  protected _matchingRows: Set<RowId> = new Set();   // Set of rows matching the filter.
+  protected _matchingRows: Set<UIRowId> = new Set();   // Set of rows matching the filter.
 
-  constructor(protected _filterFunc: RowFilterFunc<RowId>) {
+  constructor(protected _filterFunc: RowFilterFunc<UIRowId>) {
     super();
   }
 
@@ -309,8 +308,8 @@ export class BaseFilteredRowSource extends RowListener implements RowSource {
   }
 
   // These are implemented by FilteredRowSource, but the base class doesn't need to do anything.
-  protected _addExcludedRow(row: RowId): void { /* no-op */ }
-  protected _deleteExcludedRow(row: RowId): boolean { return true; }
+  protected _addExcludedRow(row: UIRowId): void { /* no-op */ }
+  protected _deleteExcludedRow(row: UIRowId): boolean { return true; }
 }
 
 /**
@@ -321,13 +320,13 @@ export class BaseFilteredRowSource extends RowListener implements RowSource {
  * FilteredRowSource is also a RowListener, so to subscribe to a rowSource, use `subscribeTo()`.
  */
 export class FilteredRowSource extends BaseFilteredRowSource {
-  private _excludedRows: Set<RowId> = new Set();   // Set of rows NOT matching the filter.
+  private _excludedRows: Set<UIRowId> = new Set();   // Set of rows NOT matching the filter.
 
   /**
    * Change the filter function. This may trigger 'remove' and 'add' events as necessary to indicate
    * that rows stopped or started matching the new filter.
    */
-  public updateFilter(filterFunc: RowFilterFunc<RowId>) {
+  public updateFilter(filterFunc: RowFilterFunc<UIRowId>) {
     this._filterFunc = filterFunc;
     const changes: FilterRowChanges = {};
     // After the first call, _excludedRows may have additional rows, but there is no harm in it,
@@ -356,8 +355,8 @@ export class FilteredRowSource extends BaseFilteredRowSource {
     return this._excludedRows.values();
   }
 
-  protected _addExcludedRow(row: RowId): void { this._excludedRows.add(row); }
-  protected _deleteExcludedRow(row: RowId): boolean { return this._excludedRows.delete(row); }
+  protected _addExcludedRow(row: UIRowId): void { this._excludedRows.add(row); }
+  protected _deleteExcludedRow(row: UIRowId): boolean { return this._excludedRows.delete(row); }
 }
 
 // ----------------------------------------------------------------------
@@ -368,7 +367,7 @@ export class FilteredRowSource extends BaseFilteredRowSource {
  * Private helper object that maintains a set of rows for a particular group.
  */
 class RowGroupHelper<Value> extends RowSource {
-  private _rows: Set<RowId> = new Set();
+  private _rows: Set<UIRowId> = new Set();
   constructor(public readonly groupValue: Value) {
     super();
   }
@@ -411,12 +410,12 @@ function _addToMapOfArrays<K, V>(map: Map<K, V[]>, key: K, r: V): void {
  */
 export class RowGrouping<Value> extends RowListener {
   // Maps row identifiers to groupValues.
-  private _rowsToValues: Map<RowId, Value> = new Map();
+  private _rowsToValues: Map<UIRowId, Value> = new Map();
 
   // Maps group values to RowGroupHelpers
   private _valuesToGroups: Map<Value, RowGroupHelper<Value>> = new Map();
 
-  constructor(private _groupFunc: (row: RowId) => Value) {
+  constructor(private _groupFunc: (row: UIRowId) => Value) {
     super();
 
     // On disposal, dispose all RowGroupHelpers that we maintain.
@@ -538,15 +537,15 @@ export class RowGrouping<Value> extends RowListener {
  * SortedRowSet re-emits 'rowNotify(rows, value)' events from RowSources that it subscribes to.
  */
 export class SortedRowSet extends RowListener {
-  private _allRows: Set<RowId> = new Set();
+  private _allRows: Set<UIRowId> = new Set();
   private _isPaused: boolean = false;
-  private _koArray: KoArray<RowId>;
+  private _koArray: KoArray<UIRowId>;
   private _keepFunc?: (rowId: number|'new') => boolean;
 
-  constructor(private _compareFunc: CompareFunc<RowId>,
+  constructor(private _compareFunc: CompareFunc<UIRowId>,
               private _skippableRows?: SkippableRows) {
     super();
-    this._koArray = this.autoDispose(koArray<RowId>());
+    this._koArray = this.autoDispose(koArray<UIRowId>());
     this._keepFunc = _skippableRows?.getKeepFunc();
   }
 
@@ -572,7 +571,7 @@ export class SortedRowSet extends RowListener {
   /**
    * Re-sorts the array according to the new compareFunc.
    */
-  public updateSort(compareFunc: CompareFunc<RowId>): void {
+  public updateSort(compareFunc: CompareFunc<UIRowId>): void {
     this._compareFunc = compareFunc;
     if (!this._isPaused) {
       this._koArray.assign(Array.from(this._koArray.peek()).sort(this._compareFunc));
@@ -650,7 +649,7 @@ export class SortedRowSet extends RowListener {
 
   // Filter out any rows that should be skipped. This is a no-op if no _keepFunc was found.
   // All rows that sort within nContext rows of something meant to be kept are also kept.
-  private _keep(rows: RowId[], nContext: number = 2) {
+  private _keep(rows: UIRowId[], nContext: number = 2) {
     // Nothing to be done if there's no _keepFunc.
     if (!this._keepFunc) { return rows; }
 
@@ -706,7 +705,7 @@ export class SortedRowSet extends RowListener {
   }
 }
 
-type RowTester = (rowId: RowId) => boolean;
+type RowTester = (rowId: UIRowId) => boolean;
 /**
  * RowWatcher is a RowListener that maintains an observable function that checks whether a row
  * is in the connected RowSource.
@@ -718,7 +717,7 @@ export class RowWatcher extends RowListener {
   public rowFilter: Observable<RowTester> = Observable.create(this, () => false);
   // We count the number of times the row is added or removed from the source.
   // In most cases row is added and removed only once.
-  private _rowCounter: Map<RowId, number> = new Map();
+  private _rowCounter: Map<UIRowId, number> = new Map();
 
   public clear() {
     this._rowCounter.clear();
diff --git a/app/client/ui/AccountWidget.ts b/app/client/ui/AccountWidget.ts
index ef45f649..70889a8e 100644
--- a/app/client/ui/AccountWidget.ts
+++ b/app/client/ui/AccountWidget.ts
@@ -65,7 +65,7 @@ export class AccountWidget extends Disposable {
       t("Toggle Mobile Mode"),
       cssCheckmark('Tick', dom.show(viewport.viewportEnabled)),
       testId('usermenu-toggle-mobile'),
-    );
+     );
 
     if (!user) {
       return [
@@ -100,6 +100,7 @@ export class AccountWidget extends Disposable {
 
       this._maybeBuildBillingPageMenuItem(),
       this._maybeBuildActivationPageMenuItem(),
+      this._maybeBuildSupportGristPageMenuItem(),
 
       mobileModeToggle,
 
@@ -155,10 +156,10 @@ export class AccountWidget extends Disposable {
       // For links, disabling with just a class is hard; easier to just not make it a link.
       // TODO weasel menus should support disabling menuItemLink.
       (isBillingManager ?
-        menuItemLink(urlState().setLinkUrl({billing: 'billing'}), 'Billing Account') :
-        menuItem(() => null, 'Billing Account', dom.cls('disabled', true))
+        menuItemLink(urlState().setLinkUrl({billing: 'billing'}), t('Billing Account')) :
+        menuItem(() => null, t('Billing Account'), dom.cls('disabled', true))
       ) :
-      menuItem(() => this._appModel.showUpgradeModal(), 'Upgrade Plan');
+      menuItem(() => this._appModel.showUpgradeModal(), t('Upgrade Plan'));
   }
 
   private _maybeBuildActivationPageMenuItem() {
@@ -167,7 +168,21 @@ export class AccountWidget extends Disposable {
       return null;
     }
 
-    return menuItemLink('Activation', urlState().setLinkUrl({activation: 'activation'}));
+    return menuItemLink(t('Activation'), urlState().setLinkUrl({activation: 'activation'}));
+  }
+
+  private _maybeBuildSupportGristPageMenuItem() {
+    const {deploymentType} = getGristConfig();
+    if (deploymentType !== 'core') {
+      return null;
+    }
+
+    return menuItemLink(
+      t('Support Grist'),
+      cssHeartIcon('💛'),
+      urlState().setLinkUrl({supportGrist: 'support-grist'}),
+      testId('usermenu-support-grist'),
+    );
   }
 }
 
@@ -183,6 +198,10 @@ export const cssUserIcon = styled('div', `
   cursor: pointer;
 `);
 
+const cssHeartIcon = styled('span', `
+  margin-left: 8px;
+`);
+
 const cssUserInfo = styled('div', `
   padding: 12px 24px 12px 16px;
   min-width: 200px;
diff --git a/app/client/ui/AppUI.ts b/app/client/ui/AppUI.ts
index 71485ca4..a6f30e0c 100644
--- a/app/client/ui/AppUI.ts
+++ b/app/client/ui/AppUI.ts
@@ -1,7 +1,7 @@
 import {buildDocumentBanners, buildHomeBanners} from 'app/client/components/Banners';
 import {ViewAsBanner} from 'app/client/components/ViewAsBanner';
 import {domAsync} from 'app/client/lib/domAsync';
-import {loadBillingPage} from 'app/client/lib/imports';
+import {loadAccountPage, loadActivationPage, loadBillingPage, loadSupportGristPage} from 'app/client/lib/imports';
 import {createSessionObs, isBoolean, isNumber} from 'app/client/lib/sessionObs';
 import {AppModel, TopAppModel} from 'app/client/models/AppModel';
 import {DocPageModelImpl} from 'app/client/models/DocPageModel';
@@ -75,6 +75,12 @@ function createMainPage(appModel: AppModel, appObj: App) {
       return domAsync(loadBillingPage().then(bp => dom.create(bp.BillingPage, appModel)));
     } else if (pageType === 'welcome') {
       return dom.create(WelcomePage, appModel);
+    } else if (pageType === 'account') {
+      return domAsync(loadAccountPage().then(ap => dom.create(ap.AccountPage, appModel)));
+    } else if (pageType === 'support-grist') {
+      return domAsync(loadSupportGristPage().then(sgp => dom.create(sgp.SupportGristPage, appModel)));
+    } else if (pageType === 'activation') {
+      return domAsync(loadActivationPage().then(ap => dom.create(ap.ActivationPage, appModel)));
     } else {
       return dom.create(pagePanelsDoc, appModel, appObj);
     }
diff --git a/app/client/ui/ColumnFilterMenu.ts b/app/client/ui/ColumnFilterMenu.ts
index c9fa0965..d1f00b1f 100644
--- a/app/client/ui/ColumnFilterMenu.ts
+++ b/app/client/ui/ColumnFilterMenu.ts
@@ -10,7 +10,7 @@ import {ColumnFilter, NEW_FILTER_JSON} from 'app/client/models/ColumnFilter';
 import {ColumnFilterMenuModel, IFilterCount} from 'app/client/models/ColumnFilterMenuModel';
 import {ColumnRec, ViewFieldRec} from 'app/client/models/DocModel';
 import {FilterInfo} from 'app/client/models/entities/ViewSectionRec';
-import {RowId, RowSource} from 'app/client/models/rowset';
+import {RowSource} from 'app/client/models/rowset';
 import {ColumnFilterFunc, SectionFilter} from 'app/client/models/SectionFilter';
 import {TableData} from 'app/client/models/TableData';
 import {cssInput} from 'app/client/ui/cssInput';
@@ -46,6 +46,7 @@ import {relativeDatesControl} from 'app/client/ui/ColumnFilterMenuUtils';
 import {FocusLayer} from 'app/client/lib/FocusLayer';
 import {DateRangeOptions, IDateRangeOption} from 'app/client/ui/DateRangeOptions';
 import {createFormatter} from 'app/common/ValueFormatter';
+import {UIRowId} from 'app/common/TableData';
 
 const t = makeT('ColumnFilterMenu');
 
@@ -470,9 +471,13 @@ function numericInput(obs: Observable<number|undefined|IRelativeDateSpec>,
     editMode = false;
     inputEl.value = formatValue(obs.get());
 
-    // Make sure focus is trapped on input during calendar view, so that uses can still use keyboard
-    // to navigate relative date options just after picking a date on the calendar.
-    setTimeout(() => opts.isSelected.get() && inputEl.focus());
+    setTimeout(() => {
+      // Make sure focus is trapped on input during calendar view, so that uses can still use keyboard
+      // to navigate relative date options just after picking a date on the calendar.
+      if (opts.viewTypeObs.get() === 'calendarView' && opts.isSelected.get()) {
+        inputEl.focus();
+      }
+    });
   };
   const onInput = debounce(() => {
     if (isRelativeBound(obs.get())) { return; }
@@ -829,7 +834,7 @@ interface ICountOptions {
  * the possible choices as keys).
  * Note that this logic is replicated in BaseView.prototype.filterByThisCellValue.
  */
-function addCountsToMap(valueMap: Map<CellValue, IFilterCount>, rowIds: RowId[],
+function addCountsToMap(valueMap: Map<CellValue, IFilterCount>, rowIds: UIRowId[],
                         { keyMapFunc = identity, labelMapFunc = identity, columnType,
                           areHiddenRows = false, valueMapFunc }: ICountOptions) {
 
diff --git a/app/client/ui/DocMenu.ts b/app/client/ui/DocMenu.ts
index c4a3eabc..6a716765 100644
--- a/app/client/ui/DocMenu.ts
+++ b/app/client/ui/DocMenu.ts
@@ -174,7 +174,14 @@ function createLoadedDocMenu(owner: IDisposableOwner, home: HomeModel) {
       testId('doclist')
     ),
     dom.maybe(use => !use(isNarrowScreenObs()) && ['all', 'workspace'].includes(use(home.currentPage)),
-              () => upgradeButton.showUpgradeCard(css.upgradeCard.cls(''))),
+      () => {
+        // TODO: These don't currently clash (grist-core stubs the upgradeButton), but a way to
+        // manage card popups will be needed if more are added later.
+        return [
+          upgradeButton.showUpgradeCard(css.upgradeCard.cls('')),
+          home.app.supportGristNudge.showCard(),
+        ];
+      }),
   ));
 }
 
diff --git a/app/client/ui/DocTutorial.ts b/app/client/ui/DocTutorial.ts
index 97f68a4f..67905417 100644
--- a/app/client/ui/DocTutorial.ts
+++ b/app/client/ui/DocTutorial.ts
@@ -1,4 +1,5 @@
 import {GristDoc} from 'app/client/components/GristDoc';
+import {logTelemetryEvent} from 'app/client/lib/telemetry';
 import {getWelcomeHomeUrl, urlState} from 'app/client/models/gristUrlState';
 import {renderer} from 'app/client/ui/DocTutorialRenderer';
 import {cssPopupBody, FloatingPopup} from 'app/client/ui/FloatingPopup';
@@ -30,12 +31,12 @@ const TOOLTIP_KEY = 'docTutorialTooltip';
 export class DocTutorial extends FloatingPopup {
   private _appModel = this._gristDoc.docPageModel.appModel;
   private _currentDoc = this._gristDoc.docPageModel.currentDoc.get();
+  private _currentFork = this._currentDoc?.forks?.[0];
   private _docComm = this._gristDoc.docComm;
   private _docData = this._gristDoc.docData;
   private _docId = this._gristDoc.docId();
   private _slides: Observable<DocTutorialSlide[] | null> = Observable.create(this, null);
-  private _currentSlideIndex = Observable.create(this,
-    this._currentDoc?.forks?.[0]?.options?.tutorial?.lastSlideIndex ?? 0);
+  private _currentSlideIndex = Observable.create(this, this._currentFork?.options?.tutorial?.lastSlideIndex ?? 0);
 
 
   private _saveCurrentSlidePositionDebounced = debounce(this._saveCurrentSlidePosition, 1000, {
@@ -231,14 +232,30 @@ export class DocTutorial extends FloatingPopup {
 
   private async _saveCurrentSlidePosition() {
     const currentOptions = this._currentDoc?.options ?? {};
+    const currentSlideIndex = this._currentSlideIndex.get();
+    const numSlides = this._slides.get()?.length;
     await this._appModel.api.updateDoc(this._docId, {
       options: {
         ...currentOptions,
         tutorial: {
-          lastSlideIndex: this._currentSlideIndex.get(),
+          lastSlideIndex: currentSlideIndex,
         }
       }
     });
+
+    let percentComplete: number | undefined = undefined;
+    if (numSlides !== undefined && numSlides > 0) {
+      percentComplete = Math.floor(((currentSlideIndex + 1) / numSlides) * 100);
+    }
+    logTelemetryEvent('tutorialProgressChanged', {
+      full: {
+        tutorialForkIdDigest: this._currentFork?.id,
+        tutorialTrunkIdDigest: this._currentFork?.trunkId,
+        lastSlideIndex: currentSlideIndex,
+        numSlides,
+        percentComplete,
+      },
+    });
   }
 
   private async _changeSlide(slideIndex: number) {
diff --git a/app/client/ui/GristTooltips.ts b/app/client/ui/GristTooltips.ts
index 62d172c0..04264845 100644
--- a/app/client/ui/GristTooltips.ts
+++ b/app/client/ui/GristTooltips.ts
@@ -3,7 +3,7 @@ import {makeT} from 'app/client/lib/localization';
 import {ShortcutKey, ShortcutKeyContent} from 'app/client/ui/ShortcutKey';
 import {icon} from 'app/client/ui2018/icons';
 import {cssLink} from 'app/client/ui2018/links';
-import {commonUrls} from 'app/common/gristUrls';
+import {commonUrls, GristDeploymentType} from 'app/common/gristUrls';
 import {BehavioralPrompt} from 'app/common/Prefs';
 import {dom, DomContents, DomElementArg, styled} from 'grainjs';
 
@@ -104,6 +104,7 @@ export const GristTooltips: Record<Tooltip, TooltipContentFunc> = {
 export interface BehavioralPromptContent {
   title: () => string;
   content: (...domArgs: DomElementArg[]) => DomContents;
+  deploymentTypes: GristDeploymentType[] | '*';
 }
 
 export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptContent> = {
@@ -119,6 +120,7 @@ export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptCo
       ),
       ...args,
     ),
+    deploymentTypes: ['saas'],
   },
   referenceColumnsConfig: {
     title: () => t('Reference Columns'),
@@ -133,6 +135,7 @@ export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptCo
       ),
       ...args,
     ),
+    deploymentTypes: ['saas'],
   },
   rawDataPage: {
     title: () => t('Raw Data page'),
@@ -142,6 +145,7 @@ export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptCo
       dom('div', cssLink({href: commonUrls.helpRawData, target: '_blank'}, t('Learn more.'))),
       ...args,
     ),
+    deploymentTypes: ['saas'],
   },
   accessRules: {
     title: () => t('Access Rules'),
@@ -151,6 +155,7 @@ export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptCo
       dom('div', cssLink({href: commonUrls.helpAccessRules, target: '_blank'}, t('Learn more.'))),
       ...args,
     ),
+    deploymentTypes: ['saas'],
   },
   filterButtons: {
     title: () => t('Pinning Filters'),
@@ -160,6 +165,7 @@ export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptCo
       dom('div', cssLink({href: commonUrls.helpFilterButtons, target: '_blank'}, t('Learn more.'))),
       ...args,
     ),
+    deploymentTypes: ['saas'],
   },
   nestedFiltering: {
     title: () => t('Nested Filtering'),
@@ -168,6 +174,7 @@ export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptCo
       dom('div', t('Only those rows will appear which match all of the filters.')),
       ...args,
     ),
+    deploymentTypes: ['saas'],
   },
   pageWidgetPicker: {
     title: () => t('Selecting Data'),
@@ -176,6 +183,7 @@ export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptCo
       dom('div', t('Use the 𝚺 icon to create summary (or pivot) tables, for totals or subtotals.')),
       ...args,
     ),
+    deploymentTypes: ['saas'],
   },
   pageWidgetPickerSelectBy: {
     title: () => t('Linking Widgets'),
@@ -185,6 +193,7 @@ export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptCo
       dom('div', cssLink({href: commonUrls.helpLinkingWidgets, target: '_blank'}, t('Learn more.'))),
       ...args,
     ),
+    deploymentTypes: ['saas'],
   },
   editCardLayout: {
     title: () => t('Editing Card Layout'),
@@ -195,6 +204,7 @@ export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptCo
       })),
       ...args,
     ),
+    deploymentTypes: ['saas'],
   },
   addNew: {
     title: () => t('Add New'),
@@ -203,6 +213,7 @@ export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptCo
         + 'or import data.')),
       ...args,
     ),
+    deploymentTypes: ['saas'],
   },
   rickRow: {
     title: () => t('Anchor Links'),
@@ -217,6 +228,7 @@ export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptCo
       ),
       ...args,
     ),
+    deploymentTypes: '*',
   },
   customURL: {
     title: () => t('Custom Widgets'),
@@ -230,5 +242,6 @@ export const GristBehavioralPrompts: Record<BehavioralPrompt, BehavioralPromptCo
       dom('div', cssLink({href: commonUrls.helpCustomWidgets, target: '_blank'}, t('Learn more.'))),
       ...args,
     ),
+    deploymentTypes: ['saas'],
   },
 };
diff --git a/app/client/ui/NotifyUI.ts b/app/client/ui/NotifyUI.ts
index acc1e2b6..9795505d 100644
--- a/app/client/ui/NotifyUI.ts
+++ b/app/client/ui/NotifyUI.ts
@@ -30,6 +30,10 @@ function buildAction(action: NotifyAction, item: Notification, options: IBeaconO
         return dom('a', cssToastAction.cls(''), t("Upgrade Plan"), {target: '_blank'},
           {href: commonUrls.plans});
       }
+    case 'manage':
+      if (urlState().state.get().billing === 'billing') { return null; }
+      return dom('a', cssToastAction.cls(''), t("Manage billing"), {target: '_blank'},
+        {href: urlState().makeUrl({billing: 'billing'})});
     case 'renew':
       // If already on the billing page, nothing to return.
       if (urlState().state.get().billing === 'billing') { return null; }
diff --git a/app/client/ui/SupportGristNudge.ts b/app/client/ui/SupportGristNudge.ts
new file mode 100644
index 00000000..bed48c53
--- /dev/null
+++ b/app/client/ui/SupportGristNudge.ts
@@ -0,0 +1,326 @@
+import {makeT} from 'app/client/lib/localization';
+import {localStorageObs} from 'app/client/lib/localStorageObs';
+import {getStorage} from 'app/client/lib/storage';
+import {tokenFieldStyles} from 'app/client/lib/TokenField';
+import {AppModel} from 'app/client/models/AppModel';
+import {urlState} from 'app/client/models/gristUrlState';
+import {TelemetryModel, TelemetryModelImpl} from 'app/client/models/TelemetryModel';
+import {bigPrimaryButton} from 'app/client/ui2018/buttons';
+import {colors, isNarrowScreenObs, theme, vars} from 'app/client/ui2018/cssVars';
+import {icon} from 'app/client/ui2018/icons';
+import {cssLink} from 'app/client/ui2018/links';
+import {commonUrls} from 'app/common/gristUrls';
+import {getGristConfig} from 'app/common/urlUtils';
+import {Disposable, dom, makeTestId, Observable, styled} from 'grainjs';
+
+const testId = makeTestId('test-support-grist-nudge-');
+
+const t = makeT('SupportGristNudge');
+
+type ButtonState =
+  | 'collapsed'
+  | 'expanded';
+
+type CardPage =
+  | 'support-grist'
+  | 'opted-in';
+
+/**
+ * Nudges users to support Grist by opting in to telemetry.
+ *
+ * This currently includes a button that opens a card with the nudge.
+ * The button is hidden when the card is visible, and vice versa.
+ */
+export class SupportGristNudge extends Disposable {
+  private readonly _telemetryModel: TelemetryModel = new TelemetryModelImpl(this._appModel);
+
+  private readonly _buttonState: Observable<ButtonState>;
+  private readonly _currentPage: Observable<CardPage>;
+  private readonly _isClosed: Observable<boolean>;
+
+  constructor(private _appModel: AppModel) {
+    super();
+    if (!this._shouldShowCardOrButton()) { return; }
+
+    this._buttonState = localStorageObs(
+      `u=${this._appModel.currentValidUser?.id ?? 0};supportGristNudge`, 'expanded'
+    ) as Observable<ButtonState>;
+    this._currentPage = Observable.create(null, 'support-grist');
+    this._isClosed = Observable.create(this, false);
+  }
+
+  public showButton() {
+    if (!this._shouldShowCardOrButton()) { return null; }
+
+    return dom.maybe(
+      use => !use(isNarrowScreenObs()) && (use(this._buttonState) === 'collapsed' && !use(this._isClosed)),
+      () => this._buildButton()
+    );
+  }
+
+  public showCard() {
+    if (!this._shouldShowCardOrButton()) { return null; }
+
+    return dom.maybe(
+      use => !use(isNarrowScreenObs()) && (use(this._buttonState) === 'expanded' && !use(this._isClosed)),
+      () => this._buildCard()
+    );
+  }
+
+  private _markAsDismissed() {
+    this._appModel.dismissedPopup('supportGrist').set(true);
+    getStorage().removeItem(
+      `u=${this._appModel.currentValidUser?.id ?? 0};supportGristNudge`);
+
+  }
+
+  private _close() {
+    this._isClosed.set(true);
+  }
+
+  private _dismissAndClose() {
+    this._markAsDismissed();
+    this._close();
+  }
+
+  private _shouldShowCardOrButton() {
+    if (this._appModel.dismissedPopups.get().includes('supportGrist')) {
+      return false;
+    }
+
+    const {activation, deploymentType, telemetry} = getGristConfig();
+    if (deploymentType !== 'core' || !activation?.isManager) {
+      return false;
+    }
+
+    if (telemetry && telemetry.telemetryLevel !== 'off') {
+      return false;
+    }
+
+    return true;
+  }
+
+  private _buildButton() {
+    return cssContributeButton(
+      cssButtonIconAndText(
+        icon('Fireworks'),
+        t('Contribute'),
+      ),
+      cssContributeButtonCloseButton(
+        icon('CrossSmall'),
+        dom.on('click', (ev) => {
+          ev.stopPropagation();
+          this._dismissAndClose();
+        }),
+        testId('contribute-button-close'),
+      ),
+      dom.on('click', () => { this._buttonState.set('expanded'); }),
+      testId('contribute-button'),
+    );
+  }
+
+  private _buildCard() {
+    return cssCard(
+      dom.domComputed(this._currentPage, page => {
+        if (page === 'support-grist') {
+          return this._buildSupportGristCardContent();
+        } else {
+          return this._buildOptedInCardContent();
+        }
+      }),
+      testId('card'),
+    );
+  }
+
+  private _buildSupportGristCardContent() {
+    return [
+      cssCloseButton(
+        icon('CrossBig'),
+        dom.on('click', () => this._buttonState.set('collapsed')),
+        testId('card-close'),
+      ),
+      cssLeftAlignedHeader(t('Support Grist')),
+      cssParagraph(t(
+        'Opt in to telemetry to help us understand how the product ' +
+        'is used, so that we can prioritize future improvements.'
+      )),
+      cssParagraph(
+        t(
+          'We only collect usage statistics, as detailed in our {{helpCenterLink}}, never ' +
+          'document contents. Opt out any time from the {{supportGristLink}} in the user menu.',
+          {
+            helpCenterLink: helpCenterLink(),
+            supportGristLink: supportGristLink(),
+          },
+        ),
+      ),
+      cssFullWidthButton(
+        t('Opt in to Telemetry'),
+        dom.on('click', () => this._optInToTelemetry()),
+        testId('card-opt-in'),
+      ),
+    ];
+  }
+
+  private _buildOptedInCardContent() {
+    return [
+      cssCloseButton(
+        icon('CrossBig'),
+        dom.on('click', () => this._close()),
+        testId('card-close-icon-button'),
+      ),
+      cssCenteredFlex(cssSparks()),
+      cssCenterAlignedHeader(t('Opted In')),
+      cssParagraph(
+        t(
+          'Thank you! Your trust and support is greatly appreciated. ' +
+          'Opt out any time from the {{link}} in the user menu.',
+          {link: supportGristLink()},
+        ),
+      ),
+      cssCenteredFlex(
+        cssPrimaryButton(
+          t('Close'),
+          dom.on('click', () => this._close()),
+          testId('card-close-button'),
+        ),
+      ),
+    ];
+  }
+
+  private async _optInToTelemetry() {
+    await this._telemetryModel.updateTelemetryPrefs({telemetryLevel: 'limited'});
+    this._currentPage.set('opted-in');
+    this._markAsDismissed();
+  }
+}
+
+function helpCenterLink() {
+  return cssLink(
+    t('Help Center'),
+    {href: commonUrls.helpTelemetryLimited, target: '_blank'},
+  );
+}
+
+function supportGristLink() {
+  return cssLink(
+    t('Support Grist page'),
+    {href: urlState().makeUrl({supportGrist: 'support-grist'}), target: '_blank'},
+  );
+}
+
+const cssCenteredFlex = styled('div', `
+  display: flex;
+  justify-content: center;
+  align-items: center;
+`);
+
+const cssContributeButton = styled('div', `
+  position: relative;
+  background: ${theme.controlPrimaryBg};
+  color: ${theme.controlPrimaryFg};
+  border-radius: 25px;
+  padding: 4px 12px 4px 8px;
+  font-style: normal;
+  font-weight: medium;
+  font-size: 13px;
+  line-height: 16px;
+  cursor: pointer;
+  --icon-color: ${theme.controlPrimaryFg};
+
+  &:hover {
+    background: ${theme.controlPrimaryHoverBg};
+  }
+`);
+
+const cssButtonIconAndText = styled('div', `
+  display: flex;
+  gap: 8px;
+`);
+
+const cssContributeButtonCloseButton = styled(tokenFieldStyles.cssDeleteButton, `
+  margin-left: 4px;
+  vertical-align: bottom;
+  line-height: 1;
+  position: absolute;
+  top: -4px;
+  right: -8px;
+  border-radius: 16px;
+  background-color: ${colors.dark};
+  width: 18px;
+  height: 18px;
+  cursor: pointer;
+  z-index: 1;
+  display: none;
+  align-items: center;
+  justify-content: center;
+
+  .${cssContributeButton.className}:hover & {
+    display: flex;
+  }
+`);
+
+const cssCard = styled('div', `
+  width: 297px;
+  padding: 24px;
+  background: #DCF4EB;
+  border-radius: 4px;
+  align-self: flex-start;
+  position: sticky;
+  flex-shrink: 0;
+  top: 0px;
+`);
+
+const cssHeader = styled('div', `
+  font-size: ${vars.xxxlargeFontSize};
+  font-weight: 600;
+  margin-bottom: 16px;
+`);
+
+const cssLeftAlignedHeader = styled(cssHeader, `
+  text-align: left;
+`);
+
+const cssCenterAlignedHeader = styled(cssHeader, `
+  text-align: center;
+`);
+
+const cssParagraph = styled('div', `
+  font-size: 13px;
+  line-height: 18px;
+  margin-bottom: 12px;
+`);
+
+const cssPrimaryButton = styled(bigPrimaryButton, `
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 32px;
+  text-align: center;
+`);
+
+const cssFullWidthButton = styled(cssPrimaryButton, `
+  width: 100%;
+`);
+
+const cssCloseButton = styled('div', `
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  padding: 4px;
+  border-radius: 4px;
+  cursor: pointer;
+  --icon-color: ${colors.slate};
+
+  &:hover {
+    background-color: ${colors.mediumGreyOpaque};
+  }
+`);
+
+const cssSparks = styled('div', `
+  height: 48px;
+  width: 48px;
+  background-image: var(--icon-Sparks);
+  display: inline-block;
+  background-repeat: no-repeat;
+`);
diff --git a/app/client/ui/SupportGristPage.ts b/app/client/ui/SupportGristPage.ts
new file mode 100644
index 00000000..a3b35536
--- /dev/null
+++ b/app/client/ui/SupportGristPage.ts
@@ -0,0 +1,289 @@
+import {buildHomeBanners} from 'app/client/components/Banners';
+import {makeT} from 'app/client/lib/localization';
+import {AppModel} from 'app/client/models/AppModel';
+import {urlState} from 'app/client/models/gristUrlState';
+import {TelemetryModel, TelemetryModelImpl} from 'app/client/models/TelemetryModel';
+import {AppHeader} from 'app/client/ui/AppHeader';
+import {leftPanelBasic} from 'app/client/ui/LeftPanelCommon';
+import {pagePanels} from 'app/client/ui/PagePanels';
+import {createTopBarHome} from 'app/client/ui/TopBar';
+import {cssBreadcrumbs, separator} from 'app/client/ui2018/breadcrumbs';
+import {bigBasicButton, bigBasicButtonLink, bigPrimaryButton} from 'app/client/ui2018/buttons';
+import {mediaSmall, theme, vars} from 'app/client/ui2018/cssVars';
+import {icon} from 'app/client/ui2018/icons';
+import {cssLink} from 'app/client/ui2018/links';
+import {loadingSpinner} from 'app/client/ui2018/loaders';
+import {commonUrls} from 'app/common/gristUrls';
+import {TelemetryPrefsWithSources} from 'app/common/InstallAPI';
+import {getGristConfig} from 'app/common/urlUtils';
+import {Computed, Disposable, dom, makeTestId, Observable, styled} from 'grainjs';
+
+const testId = makeTestId('test-support-grist-page-');
+
+const t = makeT('SupportGristPage');
+
+export class SupportGristPage extends Disposable {
+  private readonly _model: TelemetryModel = new TelemetryModelImpl(this._appModel);
+  private readonly _optInToTelemetry = Computed.create(this, this._model.prefs,
+    (_use, prefs) => {
+      if (!prefs) { return null; }
+
+      return prefs.telemetryLevel.value !== 'off';
+    })
+    .onWrite(async (optIn) => {
+      const telemetryLevel = optIn ? 'limited' : 'off';
+      await this._model.updateTelemetryPrefs({telemetryLevel});
+    });
+
+  constructor(private _appModel: AppModel) {
+    super();
+    this._model.fetchTelemetryPrefs().catch(reportError);
+  }
+
+  public buildDom() {
+    const panelOpen = Observable.create(this, false);
+    return pagePanels({
+      leftPanel: {
+        panelWidth: Observable.create(this, 240),
+        panelOpen,
+        hideOpener: true,
+        header: dom.create(AppHeader, this._appModel.currentOrgName, this._appModel),
+        content: leftPanelBasic(this._appModel, panelOpen),
+      },
+      headerMain: this._buildMainHeader(),
+      contentTop: buildHomeBanners(this._appModel),
+      contentMain: this._buildMainContent(),
+    });
+  }
+
+  private _buildMainHeader() {
+    return dom.frag(
+      cssBreadcrumbs({style: 'margin-left: 16px;'},
+        cssLink(
+          urlState().setLinkUrl({}),
+          t('Home'),
+        ),
+        separator(' / '),
+        dom('span', t('Support Grist')),
+      ),
+      createTopBarHome(this._appModel),
+    );
+  }
+
+  private _buildMainContent() {
+    return cssPageContainer(
+      cssPage(
+        dom('div',
+          cssPageTitle(t('Support Grist')),
+          this._buildTelemetrySection(),
+          this._buildSponsorshipSection(),
+        ),
+      ),
+    );
+  }
+
+  private _buildTelemetrySection() {
+    return cssSection(
+      cssSectionTitle(t('Telemetry')),
+      dom.domComputed(this._model.prefs, prefs => {
+        if (prefs === null) {
+          return cssSpinnerBox(loadingSpinner());
+        }
+
+        const {activation} = getGristConfig();
+        if (!activation?.isManager) {
+          if (prefs.telemetryLevel.value === 'limited') {
+            return [
+              cssParagraph(t(
+                'This instance is opted in to telemetry. Only the site administrator has permission to change this.',
+              ))
+            ];
+          } else {
+            return [
+              cssParagraph(t(
+                'This instance is opted out of telemetry. Only the site administrator has permission to change this.',
+              ))
+            ];
+          }
+        } else {
+          return [
+            cssParagraph(t(
+              'Support Grist by opting in to telemetry, which helps us understand how the product ' +
+              'is used, so that we can prioritize future improvements.'
+            )),
+            cssParagraph(
+              t('We only collect usage statistics, as detailed in our {{link}}, never document contents.', {
+                link: telemetryHelpCenterLink(),
+              }),
+            ),
+            cssParagraph(t('You can opt out of telemetry at any time from this page.')),
+            this._buildTelemetrySectionButtons(prefs),
+          ];
+        }
+      }),
+      testId('telemetry-section'),
+    );
+  }
+
+  private _buildTelemetrySectionButtons(prefs: TelemetryPrefsWithSources) {
+    const {telemetryLevel: {value, source}} = prefs;
+    if (source === 'preferences') {
+      return dom.domComputed(this._optInToTelemetry, (optedIn) => {
+        if (optedIn) {
+          return [
+            cssOptInOutMessage(
+              t('You have opted in to telemetry. Thank you!'), ' 🙏',
+              testId('telemetry-section-message'),
+            ),
+            cssOptOutButton(t('Opt out of Telemetry'),
+              dom.on('click', () => this._optInToTelemetry.set(false)),
+            ),
+          ];
+        } else {
+          return [
+            cssOptInButton(t('Opt in to Telemetry'),
+              dom.on('click', () => this._optInToTelemetry.set(true)),
+            ),
+          ];
+        }
+      });
+    } else {
+      return cssOptInOutMessage(
+        value !== 'off'
+          ? [t('You have opted in to telemetry. Thank you!'), ' 🙏']
+          : t('You have opted out of telemetry.'),
+        testId('telemetry-section-message'),
+      );
+    }
+  }
+
+  private _buildSponsorshipSection() {
+    return cssSection(
+      cssSectionTitle(t('Sponsor Grist Labs on GitHub')),
+      cssParagraph(
+        t(
+          'Grist software is developed by Grist Labs, which offers free and paid ' +
+          'hosted plans. We also make Grist code available under a standard free ' +
+          'and open OSS license (Apache 2.0) on {{link}}.',
+          {link: gristCoreLink()},
+        ),
+      ),
+      cssParagraph(
+        t(
+          'You can support Grist open-source development by sponsoring ' +
+          'us on our {{link}}.',
+          {link: sponsorGristLink()},
+        ),
+      ),
+      cssParagraph(t(
+        'We are a small and determined team. Your support matters a lot to us. ' +
+        'It also shows to others that there is a determined community behind this product.'
+      )),
+      cssSponsorButton(
+        cssButtonIconAndText(icon('Heart'), cssButtonText(t('Manage Sponsorship'))),
+        {href: commonUrls.githubSponsorGristLabs, target: '_blank'},
+      ),
+      testId('sponsorship-section'),
+    );
+  }
+}
+
+function telemetryHelpCenterLink() {
+  return cssLink(
+    t('Help Center'),
+    {href: commonUrls.helpTelemetryLimited, target: '_blank'},
+  );
+}
+
+function sponsorGristLink() {
+  return cssLink(
+    t('GitHub Sponsors page'),
+    {href: commonUrls.githubSponsorGristLabs, target: '_blank'},
+  );
+}
+
+function gristCoreLink() {
+  return cssLink(
+    t('GitHub'),
+    {href: commonUrls.githubGristCore, target: '_blank'},
+  );
+}
+
+const cssPageContainer = styled('div', `
+  overflow: auto;
+  padding: 64px 80px;
+
+  @media ${mediaSmall} {
+    & {
+      padding: 0px;
+    }
+  }
+`);
+
+const cssPage = styled('div', `
+  padding: 16px;
+  max-width: 600px;
+  width: 100%;
+`);
+
+const cssPageTitle = styled('div', `
+  height: 32px;
+  line-height: 32px;
+  margin-bottom: 24px;
+  color: ${theme.text};
+  font-size: 24px;
+  font-weight: ${vars.headerControlTextWeight};
+`);
+
+const cssSectionTitle = styled('div', `
+  height: 24px;
+  line-height: 24px;
+  margin-bottom: 24px;
+  color: ${theme.text};
+  font-size: ${vars.xlargeFontSize};
+  font-weight: ${vars.headerControlTextWeight};
+`);
+
+const cssSection = styled('div', `
+  margin-bottom: 60px;
+`);
+
+const cssParagraph = styled('div', `
+  color: ${theme.text};
+  font-size: 14px;
+  line-height: 20px;
+  margin-bottom: 12px;
+`);
+
+const cssOptInOutMessage = styled(cssParagraph, `
+  line-height: 40px;
+  font-weight: 600;
+  margin-top: 24px;
+  margin-bottom: 0px;
+`);
+
+const cssOptInButton = styled(bigPrimaryButton, `
+  margin-top: 24px;
+`);
+
+const cssOptOutButton = styled(bigBasicButton, `
+  margin-top: 24px;
+`);
+
+const cssSponsorButton = styled(bigBasicButtonLink, `
+  margin-top: 24px;
+`);
+
+const cssButtonIconAndText = styled('div', `
+  display: flex;
+  align-items: center;
+`);
+
+const cssButtonText = styled('span', `
+  margin-left: 8px;
+`);
+
+const cssSpinnerBox = styled('div', `
+  margin-top: 24px;
+  text-align: center;
+`);
diff --git a/app/client/ui/TopBar.ts b/app/client/ui/TopBar.ts
index 6b046e5b..86e4ff40 100644
--- a/app/client/ui/TopBar.ts
+++ b/app/client/ui/TopBar.ts
@@ -26,7 +26,7 @@ const t = makeT('TopBar');
 export function createTopBarHome(appModel: AppModel) {
   return [
     cssFlexSpace(),
-
+    appModel.supportGristNudge.showButton(),
     (appModel.isTeamSite && roles.canEditAccess(appModel.currentOrg?.access || null) ?
       [
         basicButton(
diff --git a/app/client/ui/VisibleFieldsConfig.ts b/app/client/ui/VisibleFieldsConfig.ts
index 4222fd8d..ba4224b1 100644
--- a/app/client/ui/VisibleFieldsConfig.ts
+++ b/app/client/ui/VisibleFieldsConfig.ts
@@ -217,10 +217,12 @@ export class VisibleFieldsConfig extends Disposable {
           primaryButton(
             dom.text((use) => t("Hide {{label}}", {label: use(this._fieldLabel)})),
             dom.on('click', () => this._removeSelectedFields()),
+            testId('visible-hide')
           ),
           basicButton(
             t("Clear"),
             dom.on('click', () => this._setVisibleCheckboxes(fieldsDraggable, false)),
+            testId('visible-clear')
           ),
           testId('visible-batch-buttons')
         ),
@@ -259,10 +261,12 @@ export class VisibleFieldsConfig extends Disposable {
             primaryButton(
               dom.text((use) => t("Show {{label}}", {label: use(this._fieldLabel)})),
               dom.on('click', () => this._addSelectedFields()),
+              testId('hidden-show')
             ),
             basicButton(
               t("Clear"),
               dom.on('click', () => this._setHiddenCheckboxes(hiddenFieldsDraggable, false)),
+              testId('hidden-clear')
             ),
             testId('hidden-batch-buttons')
           )
diff --git a/app/client/ui2018/IconList.ts b/app/client/ui2018/IconList.ts
index 9c255fda..c10672ee 100644
--- a/app/client/ui2018/IconList.ts
+++ b/app/client/ui2018/IconList.ts
@@ -72,6 +72,7 @@ export type IconName = "ChartArea" |
   "FunctionResult" |
   "GreenArrow" |
   "Grow" |
+  "Heart" |
   "Help" |
   "Home" |
   "Idea" |
@@ -214,6 +215,7 @@ export const IconList: IconName[] = ["ChartArea",
   "FunctionResult",
   "GreenArrow",
   "Grow",
+  "Heart",
   "Help",
   "Home",
   "Idea",
diff --git a/app/client/ui2018/cssVars.ts b/app/client/ui2018/cssVars.ts
index 195cfda7..fd9ef496 100644
--- a/app/client/ui2018/cssVars.ts
+++ b/app/client/ui2018/cssVars.ts
@@ -142,6 +142,7 @@ export const vars = {
   onboardingPopupZIndex: new CustomProp('onboarding-popup-z-index', '1000'),
   floatingPopupZIndex: new CustomProp('floating-popup-z-index', '1002'),
   tutorialModalZIndex: new CustomProp('tutorial-modal-z-index', '1003'),
+  pricingModalZIndex: new CustomProp('pricing-modal-z-index', '1004'),
   notificationZIndex: new CustomProp('notification-z-index', '1100'),
   browserCheckZIndex: new CustomProp('browser-check-z-index', '5000'),
   tooltipZIndex: new CustomProp('tooltip-z-index', '5000'),
@@ -426,6 +427,9 @@ export const theme = {
     undefined, colors.slate),
   pageInitialsFg: new CustomProp('theme-left-panel-page-initials-fg', undefined, 'white'),
   pageInitialsBg: new CustomProp('theme-left-panel-page-initials-bg', undefined, colors.slate),
+  pageInitialsEmojiBg: new CustomProp('theme-left-panel-page-emoji-fg', undefined, 'white'),
+  pageInitialsEmojiOutline: new CustomProp('theme-left-panel-page-emoji-outline', undefined,
+    colors.darkGrey),
 
   /* Right Panel */
   rightPanelTabFg: new CustomProp('theme-right-panel-tab-fg', undefined, colors.dark),
diff --git a/app/client/ui2018/pages.ts b/app/client/ui2018/pages.ts
index 296afa14..29484daf 100644
--- a/app/client/ui2018/pages.ts
+++ b/app/client/ui2018/pages.ts
@@ -6,7 +6,7 @@ import { theme } from "app/client/ui2018/cssVars";
 import { icon } from "app/client/ui2018/icons";
 import { hoverTooltip, overflowTooltip } from 'app/client/ui/tooltips';
 import { menu, menuItem, menuText } from "app/client/ui2018/menus";
-import { dom, domComputed, DomElementArg, makeTestId, observable, Observable, styled } from "grainjs";
+import { Computed, dom, domComputed, DomElementArg, makeTestId, observable, Observable, styled } from "grainjs";
 
 const t = makeT('pages');
 
@@ -54,17 +54,21 @@ export function buildPageDom(name: Observable<string>, actions: PageActions, ...
     }
   });
 
+  const splitName = Computed.create(null, name, (use, _name) => splitPageInitial(_name));
+
   return pageElem = dom(
     'div',
     dom.autoDispose(lis),
+    dom.autoDispose(splitName),
     domComputed((use) => use(name) === '', blank => blank ? dom('div', '-') :
       domComputed(isRenaming, (isrenaming) => (
         isrenaming ?
           cssPageItem(
             cssPageInitial(
               testId('initial'),
-              dom.text((use) => Array.from(use(name))[0])
-              ),
+              dom.text((use) => use(splitName).initial),
+              cssPageInitial.cls('-emoji', (use) => use(splitName).hasEmoji),
+            ),
             cssEditorInput(
               {
                 initialValue: name.get() || '',
@@ -82,10 +86,11 @@ export function buildPageDom(name: Observable<string>, actions: PageActions, ...
           cssPageItem(
             cssPageInitial(
               testId('initial'),
-              dom.text((use) => Array.from(use(name))[0]),
+              dom.text((use) => use(splitName).initial),
+              cssPageInitial.cls('-emoji', (use) => use(splitName).hasEmoji),
             ),
             cssPageName(
-              dom.text(name),
+              dom.text((use) => use(splitName).displayName),
               testId('label'),
               dom.on('click', (ev) => isTargetSelected(ev.target as HTMLElement) && isRenaming.set(true)),
               overflowTooltip(),
@@ -122,6 +127,24 @@ export function buildCensoredPage() {
   );
 }
 
+// This crazy expression matches all "possible emoji" and comes from a very official source:
+// https://unicode.org/reports/tr51/#EBNF_and_Regex (linked from
+// https://stackoverflow.com/a/68146409/328565). It is processed from the original by replacing \x
+// with \u, removing whitespace, and factoring out a long subexpression.
+const emojiPart = /(?:\p{RI}\p{RI}|\p{Emoji}(?:\p{EMod}|\u{FE0F}\u{20E3}?|[\u{E0020}-\u{E007E}]+\u{E007F})?)/u;
+const pageInitialRegex = new RegExp(`^${emojiPart.source}(?:\\u{200D}${emojiPart.source})*`, "u");
+
+// Divide up the page name into an "initial" and "displayName", where an emoji initial, if
+// present, is omitted from the displayName, but a regular character used as the initial is kept.
+function splitPageInitial(name: string): {initial: string, displayName: string, hasEmoji: boolean} {
+  const m = name.match(pageInitialRegex);
+  if (m) {
+    return {initial: m[0], displayName: name.slice(m[0].length).trim(), hasEmoji: true};
+  } else {
+    return {initial: Array.from(name)[0], displayName: name.trim(), hasEmoji: false};
+  }
+}
+
 const cssPageItem = styled('a', `
   display: flex;
   flex-direction: row;
@@ -129,7 +152,8 @@ const cssPageItem = styled('a', `
   align-items: center;
   flex-grow: 1;
   .${treeViewContainer.className}-close & {
-    margin-left: 16px;
+    display: flex;
+    justify-content: center;
   }
   &, &:hover, &:focus {
     text-decoration: none;
@@ -143,10 +167,25 @@ const cssPageInitial = styled('div', `
   color: ${theme.pageInitialsFg};
   border-radius: 3px;
   background-color: ${theme.pageInitialsBg};
-  width: 16px;
-  height: 16px;
-  text-align: center;
+  width: 20px;
+  height: 20px;
   margin-right: 8px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  &-emoji {
+    background-color: ${theme.pageInitialsEmojiBg};
+    box-shadow: 0 0 0 1px var(--grist-theme-left-panel-page-emoji-outline, var(--grist-color-dark-grey));
+    font-size: 15px;
+    overflow: hidden;
+  }
+  .${treeViewContainer.className}-close & {
+    margin-right: 0;
+  }
+  .${itemHeader.className}.selected &-emoji {
+    box-shadow: none;
+  }
 `);
 
 const cssPageName = styled('div', `
diff --git a/app/client/widgets/FormulaAssistant.ts b/app/client/widgets/FormulaAssistant.ts
index 8a577663..3b3e22d6 100644
--- a/app/client/widgets/FormulaAssistant.ts
+++ b/app/client/widgets/FormulaAssistant.ts
@@ -17,7 +17,6 @@ import {autoGrow} from 'app/client/ui/forms';
 import {IconName} from 'app/client/ui2018/IconList';
 import {icon} from 'app/client/ui2018/icons';
 import {cssLink} from 'app/client/ui2018/links';
-import {DocAction} from 'app/common/DocActions';
 import {movable} from 'app/client/lib/popupUtils';
 
 import debounce from 'lodash/debounce';
@@ -61,7 +60,7 @@ export class FormulaAssistant extends Disposable {
   /** Is the request pending */
   private _waiting = Observable.create(this, false);
   /** Is this feature enabled at all */
-  private _assistantEnabled = GRIST_FORMULA_ASSISTANT();
+  private _assistantEnabled: Computed<boolean>;
   /** Preview column id */
   private _transformColId: string;
   /** Method to invoke when we are closed, it saves or reverts */
@@ -90,6 +89,12 @@ export class FormulaAssistant extends Disposable {
   }) {
     super();
 
+    this._assistantEnabled = Computed.create(this, use => {
+      const enabledByFlag = use(GRIST_FORMULA_ASSISTANT());
+      const notAnonymous = Boolean(this._options.gristDoc.appModel.currentValidUser);
+      return enabledByFlag && notAnonymous;
+    });
+
     if (!this._options.field) {
       // TODO: field is not passed only for rules (as there is no preview there available to the user yet)
       // this should be implemented but it requires creating a helper column to helper column and we don't
@@ -263,6 +268,8 @@ export class FormulaAssistant extends Disposable {
         this._buildIntro(),
         this._chat.buildDom(),
         this._buildChatInput(),
+        // Stop propagation of mousedown events, as the formula editor will still focus.
+        dom.on('mousedown', (ev) => ev.stopPropagation()),
       );
     });
   }
@@ -516,7 +523,7 @@ export class FormulaAssistant extends Disposable {
     this._options.editor.setFormula(entry.formula!);
   }
 
-  private async _sendMessage(description: string, regenerate = false) {
+  private async _sendMessage(description: string, regenerate = false): Promise<ChatMessage> {
     // Destruct options.
     const {column, gristDoc} = this._options;
     // Get the state of the chat from the column.
@@ -539,7 +546,12 @@ export class FormulaAssistant extends Disposable {
     // some markdown text back, so we need to parse it.
     const prettyMessage = state ? (reply || formula || '') : (formula || reply || '');
     // Add it to the chat.
-    this._chat.addResponse(prettyMessage, formula, suggestedActions[0]);
+    return {
+      message: prettyMessage,
+      formula,
+      action: suggestedActions[0],
+      sender: 'ai',
+    };
   }
 
   private _clear() {
@@ -556,9 +568,7 @@ export class FormulaAssistant extends Disposable {
     if (!last) {
       return;
     }
-    this._chat.thinking();
-    this._waiting.set(true);
-    await this._sendMessage(last, true).finally(() => this._waiting.set(false));
+    await this._doAsk(last);
   }
 
   private async _ask() {
@@ -568,10 +578,22 @@ export class FormulaAssistant extends Disposable {
     const message= this._userInput.get();
     if (!message) { return; }
     this._chat.addQuestion(message);
-    this._chat.thinking();
     this._userInput.set('');
+    await this._doAsk(message);
+  }
+
+  private async _doAsk(message: string) {
+    this._chat.thinking();
     this._waiting.set(true);
-    await this._sendMessage(message, false).finally(() => this._waiting.set(false));
+    try {
+      const response = await this._sendMessage(message, false);
+      this._chat.addResponse(response);
+    } catch(err) {
+      this._chat.thinking(false);
+      throw err;
+    } finally {
+      this._waiting.set(false);
+    }
   }
 }
 
@@ -601,32 +623,36 @@ class ChatHistory extends Disposable {
     this.length = Computed.create(this, use => use(this.history).length); // ??
   }
 
-  public thinking() {
-    this.history.push({
-      message: '...',
-      sender: 'ai',
-    });
-    this.scrollDown();
+  public thinking(on = true) {
+    if (!on) {
+      // Find all index of all thinking messages.
+      const messages = [...this.history.get()].filter(m => m.message === '...');
+      // Remove all thinking messages.
+      for (const message of messages) {
+        this.history.splice(this.history.get().indexOf(message), 1);
+      }
+    } else {
+      this.history.push({
+        message: '...',
+        sender: 'ai',
+      });
+      this.scrollDown();
+    }
   }
 
   public supportsMarkdown() {
     return this._options.column.chatHistory.peek().get().state !== undefined;
   }
 
-  public addResponse(message: string, formula: string|null, action?: DocAction) {
+  public addResponse(message: ChatMessage) {
     // Clear any thinking from messages.
-    this.history.set(this.history.get().filter(x => x.message !== '...'));
-    this.history.push({
-      message,
-      sender: 'ai',
-      formula,
-      action
-    });
+    this.thinking(false);
+    this.history.push({...message, sender: 'ai'});
     this.scrollDown();
   }
 
   public addQuestion(message: string) {
-    this.history.set(this.history.get().filter(x => x.message !== '...'));
+    this.thinking(false);
     this.history.push({
       message,
       sender: 'user',
@@ -740,18 +766,13 @@ async function askAI(grist: GristDoc, options: {
   const {column, description, state, regenerate} = options;
   const tableId = column.table.peek().tableId.peek();
   const colId = column.colId.peek();
-  try {
-    const result = await grist.docComm.getAssistance({
-      context: {type: 'formula', tableId, colId},
-      text: description,
-      state,
-      regenerate,
-    });
-    return result;
-  } catch (error) {
-    reportError(error);
-    throw error;
-  }
+  const result = await grist.docApi.getAssistance({
+    context: {type: 'formula', tableId, colId},
+    text: description,
+    state,
+    regenerate,
+  });
+  return result;
 }
 
 /**
diff --git a/app/client/widgets/FormulaEditor.ts b/app/client/widgets/FormulaEditor.ts
index 903b5c14..47864a39 100644
--- a/app/client/widgets/FormulaEditor.ts
+++ b/app/client/widgets/FormulaEditor.ts
@@ -154,13 +154,14 @@ export class FormulaEditor extends NewBaseEditor {
       dom.on('mousedown', (ev) => {
         // If we are detached, allow user to click and select error text.
         if (this.isDetached.get()) {
-          // If the focus is already in this editor, don't steal it. This is needed for detached editor with
-          // some input elements (mainly the AI assistant).
-          const inInput = document.activeElement instanceof HTMLInputElement
-                       || document.activeElement instanceof HTMLTextAreaElement;
-          if (inInput && this._dom.contains(document.activeElement)) {
+          // If we clicked on input element in our dom, don't do anything. We probably clicked on chat input, in AI
+          // tools box.
+          const clickedOnInput = ev.target instanceof HTMLInputElement || ev.target instanceof HTMLTextAreaElement;
+          if (clickedOnInput && this._dom.contains(ev.target)) {
+            // By not doing anything special here we assume that the input element will take the focus.
             return;
           }
+
           // Allow clicking the error message.
           if (ev.target instanceof HTMLElement && (
               ev.target.classList.contains('error_msg') ||
diff --git a/app/common/ActiveDocAPI.ts b/app/common/ActiveDocAPI.ts
index 9b333418..587939df 100644
--- a/app/common/ActiveDocAPI.ts
+++ b/app/common/ActiveDocAPI.ts
@@ -1,8 +1,7 @@
 import {ActionGroup} from 'app/common/ActionGroup';
-import {AssistanceRequest, AssistanceResponse} from 'app/common/AssistancePrompts';
 import {BulkAddRecord, CellValue, TableDataAction, UserAction} from 'app/common/DocActions';
 import {FormulaProperties} from 'app/common/GranularAccessClause';
-import {UIRowId} from 'app/common/UIRowId';
+import {UIRowId} from 'app/common/TableData';
 import {FetchUrlOptions, UploadResult} from 'app/common/uploads';
 import {DocStateComparison, PermissionData, UserAccessData} from 'app/common/UserAPI';
 import {ParseOptions} from 'app/plugin/FileParserAPI';
@@ -320,11 +319,6 @@ export interface ActiveDocAPI {
    */
   getFormulaError(tableId: string, colId: string, rowId: number): Promise<CellValue>;
 
-  /**
-   * Generates a formula code based on the AI suggestions, it also modifies the column and sets it type to a formula.
-   */
-  getAssistance(request: AssistanceRequest): Promise<AssistanceResponse>;
-
   /**
    * Fetch content at a url.
    */
diff --git a/app/common/ApiError.ts b/app/common/ApiError.ts
index 3ff4adbc..568f2d15 100644
--- a/app/common/ApiError.ts
+++ b/app/common/ApiError.ts
@@ -2,15 +2,17 @@
  * A tip for fixing an error.
  */
 export interface ApiTip {
-  action: 'add-members' | 'upgrade' |'ask-for-help';
+  action: 'add-members' | 'upgrade' | 'ask-for-help' | 'manage';
   message: string;
 }
 
+export type LimitType = 'collaborators' | 'docs' | 'workspaces' | 'assistant';
+
 /**
  * Documentation of a limit relevant to an API error.
  */
 export interface ApiLimit {
-  quantity: 'collaborators' | 'docs' | 'workspaces';  // what are we counting
+  quantity: LimitType;  // what are we counting
   subquantity?: string;    // a nuance to what we are counting
   maximum: number;         // maximum allowed
   value: number;           // current value of quantity for user
diff --git a/app/common/BillingAPI.ts b/app/common/BillingAPI.ts
index 9875f868..24d1e940 100644
--- a/app/common/BillingAPI.ts
+++ b/app/common/BillingAPI.ts
@@ -43,6 +43,16 @@ export interface IBillingPlan {
   active: boolean;
 }
 
+export interface ILimitTier {
+  name?: string;
+  volume: number;
+  price: number;
+  flatFee: number;
+  type: string;
+  planId: string;
+  interval: string; // probably 'month'|'year';
+}
+
 // Utility type that requires all properties to be non-nullish.
 // type NonNullableProperties<T> = { [P in keyof T]: Required<NonNullable<T[P]>>; };
 
@@ -69,6 +79,7 @@ export interface IBillingDiscount {
 export interface IBillingSubscription {
   // All standard plan options.
   plans: IBillingPlan[];
+  tiers: ILimitTier[];
   // Index in the plans array of the plan currently in effect.
   planIndex: number;
   // Index in the plans array of the plan to be in effect after the current period end.
@@ -111,6 +122,14 @@ export interface IBillingSubscription {
   lastInvoiceUrl?: string;    // URL of the Stripe-hosted page with the last invoice.
   lastChargeError?: string;   // The last charge error, if any, to show in case of a bad status.
   lastChargeTime?: number;    // The time of the last charge attempt.
+  limit?: ILimit|null;
+}
+
+export interface ILimit {
+  limitValue: number;
+  currentUsage: number;
+  type: string; // Limit type, for now only assistant is supported.
+  price: number; // If this is 0, it means it is a free plan.
 }
 
 export interface IBillingOrgSettings {
@@ -139,6 +158,7 @@ export interface BillingAPI {
   downgradePlan(planName: string): Promise<void>;
   renewPlan(): string;
   customerPortal(): string;
+  updateAssistantPlan(tier: number): Promise<void>;
 }
 
 export class BillingAPIImpl extends BaseAPI implements BillingAPI {
@@ -230,6 +250,13 @@ export class BillingAPIImpl extends BaseAPI implements BillingAPI {
     return `${this._url}/api/billing/renew`;
   }
 
+  public async updateAssistantPlan(tier: number): Promise<void> {
+    await this.request(`${this._url}/api/billing/upgrade-assistant`, {
+      method: 'POST',
+      body: JSON.stringify({ tier })
+    });
+  }
+
   /**
    * Checks if current org has active subscription for a Stripe plan.
    */
diff --git a/app/common/DocActions.ts b/app/common/DocActions.ts
index 503e01a3..1a64afea 100644
--- a/app/common/DocActions.ts
+++ b/app/common/DocActions.ts
@@ -14,8 +14,6 @@ export interface AllCellVersions {
 }
 export type CellVersions = Partial<AllCellVersions>;
 
-import map = require('lodash/map');
-
 export type AddRecord = ['AddRecord', string, number, ColValues];
 export type BulkAddRecord = ['BulkAddRecord', string, number[], BulkColValues];
 export type RemoveRecord = ['RemoveRecord', string, number];
@@ -150,21 +148,6 @@ export type UserAction = Array<string|number|object|boolean|null|undefined>;
 // Actions that trigger formula calculations in the data engine
 export const CALCULATING_USER_ACTIONS = new Set(['Calculate', 'UpdateCurrentTime', 'RespondToRequests']);
 
-/**
- * Gives a description for an action which involves setting values to a selection.
- * @param {Array} action - The (Bulk)AddRecord/(Bulk)UpdateRecord action to describe.
- * @param {Boolean} optExcludeVals - Indicates whether the values should be excluded from
- *  the description.
- */
-export function getSelectionDesc(action: UserAction, optExcludeVals: boolean): string {
-  const table   = action[1];
-  const rows    = action[2];
-  const colValues: number[]  = action[3] as any;  // TODO: better typing - but code may evaporate
-  const columns = map(colValues, (values, col) => optExcludeVals ? col : `${col}: ${values}`);
-  const s = typeof rows === 'object' ? 's' : '';
-  return `table ${table}, row${s} ${rows}; ${columns.join(", ")}`;
-}
-
 export function getNumRows(action: DocAction): number {
   return !isDataAction(action) ? 0
     : Array.isArray(action[2]) ? action[2].length
diff --git a/app/common/Features.ts b/app/common/Features.ts
index 8079aef1..89b3e215 100644
--- a/app/common/Features.ts
+++ b/app/common/Features.ts
@@ -58,6 +58,11 @@ export interface Features {
                                                 // for attached files in a document
 
   gracePeriodDays?: number;  // Duration of the grace period in days, before entering delete-only mode
+
+  baseMaxAssistantCalls?: number; // Maximum number of AI assistant calls. Defaults to 0 if not set, use -1 to indicate
+                                  // unbound limit. This is total limit, not per month or per day, it is used as a seed
+                                  // value for the limits table. To create a per-month limit, there must be a separate
+                                  // task that resets the usage in the limits table.
 }
 
 // Check whether it is possible to add members at the org level.  There's no flag
diff --git a/app/common/Install.ts b/app/common/Install.ts
new file mode 100644
index 00000000..2017e73e
--- /dev/null
+++ b/app/common/Install.ts
@@ -0,0 +1,10 @@
+import {TelemetryLevel} from 'app/common/Telemetry';
+
+export interface InstallPrefs {
+  telemetry?: TelemetryPrefs;
+}
+
+export interface TelemetryPrefs {
+  /** Defaults to "off". */
+  telemetryLevel?: TelemetryLevel;
+}
diff --git a/app/common/InstallAPI.ts b/app/common/InstallAPI.ts
new file mode 100644
index 00000000..745b0c1e
--- /dev/null
+++ b/app/common/InstallAPI.ts
@@ -0,0 +1,51 @@
+import {BaseAPI, IOptions} from 'app/common/BaseAPI';
+import {InstallPrefs} from 'app/common/Install';
+import {TelemetryLevel} from 'app/common/Telemetry';
+import {addCurrentOrgToPath} from 'app/common/urlUtils';
+
+export const installPropertyKeys = ['prefs'];
+
+export interface InstallProperties {
+  prefs: InstallPrefs;
+}
+
+export interface InstallPrefsWithSources {
+  telemetry: {
+    telemetryLevel: PrefWithSource<TelemetryLevel>;
+  },
+}
+
+export type TelemetryPrefsWithSources = InstallPrefsWithSources['telemetry'];
+
+export interface PrefWithSource<T> {
+  value: T;
+  source: PrefSource;
+}
+
+export type PrefSource = 'environment-variable' | 'preferences';
+
+export interface InstallAPI {
+  getInstallPrefs(): Promise<InstallPrefsWithSources>;
+  updateInstallPrefs(prefs: Partial<InstallPrefs>): Promise<void>;
+}
+
+export class InstallAPIImpl extends BaseAPI implements InstallAPI {
+  constructor(private _homeUrl: string, options: IOptions = {}) {
+    super(options);
+  }
+
+  public async getInstallPrefs(): Promise<InstallPrefsWithSources> {
+    return this.requestJson(`${this._url}/api/install/prefs`, {method: 'GET'});
+  }
+
+  public async updateInstallPrefs(prefs: Partial<InstallPrefs>): Promise<void> {
+    await this.request(`${this._url}/api/install/prefs`, {
+      method: 'PATCH',
+      body: JSON.stringify({...prefs}),
+    });
+  }
+
+  private get _url(): string {
+    return addCurrentOrgToPath(this._homeUrl);
+  }
+}
diff --git a/app/common/Prefs.ts b/app/common/Prefs.ts
index 7d418941..2af133fa 100644
--- a/app/common/Prefs.ts
+++ b/app/common/Prefs.ts
@@ -106,6 +106,7 @@ export const DismissedPopup = StringUnion(
   'tutorialFirstCard', // first card of the tutorial,
   'formulaHelpInfo', // formula help info shown in the popup editor,
   'formulaAssistantInfo', // formula assistant info shown in the popup editor,
+  'supportGrist', // nudge to opt in to telemetry,
 );
 export type DismissedPopup = typeof DismissedPopup.type;
 
diff --git a/app/common/TableData.ts b/app/common/TableData.ts
index f20b5e29..bfb7bfce 100644
--- a/app/common/TableData.ts
+++ b/app/common/TableData.ts
@@ -8,12 +8,16 @@ import {
 import {getDefaultForType} from 'app/common/gristTypes';
 import {arrayRemove, arraySplice, getDistinctValues} from 'app/common/gutil';
 import {SchemaTypes} from "app/common/schema";
-import {UIRowId} from 'app/common/UIRowId';
 import isEqual = require('lodash/isEqual');
 import fromPairs = require('lodash/fromPairs');
 
 export interface ColTypeMap { [colId: string]: string; }
 
+// This is the row ID used in the client, but it's helpful to have available in some common code
+// as well, which is why it's declared in app/common. Note that for data actions and stored data,
+// 'new' is not used.
+export type UIRowId = number | 'new';
+
 type UIRowFunc<T> = (rowId: UIRowId) => T;
 
 interface ColData {
diff --git a/app/common/Telemetry.ts b/app/common/Telemetry.ts
index f05d58e5..a6a55a8c 100644
--- a/app/common/Telemetry.ts
+++ b/app/common/Telemetry.ts
@@ -1,5 +1,4 @@
 import {StringUnion} from 'app/common/StringUnion';
-import pickBy = require('lodash/pickBy');
 
 /**
  * Telemetry levels, in increasing order of data collected.
@@ -720,36 +719,3 @@ export function buildTelemetryEventChecker(telemetryLevel: TelemetryLevel) {
 }
 
 export type TelemetryEventChecker = (event: TelemetryEvent, metadata?: TelemetryMetadata) => void;
-
-/**
- * Returns a new, filtered metadata object.
- *
- * Metadata in groups that don't meet `telemetryLevel` are removed from the
- * returned object, and the returned object is flattened.
- *
- * Returns undefined if `metadata` is undefined.
- */
-export function filterMetadata(
-  metadata: TelemetryMetadataByLevel | undefined,
-  telemetryLevel: TelemetryLevel
-): TelemetryMetadata | undefined {
-  if (!metadata) { return; }
-
-  let filteredMetadata = {};
-  for (const level of ['limited', 'full'] as const) {
-    if (Level[telemetryLevel] < Level[level]) { break; }
-
-    filteredMetadata = {...filteredMetadata, ...metadata[level]};
-  }
-
-  filteredMetadata = removeNullishKeys(filteredMetadata);
-
-  return removeNullishKeys(filteredMetadata);
-}
-
-/**
- * Returns a copy of `object` with all null and undefined keys removed.
- */
-export function removeNullishKeys(object: Record<string, any>) {
-  return pickBy(object, value => value !== null && value !== undefined);
-}
diff --git a/app/common/ThemePrefs-ti.ts b/app/common/ThemePrefs-ti.ts
index 4bb4f66d..78a60b3a 100644
--- a/app/common/ThemePrefs-ti.ts
+++ b/app/common/ThemePrefs-ti.ts
@@ -185,6 +185,8 @@ export const ThemeColors = t.iface([], {
   "left-panel-page-options-selected-hover-bg": "string",
   "left-panel-page-initials-fg": "string",
   "left-panel-page-initials-bg": "string",
+  "left-panel-page-emoji-fg": "string",
+  "left-panel-page-emoji-outline": "string",
   "right-panel-tab-fg": "string",
   "right-panel-tab-bg": "string",
   "right-panel-tab-icon": "string",
diff --git a/app/common/ThemePrefs.ts b/app/common/ThemePrefs.ts
index e6f55aaf..39ae7193 100644
--- a/app/common/ThemePrefs.ts
+++ b/app/common/ThemePrefs.ts
@@ -241,6 +241,8 @@ export interface ThemeColors {
   'left-panel-page-options-selected-hover-bg': string;
   'left-panel-page-initials-fg': string;
   'left-panel-page-initials-bg': string;
+  'left-panel-page-emoji-fg': string;
+  'left-panel-page-emoji-outline': string;
 
   /* Right Panel */
   'right-panel-tab-fg': string;
diff --git a/app/common/UIRowId.ts b/app/common/UIRowId.ts
deleted file mode 100644
index 5d9b90ea..00000000
--- a/app/common/UIRowId.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This is the row ID used in the client, but it's helpful to have available in some common code
-// as well, which is why it's declared in app/common. Note that for data actions and stored data,
-// 'new' is not used.
-export type UIRowId = number | 'new';
diff --git a/app/common/UserAPI.ts b/app/common/UserAPI.ts
index e80c9064..7c2304ac 100644
--- a/app/common/UserAPI.ts
+++ b/app/common/UserAPI.ts
@@ -1,5 +1,6 @@
 import {ActionSummary} from 'app/common/ActionSummary';
 import {ApplyUAResult, ForkResult, PermissionDataWithExtraUsers, QueryFilters} from 'app/common/ActiveDocAPI';
+import {AssistanceRequest, AssistanceResponse} from 'app/common/AssistancePrompts';
 import {BaseAPI, IOptions} from 'app/common/BaseAPI';
 import {BillingAPI, BillingAPIImpl} from 'app/common/BillingAPI';
 import {BrowserSettings} from 'app/common/BrowserSettings';
@@ -462,6 +463,8 @@ export interface DocAPI {
   // Update webhook
   updateWebhook(webhook: WebhookUpdate): Promise<void>;
   flushWebhooks(): Promise<void>;
+
+  getAssistance(params: AssistanceRequest): Promise<AssistanceResponse>;
 }
 
 // Operations that are supported by a doc worker.
@@ -1012,6 +1015,13 @@ export class DocAPIImpl extends BaseAPI implements DocAPI {
     return response.data[0];
   }
 
+  public async getAssistance(params: AssistanceRequest): Promise<AssistanceResponse> {
+    return await this.requestJson(`${this._url}/assistant`, {
+      method: 'POST',
+      body: JSON.stringify(params),
+    });
+  }
+
   private _getRecords(tableId: string, endpoint: 'data' | 'records', options?: GetRowsParams): Promise<any> {
     const url = new URL(`${this._url}/tables/${tableId}/${endpoint}`);
     if (options?.filters) {
diff --git a/app/common/gristUrls.ts b/app/common/gristUrls.ts
index 7a642818..48207792 100644
--- a/app/common/gristUrls.ts
+++ b/app/common/gristUrls.ts
@@ -5,7 +5,7 @@ import {encodeQueryParams, isAffirmative} from 'app/common/gutil';
 import {LocalPlugin} from 'app/common/plugin';
 import {StringUnion} from 'app/common/StringUnion';
 import {TelemetryLevel} from 'app/common/Telemetry';
-import {UIRowId} from 'app/common/UIRowId';
+import {UIRowId} from 'app/common/TableData';
 import {getGristConfig} from 'app/common/urlUtils';
 import {Document} from 'app/common/UserAPI';
 import clone = require('lodash/clone');
@@ -41,6 +41,9 @@ export type ActivationPage = typeof ActivationPage.type;
 export const LoginPage = StringUnion('signup', 'login', 'verified', 'forgot-password');
 export type LoginPage = typeof LoginPage.type;
 
+export const SupportGristPage = StringUnion('support-grist');
+export type SupportGristPage = typeof SupportGristPage.type;
+
 // Overall UI style.  "full" is normal, "light" is a single page focused, panels hidden experience.
 export const InterfaceStyle = StringUnion('light', 'full');
 export type InterfaceStyle = typeof InterfaceStyle.type;
@@ -72,6 +75,7 @@ export const commonUrls = {
   helpTriggerFormulas: "https://support.getgrist.com/formulas/#trigger-formulas",
   helpTryingOutChanges: "https://support.getgrist.com/copying-docs/#trying-out-changes",
   helpCustomWidgets: "https://support.getgrist.com/widget-custom",
+  helpTelemetryLimited: "https://support.getgrist.com/telemetry-limited",
   plans: "https://www.getgrist.com/pricing",
   sproutsProgram: "https://www.getgrist.com/sprouts-program",
   contact: "https://www.getgrist.com/contact",
@@ -83,6 +87,8 @@ export const commonUrls = {
   basicTutorialImage: 'https://www.getgrist.com/wp-content/uploads/2021/08/lightweight-crm.png',
   gristLabsCustomWidgets: 'https://gristlabs.github.io/grist-widget/',
   gristLabsWidgetRepository: 'https://github.com/gristlabs/grist-widget/releases/download/latest/manifest.json',
+  githubGristCore: 'https://github.com/gristlabs/grist-core',
+  githubSponsorGristLabs: 'https://github.com/sponsors/gristlabs',
 };
 
 /**
@@ -103,6 +109,7 @@ export interface IGristUrlState {
   activation?: ActivationPage;
   login?: LoginPage;
   welcome?: WelcomePage;
+  supportGrist?: SupportGristPage;
   welcomeTour?: boolean;
   docTour?: boolean;
   manageUsers?: boolean;
@@ -258,6 +265,8 @@ export function encodeUrl(gristConfig: Partial<GristLoadConfig>,
     parts.push(`welcome/${state.welcome}`);
   }
 
+  if (state.supportGrist) { parts.push(state.supportGrist); }
+
   const queryParams = pickBy(state.params, (v, k) => k !== 'linkParameters') as {[key: string]: string};
   for (const [k, v] of Object.entries(state.params?.linkParameters || {})) {
     queryParams[`${k}_`] = v;
@@ -320,7 +329,7 @@ export function decodeUrl(gristConfig: Partial<GristLoadConfig>, location: Locat
   // the minimum length of a urlId prefix is longer than the maximum length
   // of any of the valid keys in the url.
   for (const key of map.keys()) {
-    if (key.length >= MIN_URLID_PREFIX_LENGTH && !LoginPage.guard(key)) {
+    if (key.length >= MIN_URLID_PREFIX_LENGTH && !LoginPage.guard(key) && !SupportGristPage.guard(key)) {
       map.set('doc', key);
       map.set('slug', map.get(key)!);
       map.delete(key);
@@ -358,6 +367,9 @@ export function decodeUrl(gristConfig: Partial<GristLoadConfig>, location: Locat
     state.activation = ActivationPage.parse(map.get('activation')) || 'activation';
   }
   if (map.has('welcome')) { state.welcome = WelcomePage.parse(map.get('welcome')); }
+  if (map.has('support-grist')) {
+    state.supportGrist = SupportGristPage.parse(map.get('support-grist')) || 'support-grist';
+  }
   if (sp.has('planType')) { state.params!.planType = sp.get('planType')!; }
   if (sp.has('billingPlan')) { state.params!.billingPlan = sp.get('billingPlan')!; }
   if (sp.has('billingTask')) {
diff --git a/app/common/isHiddenTable.ts b/app/common/isHiddenTable.ts
index 0725ea43..cb746bb8 100644
--- a/app/common/isHiddenTable.ts
+++ b/app/common/isHiddenTable.ts
@@ -1,5 +1,4 @@
-import {TableData} from 'app/common/TableData';
-import {UIRowId} from 'app/common/UIRowId';
+import {TableData, UIRowId} from 'app/common/TableData';
 
 /**
  * Return whether a table (identified by the rowId of its metadata record) should
diff --git a/app/common/themes/GristDark.ts b/app/common/themes/GristDark.ts
index 84f1aa28..4d782a1d 100644
--- a/app/common/themes/GristDark.ts
+++ b/app/common/themes/GristDark.ts
@@ -220,6 +220,8 @@ export const GristDark: ThemeColors = {
   'left-panel-page-options-selected-hover-bg': '#A4A4A4',
   'left-panel-page-initials-fg': 'white',
   'left-panel-page-initials-bg': '#929299',
+  'left-panel-page-emoji-fg': 'black',
+  'left-panel-page-emoji-outline': '#69697D',
 
   /* Right Panel */
   'right-panel-tab-fg': '#EFEFEF',
diff --git a/app/common/themes/GristLight.ts b/app/common/themes/GristLight.ts
index fc0af490..ecb969aa 100644
--- a/app/common/themes/GristLight.ts
+++ b/app/common/themes/GristLight.ts
@@ -220,6 +220,8 @@ export const GristLight: ThemeColors = {
   'left-panel-page-options-selected-hover-bg': '#929299',
   'left-panel-page-initials-fg': 'white',
   'left-panel-page-initials-bg': '#929299',
+  'left-panel-page-emoji-fg': 'white',
+  'left-panel-page-emoji-outline': '#BDBDBD',
 
   /* Right Panel */
   'right-panel-tab-fg': '#262633',
diff --git a/app/gen-server/entity/Activation.ts b/app/gen-server/entity/Activation.ts
index 2545812d..ca84c3f7 100644
--- a/app/gen-server/entity/Activation.ts
+++ b/app/gen-server/entity/Activation.ts
@@ -1,3 +1,7 @@
+import {InstallPrefs} from "app/common/Install";
+import {ApiError} from "app/common/ApiError";
+import {InstallProperties, installPropertyKeys} from "app/common/InstallAPI";
+import {nativeValues} from "app/gen-server/lib/values";
 import {BaseEntity, Column, Entity, PrimaryColumn} from "typeorm";
 
 @Entity({name: 'activations'})
@@ -9,9 +13,47 @@ export class Activation extends BaseEntity {
   @Column({name: 'key', type: 'text', nullable: true})
   public key: string|null;
 
+  @Column({type: nativeValues.jsonEntityType, nullable: true})
+  public prefs: InstallPrefs|null;
+
   @Column({name: 'created_at', default: () => "CURRENT_TIMESTAMP"})
   public createdAt: Date;
 
   @Column({name: 'updated_at', default: () => "CURRENT_TIMESTAMP"})
   public updatedAt: Date;
+
+  public checkProperties(props: any): props is Partial<InstallProperties> {
+    for (const key of Object.keys(props)) {
+      if (!installPropertyKeys.includes(key)) {
+        throw new ApiError(`Unrecognized property ${key}`, 400);
+      }
+    }
+    return true;
+  }
+
+  public updateFromProperties(props: Partial<InstallProperties>) {
+    if (props.prefs === undefined) { return; }
+
+    if (props.prefs === null) {
+      this.prefs = null;
+    } else {
+      this.prefs = this.prefs || {};
+      if (props.prefs.telemetry !== undefined) {
+        this.prefs.telemetry = this.prefs.telemetry || {};
+        if (props.prefs.telemetry.telemetryLevel !== undefined) {
+          this.prefs.telemetry.telemetryLevel = props.prefs.telemetry.telemetryLevel;
+        }
+      }
+
+      for (const key of Object.keys(this.prefs) as Array<keyof InstallPrefs>) {
+        if (this.prefs[key] === null) {
+          delete this.prefs[key];
+        }
+      }
+
+      if (Object.keys(this.prefs).length === 0) {
+        this.prefs = null;
+      }
+    }
+  }
 }
diff --git a/app/gen-server/entity/BillingAccount.ts b/app/gen-server/entity/BillingAccount.ts
index 64806d93..d1ec88d0 100644
--- a/app/gen-server/entity/BillingAccount.ts
+++ b/app/gen-server/entity/BillingAccount.ts
@@ -3,12 +3,13 @@ import {BillingAccountManager} from 'app/gen-server/entity/BillingAccountManager
 import {Organization} from 'app/gen-server/entity/Organization';
 import {Product} from 'app/gen-server/entity/Product';
 import {nativeValues} from 'app/gen-server/lib/values';
+import {Limit} from 'app/gen-server/entity/Limit';
 
 // This type is for billing account status information.  Intended for stuff
 // like "free trial running out in N days".
-interface BillingAccountStatus {
+export interface BillingAccountStatus {
   stripeStatus?: string;
-  currentPeriodEnd?: Date;
+  currentPeriodEnd?: string;
   message?: string;
 }
 
@@ -68,6 +69,9 @@ export class BillingAccount extends BaseEntity {
   @OneToMany(type => Organization, org => org.billingAccount)
   public orgs: Organization[];
 
+  @OneToMany(type => Limit, limit => limit.billingAccount)
+  public limits: Limit[];
+
   // A calculated column that is true if it looks like there is a paid plan.
   @Column({name: 'paid', type: 'boolean', insert: false, select: false})
   public paid?: boolean;
diff --git a/app/gen-server/entity/Document.ts b/app/gen-server/entity/Document.ts
index 2e0a67d9..2414830a 100644
--- a/app/gen-server/entity/Document.ts
+++ b/app/gen-server/entity/Document.ts
@@ -1,10 +1,8 @@
 import {ApiError} from 'app/common/ApiError';
 import {DocumentUsage} from 'app/common/DocUsage';
-import {hashId} from 'app/common/hashingUtils';
 import {Role} from 'app/common/roles';
-import {DocumentOptions, DocumentProperties, documentPropertyKeys,
-        DocumentType, NEW_DOCUMENT_CODE, TutorialMetadata} from "app/common/UserAPI";
-import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager';
+import {DocumentOptions, DocumentProperties, documentPropertyKeys, DocumentType,
+        NEW_DOCUMENT_CODE} from "app/common/UserAPI";
 import {nativeValues} from 'app/gen-server/lib/values';
 import {Column, Entity, JoinColumn, ManyToOne, OneToMany, PrimaryColumn} from "typeorm";
 import {AclRuleDoc} from "./AclRule";
@@ -92,7 +90,7 @@ export class Document extends Resource {
     return super.checkProperties(props, documentPropertyKeys);
   }
 
-  public updateFromProperties(props: Partial<DocumentProperties>, dbManager?: HomeDBManager) {
+  public updateFromProperties(props: Partial<DocumentProperties>) {
     super.updateFromProperties(props);
     if (props.isPinned !== undefined) { this.isPinned = props.isPinned; }
     if (props.urlId !== undefined) {
@@ -135,9 +133,6 @@ export class Document extends Resource {
             }
             if (props.options.tutorial.lastSlideIndex !== undefined) {
               this.options.tutorial.lastSlideIndex = props.options.tutorial.lastSlideIndex;
-              if (dbManager && this.options.tutorial.numSlides) {
-                this._emitTutorialProgressChangeEvent(dbManager, this.options.tutorial);
-              }
             }
           }
         }
@@ -154,26 +149,6 @@ export class Document extends Resource {
       }
     }
   }
-
-  private _emitTutorialProgressChangeEvent(
-    dbManager: HomeDBManager,
-    tutorialMetadata: TutorialMetadata
-  ) {
-    const lastSlideIndex = tutorialMetadata.lastSlideIndex;
-    const numSlides = tutorialMetadata.numSlides;
-    const percentComplete = lastSlideIndex !== undefined && numSlides !== undefined
-      ? Math.floor((lastSlideIndex / numSlides) * 100)
-      : undefined;
-    dbManager?.emit('tutorialProgressChanged', {
-      full: {
-        tutorialForkIdDigest: hashId(this.id),
-        tutorialTrunkIdDigest: this.trunkId ? hashId(this.trunkId) : undefined,
-        lastSlideIndex,
-        numSlides,
-        percentComplete,
-      },
-    });
-  }
 }
 
 // Check that icon points to an expected location.  This will definitely
diff --git a/app/gen-server/entity/Limit.ts b/app/gen-server/entity/Limit.ts
new file mode 100644
index 00000000..1011a98f
--- /dev/null
+++ b/app/gen-server/entity/Limit.ts
@@ -0,0 +1,46 @@
+import {BaseEntity, Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn} from 'typeorm';
+import {BillingAccount} from 'app/gen-server/entity/BillingAccount';
+import {nativeValues} from 'app/gen-server/lib/values';
+
+@Entity('limits')
+export class Limit extends BaseEntity {
+  @PrimaryGeneratedColumn()
+  public id: number;
+
+  @Column()
+  public limit: number;
+
+  @Column()
+  public usage: number;
+
+  @Column()
+  public type: string;
+
+  @Column({name: 'billing_account_id'})
+  public billingAccountId: number;
+
+  @ManyToOne(type => BillingAccount)
+  @JoinColumn({name: 'billing_account_id'})
+  public billingAccount: BillingAccount;
+
+  @Column({name: 'created_at', default: () => "CURRENT_TIMESTAMP"})
+  public createdAt: Date;
+
+  /**
+   * Last time the Limit.limit value was changed, by an upgrade or downgrade. Null if it has never been changed.
+   */
+  @Column({name: 'changed_at', type: nativeValues.dateTimeType, nullable: true})
+  public changedAt: Date|null;
+
+  /**
+   * Last time the Limit.usage was used (by sending a request to the model). Null if it has never been used.
+   */
+  @Column({name: 'used_at', type: nativeValues.dateTimeType, nullable: true})
+  public usedAt: Date|null;
+
+  /**
+   * Last time the Limit.usage was reset, probably by billing cycle change. Null if it has never been reset.
+   */
+  @Column({name: 'reset_at', type: nativeValues.dateTimeType, nullable: true})
+  public resetAt: Date|null;
+}
diff --git a/app/gen-server/entity/Product.ts b/app/gen-server/entity/Product.ts
index aac39042..7b1f4a80 100644
--- a/app/gen-server/entity/Product.ts
+++ b/app/gen-server/entity/Product.ts
@@ -13,7 +13,11 @@ export const personalLegacyFeatures: Features = {
   // no vanity domain
   maxDocsPerOrg: 10,
   maxSharesPerDoc: 2,
-  maxWorkspacesPerOrg: 1
+  maxWorkspacesPerOrg: 1,
+  /**
+   * One time limit of 100 requests.
+   */
+  baseMaxAssistantCalls: 100,
 };
 
 /**
@@ -23,7 +27,12 @@ export const teamFeatures: Features = {
   workspaces: true,
   vanityDomain: true,
   maxSharesPerWorkspace: 0,   // all workspace shares need to be org members.
-  maxSharesPerDoc: 2
+  maxSharesPerDoc: 2,
+  /**
+   * Limit of 100 requests, but unlike for personal/free orgs the usage for this limit is reset at every billing cycle
+   * through Stripe webhook. For canceled subscription the usage is not reset, as the billing cycle is not changed.
+   */
+  baseMaxAssistantCalls: 100,
 };
 
 /**
@@ -40,6 +49,10 @@ export const teamFreeFeatures: Features = {
   baseMaxDataSizePerDocument: 5000 * 2 * 1024,  // 2KB per row
   baseMaxAttachmentsBytesPerDocument: 1 * 1024 * 1024 * 1024,  // 1GB
   gracePeriodDays: 14,
+  /**
+   * One time limit of 100 requests.
+   */
+  baseMaxAssistantCalls: 100,
 };
 
 /**
@@ -55,6 +68,7 @@ export const teamFreeFeatures: Features = {
   baseMaxDataSizePerDocument: 5000 * 2 * 1024,  // 2KB per row
   baseMaxAttachmentsBytesPerDocument: 1 * 1024 * 1024 * 1024,  // 1GB
   gracePeriodDays: 14,
+  baseMaxAssistantCalls: 100,
 };
 
 export const testDailyApiLimitFeatures = {
@@ -79,6 +93,7 @@ export const suspendedFeatures: Features = {
   maxDocsPerOrg: 0,
   maxSharesPerDoc: 0,
   maxWorkspacesPerOrg: 0,
+  baseMaxAssistantCalls: 0,
 };
 
 /**
diff --git a/app/gen-server/lib/Activations.ts b/app/gen-server/lib/Activations.ts
index 47d67f2a..b089efbe 100644
--- a/app/gen-server/lib/Activations.ts
+++ b/app/gen-server/lib/Activations.ts
@@ -20,6 +20,7 @@ export class Activations {
       if (!activation) {
         activation = manager.create(Activation);
         activation.id = makeId();
+        activation.prefs = {};
         await activation.save();
       }
       return activation;
diff --git a/app/gen-server/lib/DocApiForwarder.ts b/app/gen-server/lib/DocApiForwarder.ts
index 3e62d2a6..fb2013f8 100644
--- a/app/gen-server/lib/DocApiForwarder.ts
+++ b/app/gen-server/lib/DocApiForwarder.ts
@@ -60,6 +60,7 @@ export class DocApiForwarder {
     app.use('/api/docs/:docId/assign', withDocWithoutAuth);
     app.use('/api/docs/:docId/webhooks/queue', withDoc);
     app.use('/api/docs/:docId/webhooks', withDoc);
+    app.use('/api/docs/:docId/assistant', withDoc);
     app.use('^/api/docs$', withoutDoc);
   }
 
diff --git a/app/gen-server/lib/HomeDBManager.ts b/app/gen-server/lib/HomeDBManager.ts
index 27c28e74..38aee356 100644
--- a/app/gen-server/lib/HomeDBManager.ts
+++ b/app/gen-server/lib/HomeDBManager.ts
@@ -1,4 +1,4 @@
-import {ApiError} from 'app/common/ApiError';
+import {ApiError, ApiErrorDetails, LimitType} from 'app/common/ApiError';
 import {mapGetOrSet, mapSetOrClear, MapWithTTL} from 'app/common/AsyncCreate';
 import {getDataLimitStatus} from 'app/common/DocLimits';
 import {createEmptyOrgUsageSummary, DocumentUsage, OrgUsageSummary} from 'app/common/DocUsage';
@@ -38,6 +38,7 @@ import {getDefaultProductNames, personalFreeFeatures, Product} from "app/gen-ser
 import {Secret} from "app/gen-server/entity/Secret";
 import {User} from "app/gen-server/entity/User";
 import {Workspace} from "app/gen-server/entity/Workspace";
+import {Limit} from 'app/gen-server/entity/Limit';
 import {Permissions} from 'app/gen-server/lib/Permissions';
 import {scrubUserFromOrg} from "app/gen-server/lib/scrubUserFromOrg";
 import {applyPatch} from 'app/gen-server/lib/TypeORMPatches';
@@ -89,14 +90,6 @@ export const NotifierEvents = StringUnion(
 
 export type NotifierEvent = typeof NotifierEvents.type;
 
-export const HomeDBTelemetryEvents = StringUnion(
-  'tutorialProgressChanged',
-);
-
-export type HomeDBTelemetryEvent = typeof HomeDBTelemetryEvents.type;
-
-export type Event = NotifierEvent | HomeDBTelemetryEvent;
-
 // Nominal email address of a user who can view anything (for thumbnails).
 export const PREVIEWER_EMAIL = 'thumbnail@getgrist.com';
 
@@ -324,7 +317,7 @@ export class HomeDBManager extends EventEmitter {
     orgOnly: true
   }];
 
-  public emit(event: Event, ...args: any[]): boolean {
+  public emit(event: NotifierEvent, ...args: any[]): boolean {
     return super.emit(event, ...args);
   }
 
@@ -1960,7 +1953,7 @@ export class HomeDBManager extends EventEmitter {
       // Update the name and save.
       const doc: Document = queryResult.data;
       doc.checkProperties(props);
-      doc.updateFromProperties(props, this);
+      doc.updateFromProperties(props);
       if (forkId) {
         await manager.save(doc);
         return {status: 200};
@@ -2888,6 +2881,144 @@ export class HomeDBManager extends EventEmitter {
     return this._org(scope, scope.includeSupport || false, org, options);
   }
 
+  public async getLimits(accountId: number): Promise<Limit[]> {
+    const result = this._connection.transaction(async manager => {
+      return await manager.createQueryBuilder()
+        .select('limit')
+        .from(Limit, 'limit')
+        .innerJoin('limit.billingAccount', 'account')
+        .where('account.id = :accountId', {accountId})
+        .getMany();
+    });
+    return result;
+  }
+
+  public async getLimit(accountId: number, limitType: LimitType): Promise<Limit|null> {
+    return await this._getOrCreateLimit(accountId, limitType, true);
+  }
+
+  public async peekLimit(accountId: number, limitType: LimitType): Promise<Limit|null> {
+    return await this._getOrCreateLimit(accountId, limitType, false);
+  }
+
+  public async removeLimit(scope: Scope, limitType: LimitType): Promise<void> {
+    await this._connection.transaction(async manager => {
+      const org = await this._org(scope, false, scope.org ?? null, {manager, needRealOrg: true})
+        .innerJoinAndSelect('orgs.billingAccount', 'billing_account')
+        .innerJoinAndSelect('billing_account.product', 'product')
+        .leftJoinAndSelect('billing_account.limits', 'limit', 'limit.type = :limitType', {limitType})
+        .getOne();
+      const existing = org?.billingAccount?.limits?.[0];
+      if (existing) {
+        await manager.remove(existing);
+      }
+    });
+  }
+
+  /**
+   * Increases the usage of a limit for a given org. If the limit doesn't exist, it will be created.
+   * Pass `dryRun: true` to check if the limit can be increased without actually increasing it.
+   */
+  public async increaseUsage(scope: Scope, limitType: LimitType, options: {
+    delta: number,
+    dryRun?: boolean,
+  }): Promise<void> {
+    const limitError = await this._connection.transaction(async manager => {
+      const org = await this._org(scope, false, scope.org ?? null, {manager, needRealOrg: true})
+        .innerJoinAndSelect('orgs.billingAccount', 'billing_account')
+        .innerJoinAndSelect('billing_account.product', 'product')
+        .leftJoinAndSelect('billing_account.limits', 'limit', 'limit.type = :limitType', {limitType})
+        .getOne();
+      // If the org doesn't exists, or is a fake one (like for anonymous users), don't do anything.
+      if (!org || org.id === 0) {
+        // This API shouldn't be called, it should be checked first if the org is valid.
+        throw new ApiError(`Can't create a limit for non-existing organization`, 500);
+      }
+      let existing = org?.billingAccount?.limits?.[0];
+      if (!existing) {
+        const product = org?.billingAccount?.product;
+        if (!product) {
+          throw new ApiError(`getLimit: no product found for org`, 500);
+        }
+        if (product.features.baseMaxAssistantCalls === undefined) {
+          // If the product has no assistantLimit, then it is not billable yet, and we don't need to
+          // track usage as it is basically unlimited.
+          return;
+        }
+        existing = new Limit();
+        existing.billingAccountId = org.billingAccountId;
+        existing.type = limitType;
+        existing.limit = product.features.baseMaxAssistantCalls ?? 0;
+        existing.usage = 0;
+      }
+      const limitLess = existing.limit === -1; // -1 means no limit, it is not possible to do in stripe.
+      const usageAfter = existing.usage + options.delta;
+      if (!limitLess && usageAfter > existing.limit) {
+        const billable = Boolean(org?.billingAccount?.stripeCustomerId);
+        return {
+          limit: {
+            maximum: existing.limit,
+            projectedValue: existing.usage + options.delta,
+            quantity: limitType,
+            value: existing.usage,
+          },
+          tips: [{
+            // For non-billable accounts, suggest getting a plan, otherwise suggest visiting the billing page.
+            action: billable ? 'manage' : 'upgrade',
+            message: `Upgrade to a paid plan to increase your ${limitType} limit.`,
+          }]
+        } as ApiErrorDetails;
+      }
+      existing.usage += options.delta;
+      existing.usedAt = new Date();
+      if (!options.dryRun) {
+        await manager.save(existing);
+      }
+    });
+    if (limitError) {
+      let message = `Your ${limitType} limit has been reached. Please upgrade your plan to increase your limit.`;
+      if (limitType === 'assistant') {
+        message = 'You used all available credits. For a bigger limit upgrade you Assistant plan.';
+      }
+      throw new ApiError(message, 429, limitError);
+    }
+  }
+
+  private async _getOrCreateLimit(accountId: number, limitType: LimitType, force: boolean): Promise<Limit|null> {
+    if (accountId === 0) {
+      throw new Error(`getLimit: called for not existing account`);
+    }
+    const result = this._connection.transaction(async manager => {
+      let existing = await manager.createQueryBuilder()
+        .select('limit')
+        .from(Limit, 'limit')
+        .innerJoin('limit.billingAccount', 'account')
+        .where('account.id = :accountId', {accountId})
+          .andWhere('limit.type = :limitType', {limitType})
+        .getOne();
+      if (!force && !existing) { return null; }
+      if (existing) { return existing; }
+      const product = await manager.createQueryBuilder()
+        .select('product')
+        .from(Product, 'product')
+        .innerJoinAndSelect('product.accounts', 'account')
+        .where('account.id = :accountId', {accountId})
+        .getOne();
+      if (!product) {
+        throw new Error(`getLimit: no product for account ${accountId}`);
+      }
+      existing = new Limit();
+      existing.billingAccountId = product.accounts[0].id;
+      existing.type = limitType;
+      existing.limit = product.features.baseMaxAssistantCalls ?? 0;
+      existing.usage = 0;
+      await manager.save(existing);
+      return existing;
+    });
+    return result;
+  }
+
+
   private _org(scope: Scope|null, includeSupport: boolean, org: string|number|null,
                options: QueryOptions = {}): SelectQueryBuilder<Organization> {
     let query = this._orgs(options.manager);
diff --git a/app/gen-server/migration/1682636695021-ActivationPrefs.ts b/app/gen-server/migration/1682636695021-ActivationPrefs.ts
new file mode 100644
index 00000000..4edb48bf
--- /dev/null
+++ b/app/gen-server/migration/1682636695021-ActivationPrefs.ts
@@ -0,0 +1,16 @@
+import {nativeValues} from 'app/gen-server/lib/values';
+import {MigrationInterface, QueryRunner, TableColumn} from 'typeorm';
+
+export class ActivationPrefs1682636695021 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<any> {
+      await queryRunner.addColumn('activations', new TableColumn({
+        name: 'prefs',
+        type: nativeValues.jsonType,
+        isNullable: true,
+      }));
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<any> {
+    await queryRunner.dropColumn('activations', 'prefs');
+  }
+}
diff --git a/app/gen-server/migration/1685343047786-AssistantLimit.ts b/app/gen-server/migration/1685343047786-AssistantLimit.ts
new file mode 100644
index 00000000..1b114691
--- /dev/null
+++ b/app/gen-server/migration/1685343047786-AssistantLimit.ts
@@ -0,0 +1,82 @@
+import * as sqlUtils from "app/gen-server/sqlUtils";
+import {MigrationInterface, QueryRunner, Table, TableIndex} from 'typeorm';
+
+export class AssistantLimit1685343047786 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const dbType = queryRunner.connection.driver.options.type;
+    const datetime = sqlUtils.datetime(dbType);
+    const now = sqlUtils.now(dbType);
+    await queryRunner.createTable(
+      new Table({
+        name: 'limits',
+        columns: [
+          {
+            name: 'id',
+            type: 'integer',
+            isPrimary: true,
+            isGenerated: true,
+            generationStrategy: 'increment',
+          },
+          {
+            name: 'type',
+            type: 'varchar',
+          },
+          {
+            name: 'billing_account_id',
+            type: 'integer',
+          },
+          {
+            name: 'limit',
+            type: 'integer',
+            default: 0,
+          },
+          {
+            name: 'usage',
+            type: 'integer',
+            default: 0,
+          },
+          {
+            name: "created_at",
+            type: datetime,
+            default: now
+          },
+          {
+            name: "changed_at", // When the limit was last changed
+            type: datetime,
+            isNullable: true
+          },
+          {
+            name: "used_at", // When the usage was last increased
+            type: datetime,
+            isNullable: true
+          },
+          {
+            name: "reset_at", // When the usage was last reset.
+            type: datetime,
+            isNullable: true
+          },
+        ],
+        foreignKeys: [
+          {
+            columnNames: ['billing_account_id'],
+            referencedTableName: 'billing_accounts',
+            referencedColumnNames: ['id'],
+            onDelete: 'CASCADE',
+          },
+        ],
+      })
+    );
+
+    await queryRunner.createIndex(
+      'limits',
+      new TableIndex({
+        name: 'limits_billing_account_id',
+        columnNames: ['billing_account_id'],
+      })
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.dropTable('limits');
+  }
+}
diff --git a/app/server/companion.ts b/app/server/companion.ts
index e9139354..9cc82421 100644
--- a/app/server/companion.ts
+++ b/app/server/companion.ts
@@ -6,7 +6,7 @@ import { applyPatch } from 'app/gen-server/lib/TypeORMPatches';
 import { getMigrations, getOrCreateConnection, getTypeORMSettings,
          undoLastMigration, updateDb } from 'app/server/lib/dbUtils';
 import { getDatabaseUrl } from 'app/server/lib/serverUtils';
-import { getTelemetryLevel } from 'app/server/lib/Telemetry';
+import { getTelemetryPrefs } from 'app/server/lib/Telemetry';
 import { Gristifier } from 'app/server/utils/gristify';
 import { pruneActionHistory } from 'app/server/utils/pruneActionHistory';
 import * as commander from 'commander';
@@ -81,12 +81,14 @@ export function addSettingsCommand(program: commander.Command,
     .action(showTelemetry);
 }
 
-function showTelemetry(options: {
+async function showTelemetry(options: {
   json?: boolean,
   all?: boolean,
 }) {
   const contracts = TelemetryContracts;
-  const levelName = getTelemetryLevel();
+  const db = await getHomeDBManager();
+  const prefs = await getTelemetryPrefs(db);
+  const levelName = prefs.telemetryLevel.value;
   const level = Level[levelName];
   if (options.json) {
     console.log(JSON.stringify({
diff --git a/app/server/lib/ActionHistory.ts b/app/server/lib/ActionHistory.ts
index 0bc16f46..35ac9d3e 100644
--- a/app/server/lib/ActionHistory.ts
+++ b/app/server/lib/ActionHistory.ts
@@ -16,9 +16,7 @@
 import {LocalActionBundle} from 'app/common/ActionBundle';
 import {ActionGroup, MinimalActionGroup} from 'app/common/ActionGroup';
 import {createEmptyActionSummary} from 'app/common/ActionSummary';
-import {getSelectionDesc, UserAction} from 'app/common/DocActions';
 import {DocState} from 'app/common/UserAPI';
-import toPairs = require('lodash/toPairs');
 import {summarizeAction} from 'app/common/ActionSummarizer';
 
 export interface ActionGroupOptions {
@@ -163,81 +161,6 @@ export abstract class ActionHistory {
 }
 
 
-/**
- * Old helper to display the actionGroup in a human-readable way.  Being maintained
- * to avoid having to change too much at once.
- */
-export function humanDescription(actions: UserAction[]): string {
-  const action = actions[0];
-  if (!action) { return ""; }
-  let output = '';
-  // Common names for various action parameters
-  const name    = action[0];
-  const table   = action[1];
-  const rows    = action[2];
-  const colId   = action[2];
-  const columns: any = action[3];  // TODO - better typing - but code may evaporate
-  switch (name) {
-  case 'UpdateRecord':
-  case 'BulkUpdateRecord':
-  case 'AddRecord':
-  case 'BulkAddRecord':
-    output = name + ' ' + getSelectionDesc(action, columns);
-    break;
-  case 'ApplyUndoActions':
-    // Currently cannot display information about what action was undone, as the action comes
-    // with the description of the "undo" message, which might be very different
-    // Also, cannot currently properly log redos as they are not distinguished from others in any way
-    // TODO: make an ApplyRedoActions type for redoing actions
-    output = 'Undo Previous Action';
-    break;
-  case 'InitNewDoc':
-    output = 'Initialized new Document';
-    break;
-  case 'AddColumn':
-    output = 'Added column ' + colId + ' to ' + table;
-    break;
-  case 'RemoveColumn':
-    output = 'Removed column ' + colId + ' from ' + table;
-    break;
-  case 'RemoveRecord':
-  case 'BulkRemoveRecord':
-    output = 'Removed record(s) ' + rows + ' from ' + table;
-    break;
-  case 'EvalCode':
-    output = 'Evaluated Code ' + action[1];
-    break;
-  case 'AddTable':
-    output = 'Added table ' + table;
-    break;
-  case 'RemoveTable':
-    output = 'Removed table ' + table;
-    break;
-  case 'ModifyColumn':
-    // TODO: The Action Log currently only logs user actions,
-    // But ModifyColumn/Rename Column are almost always triggered from the client
-    // through a meta-table UpdateRecord.
-    // so, this is a case where making use of explicit sandbox engine 'looged' actions
-    // may be useful
-    output = 'Modify column ' + colId + ", ";
-    for (const [col, val] of toPairs(columns)) {
-      output += col + ": " + val + ", ";
-    }
-    output += ' in table ' + table;
-    break;
-  case 'RenameColumn': {
-    const newColId = action[3];
-    output = 'Renamed Column ' + colId + ' to ' + newColId + ' in ' + table;
-    break;
-  }
-  default:
-    output = name + ' [No Description]';
-  }
-  // A period for good grammar
-  output += '.';
-  return output;
-}
-
 /**
  * Convert an ActionBundle into an ActionGroup.  ActionGroups are the representation of
  * actions on the client.
@@ -260,7 +183,9 @@ export function asActionGroup(history: ActionHistory,
   return {
     actionNum: act.actionNum,
     actionHash: act.actionHash || "",
-    desc: info.desc || humanDescription(act.userActions),
+    // Desc is a human-readable description of the user action set in a few places by client-side
+    // code, but is mostly (or maybe completely) unused.
+    desc: info.desc,
     actionSummary: summarize ? summarizeAction(act) : createEmptyActionSummary(),
     fromSelf,
     linkId: info.linkId,
diff --git a/app/server/lib/ActiveDoc.ts b/app/server/lib/ActiveDoc.ts
index 2dfd0720..bb4ce879 100644
--- a/app/server/lib/ActiveDoc.ts
+++ b/app/server/lib/ActiveDoc.ts
@@ -14,7 +14,6 @@ import {
 } from 'app/common/ActionBundle';
 import {ActionGroup, MinimalActionGroup} from 'app/common/ActionGroup';
 import {ActionSummary} from "app/common/ActionSummary";
-import {AssistanceRequest, AssistanceResponse} from "app/common/AssistancePrompts";
 import {
   AclResources,
   AclTableDescription,
@@ -68,14 +67,12 @@ import {FormulaProperties, getFormulaProperties} from 'app/common/GranularAccess
 import {isHiddenCol} from 'app/common/gristTypes';
 import {commonUrls, parseUrlId} from 'app/common/gristUrls';
 import {byteString, countIf, retryOnce, safeJsonParse} from 'app/common/gutil';
-import {hashId} from 'app/common/hashingUtils';
 import {InactivityTimer} from 'app/common/InactivityTimer';
 import {Interval} from 'app/common/Interval';
 import * as roles from 'app/common/roles';
 import {schema, SCHEMA_VERSION} from 'app/common/schema';
-import {MetaRowRecord, SingleCell} from 'app/common/TableData';
+import {MetaRowRecord, SingleCell, UIRowId} from 'app/common/TableData';
 import {TelemetryEvent, TelemetryMetadataByLevel} from 'app/common/Telemetry';
-import {UIRowId} from 'app/common/UIRowId';
 import {FetchUrlOptions, UploadResult} from 'app/common/uploads';
 import {Document as APIDocument, DocReplacementOptions, DocState, DocStateComparison} from 'app/common/UserAPI';
 import {convertFromColumn} from 'app/common/ValueConverter';
@@ -86,7 +83,7 @@ import {Document} from 'app/gen-server/entity/Document';
 import {ParseOptions} from 'app/plugin/FileParserAPI';
 import {AccessTokenOptions, AccessTokenResult, GristDocAPI} from 'app/plugin/GristAPI';
 import {compileAclFormula} from 'app/server/lib/ACLFormula';
-import {AssistanceDoc, AssistanceSchemaPromptV1Context, sendForCompletion} from 'app/server/lib/Assistance';
+import {AssistanceSchemaPromptV1Context} from 'app/server/lib/Assistance';
 import {Authorizer} from 'app/server/lib/Authorizer';
 import {checksumFile} from 'app/server/lib/checksumFile';
 import {Client} from 'app/server/lib/Client';
@@ -186,7 +183,7 @@ interface UpdateUsageOptions {
  * either .loadDoc() or .createEmptyDoc() is called.
  * @param {String} docName - The document's filename, without the '.grist' extension.
  */
-export class ActiveDoc extends EventEmitter implements AssistanceDoc {
+export class ActiveDoc extends EventEmitter {
   /**
    * Decorator for ActiveDoc methods that prevents shutdown while the method is running, i.e.
    * until the returned promise is resolved.
@@ -1266,18 +1263,14 @@ export class ActiveDoc extends EventEmitter implements AssistanceDoc {
     return this._pyCall('autocomplete', txt, tableId, columnId, rowId, user.toJSON());
   }
 
-  public async getAssistance(docSession: DocSession, request: AssistanceRequest): Promise<AssistanceResponse> {
-    return this.getAssistanceWithOptions(docSession, request);
-  }
-
-  public async getAssistanceWithOptions(docSession: DocSession,
-                                        request: AssistanceRequest): Promise<AssistanceResponse> {
+  // Callback to generate a prompt containing schema info for assistance.
+  public async assistanceSchemaPromptV1(
+    docSession: OptDocSession, options: AssistanceSchemaPromptV1Context): Promise<string> {
     // Making a prompt leaks names of tables and columns etc.
     if (!await this._granularAccess.canScanData(docSession)) {
       throw new Error("Permission denied");
     }
-    await this.waitForInitialization();
-    return sendForCompletion(this, request);
+    return await this._pyCall('get_formula_prompt', options.tableId, options.colId, options.docString);
   }
 
   // Callback to make a data-engine formula tweak for assistance.
@@ -1285,11 +1278,6 @@ export class ActiveDoc extends EventEmitter implements AssistanceDoc {
     return this._pyCall('convert_formula_completion', txt);
   }
 
-  // Callback to generate a prompt containing schema info for assistance.
-  public assistanceSchemaPromptV1(options: AssistanceSchemaPromptV1Context): Promise<string> {
-    return this._pyCall('get_formula_prompt', options.tableId, options.colId, options.docString);
-  }
-
   public fetchURL(docSession: DocSession, url: string, options?: FetchUrlOptions): Promise<UploadResult> {
     return fetchURL(url, this.makeAccessId(docSession.authorizer.getUserId()), options);
   }
@@ -1396,9 +1384,9 @@ export class ActiveDoc extends EventEmitter implements AssistanceDoc {
       const isTemplate = TEMPLATES_ORG_DOMAIN === doc.workspace.org.domain && doc.type !== 'tutorial';
       this.logTelemetryEvent(docSession, 'documentForked', {
         limited: {
-          forkIdDigest: hashId(forkIds.forkId),
-          forkDocIdDigest: hashId(forkIds.docId),
-          trunkIdDigest: doc.trunkId ? hashId(doc.trunkId) : undefined,
+          forkIdDigest: forkIds.forkId,
+          forkDocIdDigest: forkIds.docId,
+          trunkIdDigest: doc.trunkId,
           isTemplate,
           lastActivity: doc.updatedAt,
         },
@@ -2540,7 +2528,7 @@ export class ActiveDoc extends EventEmitter implements AssistanceDoc {
       altSessionId ? {altSessionId} : {},
       {
         limited: {
-          docIdDigest: hashId(this._docName),
+          docIdDigest: this._docName,
         },
         full: {
           siteId: this._doc?.workspace.org.id,
diff --git a/app/server/lib/AppEndpoint.ts b/app/server/lib/AppEndpoint.ts
index 1f009e65..2e06bf8a 100644
--- a/app/server/lib/AppEndpoint.ts
+++ b/app/server/lib/AppEndpoint.ts
@@ -9,7 +9,6 @@ import fetch, {Response as FetchResponse, RequestInit} from 'node-fetch';
 import {ApiError} from 'app/common/ApiError';
 import {getSlugIfNeeded, parseSubdomainStrictly, parseUrlId} from 'app/common/gristUrls';
 import {removeTrailingSlash} from 'app/common/gutil';
-import {hashId} from 'app/common/hashingUtils';
 import {LocalPlugin} from "app/common/plugin";
 import {TELEMETRY_TEMPLATE_SIGNUP_COOKIE_NAME} from 'app/common/Telemetry';
 import {Document as APIDocument} from 'app/common/UserAPI';
@@ -304,13 +303,13 @@ export function attachAppEndpoint(options: AttachOptions): void {
     }
 
     const isPublic = ((doc as unknown) as APIDocument).public ?? false;
-    const isSnapshot = parseUrlId(urlId).snapshotId;
+    const isSnapshot = Boolean(parseUrlId(urlId).snapshotId);
     // TODO: Need a more precise way to identify a template. (This org now also has tutorials.)
     const isTemplate = TEMPLATES_ORG_DOMAIN === doc.workspace.org.domain && doc.type !== 'tutorial';
     if (isPublic || isTemplate) {
       gristServer.getTelemetry().logEvent('documentOpened', {
         limited: {
-          docIdDigest: hashId(docId),
+          docIdDigest: docId,
           access: doc.access,
           isPublic,
           isSnapshot,
diff --git a/app/server/lib/Assistance.ts b/app/server/lib/Assistance.ts
index 820213bd..f638b09e 100644
--- a/app/server/lib/Assistance.ts
+++ b/app/server/lib/Assistance.ts
@@ -5,6 +5,7 @@
 import {AssistanceRequest, AssistanceResponse} from 'app/common/AssistancePrompts';
 import {delay} from 'app/common/delay';
 import {DocAction} from 'app/common/DocActions';
+import {OptDocSession} from 'app/server/lib/DocSession';
 import log from 'app/server/lib/log';
 import fetch from 'node-fetch';
 
@@ -15,7 +16,7 @@ export const DEPS = { fetch };
  * by interfacing with an external LLM endpoint.
  */
 export interface Assistant {
-  apply(doc: AssistanceDoc, request: AssistanceRequest): Promise<AssistanceResponse>;
+  apply(session: OptDocSession, doc: AssistanceDoc, request: AssistanceRequest): Promise<AssistanceResponse>;
 }
 
 /**
@@ -30,8 +31,7 @@ export interface AssistanceDoc {
    * Marked "V1" to suggest that it is a particular prompt and it would
    * be great to try variants.
    */
-  assistanceSchemaPromptV1(options: AssistanceSchemaPromptV1Context): Promise<string>;
-
+  assistanceSchemaPromptV1(session: OptDocSession, options: AssistanceSchemaPromptV1Context): Promise<string>;
   /**
    * Some tweaks to a formula after it has been generated.
    */
@@ -46,7 +46,7 @@ export interface AssistanceSchemaPromptV1Context {
 
 /**
  * A flavor of assistant for use with the OpenAI API.
- * Tested primarily with text-davinci-002 and gpt-3.5-turbo.
+ * Tested primarily with gpt-3.5-turbo.
  */
 export class OpenAIAssistant implements Assistant {
   private _apiKey: string;
@@ -60,37 +60,43 @@ export class OpenAIAssistant implements Assistant {
       throw new Error('OPENAI_API_KEY not set');
     }
     this._apiKey = apiKey;
-    this._model = process.env.COMPLETION_MODEL || "text-davinci-002";
+    this._model = process.env.COMPLETION_MODEL || "gpt-3.5-turbo-0613";
     this._chatMode = this._model.includes('turbo');
+    if (!this._chatMode) {
+      throw new Error('Only turbo models are currently supported');
+    }
     this._endpoint = `https://api.openai.com/v1/${this._chatMode ? 'chat/' : ''}completions`;
   }
 
-  public async apply(doc: AssistanceDoc, request: AssistanceRequest): Promise<AssistanceResponse> {
+  public async apply(
+    optSession: OptDocSession, doc: AssistanceDoc, request: AssistanceRequest): Promise<AssistanceResponse> {
     const messages = request.state?.messages || [];
     const chatMode = this._chatMode;
     if (chatMode) {
       if (messages.length === 0) {
         messages.push({
           role: 'system',
-          content: 'The user gives you one or more Python classes, ' +
-            'with one last method that needs completing. Write the ' +
-            'method body as a single code block, ' +
-            'including the docstring the user gave. ' +
-            'Just give the Python code as a markdown block, ' +
-            'do not give any introduction, that will just be ' +
-            'awkward for the user when copying and pasting. ' +
-            'You are working with Grist, an environment very like ' +
-            'regular Python except `rec` (like record) is used ' +
-            'instead of `self`. ' +
-            'Include at least one `return` statement or the method ' +
-            'will fail, disappointing the user. ' +
-            'Your answer should be the body of a single method, ' +
-            'not a class, and should not include `dataclass` or ' +
-            '`class` since the user is counting on you to provide ' +
-            'a single method. Thanks!'
+          content: 'You are a helpful assistant for a user of software called Grist. ' +
+            'Below are one or more Python classes. ' +
+            'The last method needs completing. ' +
+            "The user will probably give a description of what they want the method (a 'formula') to return. " +
+            'If so, your response should include the method body as Python code in a markdown block. ' +
+            'Do not include the class or method signature, just the method body. ' +
+            'If your code starts with `class`, `@dataclass`, or `def` it will fail. Only give the method body. ' +
+            'You can import modules inside the method body if needed. ' +
+            'You cannot define additional functions or methods. ' +
+            'The method should be a pure function that performs some computation and returns a result. ' +
+            'It CANNOT perform any side effects such as adding/removing/modifying rows/columns/cells/tables/etc. ' +
+            'It CANNOT interact with files/databases/networks/etc. ' +
+            'It CANNOT display images/charts/graphs/maps/etc. ' +
+            'If the user asks for these things, tell them that you cannot help. ' +
+            'The method uses `rec` instead of `self` as the first parameter.\n\n' +
+            '```python\n' +
+            await makeSchemaPromptV1(optSession, doc, request) +
+            '\n```',
         });
         messages.push({
-          role: 'user', content: await makeSchemaPromptV1(doc, request),
+          role: 'user', content: request.text,
         });
       } else {
         if (request.regenerate) {
@@ -105,7 +111,7 @@ export class OpenAIAssistant implements Assistant {
     } else {
       messages.length = 0;
       messages.push({
-        role: 'user', content: await makeSchemaPromptV1(doc, request),
+        role: 'user', content: await makeSchemaPromptV1(optSession, doc, request),
       });
     }
 
@@ -173,11 +179,12 @@ export class HuggingFaceAssistant implements Assistant {
 
   }
 
-  public async apply(doc: AssistanceDoc, request: AssistanceRequest): Promise<AssistanceResponse> {
+  public async apply(
+    optSession: OptDocSession, doc: AssistanceDoc, request: AssistanceRequest): Promise<AssistanceResponse> {
     if (request.state) {
       throw new Error("HuggingFaceAssistant does not support state");
     }
-    const prompt = await makeSchemaPromptV1(doc, request);
+    const prompt = await makeSchemaPromptV1(optSession, doc, request);
     const response = await DEPS.fetch(
       this._completionUrl,
       {
@@ -215,7 +222,10 @@ export class HuggingFaceAssistant implements Assistant {
  * Test assistant that mimics ChatGPT and just returns the input.
  */
 export class EchoAssistant implements Assistant {
-  public async apply(doc: AssistanceDoc, request: AssistanceRequest): Promise<AssistanceResponse> {
+  public async apply(sess: OptDocSession, doc: AssistanceDoc, request: AssistanceRequest): Promise<AssistanceResponse> {
+    if (request.text === "ERROR") {
+      throw new Error(`ERROR`);
+    }
     const messages = request.state?.messages || [];
     if (messages.length === 0) {
       messages.push({
@@ -250,25 +260,28 @@ export class EchoAssistant implements Assistant {
 /**
  * Instantiate an assistant, based on environment variables.
  */
-function getAssistant() {
+export function getAssistant() {
   if (process.env.OPENAI_API_KEY === 'test') {
     return new EchoAssistant();
   }
   if (process.env.OPENAI_API_KEY) {
     return new OpenAIAssistant();
   }
-  if (process.env.HUGGINGFACE_API_KEY) {
-    return new HuggingFaceAssistant();
-  }
-  throw new Error('Please set OPENAI_API_KEY or HUGGINGFACE_API_KEY');
+  // Maintaining this is too much of a burden for now.
+  // if (process.env.HUGGINGFACE_API_KEY) {
+  //   return new HuggingFaceAssistant();
+  // }
+  throw new Error('Please set OPENAI_API_KEY');
 }
 
 /**
  * Service a request for assistance, with a little retry logic
  * since these endpoints can be a bit flakey.
  */
-export async function sendForCompletion(doc: AssistanceDoc,
-                                        request: AssistanceRequest): Promise<AssistanceResponse> {
+export async function sendForCompletion(
+  optSession: OptDocSession,
+  doc: AssistanceDoc,
+  request: AssistanceRequest): Promise<AssistanceResponse> {
   const assistant = getAssistant();
 
   let retries: number = 0;
@@ -276,7 +289,7 @@ export async function sendForCompletion(doc: AssistanceDoc,
   let response: AssistanceResponse|null = null;
   while(retries++ < 3) {
     try {
-      response = await assistant.apply(doc, request);
+      response = await assistant.apply(optSession, doc, request);
       break;
     } catch(e) {
       log.error(`Completion error: ${e}`);
@@ -289,11 +302,11 @@ export async function sendForCompletion(doc: AssistanceDoc,
   return response;
 }
 
-async function makeSchemaPromptV1(doc: AssistanceDoc, request: AssistanceRequest) {
+async function makeSchemaPromptV1(session: OptDocSession, doc: AssistanceDoc, request: AssistanceRequest) {
   if (request.context.type !== 'formula') {
     throw new Error('makeSchemaPromptV1 only works for formulas');
   }
-  return doc.assistanceSchemaPromptV1({
+  return doc.assistanceSchemaPromptV1(session, {
     tableId: request.context.tableId,
     colId: request.context.colId,
     docString: request.text,
diff --git a/app/server/lib/DocApi.ts b/app/server/lib/DocApi.ts
index afcc8e1b..2b0acddc 100644
--- a/app/server/lib/DocApi.ts
+++ b/app/server/lib/DocApi.ts
@@ -1,5 +1,5 @@
 import {createEmptyActionSummary} from "app/common/ActionSummary";
-import {ApiError} from 'app/common/ApiError';
+import {ApiError, LimitType} from 'app/common/ApiError';
 import {BrowserSettings} from "app/common/BrowserSettings";
 import {
   BulkColValues,
@@ -11,7 +11,6 @@ import {
 import {isRaisedException} from "app/common/gristTypes";
 import {buildUrlId, parseUrlId} from "app/common/gristUrls";
 import {isAffirmative} from "app/common/gutil";
-import {hashId} from "app/common/hashingUtils";
 import {SchemaTypes} from "app/common/schema";
 import {SortFunc} from 'app/common/SortFunc';
 import {Sort} from 'app/common/SortSpec';
@@ -69,6 +68,7 @@ import {
 } from 'app/server/lib/requestUtils';
 import {ServerColumnGetters} from 'app/server/lib/ServerColumnGetters';
 import {localeFromRequest} from "app/server/lib/ServerLocale";
+import {sendForCompletion} from 'app/server/lib/Assistance';
 import {isUrlAllowed, WebhookAction, WebHookSecret} from "app/server/lib/Triggers";
 import {handleOptionalUpload, handleUpload} from "app/server/lib/uploads";
 import * as assert from 'assert';
@@ -162,6 +162,8 @@ export class DocWorkerApi {
     const canEditMaybeRemoved = expressWrap(this._assertAccess.bind(this, 'editors', true));
     // converts google code to access token and adds it to request object
     const decodeGoogleToken = expressWrap(googleAuthTokenMiddleware.bind(null));
+    // check that limit can be increased by 1
+    const checkLimit = (type: LimitType) => expressWrap(this._checkLimit.bind(this, type));
 
     // Middleware to limit number of outstanding requests per document.  Will also
     // handle errors like expressWrap would.
@@ -918,8 +920,8 @@ export class DocWorkerApi {
           const {forkId} = parseUrlId(scope.urlId);
           activeDoc.logTelemetryEvent(docSession, 'tutorialRestarted', {
             full: {
-              tutorialForkIdDigest: forkId ? hashId(forkId) : undefined,
-              tutorialTrunkIdDigest: hashId(tutorialTrunkId),
+              tutorialForkIdDigest: forkId,
+              tutorialTrunkIdDigest: tutorialTrunkId,
             },
           });
         }
@@ -1053,6 +1055,20 @@ export class DocWorkerApi {
 
     this._app.get('/api/docs/:docId/send-to-drive', canView, decodeGoogleToken, withDoc(exportToDrive));
 
+    /**
+     * Send a request to the formula assistant to get completions for a formula. Increases the
+     * usage of the formula assistant for the billing account in case of success.
+     */
+    this._app.post('/api/docs/:docId/assistant', canView, checkLimit('assistant'),
+      withDoc(async (activeDoc, req, res) => {
+        const docSession = docSessionFromRequest(req);
+        const request = req.body;
+        const result = await sendForCompletion(docSession, activeDoc, request);
+        await this._increaseLimit('assistant', req);
+        res.json(result);
+      })
+    );
+
     // Create a document.  When an upload is included, it is imported as the initial
     // state of the document.  Otherwise a fresh empty document is created.
     // A "timezone" option can be supplied.
@@ -1235,6 +1251,21 @@ export class DocWorkerApi {
     return false;
   }
 
+  /**
+   * Creates a middleware that checks the current usage of a limit and rejects the request if it is exceeded.
+   */
+  private async _checkLimit(limit: LimitType, req: Request, res: Response, next: NextFunction) {
+    await this._dbManager.increaseUsage(getDocScope(req), limit, {dryRun: true, delta: 1});
+    next();
+  }
+
+  /**
+   * Increases the current usage of a limit by 1.
+   */
+  private async _increaseLimit(limit: LimitType, req: Request) {
+    await this._dbManager.increaseUsage(getDocScope(req), limit, {delta: 1});
+  }
+
   private async _assertAccess(role: 'viewers'|'editors'|'owners'|null, allowRemoved: boolean,
                               req: Request, res: Response, next: NextFunction) {
     const scope = getDocScope(req);
diff --git a/app/server/lib/DocStorage.ts b/app/server/lib/DocStorage.ts
index d6a46834..f5658c2a 100644
--- a/app/server/lib/DocStorage.ts
+++ b/app/server/lib/DocStorage.ts
@@ -378,7 +378,7 @@ export class DocStorage implements ISQLiteDB, OnDemandStorage {
           const colListSql = newCols.map(c => `${quoteIdent(c.colId)}=?`).join(', ');
           const types = newCols.map(c => c.type);
           const sqlParams = DocStorage._encodeColumnsToRows(types, newCols.map(c => [PENDING_VALUE]));
-          await db.run(`UPDATE ${quoteIdent(tableId)} SET ${colListSql}`, sqlParams[0]);
+          await db.run(`UPDATE ${quoteIdent(tableId)} SET ${colListSql}`, ...sqlParams[0]);
         }
       },
 
@@ -1093,7 +1093,7 @@ export class DocStorage implements ISQLiteDB, OnDemandStorage {
   public _process_RemoveRecord(tableId: string, rowId: string): Promise<RunResult> {
     const sql = "DELETE FROM " + quoteIdent(tableId) + " WHERE id=?";
     debuglog("RemoveRecord SQL: " + sql, [rowId]);
-    return this.run(sql, [rowId]);
+    return this.run(sql, rowId);
   }
 
 
@@ -1130,7 +1130,7 @@ export class DocStorage implements ISQLiteDB, OnDemandStorage {
       const stmt = await this.prepare(preSql + chunkParams + postSql);
       for (const index of _.range(0, numChunks * chunkSize, chunkSize)) {
         debuglog("DocStorage.BulkRemoveRecord: chunk delete " + index + "-" + (index + chunkSize - 1));
-        await stmt.run(rowIds.slice(index, index + chunkSize));
+        await stmt.run(...rowIds.slice(index, index + chunkSize));
       }
       await stmt.finalize();
     }
@@ -1139,7 +1139,7 @@ export class DocStorage implements ISQLiteDB, OnDemandStorage {
       debuglog("DocStorage.BulkRemoveRecord: leftover delete " + (numChunks * chunkSize) + "-" + (rowIds.length - 1));
       const leftoverParams = _.range(numLeftovers).map(q).join(',');
       await this.run(preSql + leftoverParams + postSql,
-                     rowIds.slice(numChunks * chunkSize, rowIds.length));
+                     ...rowIds.slice(numChunks * chunkSize, rowIds.length));
     }
   }
 
diff --git a/app/server/lib/DocWorker.ts b/app/server/lib/DocWorker.ts
index 3a870dd5..180fa2e5 100644
--- a/app/server/lib/DocWorker.ts
+++ b/app/server/lib/DocWorker.ts
@@ -110,7 +110,6 @@ export class DocWorker {
       applyUserActionsById:     activeDocMethod.bind(null, 'editors', 'applyUserActionsById'),
       findColFromValues:        activeDocMethod.bind(null, 'viewers', 'findColFromValues'),
       getFormulaError:          activeDocMethod.bind(null, 'viewers', 'getFormulaError'),
-      getAssistance:            activeDocMethod.bind(null, 'editors', 'getAssistance'),
       importFiles:              activeDocMethod.bind(null, 'editors', 'importFiles'),
       finishImportFiles:        activeDocMethod.bind(null, 'editors', 'finishImportFiles'),
       cancelImportFiles:        activeDocMethod.bind(null, 'editors', 'cancelImportFiles'),
diff --git a/app/server/lib/FlexServer.ts b/app/server/lib/FlexServer.ts
index a99fc160..72a55f13 100644
--- a/app/server/lib/FlexServer.ts
+++ b/app/server/lib/FlexServer.ts
@@ -5,6 +5,7 @@ import {encodeUrl, getSlugIfNeeded, GristDeploymentType, GristDeploymentTypes,
         GristLoadConfig, IGristUrlState, isOrgInPathOnly, parseSubdomain,
         sanitizePathTail} from 'app/common/gristUrls';
 import {getOrgUrlInfo} from 'app/common/gristUrls';
+import {InstallProperties} from 'app/common/InstallAPI';
 import {UserProfile} from 'app/common/LoginSessionAPI';
 import {tbind} from 'app/common/tbind';
 import * as version from 'app/common/version';
@@ -50,14 +51,15 @@ import {getAppPathTo, getAppRoot, getUnpackedAppRoot} from 'app/server/lib/place
 import {addPluginEndpoints, limitToPlugins} from 'app/server/lib/PluginEndpoint';
 import {PluginManager} from 'app/server/lib/PluginManager';
 import * as ProcessMonitor from 'app/server/lib/ProcessMonitor';
-import {adaptServerUrl, getOrgUrl, getOriginUrl, getScope, optStringParam,
-        RequestWithGristInfo, stringParam, TEST_HTTPS_OFFSET, trustOrigin} from 'app/server/lib/requestUtils';
+import {adaptServerUrl, getOrgUrl, getOriginUrl, getScope, isDefaultUser, optStringParam,
+        RequestWithGristInfo, sendOkReply, stringParam, TEST_HTTPS_OFFSET,
+        trustOrigin} from 'app/server/lib/requestUtils';
 import {ISendAppPageOptions, makeGristConfig, makeMessagePage, makeSendAppPage} from 'app/server/lib/sendAppPage';
 import {getDatabaseUrl, listenPromise} from 'app/server/lib/serverUtils';
 import {Sessions} from 'app/server/lib/Sessions';
 import * as shutdown from 'app/server/lib/shutdown';
 import {TagChecker} from 'app/server/lib/TagChecker';
-import {ITelemetry} from 'app/server/lib/Telemetry';
+import {getTelemetryPrefs, ITelemetry} from 'app/server/lib/Telemetry';
 import {startTestingHooks} from 'app/server/lib/TestingHooks';
 import {getTestLoginSystem} from 'app/server/lib/TestLogin';
 import {addUploadRoute} from 'app/server/lib/uploads';
@@ -706,11 +708,17 @@ export class FlexServer implements GristServer {
     });
   }
 
-  public addTelemetry() {
+  public async addTelemetry() {
     if (this._check('telemetry', 'homedb', 'json', 'api-mw')) { return; }
 
     this._telemetry = this.create.Telemetry(this._dbManager, this);
     this._telemetry.addEndpoints(this.app);
+    this._telemetry.addPages(this.app, [
+      this._redirectToHostMiddleware,
+      this._userIdMiddleware,
+      this._redirectToLoginWithoutExceptionsMiddleware,
+    ]);
+    await this._telemetry.start();
 
     // Start up a monitor for memory and cpu usage.
     this._processMonitorStop = ProcessMonitor.start(this._telemetry);
@@ -1124,7 +1132,11 @@ export class FlexServer implements GristServer {
     await this.loadConfig();
     this.addComm();
 
+    // Temporary duplication of external storage configuration.
+    // This may break https://github.com/gristlabs/grist-core/pull/546,
+    // but will revive other uses of external storage. TODO: reconcile.
     await this.create.configure?.();
+
     if (!isSingleUserMode()) {
       const externalStorage = appSettings.section('externalStorage');
       const haveExternalStorage = Object.values(externalStorage.nested)
@@ -1135,6 +1147,7 @@ export class FlexServer implements GristServer {
         this._disableExternalStorage = true;
         externalStorage.flag('active').set(false);
       }
+      await this.create.configure?.();
       const workers = this._docWorkerMap;
       const docWorkerId = await this._addSelfAsWorker(workers);
 
@@ -1198,7 +1211,7 @@ export class FlexServer implements GristServer {
     ];
 
     this.app.get('/account', ...middleware, expressWrap(async (req, resp) => {
-      return this._sendAppPage(req, resp, {path: 'account.html', status: 200, config: {}});
+      return this._sendAppPage(req, resp, {path: 'app.html', status: 200, config: {}});
     }));
   }
 
@@ -1460,6 +1473,43 @@ export class FlexServer implements GristServer {
     addGoogleAuthEndpoint(this.app, messagePage);
   }
 
+  public addInstallEndpoints() {
+    if (this._check('install')) { return; }
+
+    const isManager = expressWrap(
+      (req: express.Request, _res: express.Response, next: express.NextFunction) => {
+        if (!isDefaultUser(req)) { throw new ApiError('Access denied', 403); }
+
+        next();
+      }
+    );
+
+    this.app.get('/api/install/prefs', expressWrap(async (_req, resp) => {
+      const activation = await this._activations.current();
+
+      return sendOkReply(null, resp, {
+        telemetry: await getTelemetryPrefs(this._dbManager, activation),
+      });
+    }));
+
+    this.app.patch('/api/install/prefs', isManager, expressWrap(async (req, resp) => {
+      const props = {prefs: req.body};
+      const activation = await this._activations.current();
+      activation.checkProperties(props);
+      activation.updateFromProperties(props);
+      await activation.save();
+
+      if ((props as Partial<InstallProperties>).prefs?.telemetry) {
+        // Make sure the Telemetry singleton picks up the changes to telemetry preferences.
+        // TODO: if there are multiple home server instances, notify them all of changes to
+        // preferences (via Redis Pub/Sub).
+        await this._telemetry.fetchTelemetryPrefs();
+      }
+
+      return resp.status(200).send();
+    }));
+  }
+
   // Get the HTML template sent for document pages.
   public async getDocTemplate(): Promise<DocTemplate> {
     const page = await fse.readFile(path.join(getAppPathTo(this.appRoot, 'static'),
diff --git a/app/server/lib/GristServer.ts b/app/server/lib/GristServer.ts
index 643d622f..374b27c3 100644
--- a/app/server/lib/GristServer.ts
+++ b/app/server/lib/GristServer.ts
@@ -138,8 +138,11 @@ export function createDummyGristServer(): GristServer {
 
 export function createDummyTelemetry(): ITelemetry {
   return {
-    logEvent() { return Promise.resolve(); },
     addEndpoints() { /* do nothing */ },
-    getTelemetryLevel() { return 'off'; },
+    addPages() { /* do nothing */ },
+    start() { return Promise.resolve(); },
+    logEvent() { return Promise.resolve(); },
+    getTelemetryConfig() { return undefined; },
+    fetchTelemetryPrefs() { return Promise.resolve(); },
   };
 }
diff --git a/app/server/lib/ICreate.ts b/app/server/lib/ICreate.ts
index b49942fd..f876fa9c 100644
--- a/app/server/lib/ICreate.ts
+++ b/app/server/lib/ICreate.ts
@@ -50,6 +50,7 @@ export interface ICreateActiveDocOptions {
 export interface ICreateStorageOptions {
   name: string;
   check(): boolean;
+  checkBackend?(): Promise<void>;
   create(purpose: 'doc'|'meta', extraPrefix: string): ExternalStorage|undefined;
 }
 
@@ -119,7 +120,10 @@ export function makeSimpleCreator(opts: {
     },
     async configure() {
       for (const s of storage || []) {
-        if (s.check()) { break; }
+        if (s.check()) {
+          await s.checkBackend?.();
+          break;
+        }
       }
     },
     ...(opts.shell && {
diff --git a/app/server/lib/MinIOExternalStorage.ts b/app/server/lib/MinIOExternalStorage.ts
index dafa738a..fe70ea4b 100644
--- a/app/server/lib/MinIOExternalStorage.ts
+++ b/app/server/lib/MinIOExternalStorage.ts
@@ -107,6 +107,11 @@ export class MinIOExternalStorage implements ExternalStorage {
     }
   }
 
+  public async hasVersioning(): Promise<Boolean> {
+    const versioning = await this._s3.getBucketVersioning(this.bucket);
+    return versioning && versioning.Status === 'Enabled';
+  }
+
   public async versions(key: string, options?: { includeDeleteMarkers?: boolean }) {
     const results: minio.BucketItem[] = [];
     await new Promise((resolve, reject) => {
diff --git a/app/server/lib/Telemetry.ts b/app/server/lib/Telemetry.ts
index 4ab26d9a..44f7b571 100644
--- a/app/server/lib/Telemetry.ts
+++ b/app/server/lib/Telemetry.ts
@@ -1,8 +1,10 @@
 import {ApiError} from 'app/common/ApiError';
+import {TelemetryConfig} from 'app/common/gristUrls';
+import {assertIsDefined} from 'app/common/gutil';
 import {
   buildTelemetryEventChecker,
-  filterMetadata,
-  removeNullishKeys,
+  Level,
+  TelemetryContracts,
   TelemetryEvent,
   TelemetryEventChecker,
   TelemetryEvents,
@@ -11,18 +13,28 @@ import {
   TelemetryMetadata,
   TelemetryMetadataByLevel,
 } from 'app/common/Telemetry';
-import {HomeDBManager, HomeDBTelemetryEvents} from 'app/gen-server/lib/HomeDBManager';
+import {TelemetryPrefsWithSources} from 'app/common/InstallAPI';
+import {Activation} from 'app/gen-server/entity/Activation';
+import {Activations} from 'app/gen-server/lib/Activations';
+import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager';
 import {RequestWithLogin} from 'app/server/lib/Authorizer';
+import {expressWrap} from 'app/server/lib/expressWrap';
 import {GristServer} from 'app/server/lib/GristServer';
+import {hashId} from 'app/server/lib/hashingUtils';
 import {LogMethods} from 'app/server/lib/LogMethods';
 import {stringParam} from 'app/server/lib/requestUtils';
 import * as express from 'express';
+import fetch from 'node-fetch';
 import merge = require('lodash/merge');
+import pickBy = require('lodash/pickBy');
 
 export interface ITelemetry {
+  start(): Promise<void>;
   logEvent(name: TelemetryEvent, metadata?: TelemetryMetadataByLevel): Promise<void>;
   addEndpoints(app: express.Express): void;
-  getTelemetryLevel(): TelemetryLevel;
+  addPages(app: express.Express, middleware: express.RequestHandler[]): void;
+  getTelemetryConfig(): TelemetryConfig | undefined;
+  fetchTelemetryPrefs(): Promise<void>;
 }
 
 const MAX_PENDING_FORWARD_EVENT_REQUESTS = 25;
@@ -31,26 +43,30 @@ const MAX_PENDING_FORWARD_EVENT_REQUESTS = 25;
  * Manages telemetry for Grist.
  */
 export class Telemetry implements ITelemetry {
-  private _telemetryLevel: TelemetryLevel;
-  private _deploymentType = this._gristServer.getDeploymentType();
-  private _shouldForwardTelemetryEvents = this._deploymentType !== 'saas';
-  private _forwardTelemetryEventsUrl = process.env.GRIST_TELEMETRY_URL ||
-  'https://telemetry.getgrist.com/api/telemetry';
+  private _activation: Activation | undefined;
+  private readonly _deploymentType = this._gristServer.getDeploymentType();
+
+  private _telemetryPrefs: TelemetryPrefsWithSources | undefined;
+
+  private readonly _shouldForwardTelemetryEvents = this._deploymentType !== 'saas';
+  private readonly _forwardTelemetryEventsUrl = process.env.GRIST_TELEMETRY_URL ||
+    'https://telemetry.getgrist.com/api/telemetry';
   private _numPendingForwardEventRequests = 0;
 
-  private _installationId: string | undefined;
 
-  private _logger = new LogMethods('Telemetry ', () => ({}));
-  private _telemetryLogger = new LogMethods('Telemetry ', () => ({
+  private readonly _logger = new LogMethods('Telemetry ', () => ({}));
+  private readonly _telemetryLogger = new LogMethods('Telemetry ', () => ({
     eventType: 'telemetry',
   }));
 
-  private _checkEvent: TelemetryEventChecker | undefined;
+  private _checkTelemetryEvent: TelemetryEventChecker | undefined;
 
   constructor(private _dbManager: HomeDBManager, private _gristServer: GristServer) {
-    this._initialize().catch((e) => {
-      this._logger.error(undefined, 'failed to initialize', e);
-    });
+
+  }
+
+  public async start() {
+    await this.fetchTelemetryPrefs();
   }
 
   /**
@@ -96,19 +112,29 @@ export class Telemetry implements ITelemetry {
     event: TelemetryEvent,
     metadata?: TelemetryMetadataByLevel
   ) {
-    if (this._telemetryLevel === 'off') { return; }
+    if (!this._checkTelemetryEvent) {
+      this._logger.error(undefined, 'logEvent called but telemetry event checker is undefined');
+      return;
+    }
 
-    metadata = filterMetadata(metadata, this._telemetryLevel);
+    const prefs = this._telemetryPrefs;
+    if (!prefs) {
+      this._logger.error(undefined, 'logEvent called but telemetry preferences are undefined');
+      return;
+    }
+
+    const {telemetryLevel} = prefs;
+    if (TelemetryContracts[event] && TelemetryContracts[event].minimumTelemetryLevel > Level[telemetryLevel.value]) {
+      return;
+    }
+
+    metadata = filterMetadata(metadata, telemetryLevel.value);
     this._checkTelemetryEvent(event, metadata);
 
     if (this._shouldForwardTelemetryEvents) {
       await this._forwardEvent(event, metadata);
     } else {
-      this._telemetryLogger.rawLog('info', null, event, {
-        eventName: event,
-        eventSource: `grist-${this._deploymentType}`,
-        ...metadata,
-      });
+      this._logEvent(event, metadata);
     }
   }
 
@@ -125,7 +151,7 @@ export class Telemetry implements ITelemetry {
      * source. Otherwise, the event will only be logged after passing various
      * checks.
      */
-    app.post('/api/telemetry', async (req, resp) => {
+    app.post('/api/telemetry', expressWrap(async (req, resp) => {
       const mreq = req as RequestWithLogin;
       const event = stringParam(req.body.event, 'event', TelemetryEvents.values);
       if ('eventSource' in req.body.metadata) {
@@ -135,11 +161,12 @@ export class Telemetry implements ITelemetry {
         });
       } else {
         try {
+          this._assertTelemetryIsReady();
           await this.logEvent(event as TelemetryEvent, merge(
             {
               limited: {
                 eventSource: `grist-${this._deploymentType}`,
-                ...(this._deploymentType !== 'saas' ? {installationId: this._installationId} : {}),
+                ...(this._deploymentType !== 'saas' ? {installationId: this._activation!.id} : {}),
               },
               full: {
                 userId: mreq.userId,
@@ -154,38 +181,51 @@ export class Telemetry implements ITelemetry {
         }
       }
       return resp.status(200).send();
+    }));
+  }
+
+  public addPages(app: express.Application, middleware: express.RequestHandler[]) {
+    if (this._deploymentType === 'core') {
+      app.get('/support-grist', ...middleware, expressWrap(async (req, resp) => {
+        return this._gristServer.sendAppPage(req, resp,
+          {path: 'app.html', status: 200, config: {}});
+      }));
+    }
+  }
+
+  public getTelemetryConfig(): TelemetryConfig | undefined {
+    const prefs = this._telemetryPrefs;
+    if (!prefs) {
+      this._logger.error(undefined, 'getTelemetryConfig called but telemetry preferences are undefined');
+      return undefined;
+    }
+
+    return {
+      telemetryLevel: prefs.telemetryLevel.value,
+    };
+  }
+
+  public async fetchTelemetryPrefs() {
+    this._activation = await this._gristServer.getActivations().current();
+    await this._fetchTelemetryPrefs();
+  }
+
+  private async _fetchTelemetryPrefs() {
+    this._telemetryPrefs = await getTelemetryPrefs(this._dbManager, this._activation);
+    this._checkTelemetryEvent = buildTelemetryEventChecker(this._telemetryPrefs.telemetryLevel.value);
+  }
+
+  private _logEvent(
+    event: TelemetryEvent,
+    metadata?: TelemetryMetadata
+  ) {
+    this._telemetryLogger.rawLog('info', null, event, {
+      eventName: event,
+      eventSource: `grist-${this._deploymentType}`,
+      ...metadata,
     });
   }
 
-  public getTelemetryLevel() {
-    return this._telemetryLevel;
-  }
-
-  private async _initialize() {
-    this._telemetryLevel = getTelemetryLevel();
-    if (process.env.GRIST_TELEMETRY_LEVEL !== undefined) {
-      this._checkTelemetryEvent = buildTelemetryEventChecker(this._telemetryLevel);
-    }
-
-    const {id} = await this._gristServer.getActivations().current();
-    this._installationId = id;
-
-    for (const event of HomeDBTelemetryEvents.values) {
-      this._dbManager.on(event, async (metadata) => {
-        this.logEvent(event, metadata).catch(e =>
-          this._logger.error(undefined, `failed to log telemetry event ${event}`, e));
-      });
-    }
-  }
-
-  private _checkTelemetryEvent(event: TelemetryEvent, metadata?: TelemetryMetadata) {
-    if (!this._checkEvent) {
-      throw new Error('Telemetry._checkEvent is undefined');
-    }
-
-    this._checkEvent(event, metadata);
-  }
-
   private async _forwardEvent(
     event: TelemetryEvent,
     metadata?: TelemetryMetadata
@@ -198,7 +238,7 @@ export class Telemetry implements ITelemetry {
 
     try {
       this._numPendingForwardEventRequests += 1;
-      await this._postJsonPayload(JSON.stringify({event, metadata}));
+      await this._doForwardEvent(JSON.stringify({event, metadata}));
     } catch (e) {
       this._logger.error(undefined, `failed to forward telemetry event ${event}`, e);
     } finally {
@@ -206,7 +246,7 @@ export class Telemetry implements ITelemetry {
     }
   }
 
-  private async _postJsonPayload(payload: string) {
+  private async _doForwardEvent(payload: string) {
     await fetch(this._forwardTelemetryEventsUrl, {
       method: 'POST',
       headers: {
@@ -215,12 +255,90 @@ export class Telemetry implements ITelemetry {
       body: payload,
     });
   }
-}
 
-export function getTelemetryLevel(): TelemetryLevel {
-  if (process.env.GRIST_TELEMETRY_LEVEL !== undefined) {
-    return TelemetryLevels.check(process.env.GRIST_TELEMETRY_LEVEL);
-  } else {
-    return 'off';
+  private _assertTelemetryIsReady() {
+    try {
+      assertIsDefined('activation', this._activation);
+    } catch (e) {
+      this._logger.error(null, 'activation is undefined', e);
+      throw new ApiError('Telemetry is not ready', 500);
+    }
   }
 }
+
+export async function getTelemetryPrefs(
+  db: HomeDBManager,
+  activation?: Activation
+): Promise<TelemetryPrefsWithSources> {
+  const GRIST_TELEMETRY_LEVEL = process.env.GRIST_TELEMETRY_LEVEL;
+  if (GRIST_TELEMETRY_LEVEL !== undefined) {
+    const value = TelemetryLevels.check(GRIST_TELEMETRY_LEVEL);
+    return {
+      telemetryLevel: {
+        value,
+        source: 'environment-variable',
+      },
+    };
+  }
+
+  const {prefs} = activation ?? await new Activations(db).current();
+  return {
+    telemetryLevel: {
+      value: prefs?.telemetry?.telemetryLevel ?? 'off',
+      source: 'preferences',
+    }
+  };
+}
+
+/**
+ * Returns a new, filtered metadata object, or undefined if `metadata` is undefined.
+ *
+ * Filtering currently:
+ *  - removes keys in groups that exceed `telemetryLevel`
+ *  - removes keys with values of null or undefined
+ *  - hashes the values of keys suffixed with "Digest" (e.g. doc ids, fork ids)
+ *  - flattens the entire metadata object (i.e. removes the nesting of keys under
+ *    "limited" or "full")
+ */
+export function filterMetadata(
+  metadata: TelemetryMetadataByLevel | undefined,
+  telemetryLevel: TelemetryLevel
+): TelemetryMetadata | undefined {
+  if (!metadata) { return; }
+
+  let filteredMetadata: TelemetryMetadata = {};
+  for (const level of ['limited', 'full'] as const) {
+    if (Level[telemetryLevel] < Level[level]) { break; }
+
+    filteredMetadata = {...filteredMetadata, ...metadata[level]};
+  }
+
+  filteredMetadata = removeNullishKeys(filteredMetadata);
+  filteredMetadata = hashDigestKeys(filteredMetadata);
+
+  return filteredMetadata;
+}
+
+/**
+ * Returns a copy of `object` with all null and undefined keys removed.
+ */
+export function removeNullishKeys(object: Record<string, any>) {
+  return pickBy(object, value => value !== null && value !== undefined);
+}
+
+/**
+ * Returns a copy of `metadata`, replacing the values of all keys suffixed
+ * with "Digest" with the result of hashing the value. The hash is prefixed with
+ * the first 4 characters of the original value, to assist with troubleshooting.
+ */
+export function hashDigestKeys(metadata: TelemetryMetadata): TelemetryMetadata {
+  const filteredMetadata: TelemetryMetadata = {};
+  Object.entries(metadata).forEach(([key, value]) => {
+    if (key.endsWith('Digest') && typeof value === 'string') {
+      filteredMetadata[key] = hashId(value);
+    } else {
+      filteredMetadata[key] = value;
+    }
+  });
+  return filteredMetadata;
+}
diff --git a/app/server/lib/configureMinIOExternalStorage.ts b/app/server/lib/configureMinIOExternalStorage.ts
index c34a4755..2cac4d2c 100644
--- a/app/server/lib/configureMinIOExternalStorage.ts
+++ b/app/server/lib/configureMinIOExternalStorage.ts
@@ -60,3 +60,16 @@ export function checkMinIOExternalStorage() {
     region
   };
 }
+
+export async function checkMinIOBucket() {
+  const options = checkMinIOExternalStorage();
+  if (!options) {
+    throw new Error('Configuration check failed for MinIO backend storage.');
+  }
+
+  const externalStorage = new MinIOExternalStorage(options.bucket, options);
+  if (!await externalStorage.hasVersioning()) {
+    await externalStorage.close();
+    throw new Error(`FATAL: the MinIO bucket "${options.bucket}" does not have versioning enabled`);
+  }
+}
diff --git a/app/common/hashingUtils.ts b/app/server/lib/hashingUtils.ts
similarity index 70%
rename from app/common/hashingUtils.ts
rename to app/server/lib/hashingUtils.ts
index 91d2199d..31e7cef1 100644
--- a/app/common/hashingUtils.ts
+++ b/app/server/lib/hashingUtils.ts
@@ -1,11 +1,11 @@
 import {createHash} from 'crypto';
 
 /**
- * Returns a hash of `id` prefixed with the first 4 characters of `id`.
+ * Returns a hash of `id` prefixed with the first 4 characters of `id`. The first 4
+ * characters are included to assist with troubleshooting.
  *
  * Useful for situations where potentially sensitive identifiers are logged, such as
- * doc ids (like those that have public link sharing enabled). The first 4 characters
- * are included to assist with troubleshooting.
+ * doc ids of docs that have public link sharing enabled.
  */
 export function hashId(id: string): string {
   return `${id.slice(0, 4)}:${createHash('sha256').update(id.slice(4)).digest('base64')}`;
diff --git a/app/server/lib/requestUtils.ts b/app/server/lib/requestUtils.ts
index 522de9d1..96a29234 100644
--- a/app/server/lib/requestUtils.ts
+++ b/app/server/lib/requestUtils.ts
@@ -2,7 +2,7 @@ import {ApiError} from 'app/common/ApiError';
 import {DEFAULT_HOME_SUBDOMAIN, isOrgInPathOnly, parseSubdomain, sanitizePathTail} from 'app/common/gristUrls';
 import * as gutil from 'app/common/gutil';
 import {DocScope, QueryResult, Scope} from 'app/gen-server/lib/HomeDBManager';
-import {getUserId, RequestWithLogin} from 'app/server/lib/Authorizer';
+import {getUser, getUserId, RequestWithLogin} from 'app/server/lib/Authorizer';
 import {RequestWithOrg} from 'app/server/lib/extractOrg';
 import {RequestWithGrist} from 'app/server/lib/GristServer';
 import log from 'app/server/lib/log';
@@ -352,3 +352,9 @@ export function addAbortHandler(req: Request, res: Writable, op: () => void) {
     }
   });
 }
+
+export function isDefaultUser(req: Request) {
+  const defaultEmail = process.env.GRIST_DEFAULT_EMAIL;
+  const {loginEmail} = getUser(req);
+  return defaultEmail && defaultEmail === loginEmail;
+}
diff --git a/app/server/lib/sendAppPage.ts b/app/server/lib/sendAppPage.ts
index 15b06495..46d50031 100644
--- a/app/server/lib/sendAppPage.ts
+++ b/app/server/lib/sendAppPage.ts
@@ -76,7 +76,7 @@ export function makeGristConfig(options: MakeGristConfigOptons): GristLoadConfig
     featureFormulaAssistant: isAffirmative(process.env.GRIST_FORMULA_ASSISTANT),
     supportEmail: SUPPORT_EMAIL,
     userLocale: (req as RequestWithLogin | undefined)?.user?.options?.locale,
-    telemetry: server ? getTelemetryConfig(server) : undefined,
+    telemetry: server?.getTelemetry().getTelemetryConfig(),
     deploymentType: server?.getDeploymentType(),
     ...extra,
   };
@@ -163,13 +163,6 @@ function getFeatures(): IFeature[] {
   return Features.checkAll(difference(enabledFeatures, disabledFeatures));
 }
 
-function getTelemetryConfig(server: GristServer) {
-  const telemetry = server.getTelemetry();
-  return {
-    telemetryLevel: telemetry.getTelemetryLevel(),
-  };
-}
-
 function configuredPageTitleSuffix() {
   const result = process.env.GRIST_PAGE_TITLE_SUFFIX;
   return result === "_blank" ? "" : result;
diff --git a/app/server/mergedServerMain.ts b/app/server/mergedServerMain.ts
index c4dddc52..6b640542 100644
--- a/app/server/mergedServerMain.ts
+++ b/app/server/mergedServerMain.ts
@@ -106,44 +106,50 @@ export async function main(port: number, serverTypes: ServerType[],
   server.addApiMiddleware();
   await server.addBillingMiddleware();
 
-  await server.start();
+  try {
+    await server.start();
 
-  if (includeHome) {
-    server.addUsage();
-    if (!includeDocs) {
-      server.addDocApiForwarder();
+    if (includeHome) {
+      server.addUsage();
+      if (!includeDocs) {
+        server.addDocApiForwarder();
+      }
+      server.addJsonSupport();
+      await server.addLandingPages();
+      // todo: add support for home api to standalone app
+      server.addHomeApi();
+      server.addBillingApi();
+      server.addNotifier();
+      await server.addTelemetry();
+      await server.addHousekeeper();
+      await server.addLoginRoutes();
+      server.addAccountPage();
+      server.addBillingPages();
+      server.addWelcomePaths();
+      server.addLogEndpoint();
+      server.addGoogleAuthEndpoint();
+      server.addInstallEndpoints();
     }
-    server.addJsonSupport();
-    await server.addLandingPages();
-    // todo: add support for home api to standalone app
-    server.addHomeApi();
-    server.addBillingApi();
-    server.addNotifier();
-    server.addTelemetry();
-    await server.addHousekeeper();
-    await server.addLoginRoutes();
-    server.addAccountPage();
-    server.addBillingPages();
-    server.addWelcomePaths();
-    server.addLogEndpoint();
-    server.addGoogleAuthEndpoint();
+
+    if (includeDocs) {
+      server.addJsonSupport();
+      await server.addTelemetry();
+      await server.addDoc();
+    }
+
+    if (includeHome) {
+      server.addClientSecrets();
+    }
+
+    server.finalize();
+
+    server.checkOptionCombinations();
+    server.summary();
+    return server;
+  } catch(e) {
+    await server.close();
+    throw e;
   }
-
-  if (includeDocs) {
-    server.addJsonSupport();
-    server.addTelemetry();
-    await server.addDoc();
-  }
-
-  if (includeHome) {
-    server.addClientSecrets();
-  }
-
-  server.finalize();
-
-  server.checkOptionCombinations();
-  server.summary();
-  return server;
 }
 
 
diff --git a/buildtools/webpack.config.js b/buildtools/webpack.config.js
index 9e35f6a7..5f87c794 100644
--- a/buildtools/webpack.config.js
+++ b/buildtools/webpack.config.js
@@ -1,3 +1,4 @@
+const fs = require('fs');
 const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
 const { ProvidePlugin } = require('webpack');
 const path = require('path');
@@ -12,10 +13,12 @@ module.exports = {
   entry: {
     main: "app/client/app",
     errorPages: "app/client/errorMain",
-    account: "app/client/accountMain",
     billing: "app/client/billingMain",
-    activation: "app/client/activationMain",
-    test: "test/client-harness/client",
+    // Include client test harness if it is present (it won't be in
+    // docker image).
+    ...(fs.existsSync("test/client-harness/client.js") ? {
+      test: "test/client-harness/client",
+    } : {}),
   },
   output: {
     filename: "[name].bundle.js",
diff --git a/documentation/llm.md b/documentation/llm.md
index 3a6b880d..2042ba1c 100644
--- a/documentation/llm.md
+++ b/documentation/llm.md
@@ -1,35 +1,35 @@
 # Using Large Language Models with Grist
 
 In this experimental Grist feature, originally developed by Alex Hall,
-you can hook up an AI model such as OpenAI's Codex to write formulas for
+you can hook up OpenAI's ChatGPT to write formulas for
 you. Here's how.
 
-First, you need an API key. You'll have best results currently with an
-OpenAI model. Visit https://openai.com/api/ and prepare a key, then
+First, you need an API key. Visit https://openai.com/api/ and prepare a key, then
 store it in an environment variable `OPENAI_API_KEY`.
 
-Alternatively, there are many non-proprietary models hosted on Hugging Face.
-At the time of writing, none can compare with OpenAI for use with Grist.
-Things can change quickly in the world of AI though. So instead of OpenAI,
-you can visit https://huggingface.co/ and prepare a key, then
-store it in an environment variable `HUGGINGFACE_API_KEY`.
-
 That's all the configuration needed!
 
 Currently it is only a backend feature, we are still working on the UI for it.
 
-## Trying other models
+## Hugging Face and other OpenAI models (deactivated)
 
-The model used will default to `text-davinci-002` for OpenAI. You can
-get better results by setting an environment variable `COMPLETION_MODEL` to
-`code-davinci-002` if you have access to that model.
+_Not currently available, needs some work to revive. These notes are only preserved as a reminder to ourselves of how this worked._
 
-The model used will default to `NovelAI/genji-python-6B` for
+~~To use a different OpenAI model such as `code-davinci-002` or `text-davinci-003`,
+set the environment variable `COMPLETION_MODEL` to the name of the model.~~
+
+~~Alternatively, there are many non-proprietary models hosted on Hugging Face.
+At the time of writing, none can compare with OpenAI for use with Grist.
+Things can change quickly in the world of AI though. So instead of OpenAI,
+you can visit https://huggingface.co/ and prepare a key, then
+store it in an environment variable `HUGGINGFACE_API_KEY`.~~
+
+~~The model used will default to `NovelAI/genji-python-6B` for
 Hugging Face. There's no particularly great model for this application,
 but you can try other models by setting an environment variable
 `COMPLETION_MODEL` to `codeparrot/codeparrot` or
-`NinedayWang/PolyCoder-2.7B` or similar.
+`NinedayWang/PolyCoder-2.7B` or similar.~~
 
-If you are hosting a model yourself, host it as Hugging Face does,
+~~If you are hosting a model yourself, host it as Hugging Face does,
 and use `COMPLETION_URL` rather than `COMPLETION_MODEL` to
-point to the model on your own server rather than Hugging Face.
+point to the model on your own server rather than Hugging Face.~~
diff --git a/package.json b/package.json
index f0c5f83b..c104212d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grist-core",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": "Apache-2.0",
   "description": "Grist is the evolution of spreadsheets",
   "homepage": "https://github.com/gristlabs/grist-core",
@@ -13,8 +13,8 @@
     "install:python3": "buildtools/prepare_python3.sh",
     "build:prod": "buildtools/build.sh",
     "start:prod": "sandbox/run.sh",
-    "test": "GRIST_SESSION_COOKIE=grist_test_cookie GRIST_TEST_LOGIN=1 TEST_SUPPORT_API_KEY=api_key_for_support TEST_CLEAN_DATABASE=true mocha ${DEBUG:+-b --no-exit} --slow 8000 ${DEBUG:---forbid-only} -g \"${GREP_TESTS}\" '_build/test/common/*.js' '_build/test/client/*.js' '_build/test/nbrowser/*.js' '_build/test/server/**/*.js' '_build/test/gen-server/**/*.js'",
-    "test:nbrowser": "TEST_SUITE=nbrowser TEST_SUITE_FOR_TIMINGS=nbrowser TIMINGS_FILE=test/timings/nbrowser.txt GRIST_SESSION_COOKIE=grist_test_cookie GRIST_TEST_LOGIN=1 TEST_SUPPORT_API_KEY=api_key_for_support TEST_CLEAN_DATABASE=true mocha ${DEBUG:+-b --no-exit} ${DEBUG:---forbid-only} -g \"${GREP_TESTS}\" --slow 8000 -R test/xunit-file '_build/test/nbrowser/**/*.js'",
+    "test": "GRIST_SESSION_COOKIE=grist_test_cookie GRIST_TEST_LOGIN=1 TEST_SUPPORT_API_KEY=api_key_for_support TEST_CLEAN_DATABASE=true mocha ${DEBUG:+-b --no-exit} --slow 8000 $([ -z $DEBUG ] && echo --forbid-only) -g \"${GREP_TESTS}\" '_build/test/common/*.js' '_build/test/client/*.js' '_build/test/nbrowser/*.js' '_build/test/server/**/*.js' '_build/test/gen-server/**/*.js'",
+    "test:nbrowser": "TEST_SUITE=nbrowser TEST_SUITE_FOR_TIMINGS=nbrowser TIMINGS_FILE=test/timings/nbrowser.txt GRIST_SESSION_COOKIE=grist_test_cookie GRIST_TEST_LOGIN=1 TEST_SUPPORT_API_KEY=api_key_for_support TEST_CLEAN_DATABASE=true mocha ${DEBUG:+-b --no-exit} $([ -z $DEBUG ] && echo --forbid-only) -g \"${GREP_TESTS}\" --slow 8000 -R test/xunit-file '_build/test/nbrowser/**/*.js'",
     "test:client": "GRIST_SESSION_COOKIE=grist_test_cookie mocha ${DEBUG:+'-b'} '_build/test/client/**/*.js'",
     "test:common": "GRIST_SESSION_COOKIE=grist_test_cookie mocha ${DEBUG:+'-b'} '_build/test/common/**/*.js'",
     "test:server": "TEST_SUITE=server TEST_SUITE_FOR_TIMINGS=server TIMINGS_FILE=test/timings/server.txt GRIST_SESSION_COOKIE=grist_test_cookie mocha ${DEBUG:+'-b'} -R test/xunit-file '_build/test/server/**/*.js' '_build/test/gen-server/**/*.js'",
@@ -190,11 +190,13 @@
     "@gristlabs/sqlite3": "5.1.4-grist.8"
   },
   "mocha": {
-    "require": ["test/setupPaths",
-                "source-map-support/register",
-                "test/report-why-tests-hang",
-                "test/init-mocha-webdriver",
-                "test/split-tests",
-                "test/chai-as-promised"]
+    "require": [
+      "test/setupPaths",
+      "source-map-support/register",
+      "test/report-why-tests-hang",
+      "test/init-mocha-webdriver",
+      "test/split-tests",
+      "test/chai-as-promised"
+    ]
   }
 }
diff --git a/sandbox/grist/formula_prompt.py b/sandbox/grist/formula_prompt.py
index ba01963f..c3125135 100644
--- a/sandbox/grist/formula_prompt.py
+++ b/sandbox/grist/formula_prompt.py
@@ -150,7 +150,7 @@ def class_schema(engine, table_id, exclude_col_id=None, lookups=False):
   return result
 
 
-def get_formula_prompt(engine, table_id, col_id, description,
+def get_formula_prompt(engine, table_id, col_id, _description,
                        include_all_tables=True,
                        lookups=True):
   result = ""
@@ -165,9 +165,7 @@ def get_formula_prompt(engine, table_id, col_id, description,
   result += "    @property\n"
   result += "    # rec is alias for self\n"
   result += "    def {}(rec) -> {}:\n".format(col_id, return_type)
-  result += '        """\n'
-  result += '{}\n'.format(indent(description, "        "))
-  result += '        """\n'
+  result += "        # Please fill in code only after this line, not the `def`\n"
   return result
 
 def indent(text, prefix, predicate=None):
diff --git a/sandbox/grist/test_formula_prompt.py b/sandbox/grist/test_formula_prompt.py
index d03752d4..9ddefc03 100644
--- a/sandbox/grist/test_formula_prompt.py
+++ b/sandbox/grist/test_formula_prompt.py
@@ -151,9 +151,7 @@ class Table2:
     @property
     # rec is alias for self
     def new_formula(rec) -> float:
-        """
-        description here
-        """
+        # Please fill in code only after this line, not the `def`
 ''')
 
   def test_get_formula_prompt(self):
@@ -183,9 +181,7 @@ class Table1:
     @property
     # rec is alias for self
     def text(rec) -> str:
-        """
-        description here
-        """
+        # Please fill in code only after this line, not the `def`
 ''')
 
     self.assert_prompt("Table2", "ref", '''\
@@ -199,9 +195,7 @@ class Table2:
     @property
     # rec is alias for self
     def ref(rec) -> Table1:
-        """
-        description here
-        """
+        # Please fill in code only after this line, not the `def`
 ''')
 
     self.assert_prompt("Table3", "reflist", '''\
@@ -219,9 +213,7 @@ class Table3:
     @property
     # rec is alias for self
     def reflist(rec) -> List[Table2]:
-        """
-        description here
-        """
+        # Please fill in code only after this line, not the `def`
 ''')
 
   def test_convert_completion(self):
diff --git a/static/account.html b/static/account.html
deleted file mode 100644
index 2fd44b28..00000000
--- a/static/account.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <meta charset="utf8">
-  <!-- INSERT BASE -->
-  <link rel="icon" type="image/x-icon" href="icons/favicon.png" />
-  <link rel="stylesheet" href="icons/icons.css">
-  <!-- INSERT LOCALE -->
-  <!-- INSERT CONFIG -->
-  <!-- INSERT CUSTOM -->
-  <title>Account<!-- INSERT TITLE SUFFIX --></title>
-</head>
-<body>
-  <script src="account.bundle.js"></script>
-</body>
-</html>
diff --git a/static/activation.html b/static/activation.html
deleted file mode 100644
index 0a0378df..00000000
--- a/static/activation.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <meta charset="utf8">
-  <!-- INSERT BASE -->
-  <link rel="icon" type="image/x-icon" href="icons/favicon.png" />
-  <link rel="stylesheet" href="icons/icons.css">
-  <!-- INSERT LOCALE -->
-  <!-- INSERT CUSTOM -->
-  <title>Activation<!-- INSERT TITLE SUFFIX --></title>
-</head>
-<body>
-  <!-- INSERT ERROR -->
-  <!-- INSERT CONFIG -->
-  <script src="activation.bundle.js"></script>
-</body>
-</html>
diff --git a/static/icons/icons.css b/static/icons/icons.css
index f998d832..0c9d2f81 100644
--- a/static/icons/icons.css
+++ b/static/icons/icons.css
@@ -73,6 +73,7 @@
   --icon-FunctionResult: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTQsMiBMMTIsMiBDMTMuMTA0NTY5NSwyIDE0LDIuODk1NDMwNSAxNCw0IEwxNCwxMiBDMTQsMTMuMTA0NTY5NSAxMy4xMDQ1Njk1LDE0IDEyLDE0IEw0LDE0IEMyLjg5NTQzMDUsMTQgMiwxMy4xMDQ1Njk1IDIsMTIgTDIsNCBDMiwyLjg5NTQzMDUgMi44OTU0MzA1LDIgNCwyIFogTTQuNSw2IEM0LjIyMzg1NzYzLDYgNCw2LjIyMzg1NzYzIDQsNi41IEM0LDYuNzc2MTQyMzcgNC4yMjM4NTc2Myw3IDQuNSw3IEwxMS41LDcgQzExLjc3NjE0MjQsNyAxMiw2Ljc3NjE0MjM3IDEyLDYuNSBDMTIsNi4yMjM4NTc2MyAxMS43NzYxNDI0LDYgMTEuNSw2IEw0LjUsNiBaIE00LjUsOSBDNC4yMjM4NTc2Myw5IDQsOS4yMjM4NTc2MyA0LDkuNSBDNCw5Ljc3NjE0MjM3IDQuMjIzODU3NjMsMTAgNC41LDEwIEwxMS41LDEwIEMxMS43NzYxNDI0LDEwIDEyLDkuNzc2MTQyMzcgMTIsOS41IEMxMiw5LjIyMzg1NzYzIDExLjc3NjE0MjQsOSAxMS41LDkgTDQuNSw5IFoiIGZpbGw9IiMwMDAiIGZpbGwtcnVsZT0ibm9uemVybyIvPjwvc3ZnPg==');
   --icon-GreenArrow: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iOTQiIGhlaWdodD0iMTIiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTk0IDZMODQgMC4yMjY0OTdWMTEuNzczNUw5NCA2Wk0wIDdINC43VjVIMFY3Wk0xNC4xIDdIMjMuNVY1SDE0LjFWN1pNMzIuOSA3SDQyLjNWNUgzMi45VjdaTTUxLjcgN0g2MS4xVjVINTEuN1Y3Wk03MC41IDdINzkuOVY1SDcwLjVWN1oiIGZpbGw9IiMxNkIzNzgiLz48L3N2Zz4=');
   --icon-Grow: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTEuNSAxLjVMNi41IDYuNU05LjUgOS41TDE0LjUgMTQuNU03LjUgMS41SDEuNVY3LjVNMTQuNSA4LjVWMTQuNUg4LjUiIHN0cm9rZT0iIzkyOTI5OSIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz48L3N2Zz4=');
+  --icon-Heart: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTciIGhlaWdodD0iMTciIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwXzg0Nl8xNTQxOSkiPjxwYXRoIGQ9Ik03LjY4NTY0IDE1Ljk5OUM2Ljg4NTY0IDE1LjI5OSAwLjI4NTY0NSA5Ljc5OTAxIDAuMjg1NjQ1IDUuNTk5MDFDMC4yODU2NDUgMi44OTkwMSAyLjQ4NTY0IDAuNzk5MDExIDUuMDg1NjQgMC43OTkwMTFDNi4yODU2NCAwLjc5OTAxMSA3LjM4NTY0IDEuMjk5MDEgOC4yODU2NCAxLjk5OTAxQzkuMTg1NjQgMS4xOTkwMSAxMC4yODU2IDAuNzk5MDExIDExLjQ4NTYgMC43OTkwMTFDMTQuMTg1NiAwLjc5OTAxMSAxNi4yODU2IDIuOTk5MDEgMTYuMjg1NiA1LjU5OTAxQzE2LjI4NTYgOS43OTkwMSA5LjY4NTY1IDE1LjI5OSA4Ljg4NTY0IDE1Ljg5OUM4LjU4NTY0IDE2LjI5OSA3Ljk4NTY0IDE2LjI5OSA3LjY4NTY0IDE1Ljk5OVpNNS4wODU2NCAyLjc5OTAxQzMuNTg1NjQgMi43OTkwMSAyLjI4NTY0IDQuMDk5MDEgMi4yODU2NCA1LjU5OTAxQzIuMjg1NjQgNy43OTkwMSA1Ljc4NTY0IDExLjU5OSA4LjI4NTY0IDEzLjc5OUMxMC4zODU2IDExLjg5OSAxNC4yODU2IDcuOTk5MDEgMTQuMjg1NiA1LjU5OTAxQzE0LjI4NTYgMy45OTkwMSAxMi45ODU2IDIuNzk5MDEgMTEuNDg1NiAyLjc5OTAxQzEwLjU4NTYgMi43OTkwMSA5LjY4NTY0IDMuMjk5MDEgOS4xODU2NCA0LjA5OTAxQzguNzg1NjQgNC42OTkwMSA3Ljg4NTY0IDQuNjk5MDEgNy40ODU2NCA0LjA5OTAxQzYuODg1NjQgMy4yOTkwMSA2LjA4NTY0IDIuNzk5MDEgNS4wODU2NCAyLjc5OTAxWiIgZmlsbD0iIzE2QjM3OCIvPjwvZz48ZGVmcz48Y2xpcFBhdGggaWQ9ImNsaXAwXzg0Nl8xNTQxOSI+PHBhdGggZmlsbD0iI2ZmZiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLjI4NiAuNDk5KSIgZD0iTTAgMEgxNlYxNkgweiIvPjwvY2xpcFBhdGg+PC9kZWZzPjwvc3ZnPg==');
   --icon-Help: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIuNzA5MjY0NDMsMy40MTYzNzEyMSBDMS42NDQ0MDc2OSw0LjY0NDQzMjIyIDEsNi4yNDY5NjEzNyAxLDggQzEsOS43NTMwMzg2MyAxLjY0NDQwNzY5LDExLjM1NTU2NzggMi43MDkyNjQ0MywxMi41ODM2Mjg4IEw0Ljg0MDA3MTI5LDEwLjQ1MjgyMTkgQzQuMzEzNTQwOCw5Ljc3NTQ4MDA3IDQsOC45MjQzNTU3MyA0LDggQzQsNy4wNzU2NDQyNyA0LjMxMzU0MDgsNi4yMjQ1MTk5MyA0Ljg0MDA3MTI5LDUuNTQ3MTc4MDcgTDIuNzA5MjY0NDMsMy40MTYzNzEyMSBaIE0zLjQxNjM3MTIxLDIuNzA5MjY0NDMgTDUuNTQ3MTc4MDcsNC44NDAwNzEyOSBDNi4yMjQ1MTk5Myw0LjMxMzU0MDggNy4wNzU2NDQyNyw0IDgsNCBDOC45MjQzNTU3Myw0IDkuNzc1NDgwMDcsNC4zMTM1NDA4IDEwLjQ1MjgyMTksNC44NDAwNzEyOSBMMTIuNTgzNjI4OCwyLjcwOTI2NDQzIEMxMS4zNTU1Njc4LDEuNjQ0NDA3NjkgOS43NTMwMzg2MywxIDgsMSBDNi4yNDY5NjEzNywxIDQuNjQ0NDMyMjIsMS42NDQ0MDc2OSAzLjQxNjM3MTIxLDIuNzA5MjY0NDMgWiBNNS45MDE5ODczMSw1Ljg1NTYyMzc2IEM1Ljg5NDgyMDAxLDUuODYzNzgzMDcgNS44ODczNDIwNCw1Ljg3MTc2NDc0IDUuODc5NTUzMzksNS44Nzk1NTMzOSBDNS44NzE3NjQ3NCw1Ljg4NzM0MjA0IDUuODYzNzgzMDcsNS44OTQ4MjAwMSA1Ljg1NTYyMzc2LDUuOTAxOTg3MzEgQzUuMzI2Mjk1NSw2LjQ0MjkzOTMyIDUsNy4xODMzNjQ0NiA1LDggQzUsOC44MTY2MzU1NCA1LjMyNjI5NTUsOS41NTcwNjA2OCA1Ljg1NTYyMzc2LDEwLjA5ODAxMjcgQzUuODYzNzgzMDcsMTAuMTA1MTggNS44NzE3NjQ3NCwxMC4xMTI2NTggNS44Nzk1NTMzOSwxMC4xMjA0NDY2IEM1Ljg4NzM0MjA0LDEwLjEyODIzNTMgNS44OTQ4MjAwMSwxMC4xMzYyMTY5IDUuOTAxOTg3MzEsMTAuMTQ0Mzc2MiBDNi40NDI5MzkzMiwxMC42NzM3MDQ1IDcuMTgzMzY0NDYsMTEgOCwxMSBDOC44MTY2MzU1NCwxMSA5LjU1NzA2MDY4LDEwLjY3MzcwNDUgMTAuMDk4MDEyNywxMC4xNDQzNzYyIEMxMC4xMDUxOCwxMC4xMzYyMTY5IDEwLjExMjY1OCwxMC4xMjgyMzUzIDEwLjEyMDQ0NjYsMTAuMTIwNDQ2NiBDMTAuMTI4MjM1MywxMC4xMTI2NTggMTAuMTM2MjE2OSwxMC4xMDUxOCAxMC4xNDQzNzYyLDEwLjA5ODAxMjcgQzEwLjY3MzcwNDUsOS41NTcwNjA2OCAxMSw4LjgxNjYzNTU0IDExLDggQzExLDcuMTgzMzY0NDYgMTAuNjczNzA0NSw2LjQ0MjkzOTMyIDEwLjE0NDM3NjIsNS45MDE5ODczMSBDMTAuMTM2MjE2OSw1Ljg5NDgyMDAxIDEwLjEyODIzNTMsNS44ODczNDIwNCAxMC4xMjA0NDY2LDUuODc5NTUzMzkgQzEwLjExMjY1OCw1Ljg3MTc2NDc0IDEwLjEwNTE4LDUuODYzNzgzMDcgMTAuMDk4MDEyNyw1Ljg1NTYyMzc2IEM5LjU1NzA2MDY4LDUuMzI2Mjk1NSA4LjgxNjYzNTU0LDUgOCw1IEM3LjE4MzM2NDQ2LDUgNi40NDI5MzkzMiw1LjMyNjI5NTUgNS45MDE5ODczMSw1Ljg1NTYyMzc2IFogTTMuNDE2MzcxMjEsMTMuMjkwNzM1NiBDNC42NDQ0MzIyMiwxNC4zNTU1OTIzIDYuMjQ2OTYxMzcsMTUgOCwxNSBDOS43NTMwMzg2MywxNSAxMS4zNTU1Njc4LDE0LjM1NTU5MjMgMTIuNTgzNjI4OCwxMy4yOTA3MzU2IEwxMC40NTI4MjE5LDExLjE1OTkyODcgQzkuNzc1NDgwMDcsMTEuNjg2NDU5MiA4LjkyNDM1NTczLDEyIDgsMTIgQzcuMDc1NjQ0MjcsMTIgNi4yMjQ1MTk5MywxMS42ODY0NTkyIDUuNTQ3MTc4MDcsMTEuMTU5OTI4NyBMMy40MTYzNzEyMSwxMy4yOTA3MzU2IFogTTEzLjI5MDczNTYsMTIuNTgzNjI4OCBDMTQuMzU1NTkyMywxMS4zNTU1Njc4IDE1LDkuNzUzMDM4NjMgMTUsOCBDMTUsNi4yNDY5NjEzNyAxNC4zNTU1OTIzLDQuNjQ0NDMyMjIgMTMuMjkwNzM1NiwzLjQxNjM3MTIxIEwxMS4xNTk5Mjg3LDUuNTQ3MTc4MDcgQzExLjY4NjQ1OTIsNi4yMjQ1MTk5MyAxMiw3LjA3NTY0NDI3IDEyLDggQzEyLDguOTI0MzU1NzMgMTEuNjg2NDU5Miw5Ljc3NTQ4MDA3IDExLjE1OTkyODcsMTAuNDUyODIxOSBMMTMuMjkwNzM1NiwxMi41ODM2Mjg4IFogTTgsMTYgQzMuNTgxNzIyLDE2IDAsMTIuNDE4Mjc4IDAsOCBDMCwzLjU4MTcyMiAzLjU4MTcyMiwwIDgsMCBDMTIuNDE4Mjc4LDAgMTYsMy41ODE3MjIgMTYsOCBDMTYsMTIuNDE4Mjc4IDEyLjQxODI3OCwxNiA4LDE2IFoiIGZpbGw9IiMwMDAiIGZpbGwtcnVsZT0ibm9uemVybyIvPjwvc3ZnPg==');
   --icon-Home: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTgsMi4wODMwOTUxOSBMMS40NzE4MjUzMiw2IEw4LDkuOTE2OTA0ODEgTDE0LjUyODE3NDcsNiBMOCwyLjA4MzA5NTE5IFogTTguMjU3MjQ3ODgsMS4wNzEyNTM1NCBMMTUuNzU3MjQ3OSw1LjU3MTI1MzU0IEMxNi4wODA5MTc0LDUuNzY1NDU1MjMgMTYuMDgwOTE3NCw2LjIzNDU0NDc3IDE1Ljc1NzI0NzksNi40Mjg3NDY0NiBMOC4yNTcyNDc4OCwxMC45Mjg3NDY1IEM4LjA5ODkwNjY4LDExLjAyMzc1MTIgNy45MDEwOTMzMiwxMS4wMjM3NTEyIDcuNzQyNzUyMTIsMTAuOTI4NzQ2NSBMMC4yNDI3NTIxMjIsNi40Mjg3NDY0NiBDLTAuMDgwOTE3Mzc0MSw2LjIzNDU0NDc3IC0wLjA4MDkxNzM3NDEsNS43NjU0NTUyMyAwLjI0Mjc1MjEyMiw1LjU3MTI1MzU0IEw3Ljc0Mjc1MjEyLDEuMDcxMjUzNTQgQzcuOTAxMDkzMzIsMC45NzYyNDg4MjEgOC4wOTg5MDY2OCwwLjk3NjI0ODgyMSA4LjI1NzI0Nzg4LDEuMDcxMjUzNTQgWiBNMTQuNTI4MTc0NywxMCBMMTMuNzQyNzUyMSw5LjUyODc0NjQ2IEMxMy41MDU5NjIsOS4zODY2NzIzOCAxMy40MjkxNzk1LDkuMDc5NTQyMjYgMTMuNTcxMjUzNSw4Ljg0Mjc1MjEyIEMxMy43MTMzMjc2LDguNjA1OTYxOTkgMTQuMDIwNDU3Nyw4LjUyOTE3OTQ2IDE0LjI1NzI0NzksOC42NzEyNTM1NCBMMTUuNzU3MjQ3OSw5LjU3MTI1MzU0IEMxNi4wODA5MTc0LDkuNzY1NDU1MjMgMTYuMDgwOTE3NCwxMC4yMzQ1NDQ4IDE1Ljc1NzI0NzksMTAuNDI4NzQ2NSBMOC4yNTcyNDc4OCwxNC45Mjg3NDY1IEM4LjA5ODkwNjY4LDE1LjAyMzc1MTIgNy45MDEwOTMzMiwxNS4wMjM3NTEyIDcuNzQyNzUyMTIsMTQuOTI4NzQ2NSBMMC4yNDI3NTIxMjIsMTAuNDI4NzQ2NSBDLTAuMDgwOTE3Mzc0MSwxMC4yMzQ1NDQ4IC0wLjA4MDkxNzM3NDEsOS43NjU0NTUyMyAwLjI0Mjc1MjEyMiw5LjU3MTI1MzU0IEwxLjc0Mjc1MjEyLDguNjcxMjUzNTQgQzEuOTc5NTQyMjYsOC41MjkxNzk0NiAyLjI4NjY3MjM4LDguNjA1OTYxOTkgMi40Mjg3NDY0Niw4Ljg0Mjc1MjEyIEMyLjU3MDgyMDU0LDkuMDc5NTQyMjYgMi40OTQwMzgwMSw5LjM4NjY3MjM4IDIuMjU3MjQ3ODgsOS41Mjg3NDY0NiBMMS40NzE4MjUzMiwxMCBMOCwxMy45MTY5MDQ4IEwxNC41MjgxNzQ3LDEwIFoiIGZpbGw9IiMwMDAiIGZpbGwtcnVsZT0ibm9uemVybyIvPjwvc3ZnPg==');
   --icon-Idea: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTcsMC41IEM3LDAuMjIzODU3NjI1IDcuMjIzODU3NjMsMCA3LjUsMCBDNy43NzYxNDIzNywwIDgsMC4yMjM4NTc2MjUgOCwwLjUgTDgsMi41IEM4LDIuNzc2MTQyMzcgNy43NzYxNDIzNywzIDcuNSwzIEM3LjIyMzg1NzYzLDMgNywyLjc3NjE0MjM3IDcsMi41IEw3LDAuNSBaIE0xLjQ4OTQ0NjYxLDMuMTk2NTUzMzkgQzEuMjk0MTg0NDYsMy4wMDEyOTEyNCAxLjI5NDE4NDQ2LDIuNjg0NzA4NzYgMS40ODk0NDY2MSwyLjQ4OTQ0NjYxIEMxLjY4NDcwODc2LDIuMjk0MTg0NDYgMi4wMDEyOTEyNCwyLjI5NDE4NDQ2IDIuMTk2NTUzMzksMi40ODk0NDY2MSBMMy42MTA1NTMzOSwzLjkwMzQ0NjYxIEMzLjgwNTgxNTU0LDQuMDk4NzA4NzYgMy44MDU4MTU1NCw0LjQxNTI5MTI0IDMuNjEwNTUzMzksNC42MTA1NTMzOSBDMy40MTUyOTEyNCw0LjgwNTgxNTU0IDMuMDk4NzA4NzYsNC44MDU4MTU1NCAyLjkwMzQ0NjYxLDQuNjEwNTUzMzkgTDEuNDg5NDQ2NjEsMy4xOTY1NTMzOSBaIE0xMi44MDM0NDY2LDIuNDg5NDQ2NjEgQzEyLjk5ODcwODgsMi4yOTQxODQ0NiAxMy4zMTUyOTEyLDIuMjk0MTg0NDYgMTMuNTEwNTUzNCwyLjQ4OTQ0NjYxIEMxMy43MDU4MTU1LDIuNjg0NzA4NzYgMTMuNzA1ODE1NSwzLjAwMTI5MTI0IDEzLjUxMDU1MzQsMy4xOTY1NTMzOSBMMTIuMDk2NTUzNCw0LjYxMDU1MzM5IEMxMS45MDEyOTEyLDQuODA1ODE1NTQgMTEuNTg0NzA4OCw0LjgwNTgxNTU0IDExLjM4OTQ0NjYsNC42MTA1NTMzOSBDMTEuMTk0MTg0NSw0LjQxNTI5MTI0IDExLjE5NDE4NDUsNC4wOTg3MDg3NiAxMS4zODk0NDY2LDMuOTAzNDQ2NjEgTDEyLjgwMzQ0NjYsMi40ODk0NDY2MSBaIE0xMCwxMi4yMjMzNjY2IEwxMCwxNC41IEMxMCwxNC43NzYxNDI0IDkuNzc2MTQyMzcsMTUgOS41LDE1IEw1LjUsMTUgQzUuMjIzODU3NjMsMTUgNSwxNC43NzYxNDI0IDUsMTQuNSBMNSwxMi4yMjI2NzMyIEMzLjI4NDM3MTQ2LDExLjA3Nzg0MDQgMi41NTY2OTc1Niw4Ljg5NTgwMTU4IDMuMjczODk0MTMsNi45MzUwNzcwNyBDNC4wMjUwMDkzMyw0Ljg4MTYyMzMxIDYuMTQzNDksMy42NjUyNjIzMiA4LjI5NTU2NjkyLDQuMDUxNzk5OTQgQzEwLjQ0NzQzMTksNC40MzgyOTk0OSAxMi4wMTAxMTM2LDYuMzE1NTI0NzggMTEuOTk5OTk3Myw4LjUwMTczODM2IEMxMS45OTY0OTg2LDEwLjAwNDU1NjkgMTEuMjQwNzkxOSwxMS4zOTg0NzI3IDEwLDEyLjIyMzM2NjYgWiBNOSwxMS45NDUgQzksMTEuNzY1OTAwOCA5LjA5NTc5MzU2LDExLjYwMDQ4MDUgOS4yNTExMzEyOCwxMS41MTEzMzYxIEMxMC4zMzA1NDU2LDEwLjg5MTg4NzYgMTAuOTk3MjgyNCw5Ljc0MzQzMzQ2IDExLjAwMDAwMTIsOC40OTg5MDc2OSBDMTEuMDA4MTE1Nyw2Ljc5NzAxMjQgOS43OTI2MjE5OCw1LjMzNjY5MDI0IDguMTE4Nzg0MzgsNS4wMzYwNDk4OCBDNi40NDQ5NDY3OCw0LjczNTQwOTUxIDQuNzk3MjM5NTksNS42ODE0NjgwNSA0LjIxMzAzODg4LDcuMjc4NTk4NzUgQzMuNjI4ODM4MTYsOC44NzU3Mjk0NSA0LjI3NzIzNDU1LDEwLjY2MTY2IDUuNzUwMDA1NjksMTEuNTExOTkwNiBDNS45MDQ3MDMwMiwxMS42MDEzMDc4IDYsMTEuNzY2MzY5NiA2LDExLjk0NSBMNiwxNCBMOSwxNCBMOSwxMS45NDUgWiBNMTMuNSw5IEMxMy4yMjM4NTc2LDkgMTMsOC43NzYxNDIzNyAxMyw4LjUgQzEzLDguMjIzODU3NjMgMTMuMjIzODU3Niw4IDEzLjUsOCBMMTQuNSw4IEMxNC43NzYxNDI0LDggMTUsOC4yMjM4NTc2MyAxNSw4LjUgQzE1LDguNzc2MTQyMzcgMTQuNzc2MTQyNCw5IDE0LjUsOSBMMTMuNSw5IFogTTAuNSw5IEMwLjIyMzg1NzYyNSw5IDAsOC43NzYxNDIzNyAwLDguNSBDMCw4LjIyMzg1NzYzIDAuMjIzODU3NjI1LDggMC41LDggTDEuNSw4IEMxLjc3NjE0MjM3LDggMiw4LjIyMzg1NzYzIDIsOC41IEMyLDguNzc2MTQyMzcgMS43NzYxNDIzNyw5IDEuNSw5IEwwLjUsOSBaIiBmaWxsPSIjMDAwIiBmaWxsLXJ1bGU9Im5vbnplcm8iLz48L3N2Zz4=');
diff --git a/static/locales/de.client.json b/static/locales/de.client.json
index 3d9f3d06..df78bbab 100644
--- a/static/locales/de.client.json
+++ b/static/locales/de.client.json
@@ -1073,5 +1073,31 @@
     "WebhookPage": {
         "Clear Queue": "Warteschlange löschen",
         "Webhook Settings": "Webhaken Einstellungen"
+    },
+    "FormulaAssistant": {
+        "Ask the bot.": "Fragen Sie den Bot.",
+        "Capabilities": "Fähigkeiten",
+        "Community": "Gemeinschaft",
+        "Data": "Daten",
+        "Formula Cheat Sheet": "Formel-Spickzettel",
+        "Formula Help. ": "Formel-Hilfe. ",
+        "Function List": "Funktionsliste",
+        "Grist's AI Assistance": "Grists KI-Unterstützung",
+        "Grist's AI Formula Assistance. ": "Grists KI-Formelunterstützung. ",
+        "Need help? Our AI assistant can help.": "Brauchen Sie Hilfe? Unser KI-Assistent kann helfen.",
+        "New Chat": "Neuer Chat",
+        "Preview": "Vorschau",
+        "Regenerate": "Regenerieren",
+        "Save": "Speichern",
+        "See our {{helpFunction}} and {{formulaCheat}}, or visit our {{community}} for more help.": "Weitere Informationen finden Sie unter {{helpFunction}} und {{formulaCheat}} oder besuchen Sie unsere {{community}} für weitere Hilfe.",
+        "Tips": "Tipps"
+    },
+    "GridView": {
+        "Click to insert": "Zum Einfügen klicken"
+    },
+    "WelcomeSitePicker": {
+        "Welcome back": "Willkommen zurück",
+        "You can always switch sites using the account menu.": "Sie können jederzeit über das Kontomenü zwischen den Websites wechseln.",
+        "You have access to the following Grist sites.": "Sie haben Zugriff auf die folgenden Grist-Seiten."
     }
 }
diff --git a/static/locales/en.client.json b/static/locales/en.client.json
index 32d48834..a1504192 100644
--- a/static/locales/en.client.json
+++ b/static/locales/en.client.json
@@ -70,7 +70,11 @@
         "Sign Out": "Sign Out",
         "Sign in": "Sign in",
         "Switch Accounts": "Switch Accounts",
-        "Toggle Mobile Mode": "Toggle Mobile Mode"
+        "Toggle Mobile Mode": "Toggle Mobile Mode",
+        "Activation": "Activation",
+        "Billing Account": "Billing Account",
+        "Support Grist": "Support Grist",
+        "Upgrade Plan": "Upgrade Plan"
     },
     "ViewAsDropdown": {
         "View As": "View As",
@@ -475,7 +479,8 @@
         "Notifications": "Notifications",
         "Renew": "Renew",
         "Report a problem": "Report a problem",
-        "Upgrade Plan": "Upgrade Plan"
+        "Upgrade Plan": "Upgrade Plan",
+        "Manage billing": "Manage billing"
     },
     "OnBoardingPopups": {
         "Finish": "Finish",
@@ -1035,5 +1040,37 @@
         "Welcome back": "Welcome back",
         "You can always switch sites using the account menu.": "You can always switch sites using the account menu.",
         "You have access to the following Grist sites.": "You have access to the following Grist sites."
+    },
+    "SupportGristNudge": {
+        "Close": "Close",
+        "Contribute": "Contribute",
+        "Help Center": "Help Center",
+        "Opt in to Telemetry": "Opt in to Telemetry",
+        "Opted In": "Opted In",
+        "Support Grist": "Support Grist",
+        "Support Grist page": "Support Grist page"
+    },
+    "SupportGristPage": {
+        "GitHub": "GitHub",
+        "GitHub Sponsors page": "GitHub Sponsors page",
+        "Help Center": "Help Center",
+        "Home": "Home",
+        "Manage Sponsorship": "Manage Sponsorship",
+        "Opt in to Telemetry": "Opt in to Telemetry",
+        "Opt out of Telemetry": "Opt out of Telemetry",
+        "Sponsor Grist Labs on GitHub": "Sponsor Grist Labs on GitHub",
+        "Support Grist": "Support Grist",
+        "Telemetry": "Telemetry",
+        "This instance is opted in to telemetry. Only the site administrator has permission to change this.": "This instance is opted in to telemetry. Only the site administrator has permission to change this.",
+        "This instance is opted out of telemetry. Only the site administrator has permission to change this.": "This instance is opted out of telemetry. Only the site administrator has permission to change this.",
+        "We only collect usage statistics, as detailed in our {{link}}, never document contents.": "We only collect usage statistics, as detailed in our {{link}}, never document contents.",
+        "You can opt out of telemetry at any time from this page.": "You can opt out of telemetry at any time from this page.",
+        "You have opted in to telemetry. Thank you!": "You have opted in to telemetry. Thank you!",
+        "You have opted out of telemetry.": "You have opted out of telemetry."
+    },
+    "buildViewSectionDom": {
+        "No data": "No data",
+        "No row selected in {{title}}": "No row selected in {{title}}",
+        "Not all data is shown": "Not all data is shown"
     }
 }
diff --git a/static/locales/es.client.json b/static/locales/es.client.json
index e82448c0..0c29dbd4 100644
--- a/static/locales/es.client.json
+++ b/static/locales/es.client.json
@@ -1063,5 +1063,31 @@
     "WebhookPage": {
         "Clear Queue": "Borrar la cola",
         "Webhook Settings": "Ajustes del gancho web"
+    },
+    "FormulaAssistant": {
+        "Regenerate": "Regenerar",
+        "Save": "Guardar",
+        "Preview": "Vista previa",
+        "Need help? Our AI assistant can help.": "¿Necesitas ayuda? Nuestro asistente de IA puede ayudarle.",
+        "New Chat": "Nuevo chat",
+        "Ask the bot.": "Pregúntale al bot.",
+        "Capabilities": "Capacidades",
+        "Community": "Comunidad",
+        "Data": "Datos",
+        "Formula Cheat Sheet": "Hoja de trucos de fórmulas",
+        "Formula Help. ": "Ayuda de fórmula. ",
+        "Function List": "Lista de función",
+        "Grist's AI Assistance": "Asistencia de IA de Grist",
+        "Grist's AI Formula Assistance. ": "Asistencia de fórmula de IA de Grist. ",
+        "Tips": "Consejos",
+        "See our {{helpFunction}} and {{formulaCheat}}, or visit our {{community}} for more help.": "Consulte nuestras páginas {{helpFunction}} y {{formulaCheat}}, o visite nuestra página {{community}} para obtener más ayuda."
+    },
+    "GridView": {
+        "Click to insert": "Haga clic para insertar"
+    },
+    "WelcomeSitePicker": {
+        "Welcome back": "Bienvenido de nuevo",
+        "You can always switch sites using the account menu.": "Siempre puedes cambiar de sitio utilizando el menú de la cuenta.",
+        "You have access to the following Grist sites.": "Usted tiene acceso a los siguientes sitios de Grist."
     }
 }
diff --git a/static/locales/it.client.json b/static/locales/it.client.json
index 6b8b80a8..adc66fdc 100644
--- a/static/locales/it.client.json
+++ b/static/locales/it.client.json
@@ -1009,5 +1009,31 @@
     "Clipboard": {
         "Unavailable Command": "Comando non disponibile",
         "Got it": "Ricevuto"
+    },
+    "FormulaAssistant": {
+        "Ask the bot.": "Chiedi al bot.",
+        "Capabilities": "Capacità",
+        "Community": "Comunità",
+        "Data": "Dati",
+        "Formula Cheat Sheet": "Azioni tipiche con le formule",
+        "Formula Help. ": "Aiuto con le formule. ",
+        "Function List": "Lista delle funzioni",
+        "Grist's AI Assistance": "Assistenza dalla IA di Grist",
+        "Need help? Our AI assistant can help.": "Bisogno di aiuto? Prova il nostro assistente IA.",
+        "New Chat": "Nuova chat",
+        "Preview": "Anteprima",
+        "Regenerate": "Rigenera",
+        "Save": "Salva",
+        "Tips": "Suggerimenti",
+        "Grist's AI Formula Assistance. ": "Assistenza dalla IA di Grist per le formule. ",
+        "See our {{helpFunction}} and {{formulaCheat}}, or visit our {{community}} for more help.": "Vedi {{helpFunction}} e {{formulaCheat}}, o visita la {{community}} per ulteriore aiuto."
+    },
+    "GridView": {
+        "Click to insert": "Clicca per inserire"
+    },
+    "WelcomeSitePicker": {
+        "Welcome back": "Bentornato",
+        "You can always switch sites using the account menu.": "Puoi sempre cambiare sito usando il menu del tuo profilo.",
+        "You have access to the following Grist sites.": "Hai accesso a questi siti di Grist."
     }
 }
diff --git a/static/locales/pt.client.json b/static/locales/pt.client.json
index 0967ef42..e6af54f2 100644
--- a/static/locales/pt.client.json
+++ b/static/locales/pt.client.json
@@ -1 +1,1038 @@
-{}
+{
+    "AccountPage": {
+        "API Key": "Chave API",
+        "API": "API",
+        "Account settings": "Configurações de conta",
+        "Allow signing in to this account with Google": "Permitir o acesso a esta conta com o Google",
+        "Change Password": "Alterar Palavra-passe",
+        "Edit": "Editar",
+        "Email": "E-mail",
+        "Login Method": "Método de Login",
+        "Name": "Nome",
+        "Names only allow letters, numbers and certain special characters": "Nomes só permitem letras, números e certos caracteres especiais",
+        "Password & Security": "Palavra-passe e Segurança",
+        "Save": "Gravar",
+        "Theme": "Tema",
+        "Two-factor authentication": "Autenticação de dois fatores",
+        "Two-factor authentication is an extra layer of security for your Grist account designed to ensure that you're the only person who can access your account, even if someone knows your password.": "A autenticação de dois fatores é uma camada extra de segurança para a sua conta Grist projetada para garantir que seja a única pessoa que pode aceder a sua conta, mesmo que alguém saiba a sua palavra-passe.",
+        "Language": "Idioma"
+    },
+    "ColumnFilterMenu": {
+        "Others": "Outros",
+        "Search": "Pesquisar",
+        "Search values": "Pesquisar valores",
+        "All": "Todos",
+        "All Except": "Todos, Exceto",
+        "All Shown": "Todos Mostrados",
+        "Filter by Range": "Filtrar por intervalo",
+        "Future Values": "Valores Futuros",
+        "No matching values": "Nenhum valor coincidente",
+        "None": "Nenhum",
+        "Min": "Mín",
+        "Max": "Máx",
+        "Start": "Começo",
+        "End": "Fim",
+        "Other Matching": "Outros Coincidentes",
+        "Other Non-Matching": "Outros Não-Coincidentes",
+        "Other Values": "Outros Valores"
+    },
+    "CustomSectionConfig": {
+        "Read selected table": "Ler a tabela selecionada",
+        " (optional)": " (opcional)",
+        "Add": "Adicionar",
+        "Enter Custom URL": "Digite a URL personalizada",
+        "Full document access": "Acesso total ao documento",
+        "Learn more about custom widgets": "Saiba mais sobre Widgets personalizados",
+        "No document access": "Sem acesso ao documento",
+        "Open configuration": "Abrir configuração",
+        "Pick a column": "Escolha uma coluna",
+        "Pick a {{columnType}} column": "Escolha uma coluna {{columnType}}",
+        "Select Custom Widget": "Selecione o Widget personalizado",
+        "Widget does not require any permissions.": "O Widget não requer nenhuma permissão.",
+        "Widget needs to {{read}} the current table.": "O Widget necessita {{read}} a tabela atual.",
+        "Widget needs {{fullAccess}} to this document.": "O Widget necessita {{fullAccess}} ao documento.",
+        "{{wrongTypeCount}} non-{{columnType}} columns are not shown_one": "{{wrongTypeCount}} a não-{{columnType}} coluna não é mostrada",
+        "{{wrongTypeCount}} non-{{columnType}} columns are not shown_other": "{{wrongTypeCount}} as não-{{columnType}} colunas não são mostradas"
+    },
+    "DocHistory": {
+        "Activity": "Atividade",
+        "Snapshots": "Instantâneos",
+        "Beta": "Beta",
+        "Compare to Current": "Comparar ao atual",
+        "Compare to Previous": "Comparar ao anterior",
+        "Open Snapshot": "Abrir Instantâneo",
+        "Snapshots are unavailable.": "Os instantâneos não estão disponíveis."
+    },
+    "DocMenu": {
+        "By Date Modified": "Por Data de Modificação",
+        "Deleted {{at}}": "{{at}} excluído",
+        "Discover More Templates": "Descubra mais Modelos",
+        "Document will be moved to Trash.": "O documento será movido para Lixo.",
+        "Document will be permanently deleted.": "O documento será permanentemente excluído.",
+        "Documents stay in Trash for 30 days, after which they get deleted permanently.": "Os documentos ficam na Lixo por 30 dias, após os quais são excluídos permanentemente.",
+        "Edited {{at}}": "{{at}} editado",
+        "Examples & Templates": "Exemplos & Modelos",
+        "Examples and Templates": "Exemplos e Modelos",
+        "Featured": "Destaques",
+        "Manage Users": "Gerir Utilizadores",
+        "More Examples and Templates": "Mais Exemplos e Modelos",
+        "Move": "Mover",
+        "Move {{name}} to workspace": "Mover {{name}} para a área de trabalho",
+        "Other Sites": "Outros Sites",
+        "Permanently Delete \"{{name}}\"?": "Apagar \"{{name}}\" permanentemente?",
+        "Pin Document": "Fixar documento",
+        "Pinned Documents": "Documentos Fixados",
+        "Remove": "Remover",
+        "Rename": "Renomear",
+        "Requires edit permissions": "Requer permissões de edição",
+        "Restore": "Restaurar",
+        "This service is not available right now": "Este serviço não está disponível no momento",
+        "To restore this document, restore the workspace first.": "Para restaurar esse documento, restaure a área de trabalho primeiro.",
+        "Trash": "Lixo",
+        "Trash is empty.": "A lixo está vazia.",
+        "Unpin Document": "Desafixar o Documento",
+        "Workspace not found": "Área de trabalho não encontrada",
+        "You are on the {{siteName}} site. You also have access to the following sites:": "Está no site {{siteName}}. Também tem acesso aos seguintes sites:",
+        "(The organization needs a paid plan)": "(A organização precisa de um plano pago)",
+        "All Documents": "Todos os Documentos",
+        "By Name": "Por Nome",
+        "Access Details": "Detalhes de Acesso",
+        "Current workspace": "Área de trabalho atual",
+        "Delete": "Apagar",
+        "Delete Forever": "Apagar para sempre",
+        "Delete {{name}}": "Apagar {{name}}",
+        "You are on your personal site. You also have access to the following sites:": "Está na sua página pessoal. Também tem acesso às seguintes páginas:",
+        "You may delete a workspace forever once it has no documents in it.": "Pode apagar uma área de trabalho para sempre uma vez que ela não contenha documentos."
+    },
+    "GristDoc": {
+        "Import from file": "Importação de ficheiro",
+        "Added new linked section to view {{viewName}}": "Adicionada nova secção vinculada para visualizar {{viewName}}}",
+        "Saved linked section {{title}} in view {{name}}": "Secção vinculada gravada {{title}} em exibição {{name}}"
+    },
+    "FormulaAssistant": {
+        "See our {{helpFunction}} and {{formulaCheat}}, or visit our {{community}} for more help.": "Consulte o nosso {{helpFunction}} e {{formulaCheat}} ou visite o nosso {{community}} para obter mais ajuda.",
+        "Formula Help. ": "Ajuda de fórmulas. ",
+        "Preview": "Pré-visualização",
+        "Regenerate": "Regenerar",
+        "Save": "Gravar",
+        "Grist's AI Formula Assistance. ": "Assistência de fórmula de IA de Grist. ",
+        "Ask the bot.": "Pergunte o robô.",
+        "Data": "Dados",
+        "New Chat": "Novo chat",
+        "Formula Cheat Sheet": "Folha de consulta de fórmulas",
+        "Tips": "Dicas",
+        "Capabilities": "Capacidades",
+        "Need help? Our AI assistant can help.": "Precisa de ajuda? O nosso assistente de IA pode ajudar.",
+        "Community": "Comunidade",
+        "Function List": "Lista de funções",
+        "Grist's AI Assistance": "Assistência de IA da Grist"
+    },
+    "WelcomeSitePicker": {
+        "You can always switch sites using the account menu.": "Sempre pode alternar entre sites através do menu da conta.",
+        "Welcome back": "Bem-vindo de volta"
+    },
+    "MakeCopyMenu": {
+        "Cancel": "Cancelar",
+        "However, it appears to be already identical.": "No entanto, parece já ser idêntico.",
+        "Include the structure without any of the data.": "Incluir a estrutura sem os dados.",
+        "It will be overwritten, losing any content not in this document.": "Será substituído, perdendo qualquer conteúdo que não esteja neste documento.",
+        "Name": "Nome",
+        "You do not have write access to the selected workspace": "Não tem acesso de gravação na área de trabalho selecionada",
+        "No destination workspace": "Nenhuma área de trabalho de destino",
+        "Organization": "Organização",
+        "Original Has Modifications": "Original Tem Modificações",
+        "Original Looks Unrelated": "Original Parece não Relacionado",
+        "Original Looks Identical": "Original Parece Identêntico",
+        "Overwrite": "Sobreescrever",
+        "Replacing the original requires editing rights on the original document.": "A substituição do original requer direitos de edição sobre o documento original.",
+        "Sign up": "Cadastre-se",
+        "The original version of this document will be updated.": "A versão original deste documento será atualizada.",
+        "To save your changes, please sign up, then reload this page.": "Para gravar as suas alterações, cadastre-se e recarregue esta página.",
+        "Update": "Atualizar",
+        "Update Original": "Atualizar o Original",
+        "Workspace": "Área de Trabalho",
+        "You do not have write access to this site": "Não tem acesso de gravação a este site",
+        "As Template": "Como Modelo",
+        "Be careful, the original has changes not in this document. Those changes will be overwritten.": "Tenha cuidado, o original tem mudanças que não estão neste documento. Essas mudanças serão sobrescritas.",
+        "Enter document name": "Digite o nome do documento"
+    },
+    "Pages": {
+        "Delete": "Apagar",
+        "Delete data and this page.": "Apagar os dados desta página.",
+        "The following tables will no longer be visible_one": "A seguinte tabela não será mais visível",
+        "The following tables will no longer be visible_other": "As seguintes tabelas não serão mais visíveis"
+    },
+    "RightPanel": {
+        "Theme": "Tema",
+        "CHART TYPE": "TIPO DE GRÁFICO",
+        "COLUMN TYPE": "TIPO DE COLUNA",
+        "CUSTOM": "PERSONALIZADO",
+        "Change Widget": "Alterar widget",
+        "Columns_one": "Coluna",
+        "Columns_other": "Colunas",
+        "DATA TABLE": "TABELA DE DADOS",
+        "DATA TABLE NAME": "NOME DA TABELA DE DADOS",
+        "Data": "Dados",
+        "Detach": "Separar",
+        "Edit Data Selection": "Editar Seleção de Dados",
+        "Fields_one": "Campo",
+        "Fields_other": "Campos",
+        "SELECT BY": "SELECIONADO POR",
+        "GROUPED BY": "AGRUPADO POR",
+        "SELECTOR FOR": "SELETOR PARA",
+        "ROW STYLE": "ESTILO DE LINHA",
+        "Row Style": "Estilo de Linha",
+        "SOURCE DATA": "DADOS DE ORIGEM",
+        "Save": "Gravar",
+        "Select Widget": "Selecionar Widget",
+        "Series_one": "Séries",
+        "Series_other": "Séries",
+        "Sort & Filter": "Ordenar & Filtrar",
+        "TRANSFORM": "TRANSFORMAR",
+        "WIDGET TITLE": "TÍTULO DO WIDGET",
+        "Widget": "Widget",
+        "You do not have edit access to this document": "Não tem permissão de edição desse documento",
+        "Add referenced columns": "Adicionar colunas referenciadas"
+    },
+    "ShareMenu": {
+        "Return to {{termToUse}}": "Retornar ao {{termToUse}}",
+        "Save Copy": "Gravar Cópia",
+        "Save Document": "Gravar Documento",
+        "Send to Google Drive": "Enviar ao Google Drive",
+        "Show in folder": "Mostrar na pasta",
+        "Unsaved": "Não gravado",
+        "Work on a Copy": "Trabalho numa cópia",
+        "Access Details": "Detalhes de Acesso",
+        "Back to Current": "Voltar ao Atual",
+        "Compare to {{termToUse}}": "Comparar ao {{termToUse}}",
+        "Current Version": "Versão Atual",
+        "Download": "Descarregar",
+        "Duplicate Document": "Duplicar o Documento",
+        "Edit without affecting the original": "Editar sem afetar o original",
+        "Export CSV": "Exportar CSV",
+        "Export XLSX": "Exportar XLSX",
+        "Manage Users": "Gerir Utilizadores",
+        "Original": "Original",
+        "Replace {{termToUse}}...": "Substituir {{termToUse}}…"
+    },
+    "SiteSwitcher": {
+        "Create new team site": "Criar site de equipa",
+        "Switch Sites": "Alternar sites"
+    },
+    "ViewAsBanner": {
+        "UnknownUser": "Utilizador desconhecido"
+    },
+    "ColumnInfo": {
+        "COLUMN LABEL": "RÓTULO DA COLUNA",
+        "COLUMN DESCRIPTION": "DESCRIÇÃO DA COLUNA",
+        "COLUMN ID: ": "ID DA COLUNA: ",
+        "Cancel": "Cancelar",
+        "Save": "Gravar"
+    },
+    "FieldBuilder": {
+        "DATA FROM TABLE": "DADOS DA TABELA",
+        "Mixed format": "Formato misto",
+        "Mixed types": "Tipos mistos",
+        "Apply Formula to Data": "Aplicar fórmula aos dados",
+        "CELL FORMAT": "FORMATO DA CÉLULA",
+        "Changing multiple column types": "Alterar vários tipos de colunas",
+        "Revert field settings for {{colId}} to common": "Reverter configurações de campo da {{colId}} para comum",
+        "Save field settings for {{colId}} as common": "Gravar configurações de campo da {{colId}} como comum",
+        "Use separate field settings for {{colId}}": "Use configurações de campo separadas para {{colId}}"
+    },
+    "NumericTextBox": {
+        "Number Format": "Formato de número",
+        "Currency": "Moeda",
+        "Decimals": "Decimais",
+        "Default currency ({{defaultCurrency}})": "Moeda padrão ({{defaultCurrency}})"
+    },
+    "ACUserManager": {
+        "Enter email address": "Digite o endereço de e-mail",
+        "Invite new member": "Convidar novo membro",
+        "We'll email an invite to {{email}}": "Enviaremos um convite por e-mail para {{email}}"
+    },
+    "AccessRules": {
+        "Add Column Rule": "Adicionar Regra de Coluna",
+        "Add Default Rule": "Adicionar Regra Padrão",
+        "Add Table Rules": "Adicionar Regras de Tabela",
+        "Add User Attributes": "Adicionar Atibutos de Utilizador",
+        "Allow everyone to copy the entire document, or view it in full in fiddle mode.\nUseful for examples and templates, but not for sensitive data.": "Permitir que todos possam copiar, ver e mexer no documento todo.\nÚtil para exemplos e modelos, mas não para dados sensíveis.",
+        "Allow everyone to view Access Rules.": "Permitir que todos visualizem as Regras de Acesso.",
+        "Attribute name": "Nome do atributo",
+        "Attribute to Look Up": "Atributo para Procurar",
+        "Checking...": "A verificar…",
+        "Condition": "Condição",
+        "Default Rules": "Regras Padrão",
+        "Delete Table Rules": "Apagar Regras de Tabela",
+        "Enter Condition": "Insira a condição",
+        "Everyone": "Todos",
+        "Everyone Else": "Todos os outros",
+        "Invalid": "Inválido",
+        "Lookup Column": "Coluna de pesquisa",
+        "Lookup Table": "Tabela de Pesquisa",
+        "Permission to access the document in full when needed": "Permissão para aceder o documento completo quando necessário",
+        "Permission to view Access Rules": "Permissão para visualizar as Regras de Acesso",
+        "Permissions": "Permissões",
+        "Remove column {{- colId }} from {{- tableId }} rules": "Remover a coluna {{- colId }} das regras de {{- tableId }}",
+        "Remove {{- tableId }} rules": "Remover regras de {{- tableId }}",
+        "Remove {{- name }} user attribute": "Remover o atributo do utilizador {{- name }}",
+        "Reset": "Redefinir",
+        "Rules for table ": "Regras para a tabela ",
+        "Save": "Gravar",
+        "Saved": "Gravado",
+        "Special Rules": "Regras Especiais",
+        "Type a message...": "Escreva uma mensagem…",
+        "User Attributes": "Atributos de Utilizador",
+        "View As": "Ver como",
+        "Seed rules": "Regras de propagação",
+        "When adding table rules, automatically add a rule to grant OWNER full access.": "Ao adicionar regras de tabela, adicione automaticamente uma regra para conceder ao PROPRIETÁRIO acesso total.",
+        "Permission to edit document structure": "Permissão para editar a estrutura do documento"
+    },
+    "ChartView": {
+        "Toggle chart aggregation": "Alternar a agregação de gráficos",
+        "selected new group data columns": "novas colunas de dados de grupo selecionadas",
+        "Create separate series for each value of the selected column.": "Crie séries separadas para cada valor da coluna selecionada.",
+        "Each Y series is followed by a series for the length of error bars.": "Cada série Y é seguida por uma série para o comprimento das barras de erro.",
+        "Each Y series is followed by two series, for top and bottom error bars.": "Cada série Y é seguida por duas séries, para as barras de erro superior e inferior.",
+        "Pick a column": "Escolha uma coluna"
+    },
+    "CodeEditorPanel": {
+        "Access denied": "Acesso negado",
+        "Code View is available only when you have full document access.": "A Vista de Código só está disponível quando tem acesso total aos documentos."
+    },
+    "NotifyUI": {
+        "Ask for help": "Peça ajuda",
+        "Cannot find personal site, sorry!": "Não encontro site pessoal, desculpe!",
+        "Give feedback": "Dar feedback",
+        "Go to your free personal site": "Acede o seu site pessoal gratuito",
+        "No notifications": "Nenhuma notificação",
+        "Notifications": "Notificações",
+        "Renew": "Renovar",
+        "Report a problem": "Reportar um problema",
+        "Upgrade Plan": "Atualizar o Plano"
+    },
+    "OpenVideoTour": {
+        "Video Tour": "Tour de Vídeo",
+        "Grist Video Tour": "Tour de Vídeo Grist",
+        "YouTube video player": "Reprodutor de vídeo YouTube"
+    },
+    "OnBoardingPopups": {
+        "Finish": "Terminar",
+        "Next": "Próximo"
+    },
+    "PageWidgetPicker": {
+        "Add to Page": "Adicionar à Página",
+        "Building {{- label}} widget": "Construír o {{- label}} widget",
+        "Group by": "Agrupar por",
+        "Select Data": "Selecionar dados",
+        "Select Widget": "Selcione o Widget"
+    },
+    "PermissionsWidget": {
+        "Allow All": "Permitir Todos",
+        "Deny All": "Recusar Todos",
+        "Read Only": "Somente leitura"
+    },
+    "PluginScreen": {
+        "Import failed: ": "Falha na importação: "
+    },
+    "RecordLayout": {
+        "Updating record layout.": "Atualizar o layout dos registos."
+    },
+    "RecordLayoutEditor": {
+        "Add Field": "Adicionar Campo",
+        "Create New Field": "Criar um Novo Campo",
+        "Show field {{- label}}": "Mostrar campo {{- label}}",
+        "Save Layout": "Guardar Layout",
+        "Cancel": "Cancelar"
+    },
+    "RefSelect": {
+        "Add Column": "Adicionar Coluna",
+        "No columns to add": "Não há colunas para adicionar"
+    },
+    "RowContextMenu": {
+        "Copy anchor link": "Copiar a ligação de ancoragem",
+        "Delete": "Apagar",
+        "Duplicate rows_one": "Duplicar linha",
+        "Duplicate rows_other": "Duplicar linhas",
+        "Insert row": "Inserir linha",
+        "Insert row above": "Inserir linha acima",
+        "Insert row below": "Inserir linha abaixo"
+    },
+    "SelectionSummary": {
+        "Copied to clipboard": "Copiado para a área de transferência"
+    },
+    "SortConfig": {
+        "Add Column": "Adicionar Coluna",
+        "Empty values last": "Valores vazios por último",
+        "Natural sort": "Classificação natural",
+        "Update Data": "Atualizar Dados",
+        "Use choice position": "Usar posição de escolha",
+        "Search Columns": "Procurar colunas"
+    },
+    "SortFilterConfig": {
+        "Filter": "FILTRAR",
+        "Revert": "Reverter",
+        "Save": "Gravar",
+        "Sort": "ORDENAR",
+        "Update Sort & Filter settings": "Atualizar configurações de Classificação e Filtro"
+    },
+    "ThemeConfig": {
+        "Appearance ": "Aparência ",
+        "Switch appearance automatically to match system": "Alternar a aparência automaticamente para corresponder ao sistema"
+    },
+    "Tools": {
+        "Access Rules": "Regras de Acesso",
+        "Code View": "Vista do Código",
+        "Delete": "Apagar",
+        "Delete document tour?": "Apagar tour do documento?",
+        "Document History": "Histórico do Documento",
+        "How-to Tutorial": "Tutorial de Como Fazer",
+        "Raw Data": "Dados Primários",
+        "Return to viewing as yourself": "Voltar a ver como você mesmo",
+        "TOOLS": "FERRAMENTAS",
+        "Tour of this Document": "Tour desse Documento",
+        "Validate Data": "Validar dados",
+        "Settings": "Configurações"
+    },
+    "TopBar": {
+        "Manage Team": "Gerir Equipa"
+    },
+    "TriggerFormulas": {
+        "Cancel": "Cancelar",
+        "Close": "Fechar",
+        "Current field ": "Campo atual ",
+        "OK": "OK",
+        "Any field": "Qualquer campo",
+        "Apply on changes to:": "Aplicar em alterações para:",
+        "Apply on record changes": "Aplicar em alterações de registo",
+        "Apply to new records": "Aplicar a novos registos"
+    },
+    "TypeTransformation": {
+        "Apply": "Aplicar",
+        "Cancel": "Cancelar",
+        "Preview": "Prévisualizar",
+        "Revise": "Revisar",
+        "Update formula (Shift+Enter)": "Atualizar a fórmula (Shift+Enter)"
+    },
+    "UserManagerModel": {
+        "Editor": "Editor",
+        "In Full": "Na íntegra",
+        "No Default Access": "Sem Acesso Padrão",
+        "None": "Nenhum",
+        "Owner": "Proprietário",
+        "View & Edit": "Ver & Editar",
+        "View Only": "Somente Ver",
+        "Viewer": "Observador"
+    },
+    "ValidationPanel": {
+        "Rule {{length}}": "Regra {{length}}",
+        "Update formula (Shift+Enter)": "Atualizar a fórmula (Shift+Enter)"
+    },
+    "ViewConfigTab": {
+        "Advanced settings": "Configurações avançadas",
+        "Big tables may be marked as \"on-demand\" to avoid loading them into the data engine.": "As tabelas grandes podem ser marcadas como \"sob-necessidade\" para evitar o seu carregamento no mecanismo de dados.",
+        "Blocks": "Blocos",
+        "Compact": "Compactar",
+        "Edit Card Layout": "Editar Layout do Cartão",
+        "Form": "Formulário",
+        "Make On-Demand": "Fazer Sob-Necessidade",
+        "Plugin: ": "Plugin: ",
+        "Section: ": "Secção: ",
+        "Unmark On-Demand": "Desmarcar Sob-Necessidade"
+    },
+    "FieldConfig": {
+        "Make into data column": "Transformar em coluna de dados",
+        "Mixed Behavior": "Comportamento Misto",
+        "Set formula": "Definir fórmula",
+        "Set trigger formula": "Definir fórmula de disparo",
+        "TRIGGER FORMULA": "FÓRMULA DE DISPARO",
+        "DESCRIPTION": "DESCRIÇÃO",
+        "COLUMN BEHAVIOR": "COMPORTAMENTO DE COLUNA",
+        "COLUMN LABEL AND ID": "RÓTULO E IDENTIFICAÇÃO DA COLUNA",
+        "Clear and make into formula": "Limpar e transformar em fórmula",
+        "Clear and reset": "Limpar e redefinir",
+        "Column options are limited in summary tables.": "As opções de coluna são limitadas nas tabelas de resumo.",
+        "Convert column to data": "Converter coluna para dados",
+        "Convert to trigger formula": "Converter em fórmula de disparo",
+        "Data Columns_one": "Coluna de Dados",
+        "Data Columns_other": "Colunas de Dados",
+        "Empty Columns_one": "Coluna vazia",
+        "Empty Columns_other": "Colunas Vazias",
+        "Enter formula": "Insira a fórmula",
+        "Formula Columns_one": "Coluna de Fórmula",
+        "Formula Columns_other": "Colunas de Fórmula"
+    },
+    "FieldMenus": {
+        "Revert to common settings": "Reverter para configurações comuns",
+        "Save as common settings": "Gravar como configuraçes comuns",
+        "Use separate settings": "Use configurações separadas",
+        "Using common settings": "Utilizar configurações comuns",
+        "Using separate settings": "Utilizar configurações separadas"
+    },
+    "FilterConfig": {
+        "Add Column": "Adicionar Coluna"
+    },
+    "FilterBar": {
+        "SearchColumns": "Procurar colunas",
+        "Search Columns": "Procurar colunas"
+    },
+    "GridOptions": {
+        "Grid Options": "Opções de Grade",
+        "Horizontal Gridlines": "Linhas de Grade Horizontais",
+        "Vertical Gridlines": "Linhas de Grade Verticais",
+        "Zebra Stripes": "Listras de Zebra"
+    },
+    "GridViewMenus": {
+        "Add Column": "Adicionar Coluna",
+        "Add to sort": "Adicionar à classificação",
+        "Clear values": "Limpar valores",
+        "Column Options": "Opções de Coluna",
+        "Convert formula to data": "Converter fórmula em dados",
+        "Delete {{count}} columns_one": "Apagar coluna",
+        "Delete {{count}} columns_other": "Apagar {{count}} colunas",
+        "Filter Data": "Filtrar Dados",
+        "Freeze {{count}} more columns_one": "Congelar mais uma coluna",
+        "Freeze {{count}} more columns_other": "Congelar {{count}} colunas mais",
+        "Freeze {{count}} columns_one": "Congelar esta coluna",
+        "Freeze {{count}} columns_other": "Congelar {{count}} colunas",
+        "Hide {{count}} columns_one": "Ocultar coluna",
+        "Hide {{count}} columns_other": "Ocultar {{count}} colunas",
+        "Insert column to the {{to}}": "Inserir coluna para a {{to}}",
+        "More sort options ...": "Mais opções de ordenação…",
+        "Rename column": "Renomear coluna",
+        "Reset {{count}} columns_one": "Reinicializar coluna",
+        "Reset {{count}} columns_other": "Reinicializar {{count}} colunas",
+        "Reset {{count}} entire columns_one": "Reinicializar toda a coluna",
+        "Reset {{count}} entire columns_other": "Reinicializar {{count}} colunas inteiras",
+        "Sort": "Ordenar",
+        "Show column {{- label}}": "Mostrar coluna {{- label}}",
+        "Sorted (#{{count}})_one": "Ordenado (#{{count}})",
+        "Sorted (#{{count}})_other": "Ordenado (#{{count}})",
+        "Unfreeze all columns": "Descongelar todas as colunas",
+        "Unfreeze {{count}} columns_one": "Descongelar esta coluna",
+        "Unfreeze {{count}} columns_other": "Descongelar {{count}} colunas",
+        "Insert column to the left": "Inserir coluna à esquerda",
+        "Insert column to the right": "Inserir coluna à direita"
+    },
+    "HomeIntro": {
+        "Any documents created in this site will appear here.": "Qualquer documento criado neste site aparecerá aqui.",
+        "Browse Templates": "Explore os Modelos",
+        "Create Empty Document": "Criar um Documento Vazio",
+        "Get started by creating your first Grist document.": "Comece a criar o seu primeiro documento Grist.",
+        "Get started by exploring templates, or creating your first Grist document.": "Comece a explorar os modelos, ou criar o seu primeiro documento Grist.",
+        "Get started by inviting your team and creating your first Grist document.": "Comece a convidar a sua equipa e criar o seu primeiro documento Grist.",
+        "Help Center": "Centro de Ajuda",
+        "Import Document": "Importar Documento",
+        "Interested in using Grist outside of your team? Visit your free ": "Interessado em usar Grist além da sua equipa? Visite gratuitamente o seu ",
+        "Invite Team Members": "Convide membros da equipa",
+        "Sign up": "Cadastre-se",
+        "Sprouts Program": "Programa Brotos",
+        "This workspace is empty.": "Essa área de trabalho está vazia.",
+        "Visit our {{link}} to learn more.": "Visite o nosso {{link}} para saber mais.",
+        "Welcome to Grist!": "Bem-vindo ao Grist!",
+        "Welcome to Grist, {{name}}!": "Bem-vindo ao Grist, {{name}}!",
+        "Welcome to {{orgName}}": "Bem-vindo ao {{orgName}}",
+        "You have read-only access to this site. Currently there are no documents.": "Só tem acesso de leitura a este site. Atualmente não há documentos.",
+        "personal site": "Site pessoal",
+        "{{signUp}} to save your work. ": "{{signUp}} para gravar o seu trabalho. ",
+        "Welcome to Grist, {{- name}}!": "Bem-vindo ao Grist, {{-name}}!",
+        "Welcome to {{- orgName}}": "Bem-vindo a {{-orgName}}"
+    },
+    "GristTooltips": {
+        "Apply conditional formatting to rows based on formulas.": "Aplicar formatação condicional em linhas com base em fórmulas.",
+        "Updates every 5 minutes.": "Atualiza a cada 5 minutos.",
+        "Apply conditional formatting to cells in this column when formula conditions are met.": "Aplicar formatação condicional às células nesta coluna quando as condições da fórmula forem atendidas.",
+        "Cells in a reference column always identify an {{entire}} record in that table, but you may select which column from that record to show.": "As células numa coluna de referência sempre identificam um registo {{entire}} nessa tabela, mas pode selecionar qual coluna desse registo deve ser mostrada.",
+        "Click on “Open row styles” to apply conditional formatting to rows.": "Clique em \"Abrir estilos de linhas\" para aplicar a formatação condicional às linhas.",
+        "Click the Add New button to create new documents or workspaces, or import data.": "Clique no botão Adicionar Novo para criar documentos ou espaços de trabalho ou importar dados.",
+        "Clicking {{EyeHideIcon}} in each cell hides the field from this view without deleting it.": "Clicar {{EyeHideIcon}} em cada célula esconde o campo desta visualização sem apagá-lo.",
+        "Editing Card Layout": "A editar o layout do cartão",
+        "Formulas that trigger in certain cases, and store the calculated value as data.": "Fórmulas que acionam em certos casos e armazenam o valor calculado como dados.",
+        "Learn more.": "Saiba mais.",
+        "Link your new widget to an existing widget on this page.": "Vincule o seu novo widget a um widget existente nesta página.",
+        "Linking Widgets": "A vincular widgets",
+        "Nested Filtering": "Filtragem aninhada",
+        "Only those rows will appear which match all of the filters.": "Somente serão exibidas as linhas que correspondem a todos os filtros.",
+        "Pinned filters are displayed as buttons above the widget.": "Os filtros fixados são exibidos como botões acima do widget.",
+        "Pinning Filters": "A fixar filtros",
+        "Raw Data page": "Página de dados brutos",
+        "Rearrange the fields in your card by dragging and resizing cells.": "Organize os campos no seu cartão arrastando e redimensionando células.",
+        "Reference Columns": "Colunas de referência",
+        "Reference columns are the key to {{relational}} data in Grist.": "As colunas de referência são a chave para os dados {{relational}} no Grist.",
+        "Select the table containing the data to show.": "Selecione a tabela que contém os dados a serem exibidos.",
+        "Select the table to link to.": "Selecione a tabela à qual se vincular.",
+        "Selecting Data": "A selecionar dados",
+        "The Raw Data page lists all data tables in your document, including summary tables and tables not included in page layouts.": "A página de dados brutos lista todas as tabelas de dados no seu documento, incluindo tabelas de resumo e tabelas não incluídas nos layouts de página.",
+        "The total size of all data in this document, excluding attachments.": "O tamanho total de todos os dados deste documento, excluindo os anexos.",
+        "They allow for one record to point (or refer) to another.": "Eles permitem que um registo aponte (ou se refira) a outro.",
+        "This is the secret to Grist's dynamic and productive layouts.": "Este é o segredo dos layouts dinâmicos e produtivos do Grist.",
+        "Try out changes in a copy, then decide whether to replace the original with your edits.": "Experimente mudanças numa cópia, depois decida se deseja substituir o original pelas suas edições.",
+        "Unpin to hide the the button while keeping the filter.": "Desfixe para ocultar o botão enquanto mantém o filtro.",
+        "Use the \\u{1D6BA} icon to create summary (or pivot) tables, for totals or subtotals.": "Use o ícone \\u{1D6BA} para criar tabelas de resumo (ou dinâmicas) para totais ou subtotais.",
+        "Useful for storing the timestamp or author of a new record, data cleaning, and more.": "Útil para armazenar o carimbo da hora ou autor de um novo registo, limpeza de dados e muito mais.",
+        "You can filter by more than one column.": "Pode filtrar por mais que uma coluna.",
+        "entire": "inteiro",
+        "relational": "relacionais",
+        "Access Rules": "Regras de Acesso",
+        "Access rules give you the power to create nuanced rules to determine who can see or edit which parts of your document.": "As regras de acesso lhe dão o poder de criar regras diferenciadas para determinar quem pode ver ou editar quais partes do seu documento.",
+        "Add New": "Adicionar Novo",
+        "Use the 𝚺 icon to create summary (or pivot) tables, for totals or subtotals.": "Use o ícone 𝚺 para criar tabelas resumidas (ou dinâmicas), para totais ou subtotais.",
+        "Anchor Links": "Ligações de âncora",
+        "Custom Widgets": "Widgets personalizados"
+    },
+    "WelcomeQuestions": {
+        "IT & Technology": "TI e Tecnologia",
+        "Marketing": "Publicidade",
+        "Media Production": "Produção de Mídia",
+        "Other": "Outros",
+        "Product Development": "Desenvolvimento de Produto",
+        "Research": "Investigação",
+        "Sales": "Vendas",
+        "Type here": "Digite aqui",
+        "Welcome to Grist!": "Bem-vindo ao Grist!",
+        "What brings you to Grist? Please help us serve you better.": "O que te traz ao Grist? Por favor, ajude-nos a atendê-lo melhor.",
+        "Education": "Educação",
+        "Finance & Accounting": "Finanças e Contabilidade",
+        "HR & Management": "RH e Gestão"
+    },
+    "WidgetTitle": {
+        "Cancel": "Cancelar",
+        "DATA TABLE NAME": "NOME DA TABELA DE DADOS",
+        "Override widget title": "Substituir o título do Widget",
+        "Provide a table name": "Forneça um nome de tabela",
+        "Save": "Gravar",
+        "WIDGET TITLE": "TÍTULO DO WIDGET",
+        "WIDGET DESCRIPTION": "DESCRIÇÃO DO WIDGET"
+    },
+    "breadcrumbs": {
+        "You may make edits, but they will create a new copy and will\nnot affect the original document.": "Pode fazer edições, mas elas criarão uma nova cópia e\nnão afetarão o documento original.",
+        "override": "sobreescrever",
+        "fiddle": "mexer",
+        "recovery mode": "modo de recuperação",
+        "snapshot": "instantâneo",
+        "unsaved": "não-gravado"
+    },
+    "duplicatePage": {
+        "Duplicate page {{pageName}}": "Duplicar página {{pageName}}",
+        "Note that this does not copy data, but creates another view of the same data.": "Observe que isto não copia dados, mas cria uma outra visão dos mesmos dados."
+    },
+    "errorPages": {
+        "Access denied{{suffix}}": "Acesso negado{{suffix}}",
+        "Add account": "Adicionar conta",
+        "Contact support": "Entre em contato com o suporte",
+        "Error{{suffix}}": "Erro {{suffix}}",
+        "Go to main page": "Ir para a página principal",
+        "Page not found{{suffix}}": "Página não encontrada {{suffix}}",
+        "Sign in": "Entrar",
+        "Sign in again": "Iniciar sessão novamente",
+        "Sign in to access this organization's documents.": "Faça o login para aceder os documentos desta organização.",
+        "Signed out{{suffix}}": "Sessão finalizada{{suffix}}",
+        "Something went wrong": "Algo deu errado",
+        "The requested page could not be found.{{separator}}Please check the URL and try again.": "A página solicitada não pôde ser encontrada.{{separator}}Por favor, verifique a URL e tente novamente.",
+        "There was an error: {{message}}": "Houve um erro: {{message}}",
+        "There was an unknown error.": "Houve um erro desconhecido.",
+        "You are now signed out.": "Agora está fora da sessão.",
+        "You are signed in as {{email}}. You can sign in with a different account, or ask an administrator for access.": "Está inscrito como {{email}}. Pode entrar com uma conta diferente, ou pedir acesso a um administrador.",
+        "You do not have access to this organization's documents.": "Não tem acesso aos documentos desta organização."
+    },
+    "CellStyle": {
+        "Cell Style": "Estilo de célula",
+        "Default cell style": "Estilo de célula padrão",
+        "Mixed style": "Estilo misto",
+        "Open row styles": "Estilos de linha aberta",
+        "CELL STYLE": "ESTILO DE CÉLULA"
+    },
+    "ChoiceTextBox": {
+        "CHOICES": "ESCOLHAS"
+    },
+    "ColumnEditor": {
+        "COLUMN DESCRIPTION": "DESCRIÇÃO DA COLUNA",
+        "COLUMN LABEL": "RÓTULO DA COLUNA"
+    },
+    "ConditionalStyle": {
+        "Add another rule": "Adicionar outra regra",
+        "Add conditional style": "Adicionar estilo condicional",
+        "Error in style rule": "Erro na regra de estilo",
+        "Row Style": "Estilo de Linha",
+        "Rule must return True or False": "A regra deve retornar Verdadeiro ou Falso"
+    },
+    "CurrencyPicker": {
+        "Invalid currency": "Moeda inválida"
+    },
+    "DiscussionEditor": {
+        "Cancel": "Cancelar",
+        "Comment": "Comentário",
+        "Edit": "Editar",
+        "Marked as resolved": "Marcado como resolvido",
+        "Only current page": "Somente a página atual",
+        "Only my threads": "Somente os meus tópicos",
+        "Open": "Abrir",
+        "Remove": "Remover",
+        "Reply": "Responder",
+        "Resolve": "Resolver",
+        "Reply to a comment": "Responder a um comentário",
+        "Show resolved comments": "Mostrar comentários resolvidos",
+        "Showing last {{nb}} comments": "Mostrar os últimos {{nb}} comentários",
+        "Started discussion": "Discussão iniciada",
+        "Write a comment": "Escreva um comentário",
+        "Save": "Gravar"
+    },
+    "EditorTooltip": {
+        "Convert column to formula": "Converter coluna em fórmula"
+    },
+    "WelcomeTour": {
+        "convert to card view, select data, and more.": "converta para a visualização de cartão, selecione dados e muito mais.",
+        "creator panel": "painel do criador",
+        "template library": "biblioteca de modelos",
+        "Add New": "Adicionar Novo",
+        "Browse our {{templateLibrary}} to discover what's possible and get inspired.": "Procure o nosso {{templateLibrary}} para descobrir o que é possível e se inspirar.",
+        "Building up": "A construir",
+        "Configuring your document": "A configurar o seu documento",
+        "Customizing columns": "A personalizar colunas",
+        "Double-click or hit {{enter}} on a cell to edit it. ": "Clique duas vezes ou pressione {{enter}} numa célula para editá-la. ",
+        "Editing Data": "A editar dados",
+        "Enter": "Entra",
+        "Flying higher": "A voar mais alto",
+        "Help Center": "Centro de Ajuda",
+        "Make it relational! Use the {{ref}} type to link tables. ": "Faça-o relacional! Use o tipo {{ref}} para vincular tabelas. ",
+        "Reference": "Referência",
+        "Set formatting options, formulas, or column types, such as dates, choices, or attachments. ": "Defina opções de formatação, fórmulas ou tipos de coluna, como datas, escolhas ou anexos. ",
+        "Share": "Partilhar",
+        "Sharing": "A partilhar",
+        "Start with {{equal}} to enter a formula.": "Comece com {{equal}} para inserir uma fórmula.",
+        "Toggle the {{creatorPanel}} to format columns, ": "Alternar o {{creatorPanel}} para formatar colunas, ",
+        "Use the Share button ({{share}}) to share the document or export data.": "Use o botão Partilhar ({{share}}) para partilhar o documento ou exportar dados.",
+        "Use {{addNew}} to add widgets, pages, or import more data. ": "Use {{addNew}} para adicionar widgets, páginas ou importar mais dados. ",
+        "Use {{helpCenter}} for documentation or questions.": "Use {{helpCenter}} para documentação ou perguntas.",
+        "Welcome to Grist!": "Bem-vindo ao Grist!"
+    },
+    "LanguageMenu": {
+        "Language": "Idioma"
+    },
+    "GridView": {
+        "Click to insert": "Clique para inserir"
+    },
+    "AccountWidget": {
+        "Access Details": "Detalhes de Acesso",
+        "Accounts": "Contas",
+        "Add Account": "Adicionar Conta",
+        "Document Settings": "Configurações do documento",
+        "Manage Team": "Gerir Equipa",
+        "Pricing": "Preços",
+        "Profile Settings": "Configurações de Perfil",
+        "Sign Out": "Sair",
+        "Sign in": "Entrar",
+        "Switch Accounts": "Alternar Contas",
+        "Toggle Mobile Mode": "Alternar Modo Móvel"
+    },
+    "ViewAsDropdown": {
+        "View As": "Ver como",
+        "Users from table": "Utilizadores da tabela",
+        "Example Users": "Utilizadores de exemplo"
+    },
+    "ActionLog": {
+        "Action Log failed to load": "Falha ao carregar o Log de Ações",
+        "Column {{colId}} was subsequently removed in action #{{action.actionNum}}": "A Coluna {{colId}} foi posteriormente removida em ação #{{action.actionNum}}",
+        "Table {{tableId}} was subsequently removed in action #{{actionNum}}": "A Tabela {{tableId}} foi posteriormente removida em ação #{{actionNum}}",
+        "This row was subsequently removed in action {{action.actionNum}}": "Essa linha foi posteriormente removida em ação {{action.actionNum}}"
+    },
+    "AddNewButton": {
+        "Add New": "Adicionar Novo"
+    },
+    "ApiKey": {
+        "By generating an API key, you will be able to make API calls for your own account.": "Ao gerar uma chave API, será capaz de fazer chamadas API para a sua própria conta.",
+        "Click to show": "Clique para mostrar",
+        "Create": "Criar",
+        "Remove": "Remover",
+        "Remove API Key": "Remover a Chave API",
+        "This API key can be used to access this account anonymously via the API.": "Esta chave API pode ser usada para aceder esta conta anonimamente através da API.",
+        "This API key can be used to access your account via the API. Don’t share your API key with anyone.": "Esta chave API pode ser usada para aceder a sua conta através da API. Não partilhe a sua chave API com ninguém.",
+        "You're about to delete an API key. This will cause all future requests using this API key to be rejected. Do you still want to delete?": "Está prestes a apagar uma chave API. Isto fará com que todas as solicitações futuras usando esta chave API sejam rejeitadas. Realmente quer apagar?"
+    },
+    "App": {
+        "Description": "Descrição",
+        "Key": "Chave",
+        "Memory Error": "Erro de Memória",
+        "Translators: please translate this only when your language is ready to be offered to users": "Tradutores: por favor, traduzam isto apenas quando o seu idioma estiver pronto para ser oferecido aos utilizadores"
+    },
+    "AppHeader": {
+        "Home Page": "Página inicial",
+        "Legacy": "Legado",
+        "Personal Site": "Site pessoal",
+        "Team Site": "Site da Equipa"
+    },
+    "AppModel": {
+        "This team site is suspended. Documents can be read, but not modified.": "Este site da equipa está suspenso. Os documentos podem ser lidos, mas não modificados."
+    },
+    "CellContextMenu": {
+        "Clear cell": "Limpar célula",
+        "Clear values": "Limpar valores",
+        "Copy anchor link": "Copiar a ligação de ancoragem",
+        "Delete {{count}} columns_one": "Apagar coluna",
+        "Delete {{count}} columns_other": "Apagar {{count}} colunas",
+        "Delete {{count}} rows_one": "Apagar linha",
+        "Delete {{count}} rows_other": "Apagar {{count}} linhas",
+        "Duplicate rows_one": "Duplicar linha",
+        "Duplicate rows_other": "Duplicar linhas",
+        "Filter by this value": "Filtre por este valor",
+        "Insert column to the left": "Inserir coluna à esquerda",
+        "Insert column to the right": "Inserir coluna à direita",
+        "Insert row": "Inserir linha",
+        "Insert row above": "Inserir linha acima",
+        "Insert row below": "Inserir linha abaixo",
+        "Reset {{count}} columns_one": "Reinicializar coluna",
+        "Reset {{count}} columns_other": "Reinicializar {{count}} colunas",
+        "Reset {{count}} entire columns_one": "Reinicializar toda a coluna",
+        "Reset {{count}} entire columns_other": "Reinicializar {{count}} colunas inteiras",
+        "Comment": "Comentário",
+        "Copy": "Copiar",
+        "Cut": "Cortar",
+        "Paste": "Colar"
+    },
+    "ColorSelect": {
+        "Apply": "Aplicar",
+        "Cancel": "Cancelar",
+        "Default cell style": "Estilo de célula padrão"
+    },
+    "DataTables": {
+        "Click to copy": "Clique para copiar",
+        "Delete {{formattedTableName}} data, and remove it from all pages?": "Apagar os dados da {{formattedTableName}} e removê-la de todas as páginas?",
+        "Duplicate Table": "Duplicar a Tabela",
+        "Raw Data Tables": "Tabelas de Dados Primários",
+        "Table ID copied to clipboard": "ID da Tabela copiada para a área de transferência",
+        "You do not have edit access to this document": "Não tem permissão de edição desse documento"
+    },
+    "DocPageModel": {
+        "Add Empty Table": "Adicionar Tabela Vazia",
+        "Add Page": "Adicionar Página",
+        "Add Widget to Page": "Adicionar Widget à Página",
+        "Document owners can attempt to recover the document. [{{error}}]": "Proprietários do documento podem tentar recuperar o documento. [{{error}}]",
+        "Enter recovery mode": "Entrar em modo de recuperação",
+        "Error accessing document": "Erro ao aceder o documento",
+        "Reload": "Recarregar",
+        "Sorry, access to this document has been denied. [{{error}}]": "Desculpe, o acesso a esse documento foi negado. [{{error}}]",
+        "You can try reloading the document, or using recovery mode. Recovery mode opens the document to be fully accessible to owners, and inaccessible to others. It also disables formulas. [{{error}}]": "Pode tentar recarregar o documento ou usar o modo de recuperação. O modo de recuperação abre o documento para ser totalmente acessível aos proprietários e inacessível a outras pessoas. Ele também desativa as fórmulas. [{{error}}]",
+        "You do not have edit access to this document": "Não tem permissão de edição desse documento"
+    },
+    "DocTour": {
+        "Cannot construct a document tour from the data in this document. Ensure there is a table named GristDocTour with columns Title, Body, Placement, and Location.": "Não é possível construir um Tour a partir dos dados contidos neste documento. Certifique-se de que haja uma tabela chamada GristDocTour com colunas Title, Body, Placement e Location.",
+        "No valid document tour": "Tour de documento inválido"
+    },
+    "DocumentSettings": {
+        "Currency:": "Moeda:",
+        "Document Settings": "Configurações do documento",
+        "Engine (experimental {{span}} change at own risk):": "Motor (experimental {{span}} mudança por conta e risco próprios):",
+        "Local currency ({{currency}})": "Moeda local ({{currency}})",
+        "Locale:": "Localização:",
+        "Save": "Gravar",
+        "Save and Reload": "Gravar e Recarregar",
+        "This document's ID (for API use):": "O ID deste documento (para uso em API):",
+        "Time Zone:": "Fuso horário:",
+        "API": "API",
+        "Document ID copied to clipboard": "ID do documento copiado para a área de transferência",
+        "Ok": "OK",
+        "Manage Webhooks": "Gerir ganchos web",
+        "Webhooks": "Ganchos Web"
+    },
+    "DocumentUsage": {
+        "Attachments Size": "Tamanho dos Anexos",
+        "Contact the site owner to upgrade the plan to raise limits.": "Entre em contato com o proprietário do site para atualizar o plano para aumentar os limites.",
+        "Data Size": "Tamanho dos Dados",
+        "For higher limits, ": "Para limites maiores, ",
+        "Rows": "Linhas",
+        "Usage": "Uso",
+        "Usage statistics are only available to users with full access to the document data.": "As estatísticas de uso só estão disponíveis para utilizadores com acesso total aos dados do documento.",
+        "start your 30-day free trial of the Pro plan.": "comece a sua avaliação gratuita de 30 dias do plano Pro."
+    },
+    "Drafts": {
+        "Restore last edit": "Restaurar a última edição",
+        "Undo discard": "Desfazer descarte"
+    },
+    "DuplicateTable": {
+        "Copy all data in addition to the table structure.": "Copiar todos os dados, além da estrutura da tabela.",
+        "Instead of duplicating tables, it's usually better to segment data using linked views. {{link}}": "Em vez de dplicar tabelas, geralmente é melhor segmentar os dados usando vistas vinculadas. {{link}}",
+        "Name for new table": "Nome para a nova tabela",
+        "Only the document default access rules will apply to the copy.": "Somente as regras de acesso padrão do documento serão aplicadas à cópia."
+    },
+    "ExampleInfo": {
+        "Afterschool Program": "Programa Pós-Escolar",
+        "Check out our related tutorial for how to link data, and create high-productivity layouts.": "Confira o nosso tutorial relacionado para saber como vincular dados e criar leiautes de alta produtividade.",
+        "Check out our related tutorial for how to model business data, use formulas, and manage complexity.": "Consulte o nosso tutorial relacionado para saber como modelar dados corporativos, usar fórmulas e gerir a complexidade.",
+        "Check out our related tutorial to learn how to create summary tables and charts, and to link charts dynamically.": "Confira o nosso tutorial relacionado para aprender como criar tabelas e gráficos resumidos e para vincular os gráficos dinamicamente.",
+        "Investment Research": "Pesquisa de Investimento",
+        "Lightweight CRM": "CRM Simples (Gestão de Relações com o Cliente)",
+        "Tutorial: Analyze & Visualize": "Tutorial: Analisar e Visualizar",
+        "Tutorial: Create a CRM": "Tutorial: Criar um CRM",
+        "Tutorial: Manage Business Data": "Tutorial: Gerir dados corporativos",
+        "Welcome to the Afterschool Program template": "Bem vindo ao modelo do Programa Pós-Escolar",
+        "Welcome to the Investment Research template": "Bem vindo ao modelo de Pesquisa de Investimento",
+        "Welcome to the Lightweight CRM template": "Bem vindo ao modelo de CRM Simples (gestão de relações com o cliente)"
+    },
+    "HomeLeftPane": {
+        "Access Details": "Detalhes de Acesso",
+        "All Documents": "Todos os Documentos",
+        "Create Empty Document": "Criar um Documento Vazio",
+        "Create Workspace": "Criar Área de Trabalho",
+        "Delete": "Apagar",
+        "Delete {{workspace}} and all included documents?": "Apagar {{workspace}} e todos os documentos inclusos?",
+        "Examples & Templates": "Modelos",
+        "Import Document": "Importar Documento",
+        "Manage Users": "Gerir Utilizadores",
+        "Rename": "Renomear",
+        "Trash": "Lixo",
+        "Workspace will be moved to Trash.": "A Área de Trabalho será movida para Lixo.",
+        "Workspaces": "Áreas de Trabalho",
+        "Tutorial": "Tutorial"
+    },
+    "Importer": {
+        "Merge rows that match these fields:": "Mesclar linhas que correspondem a estes campos:",
+        "Select fields to match on": "Selecione os campos a serem correspondidos em",
+        "Update existing records": "Atualizar os registos existentes"
+    },
+    "LeftPanelCommon": {
+        "Help Center": "Centro de Ajuda"
+    },
+    "ViewLayoutMenu": {
+        "Advanced Sort & Filter": "Ordenar & filtrar avançados",
+        "Copy anchor link": "Copiar a ligação de ancoragem",
+        "Data selection": "Seleção de dados",
+        "Delete record": "Apagar registo",
+        "Delete widget": "Apagar Widget",
+        "Download as CSV": "Descarregar como CSV",
+        "Download as XLSX": "Descarregar como XLSX",
+        "Edit Card Layout": "Editar Layout de cartão",
+        "Open configuration": "Abrir configuração",
+        "Print widget": "Imprimir Widget",
+        "Show raw data": "Mostrar dados primários",
+        "Widget options": "Opções do Widget",
+        "Add to page": "Adicionar à página",
+        "Collapse widget": "Colapsar widget"
+    },
+    "ViewSectionMenu": {
+        "(customized)": "(personalizado)",
+        "(empty)": "(vazio)",
+        "(modified)": "(modificado)",
+        "Custom options": "Opções personalizadas",
+        "FILTER": "FILTRAR",
+        "Revert": "Reverter",
+        "SORT": "ORDENAR",
+        "Save": "Gravar",
+        "Update Sort&Filter settings": "Atualizar configurações de Ordenar e Filtrar"
+    },
+    "VisibleFieldsConfig": {
+        "Cannot drop items into Hidden Fields": "Não é possível lançar itens em Campos Ocultos",
+        "Clear": "Limpar",
+        "Hidden Fields cannot be reordered": "Campos ocultos não podem ser reordenados",
+        "Select All": "Selecionar Todos",
+        "Visible {{label}}": "{{label}} visível",
+        "Hide {{label}}": "Ocultar {{label}}",
+        "Hidden {{label}}": "{{label}} escondido",
+        "Show {{label}}": "Mostrar {{label}}"
+    },
+    "menus": {
+        "* Workspaces are available on team plans. ": "* As áreas de trabalho estão disponíveis nos planos de equipa. ",
+        "Select fields": "Selecionar campos",
+        "Upgrade now": "Atualizar agora",
+        "Any": "Qualquer",
+        "Numeric": "Numérico",
+        "Text": "Texto",
+        "Integer": "Inteiro",
+        "Toggle": "Alternar",
+        "Date": "Data",
+        "DateTime": "DataHora",
+        "Choice": "Opção",
+        "Choice List": "Lista de opções",
+        "Reference": "Referência",
+        "Reference List": "Lista de Referências",
+        "Attachment": "Anexo"
+    },
+    "modals": {
+        "Cancel": "Cancelar",
+        "Ok": "OK",
+        "Save": "Gravar"
+    },
+    "pages": {
+        "Duplicate Page": "Duplicar a Página",
+        "Remove": "Remover",
+        "Rename": "Renomear",
+        "You do not have edit access to this document": "Não tem permissão de edição desse documento"
+    },
+    "search": {
+        "Find Next ": "Encontrar Próximo ",
+        "Find Previous ": "Encontrar Anterior ",
+        "No results": "Sem resultados",
+        "Search in document": "Procurar no documento"
+    },
+    "sendToDrive": {
+        "Sending file to Google Drive": "A enviar ficheiro ao Google Drive"
+    },
+    "NTextBox": {
+        "false": "falso",
+        "true": "verdadeiro"
+    },
+    "ACLUsers": {
+        "Example Users": "Utilizadores de exemplo",
+        "Users from table": "Utilizadores da tabela",
+        "View As": "Ver como"
+    },
+    "TypeTransform": {
+        "Apply": "Aplicar",
+        "Cancel": "Cancelar",
+        "Preview": "Pré-visualização",
+        "Revise": "Revisar",
+        "Update formula (Shift+Enter)": "Atualizar a fórmula (Shift+Enter)"
+    },
+    "FieldEditor": {
+        "It should be impossible to save a plain data value into a formula column": "Deveria ser impossível de gravar um valor de dados simples numa coluna de fórmula",
+        "Unable to finish saving edited cell": "Não é possível concluir gravar a célula editada"
+    },
+    "FormulaEditor": {
+        "Column or field is required": "Coluna ou campo é obrigatório",
+        "Error in the cell": "Erro na célula",
+        "Errors in all {{numErrors}} cells": "Erro em todas as {{numErrors}} células",
+        "Errors in {{numErrors}} of {{numCells}} cells": "Erros em {{numErrors}} de {{numCells}} células",
+        "editingFormula is required": "ediçãoFórmula é obrigatório"
+    },
+    "HyperLinkEditor": {
+        "[link label] url": "[rótulo da ligação] URL"
+    },
+    "Reference": {
+        "CELL FORMAT": "FORMATO DA CÉLULA",
+        "Row ID": "ID da linha",
+        "SHOW COLUMN": "MOSTRAR COLUNA"
+    },
+    "DescriptionConfig": {
+        "DESCRIPTION": "DESCRIÇÃO"
+    },
+    "PagePanels": {
+        "Close Creator Panel": "Fechar Painel do Criador",
+        "Open Creator Panel": "Abrir o Painel do Criador"
+    },
+    "ColumnTitle": {
+        "Add description": "Adicionar descrição",
+        "COLUMN ID: ": "ID DA COLUNA: ",
+        "Cancel": "Cancelar",
+        "Column ID copied to clipboard": "ID da coluna copiada para a área de transferência",
+        "Column description": "Descrição da coluna",
+        "Column label": "Rótulo da coluna",
+        "Provide a column label": "Forneça um rótulo de coluna",
+        "Save": "Gravar",
+        "Close": "Fechar"
+    },
+    "Clipboard": {
+        "Got it": "Entendido",
+        "Unavailable Command": "Comando indisponível"
+    },
+    "FieldContextMenu": {
+        "Clear field": "Limpar campo",
+        "Copy": "Copiar",
+        "Copy anchor link": "Copiar ligação de âncora",
+        "Cut": "Cortar",
+        "Hide field": "Ocultar campo",
+        "Paste": "Colar"
+    },
+    "WebhookPage": {
+        "Clear Queue": "Limpar fila",
+        "Webhook Settings": "Configurações do gancho web"
+    }
+}
diff --git a/static/locales/pt_BR.client.json b/static/locales/pt_BR.client.json
index 4dcb5f97..3bdc4aee 100644
--- a/static/locales/pt_BR.client.json
+++ b/static/locales/pt_BR.client.json
@@ -1073,5 +1073,31 @@
         "Clear field": "Limpar campo",
         "Copy": "Copiar",
         "Cut": "Cortar"
+    },
+    "FormulaAssistant": {
+        "Capabilities": "Capacidades",
+        "Formula Help. ": "Ajuda de Fórmula. ",
+        "Function List": "Lista de funções",
+        "Grist's AI Assistance": "Assistência de IA do Grist",
+        "Grist's AI Formula Assistance. ": "Assistência à Fórmula IA do Grist. ",
+        "Need help? Our AI assistant can help.": "Precisa de ajuda? Nosso assistente de IA pode ajudar.",
+        "New Chat": "Novo chat",
+        "Preview": "Prévisualizar",
+        "Regenerate": "Regenerar",
+        "Save": "Salvar",
+        "Tips": "Dicas",
+        "See our {{helpFunction}} and {{formulaCheat}}, or visit our {{community}} for more help.": "Consulte nossos sites {{helpFunction}} e {{formulaCheat}}, ou visite nosso site {{community}} para obter mais ajuda.",
+        "Ask the bot.": "Pergunte ao bot.",
+        "Data": "Dados",
+        "Formula Cheat Sheet": "Folha de Consulta da Fórmula",
+        "Community": "Comunidade"
+    },
+    "GridView": {
+        "Click to insert": "Clique para inserir"
+    },
+    "WelcomeSitePicker": {
+        "You have access to the following Grist sites.": "Você tem acesso aos seguintes sites do Grist.",
+        "Welcome back": "Bem-vindo de volta",
+        "You can always switch sites using the account menu.": "Você sempre pode alternar entre sites usando o menu da conta."
     }
 }
diff --git a/static/locales/ru.client.json b/static/locales/ru.client.json
index d17a3c26..f9ebde05 100644
--- a/static/locales/ru.client.json
+++ b/static/locales/ru.client.json
@@ -1009,5 +1009,31 @@
     "WebhookPage": {
         "Clear Queue": "Очистить очередь",
         "Webhook Settings": "Настройки вебхука"
+    },
+    "FormulaAssistant": {
+        "Ask the bot.": "Спроси у бота.",
+        "Capabilities": "Возможности",
+        "Community": "Сообщество",
+        "Data": "Данные",
+        "Formula Cheat Sheet": "Шпаргалка по формуле",
+        "Formula Help. ": "Справка по формуле. ",
+        "Function List": "Список функций",
+        "Grist's AI Assistance": "Помощь AI Grist'а",
+        "Grist's AI Formula Assistance. ": "Помощник по формуле AI Grist'a. ",
+        "New Chat": "Новый чат",
+        "Preview": "Предпросмотр",
+        "Regenerate": "Регенерировать",
+        "Save": "Сохранить",
+        "See our {{helpFunction}} and {{formulaCheat}}, or visit our {{community}} for more help.": "Посмотрите наш {{helpFunction}} и {{formulaCheat}}, или поситите наше {{community}} для получения дополнительной помощи.",
+        "Tips": "Советы",
+        "Need help? Our AI assistant can help.": "Нужна помощь? Наш AI помощник может помочь."
+    },
+    "GridView": {
+        "Click to insert": "Нажмите для вставки"
+    },
+    "WelcomeSitePicker": {
+        "Welcome back": "С возвращением",
+        "You can always switch sites using the account menu.": "Вы всегда можете переключиться с одного сайта на другой, используя меню учетной записи.",
+        "You have access to the following Grist sites.": "У вас есть доступ к следующим сайтам Grist."
     }
 }
diff --git a/static/ui-icons/UI/Heart.svg b/static/ui-icons/UI/Heart.svg
new file mode 100644
index 00000000..3acc81d7
--- /dev/null
+++ b/static/ui-icons/UI/Heart.svg
@@ -0,0 +1,10 @@
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_846_15419)">
+<path d="M7.68564 15.999C6.88564 15.299 0.285645 9.79901 0.285645 5.59901C0.285645 2.89901 2.48564 0.799011 5.08564 0.799011C6.28564 0.799011 7.38564 1.29901 8.28564 1.99901C9.18564 1.19901 10.2856 0.799011 11.4856 0.799011C14.1856 0.799011 16.2856 2.99901 16.2856 5.59901C16.2856 9.79901 9.68565 15.299 8.88564 15.899C8.58564 16.299 7.98564 16.299 7.68564 15.999ZM5.08564 2.79901C3.58564 2.79901 2.28564 4.09901 2.28564 5.59901C2.28564 7.79901 5.78564 11.599 8.28564 13.799C10.3856 11.899 14.2856 7.99901 14.2856 5.59901C14.2856 3.99901 12.9856 2.79901 11.4856 2.79901C10.5856 2.79901 9.68564 3.29901 9.18564 4.09901C8.78564 4.69901 7.88564 4.69901 7.48564 4.09901C6.88564 3.29901 6.08564 2.79901 5.08564 2.79901Z" fill="#16B378"/>
+</g>
+<defs>
+<clipPath id="clip0_846_15419">
+<rect width="16" height="16" fill="white" transform="translate(0.285645 0.499023)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/stubs/app/server/lib/create.ts b/stubs/app/server/lib/create.ts
index 98c11b52..370d0c5a 100644
--- a/stubs/app/server/lib/create.ts
+++ b/stubs/app/server/lib/create.ts
@@ -1,4 +1,4 @@
-import { checkMinIOExternalStorage,
+import { checkMinIOBucket, checkMinIOExternalStorage,
          configureMinIOExternalStorage } from 'app/server/lib/configureMinIOExternalStorage';
 import { makeSimpleCreator } from 'app/server/lib/ICreate';
 import { Telemetry } from 'app/server/lib/Telemetry';
@@ -12,6 +12,7 @@ export const create = makeSimpleCreator({
     {
       name: 'minio',
       check: () => checkMinIOExternalStorage() !== undefined,
+      checkBackend: () => checkMinIOBucket(),
       create: configureMinIOExternalStorage,
     },
   ],
diff --git a/stubs/app/server/server.ts b/stubs/app/server/server.ts
index dc462275..9ea30b40 100644
--- a/stubs/app/server/server.ts
+++ b/stubs/app/server/server.ts
@@ -117,5 +117,7 @@ export async function main() {
 }
 
 if (require.main === module) {
-  main().catch((err) => console.error(err));
+  main().catch((err) => {
+    console.error(err);
+  });
 }
diff --git a/test/common/Telemetry.ts b/test/common/Telemetry.ts
index 90dba2d8..ad65805c 100644
--- a/test/common/Telemetry.ts
+++ b/test/common/Telemetry.ts
@@ -1,4 +1,4 @@
-import {buildTelemetryEventChecker, filterMetadata, TelemetryEvent} from 'app/common/Telemetry';
+import {buildTelemetryEventChecker, TelemetryEvent} from 'app/common/Telemetry';
 import {assert} from 'chai';
 
 describe('Telemetry', function() {
@@ -132,84 +132,4 @@ describe('Telemetry', function() {
       );
     });
   });
-
-  describe('filterMetadata', function() {
-    it('returns filtered and flattened metadata when maxLevel is "full"', function() {
-      const metadata = {
-        limited: {
-          foo: 'abc',
-        },
-        full: {
-          bar: '123',
-        },
-      };
-      assert.deepEqual(filterMetadata(metadata, 'full'), {
-        foo: 'abc',
-        bar: '123',
-      });
-    });
-
-    it('returns filtered and flattened metadata when maxLevel is "limited"', function() {
-      const metadata = {
-        limited: {
-          foo: 'abc',
-        },
-        full: {
-          bar: '123',
-        },
-      };
-      assert.deepEqual(filterMetadata(metadata, 'limited'), {
-        foo: 'abc',
-      });
-    });
-
-    it('returns undefined when maxLevel is "off"', function() {
-      assert.isUndefined(filterMetadata(undefined, 'off'));
-    });
-
-    it('returns an empty object when metadata is empty', function() {
-      assert.isEmpty(filterMetadata({}, 'full'));
-    });
-
-    it('returns undefined when metadata is undefined', function() {
-      assert.isUndefined(filterMetadata(undefined, 'full'));
-    });
-
-    it('does not mutate metadata', function() {
-      const metadata = {
-        limited: {
-          foo: 'abc',
-        },
-        full: {
-          bar: '123',
-        },
-      };
-      filterMetadata(metadata, 'limited');
-      assert.deepEqual(metadata, {
-        limited: {
-          foo: 'abc',
-        },
-        full: {
-          bar: '123',
-        },
-      });
-    });
-
-    it('excludes keys with nullish values', function() {
-      const metadata = {
-        limited: {
-          foo1: null,
-          foo2: 'abc',
-        },
-        full: {
-          bar1: undefined,
-          bar2: '123',
-        },
-      };
-      assert.deepEqual(filterMetadata(metadata, 'full'), {
-        foo2: 'abc',
-        bar2: '123',
-      });
-    });
-  });
 });
diff --git a/test/fixtures/sites/config/page.js b/test/fixtures/sites/config/page.js
index 37bcc366..3340f201 100644
--- a/test/fixtures/sites/config/page.js
+++ b/test/fixtures/sites/config/page.js
@@ -4,28 +4,30 @@
 const urlParams = new URLSearchParams(window.location.search);
 const ready = urlParams.get('ready') ? JSON.parse(urlParams.get('ready')) : undefined;
 
-if (ready && ready.onEditOptions) {
-  ready.onEditOptions = () => {
-    document.getElementById('configure').innerHTML = 'called';
-  };
+function setup() {
+  if (ready && ready.onEditOptions) {
+    ready.onEditOptions = () => {
+      document.getElementById('configure').innerHTML = 'called';
+    };
+  }
+
+  grist.ready(ready);
+
+  grist.onOptions(data => {
+    document.getElementById('onOptions').innerHTML = JSON.stringify(data);
+  });
+
+  grist.onRecord((data, mappings) => {
+    document.getElementById('onRecord').innerHTML = JSON.stringify(data);
+    document.getElementById('onRecordMappings').innerHTML = JSON.stringify(mappings);
+  });
+
+  grist.onRecords((data, mappings) => {
+    document.getElementById('onRecords').innerHTML = JSON.stringify(data);
+    document.getElementById('onRecordsMappings').innerHTML = JSON.stringify(mappings);
+  });
 }
 
-grist.ready(ready);
-
-grist.onOptions(data => {
-  document.getElementById('onOptions').innerHTML = JSON.stringify(data);
-});
-
-grist.onRecord((data, mappings) => {
-  document.getElementById('onRecord').innerHTML = JSON.stringify(data);
-  document.getElementById('onRecordMappings').innerHTML = JSON.stringify(mappings);
-});
-
-grist.onRecords((data, mappings) => {
-  document.getElementById('onRecords').innerHTML = JSON.stringify(data);
-  document.getElementById('onRecordsMappings').innerHTML = JSON.stringify(mappings);
-});
-
 async function run(handler) {
   try {
     document.getElementById('output').innerText = 'waiting...';
@@ -66,6 +68,7 @@ async function configure() {
 }
 
 window.onload = () => {
+  setup();
   document.getElementById('ready').innerText = 'ready';
   document.getElementById('access').innerHTML = urlParams.get('access');
   document.getElementById('readonly').innerHTML = urlParams.get('readonly');
diff --git a/test/formula-dataset/data/formula-dataset-index.csv b/test/formula-dataset/data/formula-dataset-index.csv
index 56e381c9..1c977a63 100644
--- a/test/formula-dataset/data/formula-dataset-index.csv
+++ b/test/formula-dataset/data/formula-dataset-index.csv
@@ -1,69 +1,76 @@
-table_id,col_id,doc_id,Description
-Contacts,Send_Email,hQHXqAQXceeQBPvRw5sSs1,"Link to compose an email, if there is one"
-Contacts,No_Notes,hQHXqAQXceeQBPvRw5sSs1,"Number of notes for this contact"
-Category,Contains_archived_project_,hQHXqAQXceeQBPvRw5sSs1,"Whether any projects in this category are archived"
-Tasks,Today,hQHXqAQXceeQBPvRw5sSs1,Needs to be done today (or every day)
-Tasks,Week_Day,hQHXqAQXceeQBPvRw5sSs1,Full name of deadline weekday
-Tasks,period,hQHXqAQXceeQBPvRw5sSs1,Whether this task was modified between (inclusive) the dates in the single row in Settings
-Expenses,Month,55Q2EtTbFvB1N6iizLh4Rk,e.g. 2022-01
-Payroll,Date_Range,5pHLanQNThxkEaEJHKJUf5,"The start date, followed by a dash (no spaces) and the end date if there is one. Dates are month/day with no leading zeroes."
-Payroll,Per_Hour,5pHLanQNThxkEaEJHKJUf5,The hourly rate of the latest rate for this role and person that started on or before this date
-Payroll,Payment,5pHLanQNThxkEaEJHKJUf5,"Total payment amount for hours worked, rounded to the nearest cent."
-Payroll_summary_Pay_Period_Person,Dates,5pHLanQNThxkEaEJHKJUf5,"All date ranges in the group, separated by a comma and a space"
-People,Full_Name,5pHLanQNThxkEaEJHKJUf5,"e.g. Doe, John"
-General_Ledger,Quarter,2YwYBWpREY2a1N2NV7cb55,e.g. 2020 Q4
-General_Ledger,Year,2YwYBWpREY2a1N2NV7cb55,"Just the year of the date, as a string"
-Time_Calculator,Time_Worked,np7TVHmuvFcHmo1K8h7Ur4,Formatted as hours:minutes. No leading zeroes for hours.
-Time_Calculator,Seconds_Worked,np7TVHmuvFcHmo1K8h7Ur4,"Number of seconds between start/end times, if they're both there"
-Funding_Source,Percentage,qprycQa2TVwajAe6Hb3bUZ,Ratio of the amount to the total across all rows
-Funding_Source_summary,Debt_to_Equity,qprycQa2TVwajAe6Hb3bUZ,Ratio of the total amounts in the group where the type is Debt vs Equity
-Invoices,Client,bReAxyLmzmEQfHF5L5Sc1e,Client's name followed by their address on the next line
-Invoices,Hours,bReAxyLmzmEQfHF5L5Sc1e,Total duration in hours across all time logs for this invoice
-Invoices,Due,bReAxyLmzmEQfHF5L5Sc1e,30 days after the invoice date
-Invoices,Invoice_ID,bReAxyLmzmEQfHF5L5Sc1e,Invoice date followed by the client's name in brackets
-Projects,Project_Name,bReAxyLmzmEQfHF5L5Sc1e,"Client name and project name, e.g. John Doe: Big project"
-Time_Log,Date,bReAxyLmzmEQfHF5L5Sc1e,Start date if there is one
-Time_Log,Duration_hrs_,bReAxyLmzmEQfHF5L5Sc1e,Duration (if there is one) in hours rounded to two decimal places
-Time_Log,Duration_min_,bReAxyLmzmEQfHF5L5Sc1e,"Number of minutes between start and end time. If either time is missing, leave blank. If end is before start, give 0."
-Filtered_By_Formula,LabelCount,9nNr9uQwoXWAvxcWQDygh6,"1 if the state is CA, otherwise 0"
-Objects,Address,pyMHqncEspfZN5zfShCwT8,"City and state, separated by comma space"
-Books,search_terms,hdXy57qLiyNf35oNLzzgBG,"Title and author name, with a space in between"
-BOM_Items,Cost,e4gEm7dt4cgBMkouVBNMeY,Total cost if both quantity and cost are given
-Bill_Of_Materials,Cost,e4gEm7dt4cgBMkouVBNMeY,Total cost
-All_Responses,Entry,qvND7WUcuNb2fU4n1vBJ7f,"Name and submitted date in the format ""Name - month-day"""
-All_Responses,Month,qvND7WUcuNb2fU4n1vBJ7f,Submitted month (full name) and year
-Cap_Table,Common_Stock,iXggjrCPHut9u2BuhJxJkk,"If the class is Options, RSUs, or Option Pool, return 0, otherwise return the fully diluted value."
-Cap_Table,Fully_Diluted,iXggjrCPHut9u2BuhJxJkk,"The granted amount, minus the total pool used if the class is Option Pool"
-Cap_Table,Fully_Diluted_,iXggjrCPHut9u2BuhJxJkk,Fully diluted as a fraction of the total
-Classes,Spots_Left,swLvb3Fic22gVzrdczcAoZ,or Full
-Classes,Count,swLvb3Fic22gVzrdczcAoZ,Number of enrollments for this class where the status is Confirmed
-All_Survey_Responses,Product_Experience_Score,4ktYzGV1mUipSiQFtkLGqm,"A number based on the experience:
+no_formula,table_id,col_id,doc_id,Description
+0,Contacts,Send_Email,hQHXqAQXceeQBPvRw5sSs1,"Link to compose an email, if there is one"
+0,Contacts,No_Notes,hQHXqAQXceeQBPvRw5sSs1,"Number of notes for this contact"
+0,Category,Contains_archived_project_,hQHXqAQXceeQBPvRw5sSs1,"Whether any projects in this category are archived"
+0,Tasks,Today,hQHXqAQXceeQBPvRw5sSs1,Needs to be done today (or every day)
+0,Tasks,Week_Day,hQHXqAQXceeQBPvRw5sSs1,Full name of deadline weekday
+0,Tasks,period,hQHXqAQXceeQBPvRw5sSs1,Whether this task was modified between (inclusive) the dates in the single row in Settings
+0,Expenses,Month,55Q2EtTbFvB1N6iizLh4Rk,e.g. 2022-01
+0,Payroll,Date_Range,5pHLanQNThxkEaEJHKJUf5,"The start date, followed by a dash (no spaces) and the end date if there is one. Dates are month/day with no leading zeroes."
+0,Payroll,Per_Hour,5pHLanQNThxkEaEJHKJUf5,The hourly rate of the latest rate for this role and person that started on or before this date
+0,Payroll,Payment,5pHLanQNThxkEaEJHKJUf5,"Total payment amount for hours worked, rounded to the nearest cent."
+0,Payroll_summary_Pay_Period_Person,Dates,5pHLanQNThxkEaEJHKJUf5,"All date ranges in the group, separated by a comma and a space"
+0,People,Full_Name,5pHLanQNThxkEaEJHKJUf5,"e.g. Doe, John"
+0,General_Ledger,Quarter,2YwYBWpREY2a1N2NV7cb55,e.g. 2020 Q4
+0,General_Ledger,Year,2YwYBWpREY2a1N2NV7cb55,"Just the year of the date, as a string"
+0,Time_Calculator,Time_Worked,np7TVHmuvFcHmo1K8h7Ur4,Formatted as hours:minutes. No leading zeroes for hours.
+0,Time_Calculator,Seconds_Worked,np7TVHmuvFcHmo1K8h7Ur4,"Number of seconds between start/end times, if they're both there"
+0,Funding_Source,Percentage,qprycQa2TVwajAe6Hb3bUZ,Ratio of the amount to the total across all rows
+0,Funding_Source_summary,Debt_to_Equity,qprycQa2TVwajAe6Hb3bUZ,Ratio of the total amounts in the group where the type is Debt vs Equity
+0,Invoices,Client,bReAxyLmzmEQfHF5L5Sc1e,Client's name followed by their address on the next line
+0,Invoices,Hours,bReAxyLmzmEQfHF5L5Sc1e,Total duration in hours across all time logs for this invoice
+0,Invoices,Due,bReAxyLmzmEQfHF5L5Sc1e,30 days after the invoice date
+0,Invoices,Invoice_ID,bReAxyLmzmEQfHF5L5Sc1e,Invoice date followed by the client's name in brackets
+0,Projects,Project_Name,bReAxyLmzmEQfHF5L5Sc1e,"Client name and project name, e.g. John Doe: Big project"
+0,Time_Log,Date,bReAxyLmzmEQfHF5L5Sc1e,Start date if there is one
+0,Time_Log,Duration_hrs_,bReAxyLmzmEQfHF5L5Sc1e,Duration (if there is one) in hours rounded to two decimal places
+0,Time_Log,Duration_min_,bReAxyLmzmEQfHF5L5Sc1e,"Number of minutes between start and end time. If either time is missing, leave blank. If end is before start, give 0."
+0,Filtered_By_Formula,LabelCount,9nNr9uQwoXWAvxcWQDygh6,"1 if the state is CA, otherwise 0"
+0,Objects,Address,pyMHqncEspfZN5zfShCwT8,"City and state, separated by comma space"
+0,Books,search_terms,hdXy57qLiyNf35oNLzzgBG,"Title and author name, with a space in between"
+0,BOM_Items,Cost,e4gEm7dt4cgBMkouVBNMeY,Total cost if both quantity and cost are given
+0,Bill_Of_Materials,Cost,e4gEm7dt4cgBMkouVBNMeY,Total cost
+1,Bill_Of_Materials,Cost,e4gEm7dt4cgBMkouVBNMeY,Calculate the mean cost and add a row showing the variance from the mean
+0,All_Responses,Entry,qvND7WUcuNb2fU4n1vBJ7f,"Name and submitted date in the format ""Name - month-day"""
+0,All_Responses,Month,qvND7WUcuNb2fU4n1vBJ7f,Submitted month (full name) and year
+0,Cap_Table,Common_Stock,iXggjrCPHut9u2BuhJxJkk,"If the class is Options, RSUs, or Option Pool, return 0, otherwise return the fully diluted value."
+0,Cap_Table,Fully_Diluted,iXggjrCPHut9u2BuhJxJkk,"The granted amount, minus the total pool used if the class is Option Pool"
+0,Cap_Table,Fully_Diluted_,iXggjrCPHut9u2BuhJxJkk,Fully diluted as a fraction of the total
+0,Classes,Spots_Left,swLvb3Fic22gVzrdczcAoZ,or Full
+0,Classes,Count,swLvb3Fic22gVzrdczcAoZ,Number of enrollments for this class where the status is Confirmed
+1,Classes,Count,swLvb3Fic22gVzrdczcAoZ,Add a row at the end with the total number
+0,All_Survey_Responses,Product_Experience_Score,4ktYzGV1mUipSiQFtkLGqm,"A number based on the experience:
 Very Dissatisfied: 1
 Somewhat Dissatisfied: 2
 Neutral: 3
 Somewhat Satisfied: 4
 Very Satisfied: 5"
-Time_Sheet_Entries_summary_Account_Employee_Month,Total_Spend,oGxD8EnzeVs6vSQK3QBrUv,Total hours worked times hourly rate
-Time_Sheets,Title,oGxD8EnzeVs6vSQK3QBrUv,Month number and employee full name separated by a space
-All_Products,SKU,sXsBGDTKau1F3fvxkCyoaJ,"Brand code, color code, and size, separated by dashes without spaces"
-All_Products,QTY_on_Order,sXsBGDTKau1F3fvxkCyoaJ,Total quantity minus total received quantity across all incoming order line items for this product
-All_Products,Stock_Alert,sXsBGDTKau1F3fvxkCyoaJ,"If the amount in stock and on order is more than 5: In Stock
+0,Time_Sheet_Entries_summary_Account_Employee_Month,Total_Spend,oGxD8EnzeVs6vSQK3QBrUv,Total hours worked times hourly rate
+0,Time_Sheets,Title,oGxD8EnzeVs6vSQK3QBrUv,Month number and employee full name separated by a space
+0,All_Products,SKU,sXsBGDTKau1F3fvxkCyoaJ,"Brand code, color code, and size, separated by dashes without spaces"
+0,All_Products,QTY_on_Order,sXsBGDTKau1F3fvxkCyoaJ,Total quantity minus total received quantity across all incoming order line items for this product
+0,All_Products,Stock_Alert,sXsBGDTKau1F3fvxkCyoaJ,"If the amount in stock and on order is more than 5: In Stock
 If it's 0: OUT OF STOCK
 Otherwise: Low Stock"
-Incoming_Order_Line_Items,Received_Qty,sXsBGDTKau1F3fvxkCyoaJ,"The quantity, but only if the order is received"
-Theaters,Latitude2,dKztiPYamcCpttT1LT1FnU,Coordinate before the comma
-Theaters,Longitude,dKztiPYamcCpttT1LT1FnU,Coordinate after the comma and space
-Families,Amount_Due,cJcSKdUC3nLNAv4wTjAxA6,"Total charged minus total paid, capped at 0"
-Families,Total_Applied,cJcSKdUC3nLNAv4wTjAxA6,Total charge for all paid sessions for this family
-Gifts_summary_Occasion_Who_Year,Over_Budget_,dr6epxpXUcy9rsFVUoXTEe,Did we spend more than the budget for this person?
-Gifts_summary_Year,Total_Budget,dr6epxpXUcy9rsFVUoXTEe,Total budget for all important dates this year
-Leases,Signer,5iMYwmESm33JpEECSqdZk2,The signing tenant for this lease
-Apartments,Have_Picture,5iMYwmESm33JpEECSqdZk2,Yes or No depending on if there's a picture
-Apartments,Current_Lease,5iMYwmESm33JpEECSqdZk2,The lease for this apartment whose current status is Active
-Current_Signers,Lease_Start_Date,5iMYwmESm33JpEECSqdZk2,The start date of the lease for this apartment whose current status is Active
-Leases,Lease_End_Date,5iMYwmESm33JpEECSqdZk2,Start date plus the lease term in years minus one day
-Tenancies,Minor,5iMYwmESm33JpEECSqdZk2,"1 if the age is less than 18, otherwise 0"
-Game_Schedule,Loser,1xJAp2uxM7tFCVUbEofKoF,The team that won fewer sets
-Standings,Win_Rate,1xJAp2uxM7tFCVUbEofKoF,Ratio of wins to total games
-Standings,Wins,1xJAp2uxM7tFCVUbEofKoF,Number of games won
-Prepare_Invoices,Due,9NH6D58FmxwPP43nw7uzQK,One month after the issued date if there is one
+0,Incoming_Order_Line_Items,Received_Qty,sXsBGDTKau1F3fvxkCyoaJ,"The quantity, but only if the order is received"
+0,Theaters,Latitude2,dKztiPYamcCpttT1LT1FnU,Coordinate before the comma
+1,Theaters,Latitude2,dKztiPYamcCpttT1LT1FnU,How can I see the coordinates on a map?
+0,Theaters,Longitude,dKztiPYamcCpttT1LT1FnU,Coordinate after the comma and space
+0,Families,Amount_Due,cJcSKdUC3nLNAv4wTjAxA6,"Total charged minus total paid, capped at 0"
+0,Families,Total_Applied,cJcSKdUC3nLNAv4wTjAxA6,Total charge for all paid sessions for this family
+0,Gifts_summary_Occasion_Who_Year,Over_Budget_,dr6epxpXUcy9rsFVUoXTEe,Did we spend more than the budget for this person?
+0,Gifts_summary_Year,Total_Budget,dr6epxpXUcy9rsFVUoXTEe,Total budget for all important dates this year
+0,Leases,Signer,5iMYwmESm33JpEECSqdZk2,The signing tenant for this lease
+1,Leases,Signer,5iMYwmESm33JpEECSqdZk2,Show the attached photo of the signing tenant
+0,Apartments,Have_Picture,5iMYwmESm33JpEECSqdZk2,Yes or No depending on if there's a picture
+0,Apartments,Current_Lease,5iMYwmESm33JpEECSqdZk2,The lease for this apartment whose current status is Active
+0,Current_Signers,Lease_Start_Date,5iMYwmESm33JpEECSqdZk2,The start date of the lease for this apartment whose current status is Active
+0,Leases,Lease_End_Date,5iMYwmESm33JpEECSqdZk2,Start date plus the lease term in years minus one day
+0,Tenancies,Minor,5iMYwmESm33JpEECSqdZk2,"1 if the age is less than 18, otherwise 0"
+0,Game_Schedule,Loser,1xJAp2uxM7tFCVUbEofKoF,The team that won fewer sets
+0,Standings,Win_Rate,1xJAp2uxM7tFCVUbEofKoF,Ratio of wins to total games
+0,Standings,Wins,1xJAp2uxM7tFCVUbEofKoF,Number of games won
+0,Prepare_Invoices,Due,9NH6D58FmxwPP43nw7uzQK,One month after the issued date if there is one
+1,Prepare_Invoices,Due,9NH6D58FmxwPP43nw7uzQK,Hello
+1,Prepare_Invoices,Due,9NH6D58FmxwPP43nw7uzQK,Can you help me?
+1,Prepare_Invoices,Due,9NH6D58FmxwPP43nw7uzQK,How do I create a new table?
diff --git a/test/formula-dataset/runCompletion_impl.ts b/test/formula-dataset/runCompletion_impl.ts
index 4ac94f8b..7ec13917 100644
--- a/test/formula-dataset/runCompletion_impl.ts
+++ b/test/formula-dataset/runCompletion_impl.ts
@@ -25,7 +25,7 @@
 
 
 import { ActiveDoc, Deps as ActiveDocDeps } from "app/server/lib/ActiveDoc";
-import { DEPS } from "app/server/lib/Assistance";
+import { DEPS, sendForCompletion } from "app/server/lib/Assistance";
 import log from 'app/server/lib/log';
 import crypto from 'crypto';
 import parse from 'csv-parse/lib/sync';
@@ -53,6 +53,7 @@ const TEMPLATE_URL = "https://grist-static.com/datasets/grist_dataset_formulai_2
 const oldFetch = DEPS.fetch;
 
 interface FormulaRec {
+  no_formula: string;
   table_id: string;
   col_id: string;
   doc_id: string;
@@ -162,7 +163,7 @@ where c.colId = ? and t.tableId = ?
 `, rec.col_id, rec.table_id);
           formula = colInfo?.formula;
 
-          const result = await activeDoc.getAssistanceWithOptions(session, {
+          const result = await sendForCompletion(session, activeDoc, {
             context: {type: 'formula', tableId, colId},
             state: history,
             text: followUp || description,
@@ -170,6 +171,10 @@ where c.colId = ? and t.tableId = ?
           if (result.state) {
             history = result.state;
           }
+          if (rec.no_formula == "1") {
+            success = result.suggestedActions.length === 0;
+            return null;
+          }
           suggestedActions = result.suggestedActions;
           // apply modification
           const {actionNum} = await activeDoc.applyUserActions(session, suggestedActions);
diff --git a/test/nbrowser/ColumnOps.ntest.js b/test/nbrowser/ColumnOps.ntest.js
index 816d7bbb..3bed2e28 100644
--- a/test/nbrowser/ColumnOps.ntest.js
+++ b/test/nbrowser/ColumnOps.ntest.js
@@ -7,7 +7,6 @@ describe('ColumnOps.ntest', function() {
   const cleanup = test.setupTestSuite(this);
 
   before(async function() {
-    this.timeout(Math.max(this.timeout(), 30000)); // Long-running test, unfortunately
     await gu.supportOldTimeyTestCode();
     await gu.useFixtureDoc(cleanup, "World.grist", true);
     await gu.toggleSidePanel('left', 'close');
diff --git a/test/nbrowser/CustomWidgetsConfig.ts b/test/nbrowser/CustomWidgetsConfig.ts
index 43ae72fe..cefdea0a 100644
--- a/test/nbrowser/CustomWidgetsConfig.ts
+++ b/test/nbrowser/CustomWidgetsConfig.ts
@@ -223,10 +223,10 @@ describe('CustomWidgetsConfig', function () {
     constructor(public frameSelector = 'iframe') {}
     // Wait for a frame.
     public async waitForFrame() {
-      await driver.wait(() => driver.find(this.frameSelector).isPresent(), 1000);
+      await driver.wait(() => driver.find(this.frameSelector).isPresent(), 3000);
       const iframe = driver.find(this.frameSelector);
       await driver.switchTo().frame(iframe);
-      await driver.wait(async () => (await driver.find('#ready').getText()) === 'ready', 1000);
+      await driver.wait(async () => (await driver.find('#ready').getText()) === 'ready', 3000);
       await driver.switchTo().defaultContent();
     }
     public async content() {
@@ -254,7 +254,7 @@ describe('CustomWidgetsConfig', function () {
     }
     // Wait for frame to close.
     public async waitForClose() {
-      await driver.wait(async () => !(await driver.find(this.frameSelector).isPresent()), 1000);
+      await driver.wait(async () => !(await driver.find(this.frameSelector).isPresent()), 3000);
     }
     // Wait for the onOptions event, and return its value.
     public async onOptions() {
@@ -262,7 +262,7 @@ describe('CustomWidgetsConfig', function () {
       await driver.switchTo().frame(iframe);
       // Wait for options to get filled, initially this div is empty,
       // as first message it should get at least null as an options.
-      await driver.wait(async () => await driver.find('#onOptions').getText(), 1000);
+      await driver.wait(async () => await driver.find('#onOptions').getText(), 3000);
       const text = await driver.find('#onOptions').getText();
       await driver.switchTo().defaultContent();
       return JSON.parse(text);
diff --git a/test/nbrowser/DocTutorial.ts b/test/nbrowser/DocTutorial.ts
index 86d5782d..8a7f004f 100644
--- a/test/nbrowser/DocTutorial.ts
+++ b/test/nbrowser/DocTutorial.ts
@@ -558,7 +558,7 @@ describe('DocTutorial', function () {
 
       // Check that the update is immediately reflected in the tutorial popup.
       assert.equal(
-        await driver.find('.test-doc-tutorial-popup p').getText(),
+        await driver.findWait('.test-doc-tutorial-popup p', 2000).getText(),
         'Welcome to the Grist Basics tutorial V2.'
       );
 
@@ -571,7 +571,7 @@ describe('DocTutorial', function () {
       // Switch to another user and restart the tutorial.
       viewerSession = await gu.session().teamSite.user('user2').login();
       await viewerSession.loadDoc(`/doc/${doc.id}`);
-      await driver.find('.test-doc-tutorial-popup-restart').click();
+      await driver.findWait('.test-doc-tutorial-popup-restart', 2000).click();
       await driver.find('.test-modal-confirm').click();
       await gu.waitForServer();
       await driver.findWait('.test-doc-tutorial-popup', 2000);
diff --git a/test/nbrowser/LinkingSelector.ts b/test/nbrowser/LinkingSelector.ts
index a3761f73..4251def1 100644
--- a/test/nbrowser/LinkingSelector.ts
+++ b/test/nbrowser/LinkingSelector.ts
@@ -7,30 +7,134 @@ describe('LinkingSelector', function() {
 
   const cleanup = setupTestSuite({team: true});
   let session: gu.Session;
+  let docId: string;
 
   afterEach(() => gu.checkForErrors());
 
   before(async function() {
     session = await gu.session().login();
-    const doc = await session.tempDoc(cleanup, 'Class Enrollment.grist', {load: false});
-    await session.loadDoc(`/doc/${doc.id}/p/7`);
+    docId = (await session.tempDoc(cleanup, 'Class Enrollment.grist')).id;
   });
 
-  interface CursorSelectorInfo {
-    linkSelector: false | number;
-    cursor: false | {rowNum: number, col: number};
-  }
+  it('should update linked grid view on filter change', async function() {
+    // Add new page with summarized classes by Start_Date.
+    await gu.addNewPage('Table', 'Classes', {
+      summarize: ['Start_Date'],
+    });
 
-  async function getCursorSelectorInfo(section: WebElement): Promise<CursorSelectorInfo> {
-    const hasCursor = await section.find('.active_cursor').isPresent();
-    const hasSelector = await section.find('.link_selector_row').isPresent();
-    return {
-      linkSelector: hasSelector && Number(await section.find('.link_selector_row .gridview_data_row_num').getText()),
-      cursor: hasCursor && await gu.getCursorPosition(section),
-    };
-  }
+    // Add a new linked widget that shows classes by this date.
+    await gu.addNewSection('Table', 'Classes', {
+      selectBy: 'CLASSES [by Start_Date]'
+    });
+
+    // Click on the first date.
+    await gu.getCell('Start_Date', 1, 'CLASSES [by Start_Date]').click();
+    // Make sure we know which row is selected.
+    assert.equal(await gu.getCell('Start_Date', 1).getText(), '2018-09-13');
+
+    // Show only Start_Date in the linked section.
+    await gu.selectSectionByTitle('CLASSES');
+    await gu.openWidgetPanel();
+    await gu.selectAllVisibleColumns();
+    await gu.toggleVisibleColumn('Start_Date');
+    await gu.hideVisibleColumns();
+
+    // Make sure we see the same date.
+    await gu.getCell('Start_Date', 1, 'CLASSES').click();
+    assert.equal(await gu.getCell('Start_Date', 1).getText(), '2018-09-13');
+
+    // Now filter the summary table to not show the selected date.
+    await gu.selectSectionByTitle('CLASSES [by Start_Date]');
+    await gu.filterBy('Start_Date', false, ['2018-09-14']);
+    // Make sure this is filtered out.
+    assert.equal(await gu.getCell('Start_Date', 1, 'CLASSES [by Start_Date]').getText(), '2018-09-14');
+    // Make sure the linked section is updated.
+    assert.equal(await gu.getCell('Start_Date', 1, 'CLASSES').getText(), '2018-09-14');
+  });
+
+  it('should update linked card on filter change with same record linking', async function() {
+    // Test the same for the card view and same record linking (it uses different code).
+    // Add a list and a card view of the same table and link them together.
+    await gu.addNewPage('Table', 'Classes');
+
+    // Hide all columns in the list view.
+    await gu.openWidgetPanel();
+    await gu.selectAllVisibleColumns();
+    await gu.toggleVisibleColumn('Start_Date');
+    await gu.hideVisibleColumns();
+
+    // Rename it to list.
+    await gu.renameActiveSection('List');
+
+    // Now add a card view.
+    await gu.addNewSection('Card', 'Classes', {
+      'selectBy': 'List'
+    });
+    await gu.renameActiveSection('Card');
+    await gu.selectAllVisibleColumns();
+    await gu.toggleVisibleColumn('Start_Date');
+    await gu.hideVisibleColumns();
+
+    // Select the second row.
+    await gu.selectSectionByTitle('List');
+    await gu.getCell('Start_Date', 2).click();
+    // Make sure we know the second row is selected.
+    assert.equal(await gu.getCell('Start_Date', 2).getText(), '2018-09-14');
+    assert.equal((await gu.getCursorPosition()).rowNum, 2);
+
+    // Make sure it was also updated in the card view.
+    await gu.selectSectionByTitle('Card');
+    assert.equal(await gu.getDetailCell('Start_Date', 1).getText(), '2018-09-14');
+
+    // Now filter it out, using pinned filters (to not alter the cursor position).
+    await gu.selectSectionByTitle('List');
+    // Pin the filter to the panel by just adding it (it is pinned by default).
+    await gu.sortAndFilter()
+      .then(x => x.addColumn())
+      .then(x => x.clickColumn('Start_Date'))
+      .then(x => x.close())
+      .then(x => x.click());
+
+    // Open the pinned filter, and filter out the date.
+    await gu.openPinnedFilter('Start_Date')
+      .then(x => x.toggleValue('2018-09-14'))
+      .then(x => x.close());
+
+    // Make sure we see it as the first row
+    assert.equal(await gu.getCell('Start_Date', 1).getText(), '2018-09-13');
+    assert.equal(await gu.getCell('Start_Date', 2).getText(), '2019-01-27');
+    // And cursor was moved to the first row.
+    assert.equal((await gu.getCursorPosition()).rowNum, 1);
+    // Make sure the card view is updated.
+    await gu.selectSectionByTitle('Card');
+    assert.equal(await gu.getDetailCell('Start_Date', 1).getText(), '2018-09-13');
+  });
+
+  it('should update linked section for the first row', async function() {
+    // There was a bug here. First row wasn't somehow triggering the linked section to update itself,
+    // when it was filtered out, for self-linking.
+    await gu.selectSectionByTitle('List');
+    await gu.removeFilters();
+
+    // Select first row.
+    await gu.getCell('Start_Date', 1).click();
+    // Make sure we know what we selected.
+    assert.equal(await gu.getCell('Start_Date', 1, 'List').getText(), '2018-09-13');
+    // Make sure that card reflects it.
+    assert.equal(await gu.getDetailCell('Start_Date', 1, 'Card').getText(), '2018-09-13');
+    // Now unfilter it.
+    await gu.openColumnFilter('Start_Date')
+      .then(x => x.toggleValue('2018-09-13'))
+      .then(x => x.close());
+    // Make sure that List is updated in the first row.
+    assert.equal(await gu.getCell('Start_Date', 1, 'List').getText(), '2018-09-14');
+    // Make sure that Card is updated accordingly.
+    assert.equal(await gu.getDetailCell('Start_Date', 1, 'Card').getText(), '2018-09-14');
+  });
 
   it('should mark selected row used for linking', async function() {
+    await session.loadDoc(`/doc/${docId}/p/7`);
+
     const families = gu.getSection('FAMILIES');
     const students = gu.getSection('STUDENTS');
     const enrollments = gu.getSection('ENROLLMENTS');
@@ -94,3 +198,18 @@ describe('LinkingSelector', function() {
     assert.deepEqual(await getCursorSelectorInfo(families), {linkSelector: 3, cursor: false});
   });
 });
+
+
+interface CursorSelectorInfo {
+  linkSelector: false | number;
+  cursor: false | {rowNum: number, col: number};
+}
+
+async function getCursorSelectorInfo(section: WebElement): Promise<CursorSelectorInfo> {
+  const hasCursor = await section.find('.active_cursor').isPresent();
+  const hasSelector = await section.find('.link_selector_row').isPresent();
+  return {
+    linkSelector: hasSelector && Number(await section.find('.link_selector_row .gridview_data_row_num').getText()),
+    cursor: hasCursor && await gu.getCursorPosition(section),
+  };
+}
diff --git a/test/nbrowser/Localization.ts b/test/nbrowser/Localization.ts
index 43da5800..b5fb4d40 100644
--- a/test/nbrowser/Localization.ts
+++ b/test/nbrowser/Localization.ts
@@ -116,8 +116,7 @@ describe("Localization", function() {
       // But only uz code is preloaded.
       notPresent(uzResponse, "uz-UZ");
 
-      // For Portuguese we have only en.
-      notPresent(ptResponse, "pt", "pt-PR", "uz", "en-US");
+      notPresent(ptResponse, "pt-PR", "uz", "en-US");
     });
 
     it("loads correct languages from file system", async function() {
diff --git a/test/nbrowser/Pages.ts b/test/nbrowser/Pages.ts
index 81d98310..13969753 100644
--- a/test/nbrowser/Pages.ts
+++ b/test/nbrowser/Pages.ts
@@ -259,6 +259,42 @@ describe('Pages', function() {
     assert.include(await gu.getPageNames(), 'People');
   });
 
+  it('should pull out emoji from page names', async () => {
+    // A regular character is used as an initial AND kept in the name.
+    assert.deepEqual(await getInitialAndName(/People/), ['P', 'People']);
+
+    // It looks like our version of Chromedriver does not support sending emojis using sendKeys
+    // (issue mentioned here https://stackoverflow.com/a/59139690), so we'll use executeScript to
+    // rename pages.
+    async function renamePage(origName: string, newName: string) {
+      await gu.openPageMenu(origName);
+      await driver.find('.test-docpage-rename').doClick();
+      const editor = await driver.find('.test-docpage-editor');
+      await driver.executeScript((el: HTMLInputElement, text: string) => { el.value = text; }, editor, newName);
+      await editor.sendKeys(Key.ENTER);
+      await gu.waitForServer();
+    }
+
+    async function getInitialAndName(pageName: string|RegExp): Promise<[string, string]> {
+      return await driver.findContent('.test-treeview-itemHeader', pageName)
+      .findAll('.test-docpage-initial, .test-docpage-label', el => el.getText()) as [string,
+        string];
+    }
+
+    // An emoji is pulled into the initial, and is removed from the name.
+    await renamePage('People', '👥 People');
+
+    assert.deepEqual(await getInitialAndName(/People/), ['👥', 'People']);
+
+    // Two complex emojis -- the first one is the pulled-out initial.
+    await renamePage('People', '👨‍👩‍👧‍👦👨‍👩‍👧Guest List');
+    assert.deepEqual(await getInitialAndName(/Guest List/),
+      ['👨‍👩‍👧‍👦', '👨‍👩‍👧Guest List']);
+
+    await gu.undo(2);
+    assert.deepEqual(await getInitialAndName(/People/), ['P', 'People']);
+  });
+
   it('should show tooltip for long page names on hover', async () => {
     await gu.openPageMenu('People');
     await driver.find('.test-docpage-rename').doClick();
diff --git a/test/nbrowser/RightPanelSelectBy.ts b/test/nbrowser/RightPanelSelectBy.ts
index a496e5d2..1cc6df16 100644
--- a/test/nbrowser/RightPanelSelectBy.ts
+++ b/test/nbrowser/RightPanelSelectBy.ts
@@ -12,9 +12,6 @@ describe('RightPanelSelectBy', function() {
     const doc = await gu.importFixturesDoc('chimpy', 'nasa', 'Horizon', 'Favorite_Films_With_Linked_Ref.grist', false);
     await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`);
     await gu.waitForDocToLoad();
-
-    await gu.toggleSidePanel('right', 'open');
-    await driver.find('.test-config-data').click();
   }
 
   it('should allow linking section with same table', async function() {
@@ -24,7 +21,7 @@ describe('RightPanelSelectBy', function() {
     await driver.findContentWait('.test-treeview-itemHeader', /All/, 2000).click();
     await gu.waitForDocToLoad();
 
-    await openSelectByForSection('PERFORMANCES DETAIL');
+    await gu.openSelectByForSection('PERFORMANCES DETAIL');
 
     // the dollar in /...record$/ makes sure we match against the table main node and not a ref
     // columns such as '...record.Film'
@@ -52,7 +49,7 @@ describe('RightPanelSelectBy', function() {
   });
 
   it('should allow to remove link', async function() {
-    await openSelectByForSection('PERFORMANCES DETAIL');
+    await gu.openSelectByForSection('PERFORMANCES DETAIL');
     await driver.findContent('.test-select-row', /Select Widget/).click();
     await gu.waitForServer();
 
@@ -67,7 +64,7 @@ describe('RightPanelSelectBy', function() {
 
 
   it('should disallow creating cycles', async function() {
-    await openSelectByForSection('PERFORMANCES RECORD');
+    await gu.openSelectByForSection('PERFORMANCES RECORD');
     assert.equal(await driver.findContent('.test-select-row', /Performances detail/).isPresent(), false);
   });
 
@@ -81,7 +78,7 @@ describe('RightPanelSelectBy', function() {
     await gu.addNewSection(/Chart/, /Films/);
 
     // open `SELECT BY`
-    await openSelectByForSection('FILMS');
+    await gu.openSelectByForSection('FILMS');
 
     // check that there is a chart and we cannot link from it
     assert.equal(await gu.getSection('FILMS CHART').isPresent(), true);
@@ -96,7 +93,7 @@ describe('RightPanelSelectBy', function() {
     await gu.getPageItem('Friends').click();
     await gu.waitForServer();
     await gu.addNewSection(/Table/, /Performances/);
-    await openSelectByForSection('Performances');
+    await gu.openSelectByForSection('Performances');
     assert.equal(await driver.findContent('.test-select-row', /FRIENDS.*Favorite Film/).isPresent(), true);
     await driver.findContent('.test-select-row', /FRIENDS.*Favorite Film/).click();
     await gu.waitForServer();
@@ -135,7 +132,7 @@ describe('RightPanelSelectBy', function() {
     await gu.getPageItem('Friends').click();
     await gu.waitForServer();
     await gu.addNewSection(/Card/, /Films/);
-    await openSelectByForSection('Films Card');
+    await gu.openSelectByForSection('Films Card');
     assert.equal(await driver.findContent('.test-select-row', /FRIENDS.*Favorite Film/).isPresent(), true);
     await driver.findContent('.test-select-row', /FRIENDS.*Favorite Film/).click();
     await gu.waitForServer();
@@ -194,8 +191,3 @@ describe('RightPanelSelectBy', function() {
   });
 
 });
-
-export async function openSelectByForSection(section: string) {
-  await gu.getSection(section).click();
-  await driver.find('.test-right-select-by').click();
-}
diff --git a/test/nbrowser/SelectByRefList.ts b/test/nbrowser/SelectByRefList.ts
index db3c7f48..7982817c 100644
--- a/test/nbrowser/SelectByRefList.ts
+++ b/test/nbrowser/SelectByRefList.ts
@@ -2,7 +2,6 @@ import * as _ from 'lodash';
 import {addToRepl, assert, driver} from 'mocha-webdriver';
 import * as gu from 'test/nbrowser/gristUtils';
 import {server, setupTestSuite} from 'test/nbrowser/testUtils';
-import {openSelectByForSection} from "./RightPanelSelectBy";
 
 describe('SelectByRefList', function() {
   this.timeout(60000);
@@ -16,9 +15,6 @@ describe('SelectByRefList', function() {
       'SelectByRefList.grist', false);
     await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`);
     await gu.waitForDocToLoad();
-
-    await gu.toggleSidePanel('right');
-    await driver.find('.test-config-data').click();
   }
 
   it('should filter a table selected by ref and reflist columns', async function() {
@@ -182,7 +178,7 @@ describe('SelectByRefList', function() {
  * The values will depend on the link and the last row selected in the driving table.
  */
 async function checkSelectingRecords(selectBy: string, sourceData: string[][], newRow: string[]) {
-  await openSelectByForSection('LINKTARGET');
+  await gu.openSelectByForSection('LINKTARGET');
   await driver.findContent('.test-select-row', new RegExp(selectBy + '$')).click();
   await gu.waitForServer();
 
diff --git a/test/nbrowser/SelectBySummary.ts b/test/nbrowser/SelectBySummary.ts
index 74987814..26168b56 100644
--- a/test/nbrowser/SelectBySummary.ts
+++ b/test/nbrowser/SelectBySummary.ts
@@ -3,7 +3,6 @@ import {addToRepl, assert, driver} from 'mocha-webdriver';
 import {enterRulePart, findDefaultRuleSet} from 'test/nbrowser/aclTestUtils';
 import * as gu from 'test/nbrowser/gristUtils';
 import {server, setupTestSuite} from 'test/nbrowser/testUtils';
-import {openSelectByForSection} from "./RightPanelSelectBy";
 
 describe('SelectBySummary', function() {
   this.timeout(50000);
@@ -17,9 +16,6 @@ describe('SelectBySummary', function() {
       'SelectBySummary.grist', false);
     await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`);
     await gu.waitForDocToLoad();
-
-    await gu.toggleSidePanel('right', 'open');
-    await driver.find('.test-config-data').click();
   });
 
   it('should filter a source table selected by a summary table', async function() {
@@ -219,7 +215,7 @@ async function checkSelectingRecords(
 ) {
   const summarySection = `TABLE1 [by ${groubyColumns.join(', ')}]`;
 
-  await openSelectByForSection(targetSection);
+  await gu.openSelectByForSection(targetSection);
   await driver.findContent('.test-select-row', summarySection).click();
   await gu.waitForServer();
 
diff --git a/test/nbrowser/SelectBySummaryRef.ts b/test/nbrowser/SelectBySummaryRef.ts
index 2e41321a..964a514b 100644
--- a/test/nbrowser/SelectBySummaryRef.ts
+++ b/test/nbrowser/SelectBySummaryRef.ts
@@ -1,7 +1,6 @@
 import {addToRepl, assert, driver, Key} from 'mocha-webdriver';
 import * as gu from 'test/nbrowser/gristUtils';
 import {server, setupTestSuite} from 'test/nbrowser/testUtils';
-import {openSelectByForSection} from "./RightPanelSelectBy";
 
 describe('SelectBySummaryRef', function() {
   this.timeout(20000);
@@ -14,9 +13,6 @@ describe('SelectBySummaryRef', function() {
       'SelectBySummaryRef.grist', false);
     await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`);
     await gu.waitForDocToLoad();
-
-    await gu.toggleSidePanel('right', 'open');
-    await driver.find('.test-config-data').click();
   });
 
   it('should give correct options when linking with a summary table with ref/reflist columns', async () => {
@@ -174,7 +170,7 @@ describe('SelectBySummaryRef', function() {
 
 // Check that the 'Select by' menu in the right panel for the section has the expected options
 async function checkRightPanelSelectByOptions(section: string, expected: string[]) {
-  await openSelectByForSection(section);
+  await gu.openSelectByForSection(section);
 
   const actual = await driver.findAll('.test-select-menu .test-select-row', (e) => e.getText());
   assert.deepEqual(actual, ['Select Widget', ...expected]);
diff --git a/test/nbrowser/SupportGrist.ts b/test/nbrowser/SupportGrist.ts
new file mode 100644
index 00000000..97eeb27a
--- /dev/null
+++ b/test/nbrowser/SupportGrist.ts
@@ -0,0 +1,308 @@
+import {GristLoadConfig} from 'app/common/gristUrls';
+import {TelemetryLevel} from 'app/common/Telemetry';
+import {assert, driver} from 'mocha-webdriver';
+import * as gu from 'test/nbrowser/gristUtils';
+import {server, setupTestSuite} from 'test/nbrowser/testUtils';
+import * as testUtils from 'test/server/testUtils';
+
+describe('SupportGrist', function() {
+  this.timeout(30000);
+  setupTestSuite();
+
+  let oldEnv: testUtils.EnvironmentSnapshot;
+  let session: gu.Session;
+
+  afterEach(() => gu.checkForErrors());
+
+  describe('in grist-core', function() {
+    before(async function() {
+      oldEnv = new testUtils.EnvironmentSnapshot();
+      process.env.GRIST_TEST_SERVER_DEPLOYMENT_TYPE = 'core';
+      process.env.GRIST_DEFAULT_EMAIL = gu.session().email;
+      await server.restart();
+    });
+
+    after(async function() {
+      oldEnv.restore();
+      await server.restart();
+    });
+
+    describe('when user is not a manager', function() {
+      before(async function() {
+        oldEnv = new testUtils.EnvironmentSnapshot();
+        await server.restart();
+        session = await gu.session().user('user2').personalSite.login();
+        await session.loadDocMenu('/');
+      });
+
+      after(async function() {
+        oldEnv.restore();
+      });
+
+      it('does not show a nudge on the doc menu', async function() {
+        await assertNudgeButtonShown(false);
+        await assertNudgeCardShown(false);
+      });
+
+      it('shows a link to the Support Grist page in the user menu', async function() {
+        await gu.openAccountMenu();
+        await driver.find('.test-usermenu-support-grist').click();
+        assert.isTrue(await driver.findContentWait(
+          '.test-support-grist-page-sponsorship-section',
+          /Sponsor Grist Labs on GitHub/,
+          4000
+        ).isDisplayed());
+      });
+
+      it('shows a message that telemetry is managed by the site administrator', async function() {
+        assert.isTrue(await driver.findContentWait(
+          '.test-support-grist-page-telemetry-section',
+          /This instance is opted out of telemetry\. Only the site administrator has permission to change this\./,
+          4000
+        ).isDisplayed());
+
+        process.env.GRIST_TELEMETRY_LEVEL = 'limited';
+        await server.restart();
+        await driver.navigate().refresh();
+        assert.isTrue(await driver.findContentWait(
+          '.test-support-grist-page-telemetry-section',
+          /This instance is opted in to telemetry\. Only the site administrator has permission to change this\./,
+          4000
+        ).isDisplayed());
+      });
+    });
+
+    describe('when user is a manager', function() {
+      before(async function() {
+        oldEnv = new testUtils.EnvironmentSnapshot();
+        await server.restart();
+        session = await gu.session().personalSite.login();
+        await session.loadDocMenu('/');
+      });
+
+      after(async function() {
+        oldEnv.restore();
+      });
+
+      it('shows a nudge on the doc menu', async function() {
+        // Check that the nudge is expanded by default.
+        await assertNudgeButtonShown(false);
+        await assertNudgeCardShown(true);
+
+        // Reload the doc menu and check that it's still expanded.
+        await session.loadDocMenu('/');
+        await assertNudgeButtonShown(false);
+        await assertNudgeCardShown(true);
+
+        // Close the nudge and check that it's now collapsed.
+        await driver.find('.test-support-grist-nudge-card-close').click();
+        await assertNudgeButtonShown(true);
+        await assertNudgeCardShown(false);
+
+        // Reload again, and check that it's still collapsed.
+        await session.loadDocMenu('/');
+        await assertNudgeButtonShown(true);
+        await assertNudgeCardShown(false);
+
+        // Dismiss the contribute button and check that it's now gone, even after reloading.
+        await driver.find('.test-support-grist-nudge-contribute-button').mouseMove();
+        await driver.find('.test-support-grist-nudge-contribute-button-close').click();
+        await assertNudgeButtonShown(false);
+        await assertNudgeCardShown(false);
+        await session.loadDocMenu('/');
+        await assertNudgeButtonShown(false);
+        await assertNudgeCardShown(false);
+      });
+
+      it('shows a link to the Support Grist page in the user menu', async function() {
+        await gu.openAccountMenu();
+        await driver.find('.test-usermenu-support-grist').click();
+        await driver.findContentWait('.test-support-grist-page-telemetry-section button', /Opt in to Telemetry/, 2000);
+        assert.isFalse(await driver.find('.test-support-grist-page-telemetry-section-message').isPresent());
+      });
+
+      it('supports opting in to telemetry from the page', async function() {
+        await assertTelemetryLevel('off');
+        await driver.findContentWait(
+          '.test-support-grist-page-telemetry-section button', /Opt in to Telemetry/, 2000).click();
+        await driver.findContentWait('.test-support-grist-page-telemetry-section button', /Opt out of Telemetry/, 2000);
+        assert.equal(
+          await driver.find('.test-support-grist-page-telemetry-section-message').getText(),
+          'You have opted in to telemetry. Thank you! 🙏'
+        );
+
+        // Reload the page and check that the Grist config indicates telemetry is set to "limited".
+        await driver.navigate().refresh();
+        await driver.findContentWait('.test-support-grist-page-telemetry-section button', /Opt out of Telemetry/, 2000);
+        assert.equal(
+          await driver.findWait('.test-support-grist-page-telemetry-section-message', 2000).getText(),
+          'You have opted in to telemetry. Thank you! 🙏'
+        );
+        await assertTelemetryLevel('limited');
+      });
+
+      it('supports opting out of telemetry from the page', async function() {
+        await driver.findContent('.test-support-grist-page-telemetry-section button', /Opt out of Telemetry/).click();
+        await driver.findContentWait('.test-support-grist-page-telemetry-section button', /Opt in to Telemetry/, 2000);
+        assert.isFalse(await driver.find('.test-support-grist-page-telemetry-section-message').isPresent());
+
+        // Reload the page and check that the Grist config indicates telemetry is set to "off".
+        await driver.navigate().refresh();
+        await driver.findContentWait('.test-support-grist-page-telemetry-section button', /Opt in to Telemetry/, 2000);
+        assert.isFalse(await driver.find('.test-support-grist-page-telemetry-section-message').isPresent());
+        await assertTelemetryLevel('off');
+      });
+
+      it('supports opting in to telemetry from the nudge', async function() {
+        // Reset all dismissed popups, including the telemetry nudge.
+        await driver.executeScript('resetDismissedPopups();');
+        await gu.waitForServer();
+        await session.loadDocMenu('/');
+
+        // Opt in to telemetry and reload the page.
+        await driver.find('.test-support-grist-nudge-card-opt-in').click();
+        await driver.findWait('.test-support-grist-nudge-card-close-button', 1000).click();
+        await assertNudgeButtonShown(false);
+        await assertNudgeCardShown(false);
+        await session.loadDocMenu('/');
+
+        // Check that the nudge is no longer shown and telemetry is set to "limited".
+        await assertNudgeButtonShown(false);
+        await assertNudgeCardShown(false);
+        await assertTelemetryLevel('limited');
+      });
+
+      it('does not show the nudge if telemetry is enabled', async function() {
+        // Reset all dismissed popups, including the telemetry nudge.
+        await driver.executeScript('resetDismissedPopups();');
+        await gu.waitForServer();
+
+        // Reload the doc menu and check that the nudge still isn't shown.
+        await session.loadDocMenu('/');
+        await assertNudgeButtonShown(false);
+        await assertNudgeCardShown(false);
+
+        // Disable telemetry from the Support Grist page.
+        await gu.openAccountMenu();
+        await driver.find('.test-usermenu-support-grist').click();
+        await driver.findContentWait(
+          '.test-support-grist-page-telemetry-section button', /Opt out of Telemetry/, 2000).click();
+        await driver.findContentWait('.test-support-grist-page-telemetry-section button', /Opt in to Telemetry/, 2000);
+
+        // Reload the doc menu and check that the nudge is now shown.
+        await gu.loadDocMenu('/');
+        await assertNudgeButtonShown(false);
+        await assertNudgeCardShown(true);
+      });
+
+      it('shows telemetry opt-in status even when set via environment variable', async function() {
+        // Set the telemetry level to "limited" via environment variable and restart the server.
+        process.env.GRIST_TELEMETRY_LEVEL = 'limited';
+        await server.restart();
+
+        // Check that the Support Grist page reports telemetry is enabled.
+        await gu.loadDocMenu('/');
+        await gu.openAccountMenu();
+        await driver.find('.test-usermenu-support-grist').click();
+        assert.equal(
+          await driver.findWait('.test-support-grist-page-telemetry-section-message', 2000).getText(),
+          'You have opted in to telemetry. Thank you! 🙏'
+        );
+        assert.isFalse(await driver.findContent('.test-support-grist-page-telemetry-section button',
+          /Opt out of Telemetry/).isPresent());
+
+        // Now set the telemetry level to "off" and restart the server.
+        process.env.GRIST_TELEMETRY_LEVEL = 'off';
+        await server.restart();
+
+        // Check that the Support Grist page reports telemetry is disabled.
+        await gu.loadDocMenu('/');
+        await gu.openAccountMenu();
+        await driver.find('.test-usermenu-support-grist').click();
+        assert.equal(
+          await driver.findWait('.test-support-grist-page-telemetry-section-message', 2000).getText(),
+          'You have opted out of telemetry.'
+        );
+        assert.isFalse(await driver.findContent('.test-support-grist-page-telemetry-section button',
+        /Opt in to Telemetry/).isPresent());
+      });
+    });
+  });
+
+  describe('in grist-saas', function() {
+    before(async function() {
+      oldEnv = new testUtils.EnvironmentSnapshot();
+      process.env.GRIST_TEST_SERVER_DEPLOYMENT_TYPE = 'saas';
+      process.env.GRIST_DEFAULT_EMAIL = gu.session().email;
+      await server.restart();
+      session = await gu.session().personalSite.login();
+      await session.loadDocMenu('/');
+    });
+
+    after(async function() {
+      oldEnv.restore();
+      await server.restart();
+    });
+
+    it('does not show a nudge on the doc menu', async function() {
+      await assertNudgeButtonShown(false);
+      await assertNudgeCardShown(false);
+    });
+
+    it('does not show a link to the Support Grist page in the user menu', async function() {
+      await gu.openAccountMenu();
+      assert.isFalse(await driver.find('.test-usermenu-support-grist').isPresent());
+    });
+  });
+
+  describe('in grist-enterprise', function() {
+    before(async function() {
+      oldEnv = new testUtils.EnvironmentSnapshot();
+      process.env.GRIST_TEST_SERVER_DEPLOYMENT_TYPE = 'enterprise';
+      process.env.GRIST_DEFAULT_EMAIL = gu.session().email;
+      await server.restart();
+      session = await gu.session().personalSite.login();
+      await session.loadDocMenu('/');
+    });
+
+    after(async function() {
+      oldEnv.restore();
+      await server.restart();
+    });
+
+    it('does not show a nudge on the doc menu', async function() {
+      await assertNudgeButtonShown(false);
+      await assertNudgeCardShown(false);
+    });
+
+    it('does not show a link to the Support Grist page in the user menu', async function() {
+      await gu.openAccountMenu();
+      assert.isFalse(await driver.find('.test-usermenu-support-grist').isPresent());
+    });
+  });
+});
+
+async function assertNudgeButtonShown(isShown: boolean) {
+  if (isShown) {
+    assert.isTrue(
+      await driver.find('.test-support-grist-nudge-contribute-button').isDisplayed()
+    );
+  } else {
+    assert.isFalse(await driver.find('.test-support-grist-nudge-contribute-button').isPresent());
+  }
+}
+
+async function assertNudgeCardShown(isShown: boolean) {
+  if (isShown) {
+    assert.isTrue(
+      await driver.find('.test-support-grist-nudge-card').isDisplayed()
+    );
+  } else {
+    assert.isFalse(await driver.find('.test-support-grist-nudge-card').isPresent());
+  }
+}
+
+async function assertTelemetryLevel(level: TelemetryLevel) {
+  const {telemetry}: GristLoadConfig = await driver.executeScript('return window.gristConfig');
+  assert.equal(telemetry?.telemetryLevel, level);
+}
diff --git a/test/nbrowser/Views.ntest.js b/test/nbrowser/Views.ntest.js
index d59c31c0..3434dd69 100644
--- a/test/nbrowser/Views.ntest.js
+++ b/test/nbrowser/Views.ntest.js
@@ -132,7 +132,7 @@ describe('Views.ntest', function() {
     await gu.openColumnMenu('A');
     await $(`.grist-floating-menu .test-sort-asc`).click();
     // Delete the table.
-    await gu.removeTable("Table4");
+    await gu.sendActions([['RemoveTable', 'Table4']]);
     await gu.actions.selectTabView('Table1');
     // Assert that the default section (Table1 record) is now active.
     assert.equal(await $('.active_section > .viewsection_title').text(), 'TABLE1');
diff --git a/test/nbrowser/gristUtil-nbrowser.js b/test/nbrowser/gristUtil-nbrowser.js
index 4187c25d..72526111 100644
--- a/test/nbrowser/gristUtil-nbrowser.js
+++ b/test/nbrowser/gristUtil-nbrowser.js
@@ -53,7 +53,7 @@ async function applyPatchesToJquerylikeObject($) {
 // Adapt common old setup.
 const test = {
   setupTestSuite(self, ...args) {
-    self.timeout(20000);
+    self.timeout(40000);
     return setupTestSuite(...args);
   },
 };
diff --git a/test/nbrowser/gristUtils.ts b/test/nbrowser/gristUtils.ts
index c78a2475..9409f292 100644
--- a/test/nbrowser/gristUtils.ts
+++ b/test/nbrowser/gristUtils.ts
@@ -1467,6 +1467,29 @@ export async function moveToHidden(col: string) {
   await waitForServer();
 }
 
+/**
+ * Clicks `Select All` in visible columns section.
+ */
+export async function selectAllVisibleColumns() {
+  await driver.find('.test-vfc-visible-fields-select-all').click();
+}
+
+/**
+ * Toggle checkbox for a column in visible columns section.
+ */
+export async function toggleVisibleColumn(col: string) {
+  const row = await driver.findContent(".test-vfc-visible-fields .kf_draggable_content", exactMatch(col));
+  await row.find('input').click();
+}
+
+/**
+ * Clicks `Hide Columns` button in visible columns section.
+ */
+export async function hideVisibleColumns() {
+  await driver.find('.test-vfc-visible-hide').click();
+  await waitForServer();
+}
+
 export async function search(what: string) {
   await driver.find('.test-tb-search-icon').click();
   await driver.sleep(500);
@@ -1759,6 +1782,16 @@ export async function openAccessRulesDropdown(): Promise<void> {
   await driver.findWait('.grist-floating-menu', 1000);
 }
 
+/**
+ * Open "Select By" area in creator panel.
+ */
+export async function openSelectByForSection(section: string) {
+  await toggleSidePanel('right', 'open');
+  await driver.find('.test-config-data').click();
+  await getSection(section).click();
+  await driver.find('.test-right-select-by').click();
+}
+
 export async function editOrgAcls(): Promise<void> {
   // To prevent a common flakiness problem, wait for a potentially open modal dialog
   // to close before attempting to open the account menu.
@@ -2023,7 +2056,13 @@ export class Session {
                                 isFirstLogin?: boolean,
                                 showTips?: boolean,
                                 skipTutorial?: boolean, // By default true
+                                userName?: string,
+                                email?: string,
                                 retainExistingLogin?: boolean}) {
+    if (options?.userName) {
+      this.settings.name = options.userName;
+      this.settings.email = options.email || '';
+    }
     // Optimize testing a little bit, so if we are already logged in as the expected
     // user on the expected org, and there are no options set, we can just continue.
     if (!options && await this.isLoggedInCorrectly()) { return this; }
@@ -2805,18 +2844,123 @@ export async function scrollActiveViewTop() {
  * Filters a column in a Grid using the filter menu.
  */
 export async function filterBy(col: IColHeader|string, save: boolean, values: (string|RegExp)[]) {
-  await openColumnMenu(col, 'Filter');
-  // Select none at start
-  await driver.findContent('.test-filter-menu-bulk-action', /None/).click();
-  for(const value of values) {
-    await driver.findContent('.test-filter-menu-list label', value).click();
+  const filter = await openColumnFilter(col);
+  await filter.none();
+  for (const value of values) {
+    await filter.toggleValue(value);
   }
-  // Save filters
-  await driver.find('.test-filter-menu-apply-btn').click();
+  await filter.close();
   if (save) {
-    await driver.find('.test-section-menu-small-btn-save').click();
+    await filter.save();
   }
-  await waitForServer();
+}
+
+/**
+ * Opens a filter menu for a column and returns a controller for it.
+ */
+export async function openColumnFilter(col: IColHeader|string) {
+  await openColumnMenu(col, 'Filter');
+  return filterController;
+}
+
+/**
+ * Opens a filter menu for a column and returns a controller for it.
+ */
+export async function openPinnedFilter(col: string) {
+  const filterBar = driver.find('.active_section .test-filter-bar');
+  const pinnedFilter = filterBar.findContent('.test-filter-field', col);
+  await pinnedFilter.click();
+  return filterController;
+}
+
+const filterController = {
+  async toggleValue(value: string|RegExp) {
+    await driver.findContent('.test-filter-menu-list label', value).click();
+    return this;
+  },
+  async none() {
+    await driver.findContent('.test-filter-menu-bulk-action', /None/).click();
+    return this;
+  },
+  async all() {
+    await driver.findContent('.test-filter-menu-bulk-action', /All/).click();
+    return this;
+  },
+  async close() {
+    await driver.find('.test-filter-menu-apply-btn').click();
+    return this;
+  },
+  async cancel() {
+    await driver.find('.test-filter-menu-cancel-btn').click();
+    return this;
+  },
+  async save() {
+    await driver.find('.test-section-menu-small-btn-save').click();
+    await waitForServer();
+    return this;
+  }
+};
+
+/**
+ * Opens the filter menu in the current section, and removes all filters. Optionally saves it.
+ */
+export async function removeFilters(save = false) {
+  const sectionFilter = await sortAndFilter();
+  for(const filter of await sectionFilter.filters()) {
+    await filter.remove();
+  }
+  if (save) {
+    await sectionFilter.save();
+  } else {
+    await sectionFilter.click();
+  }
+}
+
+/**
+ * Clicks on the filter icon in the current section, and returns a controller for it for interactions.
+ */
+export async function sortAndFilter() {
+  const ctrl = {
+    async addColumn() {
+      await driver.find('.test-filter-config-add-filter-btn').click();
+      return this;
+    },
+    async clickColumn(col: string) {
+      await driver.findContent(".test-sd-searchable-list-item", col).click();
+      return this;
+    },
+    async close() {
+      await driver.find('.test-filter-menu-apply-btn').click();
+      return this;
+    },
+    async save() {
+      await driver.find('.test-section-menu-btn-save').click();
+      await waitForServer();
+      return this;
+    },
+    /**
+     * Clicks the filter icon in the current section (can be used to close the filter menu or open it)
+     */
+    async click() {
+      await driver.find('.active_section .test-section-menu-filter-icon').click();
+      return this;
+    },
+    async filters() {
+      const items = await driver.findAll('.test-filter-config-filter');
+      return items.map(item => ({
+        async remove() {
+          await item.find('.test-filter-config-remove-filter').click();
+          return this;
+        },
+        async togglePin() {
+          await item.find('.test-filter-config-pin-filter').click();
+          return this;
+        }
+      }));
+    }
+  };
+  await ctrl.click();
+  return ctrl;
 }
 
 export interface PinnedFilter {
@@ -3012,20 +3156,26 @@ export async function availableBehaviorOptions() {
   return list;
 }
 
-export function withComments() {
-  let oldEnv: testUtils.EnvironmentSnapshot;
+/**
+ * Restarts the server ensuring that it is run with the given environment variables.
+ * If variables are already set, the server is not restarted.
+ *
+ * Useful for local testing of features that depend on environment variables, as it avoids the need
+ * to restart the server when those variables are already set.
+ */
+export function withEnvironmentSnapshot(vars: Record<string, any>) {
+  let oldEnv: testUtils.EnvironmentSnapshot|null = null;
   before(async () => {
-    if (process.env.COMMENTS !== 'true') {
-      oldEnv = new testUtils.EnvironmentSnapshot();
-      process.env.COMMENTS = 'true';
-      await server.restart();
-    }
+    // Test if the vars are already set, and if so, skip.
+    if (Object.keys(vars).every(k => process.env[k] === vars[k])) { return; }
+    oldEnv = new testUtils.EnvironmentSnapshot();
+    Object.assign(process.env, vars);
+    await server.restart();
   });
   after(async () => {
-    if (oldEnv) {
-      oldEnv.restore();
-      await server.restart();
-    }
+    if (!oldEnv) { return; }
+    oldEnv.restore();
+    await server.restart();
   });
 }
 
diff --git a/test/nbrowser/testServer.ts b/test/nbrowser/testServer.ts
index 8bcce502..f69c1d56 100644
--- a/test/nbrowser/testServer.ts
+++ b/test/nbrowser/testServer.ts
@@ -65,14 +65,14 @@ export class TestServerMerged extends EventEmitter implements IMochaServer {
       await this.stop();
     }
     this._starts++;
+    const workerIdText = process.env.MOCHA_WORKER_ID || '0';
     if (reset) {
       if (process.env.TESTDIR) {
-        this.testDir = process.env.TESTDIR;
+        this.testDir = path.join(process.env.TESTDIR, workerIdText);
       } else {
-        const workerId = process.env.MOCHA_WORKER_ID || '0';
         // Create a testDir of the form grist_test_{USER}_{SERVER_NAME}_{WORKER_ID}, removing any previous one.
         const username = process.env.USER || "nobody";
-        this.testDir = path.join(tmpdir(), `grist_test_${username}_${this._name}_${workerId}`);
+        this.testDir = path.join(tmpdir(), `grist_test_${username}_${this._name}_${workerIdText}`);
         await fse.remove(this.testDir);
       }
     }
@@ -99,7 +99,7 @@ export class TestServerMerged extends EventEmitter implements IMochaServer {
     // logging. Server code uses a global logger, so it's hard to separate out (especially so if
     // we ever run different servers for different tests).
     const serverLog = process.env.VERBOSE ? 'inherit' : nodeLogFd;
-    const workerId = parseInt(process.env.MOCHA_WORKER_ID || '0', 10);
+    const workerId = parseInt(workerIdText, 10);
     const corePort = String(8295 + workerId * 2);
     const untrustedPort = String(8295 + workerId * 2 + 1);
     const env: Record<string, string> = {
diff --git a/test/server/lib/Authorizer.ts b/test/server/lib/Authorizer.ts
index 35dad0f6..45f6b295 100644
--- a/test/server/lib/Authorizer.ts
+++ b/test/server/lib/Authorizer.ts
@@ -34,7 +34,7 @@ async function activateServer(home: FlexServer, docManager: DocManager) {
   home.addJsonSupport();
   await home.addLandingPages();
   home.addHomeApi();
-  home.addTelemetry();
+  await home.addTelemetry();
   await home.addDoc();
   home.addApiErrorHandlers();
   serverUrl = home.getOwnUrl();
diff --git a/test/server/lib/Telemetry.ts b/test/server/lib/Telemetry.ts
index 5555b67c..0c3d82e6 100644
--- a/test/server/lib/Telemetry.ts
+++ b/test/server/lib/Telemetry.ts
@@ -1,7 +1,8 @@
 import {GristDeploymentType} from 'app/common/gristUrls';
+import {PrefSource} from 'app/common/InstallAPI';
 import {TelemetryEvent, TelemetryLevel} from 'app/common/Telemetry';
 import {ILogMeta, LogMethods} from 'app/server/lib/LogMethods';
-import {ITelemetry, Telemetry} from 'app/server/lib/Telemetry';
+import {filterMetadata, ITelemetry, Telemetry} from 'app/server/lib/Telemetry';
 import axios from 'axios';
 import {assert} from 'chai';
 import * as sinon from 'sinon';
@@ -9,36 +10,50 @@ import {TestServer} from 'test/gen-server/apiUtils';
 import {configForUser} from 'test/gen-server/testUtils';
 
 const chimpy = configForUser('Chimpy');
+const kiwi = configForUser('Kiwi');
 const anon = configForUser('Anonymous');
 
 describe('Telemetry', function() {
-  const deploymentTypesAndTelemetryLevels: [GristDeploymentType, TelemetryLevel][] = [
-    ['saas', 'off'],
-    ['saas', 'limited'],
-    ['saas', 'full'],
-    ['core', 'off'],
-    ['core', 'limited'],
-    ['core', 'full'],
+  const variants: [GristDeploymentType, TelemetryLevel, PrefSource][] = [
+    ['saas', 'off', 'environment-variable'],
+    ['saas', 'limited', 'environment-variable'],
+    ['saas', 'full', 'environment-variable'],
+    ['core', 'off', 'environment-variable'],
+    ['core', 'limited', 'environment-variable'],
+    ['core', 'full', 'environment-variable'],
+    ['core', 'off', 'preferences'],
+    ['core', 'limited', 'preferences'],
+    ['core', 'full', 'preferences'],
   ];
 
-  for (const [deploymentType, telemetryLevel] of deploymentTypesAndTelemetryLevels) {
-    describe(`in grist-${deploymentType} with a telemetry level of "${telemetryLevel}"`, function() {
+  for (const [deploymentType, telemetryLevel, settingSource] of variants) {
+    describe(`in grist-${deploymentType} with level "${telemetryLevel}" set via ${settingSource}`, function() {
+      let server: TestServer;
       let homeUrl: string;
       let installationId: string;
-      let server: TestServer;
       let telemetry: ITelemetry;
       let forwardEventSpy: sinon.SinonSpy;
-      let postJsonPayloadStub: sinon.SinonStub;
+      let doForwardEventStub: sinon.SinonStub;
 
       const sandbox = sinon.createSandbox();
       const loggedEvents: [TelemetryEvent, ILogMeta][] = [];
 
       before(async function() {
         process.env.GRIST_TEST_SERVER_DEPLOYMENT_TYPE = deploymentType;
-        process.env.GRIST_TELEMETRY_LEVEL = telemetryLevel;
+        if (settingSource === 'environment-variable') {
+          process.env.GRIST_TELEMETRY_LEVEL = telemetryLevel;
+        }
+        process.env.GRIST_DEFAULT_EMAIL = 'chimpy@getgrist.com';
         server = new TestServer(this);
         homeUrl = await server.start();
+        if (settingSource ==='preferences') {
+          await axios.patch(`${homeUrl}/api/install/prefs`, {
+            telemetry: {telemetryLevel},
+          }, chimpy);
+        }
         installationId = (await server.server.getActivations().current()).id;
+        telemetry = server.server.getTelemetry();
+
         sandbox
           .stub(LogMethods.prototype, 'rawLog')
           .callsFake((_level: string, _info: unknown, name: string, meta: ILogMeta) => {
@@ -46,22 +61,39 @@ describe('Telemetry', function() {
           });
         forwardEventSpy = sandbox
           .spy(Telemetry.prototype as any, '_forwardEvent');
-        postJsonPayloadStub = sandbox
-          .stub(Telemetry.prototype as any, '_postJsonPayload');
-        telemetry = server.server.getTelemetry();
+        doForwardEventStub = sandbox
+          .stub(Telemetry.prototype as any, '_doForwardEvent');
       });
 
       after(async function() {
-        await server.stop();
-        sandbox.restore();
         delete process.env.GRIST_TEST_SERVER_DEPLOYMENT_TYPE;
         delete process.env.GRIST_TELEMETRY_LEVEL;
+        delete process.env.GRIST_DEFAULT_EMAIL;
+        await server.stop();
+        sandbox.restore();
       });
 
-      it('returns the current telemetry level', async function() {
-        assert.equal(telemetry.getTelemetryLevel(), telemetryLevel);
+      it('returns the current telemetry config', async function() {
+        assert.deepEqual(telemetry.getTelemetryConfig(), {
+          telemetryLevel,
+        });
       });
 
+      if (deploymentType === 'core') {
+        it('returns the current telemetry status', async function() {
+          const resp = await axios.get(`${homeUrl}/api/install/prefs`, chimpy);
+          assert.equal(resp.status, 200);
+          assert.deepEqual(resp.data, {
+            telemetry: {
+              telemetryLevel: {
+                value: telemetryLevel,
+                source: settingSource,
+              },
+            },
+          });
+        });
+      }
+
       if (telemetryLevel !== 'off') {
         if (deploymentType === 'saas') {
           it('logs telemetry events', async function() {
@@ -77,7 +109,7 @@ describe('Telemetry', function() {
                 {
                   eventName: 'documentOpened',
                   eventSource: `grist-${deploymentType}`,
-                  docIdDigest: 'digest',
+                  docIdDigest: 'dige:Vq9L3nCkeufQ8euzDkXtM2Fl1cnsALqakjEeM6QlbXQ=',
                   isPublic: false,
                 }
               ]);
@@ -98,7 +130,7 @@ describe('Telemetry', function() {
                 {
                   eventName: 'documentOpened',
                   eventSource: `grist-${deploymentType}`,
-                  docIdDigest: 'digest',
+                  docIdDigest: 'dige:Vq9L3nCkeufQ8euzDkXtM2Fl1cnsALqakjEeM6QlbXQ=',
                   isPublic: false,
                   userId: 1,
                 }
@@ -120,10 +152,11 @@ describe('Telemetry', function() {
               assert.deepEqual(forwardEventSpy.lastCall.args, [
                 'documentOpened',
                 {
-                  docIdDigest: 'digest',
+                  docIdDigest: 'dige:Vq9L3nCkeufQ8euzDkXtM2Fl1cnsALqakjEeM6QlbXQ=',
                   isPublic: false,
                 }
               ]);
+              assert.equal(forwardEventSpy.callCount, 1);
             }
 
             if (telemetryLevel === 'full') {
@@ -139,14 +172,15 @@ describe('Telemetry', function() {
               assert.deepEqual(forwardEventSpy.lastCall.args, [
                 'documentOpened',
                 {
-                  docIdDigest: 'digest',
+                  docIdDigest: 'dige:Vq9L3nCkeufQ8euzDkXtM2Fl1cnsALqakjEeM6QlbXQ=',
                   isPublic: false,
                   userId: 1,
                 }
               ]);
+              // An earlier test triggered an apiUsage event.
+              assert.equal(forwardEventSpy.callCount, 2);
             }
 
-            assert.equal(forwardEventSpy.callCount, 1);
             assert.isEmpty(loggedEvents);
           });
         }
@@ -179,13 +213,6 @@ describe('Telemetry', function() {
         });
 
         if (telemetryLevel === 'limited') {
-          it('throws an error when an event requires an elevated telemetry level', async function() {
-            await assert.isRejected(
-              telemetry.logEvent('signupVerified', {}),
-              /Telemetry event signupVerified requires a minimum telemetry level of 2 but the current level is 1/
-            );
-          });
-
           it("throws an error when an event's metadata requires an elevated telemetry level", async function() {
             await assert.isRejected(
               telemetry.logEvent('documentOpened', {limited: {userId: 1}}),
@@ -290,16 +317,16 @@ describe('Telemetry', function() {
             if (telemetryLevel === 'limited') {
               assert.equal(forwardEventSpy.callCount, 2);
             } else {
-              // The POST above also triggers an "apiUsage" event.
-              assert.equal(forwardEventSpy.callCount, 3);
-              assert.equal(forwardEventSpy.secondCall.args[0], 'apiUsage');
+              // The count below includes 2 apiUsage events triggered as side effects.
+              assert.equal(forwardEventSpy.callCount, 4);
+              assert.equal(forwardEventSpy.thirdCall.args[0], 'apiUsage');
             }
             assert.isEmpty(loggedEvents);
           });
 
           it('skips forwarding events if too many requests are pending', async function() {
             let numRequestsMade = 0;
-            postJsonPayloadStub.callsFake(async () => {
+            doForwardEventStub.callsFake(async () => {
               numRequestsMade += 1;
               await new Promise(resolve => setTimeout(resolve, 1000));
             });
@@ -329,4 +356,169 @@ describe('Telemetry', function() {
       }
     });
   }
+
+  describe('api', function() {
+    let server: TestServer;
+    let homeUrl: string;
+
+    const sandbox = sinon.createSandbox();
+
+    before(async function() {
+      process.env.GRIST_TEST_SERVER_DEPLOYMENT_TYPE = 'core';
+      process.env.GRIST_DEFAULT_EMAIL = 'chimpy@getgrist.com';
+      server = new TestServer(this);
+      homeUrl = await server.start();
+      sandbox.stub(Telemetry.prototype as any, '_doForwardEvent');
+    });
+
+    after(async function() {
+      delete process.env.GRIST_TEST_SERVER_DEPLOYMENT_TYPE;
+      delete process.env.GRIST_DEFAULT_EMAIL;
+      await server.stop();
+      sandbox.restore();
+    });
+
+    it('GET /install/prefs returns 200 for non-default users', async function() {
+      const resp = await axios.get(`${homeUrl}/api/install/prefs`, kiwi);
+      assert.equal(resp.status, 200);
+      assert.deepEqual(resp.data, {
+        telemetry: {
+          telemetryLevel: {
+            value: 'off',
+            source: 'preferences',
+          },
+        },
+      });
+    });
+
+    it('GET /install/prefs returns 200 for the default user', async function() {
+      const resp = await axios.get(`${homeUrl}/api/install/prefs`, chimpy);
+      assert.equal(resp.status, 200);
+      assert.deepEqual(resp.data, {
+        telemetry: {
+          telemetryLevel: {
+            value: 'off',
+            source: 'preferences',
+          },
+        },
+      });
+    });
+
+    it('PATCH /install/prefs returns 403 for non-default users', async function() {
+      const resp = await axios.patch(`${homeUrl}/api/install/prefs`, {
+        telemetry: {telemetryLevel: 'limited'},
+      }, kiwi);
+      assert.equal(resp.status, 403);
+    });
+
+    it('PATCH /install/prefs returns 200 for the default user', async function() {
+      let resp = await axios.patch(`${homeUrl}/api/install/prefs`, {
+        telemetry: {telemetryLevel: 'limited'},
+      }, chimpy);
+      assert.equal(resp.status, 200);
+
+      resp = await axios.get(`${homeUrl}/api/install/prefs`, chimpy);
+      assert.deepEqual(resp.data, {
+        telemetry: {
+          telemetryLevel: {
+            value: 'limited',
+            source: 'preferences',
+          },
+        },
+      });
+    });
+  });
+
+  describe('filterMetadata', function() {
+    it('returns filtered and flattened metadata when maxLevel is "full"', function() {
+      const metadata = {
+        limited: {
+          foo: 'abc',
+        },
+        full: {
+          bar: '123',
+        },
+      };
+      assert.deepEqual(filterMetadata(metadata, 'full'), {
+        foo: 'abc',
+        bar: '123',
+      });
+    });
+
+    it('returns filtered and flattened metadata when maxLevel is "limited"', function() {
+      const metadata = {
+        limited: {
+          foo: 'abc',
+        },
+        full: {
+          bar: '123',
+        },
+      };
+      assert.deepEqual(filterMetadata(metadata, 'limited'), {
+        foo: 'abc',
+      });
+    });
+
+    it('returns undefined when maxLevel is "off"', function() {
+      assert.isUndefined(filterMetadata(undefined, 'off'));
+    });
+
+    it('returns an empty object when metadata is empty', function() {
+      assert.isEmpty(filterMetadata({}, 'full'));
+    });
+
+    it('returns undefined when metadata is undefined', function() {
+      assert.isUndefined(filterMetadata(undefined, 'full'));
+    });
+
+    it('does not mutate metadata', function() {
+      const metadata = {
+        limited: {
+          foo: 'abc',
+        },
+        full: {
+          bar: '123',
+        },
+      };
+      filterMetadata(metadata, 'limited');
+      assert.deepEqual(metadata, {
+        limited: {
+          foo: 'abc',
+        },
+        full: {
+          bar: '123',
+        },
+      });
+    });
+
+    it('excludes keys with nullish values', function() {
+      const metadata = {
+        limited: {
+          foo1: null,
+          foo2: 'abc',
+        },
+        full: {
+          bar1: undefined,
+          bar2: '123',
+        },
+      };
+      assert.deepEqual(filterMetadata(metadata, 'full'), {
+        foo2: 'abc',
+        bar2: '123',
+      });
+    });
+
+    it('hashes keys suffixed with "Digest"', function() {
+      const metadata = {
+        limited: {
+          docIdDigest: 'FGWGX4S6TB6',
+          docId: '3WH3D68J28',
+        },
+      };
+      assert.deepEqual(filterMetadata(metadata, 'limited'), {
+        docIdDigest: 'FGWG:omhYAysWiM7coZK+FLK/tIOPW4BaowXjU7J/P9ynYcU=',
+        docId: '3WH3D68J28',
+      });
+    });
+  });
 });
diff --git a/test/test_under_docker.sh b/test/test_under_docker.sh
index 3e54603c..ba7af76b 100755
--- a/test/test_under_docker.sh
+++ b/test/test_under_docker.sh
@@ -64,4 +64,4 @@ TEST_ADD_SAMPLES=1 TEST_ACCOUNT_PASSWORD=not-needed \
   GRIST_SESSION_COOKIE=grist_test_cookie \
   GRIST_TEST_LOGIN=1 \
   NODE_PATH=_build:_build/stubs \
-  $MOCHA _build/test/deployment/*.js --slow 6000 -g "${GREP_TESTS}" "$@"
+  $MOCHA _build/test/deployment/*.js --slow 6000 -g "${GREP_TESTS:-}" "$@"