diff --git a/README.md b/README.md
index d2e0a9e4f82..a1b97910c4f 100644
--- a/README.md
+++ b/README.md
@@ -275,7 +275,7 @@ Grist can be configured in many ways. Here are the main environment variables it
 | GRIST_ENABLE_REQUEST_FUNCTION      | enables the REQUEST function. This function performs HTTP requests in a similar way to `requests.request`. This function presents a significant security risk, since it can let users call internal endpoints when Grist is available publicly. This function can also cause performance issues. Unset by default.                                            |
 | GRIST_HIDE_UI_ELEMENTS             | comma-separated list of UI features to disable. Allowed names of parts: `helpCenter,billing,templates,createSite,multiSite,multiAccounts,sendToDrive,tutorials,supportGrist`. If a part also exists in GRIST_UI_FEATURES, it will still be disabled.                                                                                                          |
 | GRIST_HOST                         | hostname to use when listening on a port.                                                                                                                                                                                                                                                                                                                     |
-| GRIST_HTTPS_PROXY                  | if set, use this proxy for webhook payload delivery.                                                                                                                                                                                                                                                                                                          |
+| GRIST_HTTPS_PROXY                  | if set, use this proxy for webhook payload delivery or fetching custom widgets repository from url.                                                                                                                                                                                                                                                                                                          |
 | GRIST_ID_PREFIX                    | for subdomains of form o-*, expect or produce o-${GRIST_ID_PREFIX}*.                                                                                                                                                                                                                                                                                          |
 | GRIST_IGNORE_SESSION               | if set, Grist will not use a session for authentication.                                                                                                                                                                                                                                                                                                      |
 | GRIST_INCLUDE_CUSTOM_SCRIPT_URL    | if set, will load the referenced URL in a `<script>` tag on all app pages.                                                                                                                                                                                                                                                                                    |
@@ -332,8 +332,8 @@ ASSISTANT_MODEL     | optional. If set, this string is passed along in calls to
 ASSISTANT_LONGER_CONTEXT_MODEL     | optional. If set, requests that fail because of a context length limitation will be retried with this model set.
 OPENAI_API_KEY      | optional. Synonym for ASSISTANT_API_KEY that assumes an OpenAI endpoint is being used. Sign up for an account on OpenAI and then generate a secret key [here](https://platform.openai.com/account/api-keys).
 
-At the time of writing, the AI Assistant is known to function against OpenAI chat completion endpoints for gpt-3.5-turbo and gpt-4.
-It can also function against the chat completion endpoint provided by <a href="https://github.com/abetlen/llama-cpp-python">llama-cpp-python</a>.
+At the time of writing, the AI Assistant is known to function against OpenAI chat completion endpoints (those ending in `/v1/chat/completions`).
+It is also known to function against the chat completion endpoint provided by <a href="https://github.com/abetlen/llama-cpp-python">llama-cpp-python</a> and by [LM Studio](https://lmstudio.ai/). For useful results, the LLM should be on par with GPT 3.5 or above.
 
 #### Sandbox related variables:
 
diff --git a/app/client/components/AceEditorCompletions.ts b/app/client/components/AceEditorCompletions.ts
index 1438a110ce1..6046cb8b38f 100644
--- a/app/client/components/AceEditorCompletions.ts
+++ b/app/client/components/AceEditorCompletions.ts
@@ -20,6 +20,13 @@ export function setupAceEditorCompletions(editor: Ace.Editor, options: ICompleti
   const {Autocomplete} = ace.require('ace/autocomplete');
 
   const completer = new Autocomplete();
+  // Here is the source code:
+  // https://github.com/ajaxorg/ace/blob/23208f2f19020d1f69b90bc3b02460bda8422072/src/autocomplete.js#L180
+  // It seems that this function wasn't doing anything special, and wasn't returning anything, so
+  // AceEditor refused to insert new line. Option 'deleteSuffix is also not supported (line 150).
+  if (completer.keyboardHandler?.commands?.["Shift-Return"]) {
+    completer.keyboardHandler.commands["Shift-Return"].exec = () => false;
+  }
   completer.autoSelect = false;
   (editor as any).completer = completer;
 
diff --git a/app/client/components/BaseView.js b/app/client/components/BaseView.js
index 6f8190db92f..31133a8948e 100644
--- a/app/client/components/BaseView.js
+++ b/app/client/components/BaseView.js
@@ -32,6 +32,9 @@ const {COMMENTS} = require('app/client/models/features');
 const {DismissedPopup} = require('app/common/Prefs');
 const {markAsSeen} = require('app/client/models/UserPrefs');
 const {buildConfirmDelete, reportUndo} = require('app/client/components/modals');
+const {buildReassignModal} = require('app/client/ui/buildReassignModal');
+const {MutedError} = require('app/client/models/errors');
+
 
 /**
  * BaseView forms the basis for ViewSection classes.
@@ -648,7 +651,17 @@ 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);
+  return this.gristDoc.docData.sendActions(actions).catch(ex => {
+    if (ex.code === 'UNIQUE_REFERENCE_VIOLATION') {
+      buildReassignModal({
+        docModel: this.gristDoc.docModel,
+        actions,
+      }).catch(reportError);
+      throw new MutedError();
+    } else {
+      throw ex;
+    }
+  });
 };
 
 BaseView.prototype.buildDom = function() {
diff --git a/app/client/components/Clipboard.js b/app/client/components/Clipboard.js
index c196cd8170b..decd3f163a5 100644
--- a/app/client/components/Clipboard.js
+++ b/app/client/components/Clipboard.js
@@ -107,6 +107,7 @@ Base.setBaseFor(Clipboard);
 
 Clipboard.commands = {
   contextMenuCopy: function() { this._doContextMenuCopy(); },
+  contextMenuCopyWithHeaders: function() { this._doContextMenuCopyWithHeaders(); },
   contextMenuCut: function() { this._doContextMenuCut(); },
   contextMenuPaste: function() { this._doContextMenuPaste(); },
 };
@@ -126,7 +127,13 @@ Clipboard.prototype._onCopy = function(elem, event) {
 Clipboard.prototype._doContextMenuCopy = function() {
   let pasteObj = commands.allCommands.copy.run();
 
-  this._copyToClipboard(pasteObj, 'copy');
+  this._copyToClipboard(pasteObj, 'copy', false);
+};
+
+Clipboard.prototype._doContextMenuCopyWithHeaders = function() {
+  let pasteObj = commands.allCommands.copy.run();
+
+  this._copyToClipboard(pasteObj, 'copy', true);
 };
 
 Clipboard.prototype._onCut = function(elem, event) {
@@ -146,21 +153,21 @@ Clipboard.prototype._doContextMenuCut = function() {
 Clipboard.prototype._setCBdata = function(pasteObj, clipboardData) {
   if (!pasteObj) { return; }
 
-  const plainText = tableUtil.makePasteText(pasteObj.data, pasteObj.selection);
+  const plainText = tableUtil.makePasteText(pasteObj.data, pasteObj.selection, false);
   clipboardData.setData('text/plain', plainText);
-  const htmlText = tableUtil.makePasteHtml(pasteObj.data, pasteObj.selection);
+  const htmlText = tableUtil.makePasteHtml(pasteObj.data, pasteObj.selection, false);
   clipboardData.setData('text/html', htmlText);
 
   this._setCutCallback(pasteObj, plainText);
 };
 
-Clipboard.prototype._copyToClipboard = async function(pasteObj, action) {
+Clipboard.prototype._copyToClipboard = async function(pasteObj, action, includeColHeaders) {
   if (!pasteObj) { return; }
 
-  const plainText = tableUtil.makePasteText(pasteObj.data, pasteObj.selection);
+  const plainText = tableUtil.makePasteText(pasteObj.data, pasteObj.selection, includeColHeaders);
   let data;
   if (typeof ClipboardItem === 'function') {
-    const htmlText = tableUtil.makePasteHtml(pasteObj.data, pasteObj.selection);
+    const htmlText = tableUtil.makePasteHtml(pasteObj.data, pasteObj.selection, includeColHeaders);
     // eslint-disable-next-line no-undef
     data = new ClipboardItem({
       // eslint-disable-next-line no-undef
diff --git a/app/client/components/CodeEditorPanel.css b/app/client/components/CodeEditorPanel.css
index 10d42fcfb7c..bb03b91e19d 100644
--- a/app/client/components/CodeEditorPanel.css
+++ b/app/client/components/CodeEditorPanel.css
@@ -1,8 +1,5 @@
 .g-code-panel {
-  position:absolute;
-  width: 100%;
-  height: 100%;
-  margin: 10px;
+  padding: 10px;
   overflow: auto;
 }
 
diff --git a/app/client/components/Comm.ts b/app/client/components/Comm.ts
index 57e5bcd93af..a0ec0786f25 100644
--- a/app/client/components/Comm.ts
+++ b/app/client/components/Comm.ts
@@ -343,6 +343,9 @@ export class Comm extends dispose.Disposable implements GristServerAPI, DocListA
             if (message.details) {
               err.details = message.details;
             }
+            if (message.error?.startsWith('[Sandbox] UniqueReferenceError')) {
+              err.code = 'UNIQUE_REFERENCE_VIOLATION';
+            }
             err.shouldFork = message.shouldFork;
             log.warn(`Comm response #${reqId} ${r.methodName} ERROR:${code} ${message.error}`
                         + (message.shouldFork ? ` (should fork)` : ''));
diff --git a/app/client/components/FormRenderer.ts b/app/client/components/FormRenderer.ts
index a3cbac4d48f..7a738395f73 100644
--- a/app/client/components/FormRenderer.ts
+++ b/app/client/components/FormRenderer.ts
@@ -5,6 +5,7 @@ import {sanitizeHTML} from 'app/client/ui/sanitizeHTML';
 import {dropdownWithSearch} from 'app/client/ui/searchDropdown';
 import {isXSmallScreenObs} from 'app/client/ui2018/cssVars';
 import {confirmModal} from 'app/client/ui2018/modals';
+import {toggleSwitch} from 'app/client/ui2018/toggleSwitch';
 import {CellValue} from 'app/plugin/GristData';
 import {Disposable, dom, DomContents, makeTestId, MutableObsArray, obsArray, Observable} from 'grainjs';
 import {marked} from 'marked';
@@ -528,32 +529,21 @@ class BoolRenderer extends BaseFieldRenderer {
   }
 
   private _renderSwitchInput() {
-    return css.toggleSwitch(
-      dom('input',
-        dom.prop('checked', this.checked),
-        dom.prop('value', use => use(this.checked) ? '1' : '0'),
-        dom.on('change', (_e, elem) => this.checked.set(elem.checked)),
-        {
-          type: this.inputType,
-          name: this.name(),
-          required: this.field.options.formRequired,
-        },
+    return toggleSwitch(this. checked, {
+      label: this.field.question,
+      inputArgs: [
+        {name: this.name(), required: this.field.options.formRequired},
         preventSubmitOnEnter(),
-      ),
-      css.gristSwitch(
-        css.gristSwitchSlider(),
-        css.gristSwitchCircle(),
-      ),
-      css.toggleLabel(
+      ],
+      labelArgs: [
         css.label.cls('-required', Boolean(this.field.options.formRequired)),
-        this.field.question,
-      ),
-    );
+      ],
+    });
   }
 
   private _renderCheckboxInput() {
     return css.toggle(
-      dom('input',
+      css.checkboxInput(
         dom.prop('checked', this.checked),
         dom.prop('value', use => use(this.checked) ? '1' : '0'),
         dom.on('change', (_e, elem) => this.checked.set(elem.checked)),
@@ -613,7 +603,7 @@ class ChoiceListRenderer extends BaseFieldRenderer  {
       {name: this.name(), required},
       dom.forEach(this.checkboxes, (checkbox) =>
         css.checkbox(
-          dom('input',
+          css.checkboxInput(
             dom.prop('checked', checkbox.checked),
             dom.on('change', (_e, elem) => checkbox.checked.set(elem.value)),
             {
@@ -674,7 +664,7 @@ class RefListRenderer extends BaseFieldRenderer {
       {name: this.name(), required},
       dom.forEach(this.checkboxes, (checkbox) =>
         css.checkbox(
-          dom('input',
+          css.checkboxInput(
             dom.prop('checked', checkbox.checked),
             dom.on('change', (_e, elem) => checkbox.checked.set(elem.value)),
             {
diff --git a/app/client/components/FormRendererCss.ts b/app/client/components/FormRendererCss.ts
index 3dcccf34b7a..6d30583beec 100644
--- a/app/client/components/FormRendererCss.ts
+++ b/app/client/components/FormRendererCss.ts
@@ -102,73 +102,12 @@ export const submitButton = styled('div', `
   }
 `);
 
-// TODO: break up into multiple variables, one for each field type.
 export const field = styled('div', `
   display: flex;
   flex-direction: column;
   height: 100%;
   justify-content: space-between;
 
-  & input[type="checkbox"] {
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    margin: 0;
-    padding: 0;
-    flex-shrink: 0;
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    --radius: 3px;
-    position: relative;
-    margin-right: 8px;
-    vertical-align: baseline;
-  }
-  & input[type="checkbox"]:focus {
-    outline-color: ${vars.primaryBgHover};
-  }
-  & input[type="checkbox"]:checked:enabled,
-  & input[type="checkbox"]:indeterminate:enabled {
-    --color: ${vars.primaryBg};
-  }
-  & input[type="checkbox"]:disabled {
-    --color: ${colors.darkGrey};
-    cursor: not-allowed;
-  }
-  & input[type="checkbox"]::before,
-  & input[type="checkbox"]::after {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 16px;
-    width: 16px;
-    box-sizing: border-box;
-    border: 1px solid var(--color, ${colors.darkGrey});
-    border-radius: var(--radius);
-  }
-  & input[type="checkbox"]:checked::before,
-  & input[type="checkbox"]:disabled::before,
-  & input[type="checkbox"]:indeterminate::before {
-    background-color: var(--color);
-  }
-  & input[type="checkbox"]:not(:checked):indeterminate::after {
-    -webkit-mask-image: var(--icon-Minus);
-  }
-  & input[type="checkbox"]:not(:disabled)::after {
-    background-color: ${colors.light};
-  }
-  & input[type="checkbox"]:checked::after,
-  & input[type="checkbox"]:indeterminate::after {
-    content: '';
-    position: absolute;
-    height: 16px;
-    width: 16px;
-    -webkit-mask-image: var(--icon-Tick);
-    -webkit-mask-size: contain;
-    -webkit-mask-position: center;
-    -webkit-mask-repeat: no-repeat;
-    background-color: ${colors.light};
-  }
   & > .${label.className} {
     color: ${colors.dark};
     font-size: 13px;
@@ -217,6 +156,63 @@ export const textarea = styled('textarea', `
   resize: none;
 `);
 
+export const checkboxInput = styled('input', `
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  margin: 0;
+  padding: 0;
+  flex-shrink: 0;
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  --radius: 3px;
+  position: relative;
+  margin-right: 8px;
+  vertical-align: baseline;
+
+  &:focus {
+    outline-color: ${vars.primaryBgHover};
+  }
+  &:checked:enabled, &:indeterminate:enabled {
+    --color: ${vars.primaryBg};
+  }
+  &:disabled {
+    --color: ${colors.darkGrey};
+    cursor: not-allowed;
+  }
+  &::before, &::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 16px;
+    width: 16px;
+    box-sizing: border-box;
+    border: 1px solid var(--color, ${colors.darkGrey});
+    border-radius: var(--radius);
+  }
+  &:checked::before, &:disabled::before, &:indeterminate::before {
+    background-color: var(--color);
+  }
+  &:not(:checked):indeterminate::after {
+    -webkit-mask-image: var(--icon-Minus);
+  }
+  &:not(:disabled)::after {
+    background-color: ${colors.light};
+  }
+  &:checked::after, &:indeterminate::after {
+    content: '';
+    position: absolute;
+    height: 16px;
+    width: 16px;
+    -webkit-mask-image: var(--icon-Tick);
+    -webkit-mask-size: contain;
+    -webkit-mask-position: center;
+    -webkit-mask-repeat: no-repeat;
+    background-color: ${colors.light};
+  }
+`);
+
 export const spinner = styled(numericSpinner, `
   & input {
     height: 29px;
@@ -240,32 +236,6 @@ export const toggle = styled('label', `
   }
 `);
 
-export const toggleSwitch = styled(toggle, `
-  cursor: pointer;
-
-  & input[type='checkbox'] {
-    margin: 0;
-    position: absolute;
-    top: 1px;
-    left: 4px;
-  }
-  & input[type='checkbox'],
-  & input[type='checkbox']::before,
-  & input[type='checkbox']::after {
-    height: 1px;
-    width: 1px;
-  }
-  & input[type='checkbox']:focus {
-    outline: none;
-  }
-  & input[type='checkbox']:focus {
-    outline: none;
-  }
-  & > span {
-    margin-left: 8px;
-  }
-`);
-
 export const toggleLabel = styled('span', `
   font-size: 13px;
   font-weight: 700;
@@ -273,56 +243,6 @@ export const toggleLabel = styled('span', `
   overflow-wrap: anywhere;
 `);
 
-export const gristSwitchSlider = styled('div', `
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: #ccc;
-  border-radius: 17px;
-  -webkit-transition: background-color .4s;
-  transition: background-color .4s;
-`);
-
-export const gristSwitchCircle = styled('div', `
-  position: absolute;
-  cursor: pointer;
-  content: "";
-  height: 13px;
-  width: 13px;
-  left: 2px;
-  bottom: 2px;
-  background-color: white;
-  border-radius: 17px;
-  -webkit-transition: transform .4s;
-  transition: transform .4s;
-`);
-
-export const gristSwitch = styled('div', `
-  position: relative;
-  width: 30px;
-  height: 17px;
-  display: inline-block;
-  flex: none;
-
-  input:focus + & > .${gristSwitchSlider.className} {
-    outline: 2px solid ${vars.primaryBgHover};
-    outline-offset: 1px;
-  }
-
-  input:checked + & > .${gristSwitchSlider.className} {
-    background-color: ${vars.primaryBg};
-  }
-
-  input:checked + & > .${gristSwitchCircle.className} {
-    -webkit-transform: translateX(13px);
-    -ms-transform: translateX(13px);
-    transform: translateX(13px);
-  }
-`);
-
 export const checkboxList = styled('div', `
   display: inline-flex;
   flex-direction: column;
diff --git a/app/client/components/GridView.js b/app/client/components/GridView.js
index 725cb028674..52261aa22cf 100644
--- a/app/client/components/GridView.js
+++ b/app/client/components/GridView.js
@@ -55,7 +55,8 @@ const {NEW_FILTER_JSON} = require('app/client/models/ColumnFilter');
 const {CombinedStyle} = require("app/client/models/Styles");
 const {buildRenameColumn} = require('app/client/ui/ColumnTitle');
 const {makeT} = require('app/client/lib/localization');
-const { isList } = require('app/common/gristTypes');
+const {isList} = require('app/common/gristTypes');
+
 
 const t = makeT('GridView');
 
@@ -628,27 +629,25 @@ GridView.prototype.paste = async function(data, cutCallback) {
 
   if (actions.length > 0) {
     let cursorPos = this.cursor.getCursorPos();
-    return this.sendPasteActions(cutCallback, actions)
-    .then(results => {
-      // If rows were added, get their rowIds from the action results.
-      let addRowIds = (actions[0][0] === 'BulkAddRecord' ? results[0] : []);
-      console.assert(addRowIds.length <= updateRowIds.length,
-        `Unexpected number of added rows: ${addRowIds.length} of ${updateRowIds.length}`);
-      let newRowIds = updateRowIds.slice(0, updateRowIds.length - addRowIds.length)
-        .concat(addRowIds);
-
-      // Restore the cursor to the right rowId, even if it jumped.
-      this.cursor.setCursorPos({rowId: cursorPos.rowId === 'new' ? addRowIds[0] : cursorPos.rowId});
-
-      // Restore the selection if it would select the correct rows.
-      let topRowIndex = this.viewData.getRowIndex(newRowIds[0]);
-      if (newRowIds.every((r, i) => r === this.viewData.getRowId(topRowIndex + i))) {
-        this.cellSelector.selectArea(topRowIndex, leftIndex,
-          topRowIndex + outputHeight - 1, leftIndex + outputWidth - 1);
-      }
+    const results = await this.sendPasteActions(cutCallback, actions);
+    // If rows were added, get their rowIds from the action results.
+    let addRowIds = (actions[0][0] === 'BulkAddRecord' ? results[0] : []);
+    console.assert(addRowIds.length <= updateRowIds.length,
+      `Unexpected number of added rows: ${addRowIds.length} of ${updateRowIds.length}`);
+    let newRowIds = updateRowIds.slice(0, updateRowIds.length - addRowIds.length)
+      .concat(addRowIds);
+
+    // Restore the cursor to the right rowId, even if it jumped.
+    this.cursor.setCursorPos({rowId: cursorPos.rowId === 'new' ? addRowIds[0] : cursorPos.rowId});
+
+    // Restore the selection if it would select the correct rows.
+    let topRowIndex = this.viewData.getRowIndex(newRowIds[0]);
+    if (newRowIds.every((r, i) => r === this.viewData.getRowId(topRowIndex + i))) {
+      this.cellSelector.selectArea(topRowIndex, leftIndex,
+        topRowIndex + outputHeight - 1, leftIndex + outputWidth - 1);
+    }
 
-      commands.allCommands.clearCopySelection.run();
-    });
+    await commands.allCommands.clearCopySelection.run();
   }
 };
 
diff --git a/app/client/components/GristDoc.ts b/app/client/components/GristDoc.ts
index 516bc14d7ad..9eff9dbcd9f 100644
--- a/app/client/components/GristDoc.ts
+++ b/app/client/components/GristDoc.ts
@@ -207,6 +207,16 @@ export class GristDoc extends DisposableWithEvents {
 
   public isTimingOn = Observable.create(this, false);
 
+  /**
+   * Checks if it is ok to show raw data popup for currently selected section.
+   * We can't show raw data if:
+   * - we already have full screen section (which looks the same)
+   * - we are already showing raw data
+   *
+   * Extracted to single computed as it is used here and in menus.
+   */
+  public canShowRawData: Computed<boolean>;
+
   private _actionLog: ActionLog;
   private _undoStack: UndoStack;
   private _lastOwnActionGroup: ActionGroupWithCursorPos | null = null;
@@ -498,7 +508,21 @@ export class GristDoc extends DisposableWithEvents {
       reloadPlugins() {
         void this.docComm.reloadPlugins().then(() => G.window.location.reload(false));
       },
-
+      async showRawData(sectionId: number = 0) {
+        if (!this.canShowRawData.get()) {
+          return;
+        }
+        if (!sectionId) {
+          const viewSection = this.viewModel.activeSection();
+          if (viewSection?.isDisposed()) { return; }
+          if (viewSection.isRaw.peek()) {
+            return;
+          }
+          sectionId = viewSection.id.peek();
+        }
+        const anchorUrlState = { hash: { sectionId, popup: true } };
+        await urlState().pushUrl(anchorUrlState, { replace: true });
+      },
       // Command to be manually triggered on cell selection. Moves the cursor to the selected cell.
       // This is overridden by the formula editor to insert "$col" variables when clicking cells.
       setCursor: this.onSetCursorPos.bind(this),
@@ -603,6 +627,14 @@ export class GristDoc extends DisposableWithEvents {
         this._prevSectionId = null;
       }
     }));
+
+    this.canShowRawData = Computed.create(this, (use) => {
+      const isSinglePage = use(urlState().state).params?.style === 'singlePage';
+      if (isSinglePage || use(this.maximizedSectionId)) {
+        return false;
+      }
+      return true;
+    });
   }
 
   /**
@@ -623,15 +655,10 @@ export class GristDoc extends DisposableWithEvents {
    * Builds the DOM for this GristDoc.
    */
   public buildDom() {
-    const isMaximized = Computed.create(this, use => use(this.maximizedSectionId) !== null);
-    const isPopup = Computed.create(this, use => {
-      return ['data', 'settings'].includes(use(this.activeViewId) as any) // On Raw data or doc settings pages
-        || use(isMaximized) // Layout has a maximized section visible
-        || Boolean(use(this._popupSectionOptions)); // Layout has a popup section visible
-    });
     return cssViewContentPane(
       testId('gristdoc'),
-      cssViewContentPane.cls("-contents", isPopup),
+      cssViewContentPane.cls("-special-page", use =>
+        ['data', 'settings', 'code'].includes(use(this.activeViewId) as string)),
       dom.maybe(this._isRickRowing, () => cssStopRickRowingButton(
         cssCloseIcon('CrossBig'),
         dom.on('click', () => {
@@ -2020,8 +2047,9 @@ const cssViewContentPane = styled('div', `
       padding: 0px;
     }
   }
-  &-contents {
+  &-special-page {
     overflow: hidden;
+    padding: 0px;
   }
 `);
 
diff --git a/app/client/components/TypeConversion.ts b/app/client/components/TypeConversion.ts
index 099cbb3fb11..24a67b42760 100644
--- a/app/client/components/TypeConversion.ts
+++ b/app/client/components/TypeConversion.ts
@@ -47,6 +47,25 @@ export function addColTypeSuffix(type: string, column: ColumnRec, docModel: DocM
   }
 }
 
+/**
+ * Infers the suffix for a column type, based on the type of the column and the type to convert it to.
+ * Currently only used for Ref and RefList types, where the suffix is the tableId of the reference.
+ */
+export function inferColTypeSuffix(newPure: string, column: ColumnRec) {
+  // We can infer only for Ref and RefList types.
+  if (newPure !== "Ref" && newPure !== "RefList") {
+    return null;
+  }
+
+  // If the old type was also Ref/RefList, just return the tableId from the old type.
+  const existingTable = column.type.peek().split(':')[1];
+  const oldPure = gristTypes.extractTypeFromColType(column.type.peek());
+  if (existingTable && (oldPure === "Ref" || oldPure === "RefList")) {
+    return `${newPure}:${existingTable}`;
+  }
+  return null;
+}
+
 /**
  * Looks through the data of the given column to find the first value of the form
  * [R|r, <tableId>, <rowId>] (a Reference(List) value returned from a formula), and returns the tableId
diff --git a/app/client/components/commandList.ts b/app/client/components/commandList.ts
index 532b7cab837..00a9e02745e 100644
--- a/app/client/components/commandList.ts
+++ b/app/client/components/commandList.ts
@@ -63,6 +63,7 @@ export type CommandName =
   | 'cut'
   | 'paste'
   | 'contextMenuCopy'
+  | 'contextMenuCopyWithHeaders'
   | 'contextMenuCut'
   | 'contextMenuPaste'
   | 'fillSelectionDown'
@@ -470,6 +471,10 @@ export const groups: CommendGroupDef[] = [{
       keys: ['Mod+C'],
       desc: 'Copy current selection to clipboard',
       bindKeys: false,
+    }, {
+      name: 'contextMenuCopyWithHeaders',
+      keys: [],
+      desc: 'Copy current selection to clipboard including headers',
     }, {
       name: 'contextMenuCut',
       keys: ['Mod+X'],
diff --git a/app/client/lib/tableUtil.ts b/app/client/lib/tableUtil.ts
index 5db8153a4b3..4bec1ce6464 100644
--- a/app/client/lib/tableUtil.ts
+++ b/app/client/lib/tableUtil.ts
@@ -30,12 +30,16 @@ export function fieldInsertPositions(viewFields: KoArray<ViewFieldRec>, index: n
  * @param {CopySelection} selection - a CopySelection instance
  * @return {String}
  **/
-export function makePasteText(tableData: TableData, selection: CopySelection) {
+export function makePasteText(tableData: TableData, selection: CopySelection, includeColHeaders: boolean) {
   // tsvEncode expects data as a 2-d array with each a array representing a row
   // i.e. [["1-1", "1-2", "1-3"],["2-1", "2-2", "2-3"]]
-  const values = selection.rowIds.map(rowId =>
-    selection.columns.map(col => col.fmtGetter(rowId)));
-  return tsvEncode(values);
+  const result = [];
+  if (includeColHeaders) {
+    result.push(selection.fields.map(f => f.label()));
+  }
+  result.push(...selection.rowIds.map(rowId =>
+    selection.columns.map(col => col.fmtGetter(rowId))));
+  return tsvEncode(result);
 }
 
 /**
@@ -70,7 +74,7 @@ export function makePasteHtml(tableData: TableData, selection: CopySelection, in
     )),
     // Include column headers if requested.
     (includeColHeaders ?
-      dom('tr', selection.colIds.map(colId => dom('th', colId))) :
+      dom('tr', selection.fields.map(field => dom('th', field.label()))) :
       null
     ),
     // Fill with table cells.
diff --git a/app/client/models/AppModel.ts b/app/client/models/AppModel.ts
index addb7008824..c6d1d705659 100644
--- a/app/client/models/AppModel.ts
+++ b/app/client/models/AppModel.ts
@@ -9,7 +9,6 @@ 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 {gristThemePrefs} from 'app/client/ui2018/theme';
 import {AsyncCreate} from 'app/common/AsyncCreate';
 import {PlanSelection} from 'app/common/BillingAPI';
@@ -130,8 +129,6 @@ export interface AppModel {
 
   behavioralPromptsManager: BehavioralPromptsManager;
 
-  supportGristNudge: SupportGristNudge;
-
   refreshOrgUsage(): Promise<void>;
   showUpgradeModal(): Promise<void>;
   showNewSiteModal(): Promise<void>;
@@ -351,8 +348,6 @@ 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: ExtendedUser|null,
diff --git a/app/client/models/DataRowModel.ts b/app/client/models/DataRowModel.ts
index 0638d8db992..09b9ccf9b96 100644
--- a/app/client/models/DataRowModel.ts
+++ b/app/client/models/DataRowModel.ts
@@ -5,7 +5,8 @@ import DataTableModel from 'app/client/models/DataTableModel';
 import { IRowModel } from 'app/client/models/DocModel';
 import { ValidationRec } from 'app/client/models/entities/ValidationRec';
 import * as modelUtil from 'app/client/models/modelUtil';
-import { CellValue, ColValues } from 'app/common/DocActions';
+import { buildReassignModal } from 'app/client/ui/buildReassignModal';
+import { CellValue, ColValues, DocAction } from 'app/common/DocActions';
 import * as ko from 'knockout';
 
 /**
@@ -63,6 +64,19 @@ export class DataRowModel extends BaseRowModel {
 
     try {
       return await this._table.sendTableAction(action);
+    } catch(ex) {
+      if (ex.code === 'UNIQUE_REFERENCE_VIOLATION') {
+        // Show modal to repeat the save.
+        await buildReassignModal({
+          docModel: this._table.docModel,
+          actions: [
+            action as DocAction,
+          ]
+        });
+        // Ignore the error here, no point in returning it.
+      } else {
+        throw ex;
+      }
     } finally {
       // If the action doesn't actually result in an update to a row, it's important to reset the
       // observable to the data (if the data did get updated, this will be a no-op). This is also
diff --git a/app/client/models/HomeModel.ts b/app/client/models/HomeModel.ts
index f5275b26072..a86b8e74db4 100644
--- a/app/client/models/HomeModel.ts
+++ b/app/client/models/HomeModel.ts
@@ -6,6 +6,7 @@ import {localStorageObs} from 'app/client/lib/localStorageObs';
 import {AppModel, reportError} from 'app/client/models/AppModel';
 import {reportMessage, UserError} from 'app/client/models/errors';
 import {urlState} from 'app/client/models/gristUrlState';
+import {getUserPrefObs} from 'app/client/models/UserPrefs';
 import {ownerName} from 'app/client/models/WorkspaceInfo';
 import {IHomePage, isFeatureEnabled} from 'app/common/gristUrls';
 import {isLongerThan} from 'app/common/gutil';
@@ -31,7 +32,7 @@ export interface HomeModel {
   workspaces: Observable<Workspace[]>;
   loading: Observable<boolean|"slow">;          // Set to "slow" when loading for a while.
   available: Observable<boolean>;               // set if workspaces loaded correctly.
-  showIntro: Observable<boolean>;               // set if no docs and we should show intro.
+  empty: Observable<boolean>;                   // set if no docs.
   singleWorkspace: Observable<boolean>;         // set if workspace name should be hidden.
   trashWorkspaces: Observable<Workspace[]>;     // only set when viewing trash
   templateWorkspaces: Observable<Workspace[]>;  // Only set when viewing templates or all documents.
@@ -49,6 +50,8 @@ export interface HomeModel {
   // the current org is a personal org, or the current org is view access only.
   otherSites: Observable<Organization[]>;
 
+  onlyShowDocuments: Observable<boolean>;
+
   currentSort: Observable<SortPref>;
   currentView: Observable<ViewPref>;
   importSources: Observable<ImportSourceElement[]>;
@@ -123,21 +126,26 @@ export class HomeModelImpl extends Disposable implements HomeModel, ViewSettings
       return orgs.filter(org => org.id !== currentOrg.id);
     });
 
+  public readonly onlyShowDocuments = getUserPrefObs(this.app.userPrefsObs, 'onlyShowDocuments', {
+    defaultValue: false,
+  }) as Observable<boolean>;
+
   public readonly currentSort: Observable<SortPref>;
   public readonly currentView: Observable<ViewPref>;
 
   // The workspace for new docs, or "unsaved" to only allow unsaved-doc creation, or null if the
   // user isn't allowed to create a doc.
   public readonly newDocWorkspace = Computed.create(this, this.currentPage, this.currentWS, (use, page, ws) => {
-    // Anonymous user can create docs, but in unsaved mode.
-    if (!this.app.currentValidUser) { return "unsaved"; }
+    if (!this.app.currentValidUser) {
+      // Anonymous user can create docs, but in unsaved mode and only when enabled.
+      return getGristConfig().enableAnonPlayground ? 'unsaved' : null;
+    }
     if (page === 'trash') { return null; }
     const destWS = (['all', 'templates'].includes(page)) ? (use(this.workspaces)[0] || null) : ws;
     return destWS && roles.canEdit(destWS.access) ? destWS : null;
   });
 
-  // Whether to show intro: no docs (other than examples).
-  public readonly showIntro = Computed.create(this, this.workspaces, (use, wss) => (
+  public readonly empty = Computed.create(this, this.workspaces, (use, wss) => (
     wss.every((ws) => ws.isSupportWorkspace || ws.docs.length === 0)));
 
   public readonly shouldShowAddNewTip = Observable.create(this,
@@ -343,22 +351,16 @@ export class HomeModelImpl extends Disposable implements HomeModel, ViewSettings
   }
 
   /**
-   * Fetches templates if on the Templates or All Documents page.
-   *
-   * Only fetches featured (pinned) templates on the All Documents page.
+   * Fetches templates if on the Templates page.
    */
   private async _maybeFetchTemplates(): Promise<Workspace[] | null> {
-    const {templateOrg} = getGristConfig();
-    if (!templateOrg) { return null; }
-
-    const currentPage = this.currentPage.get();
-    const shouldFetchTemplates = ['all', 'templates'].includes(currentPage);
-    if (!shouldFetchTemplates) { return null; }
+    if (!getGristConfig().templateOrg || this.currentPage.get() !== 'templates') {
+      return null;
+    }
 
     let templateWss: Workspace[] = [];
     try {
-      const onlyFeatured = currentPage === 'all';
-      templateWss = await this._app.api.getTemplates(onlyFeatured);
+      templateWss = await this._app.api.getTemplates();
     } catch {
       reportError('Failed to load templates');
     }
@@ -381,8 +383,7 @@ export class HomeModelImpl extends Disposable implements HomeModel, ViewSettings
     if (
       !isFeatureEnabled('tutorials') ||
       !templateOrg ||
-      !onboardingTutorialDocId ||
-      this._app.dismissedPopups.get().includes('onboardingCards')
+      !onboardingTutorialDocId
     ) {
       return;
     }
diff --git a/app/client/models/NotifyModel.ts b/app/client/models/NotifyModel.ts
index c3af0b37aee..ea4221f0a75 100644
--- a/app/client/models/NotifyModel.ts
+++ b/app/client/models/NotifyModel.ts
@@ -381,7 +381,7 @@ export class Notifier extends Disposable implements INotifier {
         return dom('div',
           dom.forEach(appErrors, (appErr: IAppError) =>
             (where === 'toast' && appErr.seen ? null :
-              dom('div', timeFormat('T', new Date(appErr.timestamp)), ' ',
+              dom('div', {tabIndex: "-1"}, timeFormat('T', new Date(appErr.timestamp)), ' ',
                   appErr.error.message, testId('notification-app-error'))
             )
           ),
diff --git a/app/client/models/ViewFieldConfig.ts b/app/client/models/ViewFieldConfig.ts
index fce20d35874..f256000459c 100644
--- a/app/client/models/ViewFieldConfig.ts
+++ b/app/client/models/ViewFieldConfig.ts
@@ -43,6 +43,11 @@ export class ViewFieldConfig {
       return list.filter(f => !f.isDisposed() && !f.column().isDisposed());
     }));
 
+
+    // Helper that lists all not disposed widgets. Many methods below gets all fields
+    // list which still can contain disposed fields, this helper will filter them out.
+    const listFields = () => this.fields().filter(f => !f.isDisposed());
+
     // Just a helper field to see if we have multiple selected columns or not.
     this.multiselect = owner.autoDispose(ko.pureComputed(() => this.fields().length > 1));
 
@@ -50,7 +55,7 @@ export class ViewFieldConfig {
     // we have normal TextBox and Spinner). This will be used to allow the user to change
     // this type if such columns are selected.
     this.sameWidgets = owner.autoDispose(ko.pureComputed(() => {
-      const list = this.fields();
+      const list = listFields();
       // If we have only one field selected, list is always the same.
       if (list.length <= 1) { return true; }
       // Now get all widget list and calculate intersection of the Sets.
@@ -71,7 +76,7 @@ export class ViewFieldConfig {
         }
         // If all have the same value, return it, otherwise
         // return a default value for this option "undefined"
-        const values = this.fields().map(f => f.widget());
+        const values = listFields().map(f => f.widget());
         if (allSame(values)) {
           return values[0];
         } else {
@@ -80,7 +85,7 @@ export class ViewFieldConfig {
       },
       write: (widget) => {
         // Go through all the fields, and reset them all.
-        for(const field of this.fields.peek()) {
+        for(const field of listFields()) {
           // Reset the entire JSON, so that all options revert to their defaults.
           const previous = field.widgetOptionsJson.peek();
           // We don't need to bundle anything (actions send in the same tick, are bundled
@@ -100,7 +105,7 @@ export class ViewFieldConfig {
     // We will use this, to know which options are allowed to be changed
     // when multiple columns are selected.
     const commonOptions = owner.autoDispose(ko.pureComputed(() => {
-      const fields = this.fields();
+      const fields = listFields();
       // Put all options of first widget in the Set, and then remove
       // them one by one, if they are not present in other fields.
       let options: Set<string>|null = null;
@@ -134,7 +139,7 @@ export class ViewFieldConfig {
         // Assemble final json object.
         const result: any = {};
         // First get all widgetOption jsons from all columns/fields.
-        const optionList = this.fields().map(f => f.widgetOptionsJson());
+        const optionList = listFields().map(f => f.widgetOptionsJson());
         // And fill only those that are common
         const common = commonOptions();
         for(const key of common) {
@@ -162,7 +167,7 @@ export class ViewFieldConfig {
         }
         // Now update all options, for all fields, by amending the options
         // object from the field/column.
-        for(const item of this.fields.peek()) {
+        for(const item of listFields()) {
           const previous = item.widgetOptionsJson.peek();
           setter(item.widgetOptionsJson, {
             ...previous,
@@ -177,9 +182,9 @@ export class ViewFieldConfig {
       // Property is not supported by set of columns if it is not a common option.
       disabled: prop => ko.pureComputed(() => !commonOptions().has(prop)),
       // Property has mixed value, if not all options are the same.
-      mixed: prop => ko.pureComputed(() => !allSame(this.fields().map(f => f.widgetOptionsJson.prop(prop)()))),
+      mixed: prop => ko.pureComputed(() => !allSame(listFields().map(f => f.widgetOptionsJson.prop(prop)()))),
       // Property has empty value, if all options are empty (are null, undefined, empty Array or empty Object).
-      empty: prop => ko.pureComputed(() => allEmpty(this.fields().map(f => f.widgetOptionsJson.prop(prop)()))),
+      empty: prop => ko.pureComputed(() => allEmpty(listFields().map(f => f.widgetOptionsJson.prop(prop)()))),
     }));
 
     // This is repeated logic for wrap property in viewFieldRec,
@@ -196,8 +201,8 @@ export class ViewFieldConfig {
     // To support this use case we need to compute a snapshot of fields, and use it to save style. Style
     // picker will be rebuild every time fields change, and it will have access to last selected fields
     // when it will be disposed.
-    this.style = ko.pureComputed(() => {
-      const fields = this.fields();
+    this.style = owner.autoDispose(ko.pureComputed(() => {
+      const fields = listFields();
       const multiSelect = fields.length > 1;
       const savableOptions = modelUtil.savingComputed({
         read: () => {
@@ -256,10 +261,10 @@ export class ViewFieldConfig {
       });
       result.revert = () => { zip(fields, state).forEach(([f, s]) => f!.style(s!)); };
       return result;
-    });
+    }));
 
-    this.headerStyle = ko.pureComputed(() => {
-      const fields = this.fields();
+    this.headerStyle = owner.autoDispose(ko.pureComputed(() => {
+      const fields = listFields();
       const multiSelect = fields.length > 1;
       const savableOptions = modelUtil.savingComputed({
         read: () => {
@@ -318,7 +323,7 @@ export class ViewFieldConfig {
       });
       result.revert = () => { zip(fields, state).forEach(([f, s]) => f!.headerStyle(s!)); };
       return result;
-    });
+    }));
   }
 
   // Helper for Choice/ChoiceList columns, that saves widget options and renames values in a document
@@ -328,7 +333,7 @@ export class ViewFieldConfig {
     const tableId = this._field.column.peek().table.peek().tableId.peek();
     if (this.multiselect.peek()) {
       this._field.config.options.update(options);
-      const colIds = this.fields.peek().map(f => f.colId.peek());
+      const colIds = this.fields.peek().filter(f => !f.isDisposed()).map(f => f.colId.peek());
       return this._docModel.docData.bundleActions("Update choices configuration", () => Promise.all([
         this._field.config.options.save(),
         !hasRenames ? null : this._docModel.docData.sendActions(
diff --git a/app/client/models/entities/ColumnRec.ts b/app/client/models/entities/ColumnRec.ts
index 62c73834a03..3791baa66ff 100644
--- a/app/client/models/entities/ColumnRec.ts
+++ b/app/client/models/entities/ColumnRec.ts
@@ -63,6 +63,11 @@ export interface ColumnRec extends IRowModel<"_grist_Tables_column"> {
   displayColModel: ko.Computed<ColumnRec>;
   visibleColModel: ko.Computed<ColumnRec>;
 
+  // Reverse Ref/RefList column for this column. Only for Ref/RefList columns in two-way relations.
+  reverseColModel: ko.Computed<ColumnRec>;
+  // If this column has a relation.
+  hasReverse: ko.Computed<boolean>;
+
   disableModifyBase: ko.Computed<boolean>;    // True if column config can't be modified (name, type, etc.)
   disableModify: ko.Computed<boolean>;        // True if column can't be modified (is summary) or is being transformed.
   disableEditData: ko.Computed<boolean>;      // True to disable editing of the data in this column.
@@ -94,6 +99,12 @@ export interface ColumnRec extends IRowModel<"_grist_Tables_column"> {
   saveDisplayFormula(formula: string): Promise<void>|undefined;
 
   createValueParser(): (value: string) => any;
+
+  /** Helper method to add a reverse column (only for Ref/RefList) */
+  addReverseColumn(): Promise<void>;
+
+  /** Helper method to remove a reverse column (only for Ref/RefList) */
+  removeReverseColumn(): Promise<void>;
 }
 
 export function createColumnRec(this: ColumnRec, docModel: DocModel): void {
@@ -138,6 +149,8 @@ export function createColumnRec(this: ColumnRec, docModel: DocModel): void {
 
   // The display column to use for the column, or the column itself when no displayCol is set.
   this.displayColModel = refRecord(docModel.columns, this.displayColRef);
+  this.reverseColModel = refRecord(docModel.columns, this.reverseCol);
+  this.hasReverse = this.autoDispose(ko.pureComputed(() => Boolean(this.reverseColModel().id())));
   this.visibleColModel = refRecord(docModel.columns, this.visibleCol);
 
   this.disableModifyBase = ko.pureComputed(() => Boolean(this.summarySourceCol()));
@@ -184,6 +197,21 @@ export function createColumnRec(this: ColumnRec, docModel: DocModel): void {
     }
     return JSON.stringify(options);
   });
+
+  this.addReverseColumn = () => {
+    return docModel.docData.sendAction(['AddReverseColumn', this.table.peek().tableId.peek(), this.colId.peek()]);
+  };
+
+  this.removeReverseColumn = async () => {
+    if (!this.hasReverse.peek()) {
+      throw new Error("Column does not have a reverse column");
+    }
+    // Remove the other column. Data engine will take care of removing the relation.
+    const column = this.reverseColModel.peek();
+    const tableId = column.table.peek().tableId.peek();
+    const colId = column.colId.peek();
+    return await docModel.docData.sendAction(['RemoveColumn', tableId, colId]);
+  };
 }
 
 export function formatterForRec(
diff --git a/app/client/models/entities/ViewFieldRec.ts b/app/client/models/entities/ViewFieldRec.ts
index 9861e3c0134..667de7adaba 100644
--- a/app/client/models/entities/ViewFieldRec.ts
+++ b/app/client/models/entities/ViewFieldRec.ts
@@ -129,11 +129,10 @@ export function createViewFieldRec(this: ViewFieldRec, docModel: DocModel): void
   this.colId = this.autoDispose(ko.pureComputed(() => this.column().colId()));
   this.label = this.autoDispose(ko.pureComputed(() => this.column().label()));
   this.origLabel = this.autoDispose(ko.pureComputed(() => this.origCol().label()));
-  this.description = modelUtil.savingComputed({
+  this.description = this.autoDispose(modelUtil.savingComputed({
     read: () => this.column().description(),
     write: (setter, val) => setter(this.column().description, val)
-  });
-
+  }));
   // displayLabel displays label by default but switches to the more helpful colId whenever a
   // formula field in the view is being edited.
   this.displayLabel = modelUtil.savingComputed({
@@ -143,17 +142,17 @@ export function createViewFieldRec(this: ViewFieldRec, docModel: DocModel): void
 
   // The field knows when we are editing a formula, so that all rows can reflect that.
   const _editingFormula = ko.observable(false);
-  this.editingFormula = ko.pureComputed({
+  this.editingFormula = this.autoDispose(ko.pureComputed({
     read: () => _editingFormula(),
     write: val => {
       // Whenever any view field changes its editingFormula status, let the docModel know.
       docModel.editingFormula(val);
       _editingFormula(val);
     }
-  });
+  }));
 
   // CSS class to add to formula cells, incl. to show that we are editing this field's formula.
-  this.formulaCssClass = ko.pureComputed<string|null>(() => {
+  this.formulaCssClass = this.autoDispose(ko.pureComputed<string|null>(() => {
     const col = this.column();
 
     // If the current column is transforming, assign the CSS class "transform_field"
@@ -175,7 +174,7 @@ export function createViewFieldRec(this: ViewFieldRec, docModel: DocModel): void
     else {
       return null;
     }
-  });
+  }));
 
   // The fields's display column
   this._displayColModel = refRecord(docModel.columns, this.displayCol);
@@ -203,10 +202,10 @@ export function createViewFieldRec(this: ViewFieldRec, docModel: DocModel): void
   // Display col ref to use for the field, defaulting to the plain column itself.
   this.displayColRef = this.autoDispose(ko.pureComputed(() => this._fieldOrColumn().displayCol() || this.colRef()));
 
-  this.visibleColRef = modelUtil.addSaveInterface(ko.pureComputed({
+  this.visibleColRef = modelUtil.addSaveInterface(this.autoDispose(ko.pureComputed({
       read: () => this._fieldOrColumn().visibleCol(),
       write: (colRef) => this._fieldOrColumn().visibleCol(colRef),
-    }),
+    })),
     colRef => docModel.docData.bundleActions(null, async () => {
       const col = docModel.columns.getRowModel(colRef);
       await Promise.all([
@@ -222,9 +221,13 @@ export function createViewFieldRec(this: ViewFieldRec, docModel: DocModel): void
 
   // Helper for Reference/ReferenceList columns, which returns a formatter according to the visibleCol
   // associated with this field. If no visible column available, return formatting for the field itself.
-  this.visibleColFormatter = ko.pureComputed(() => formatterForRec(this, this.column(), docModel, 'vcol'));
+  this.visibleColFormatter = this.autoDispose(
+    ko.pureComputed(() => formatterForRec(this, this.column(), docModel, 'vcol'))
+  );
 
-  this.formatter = ko.pureComputed(() => formatterForRec(this, this.column(), docModel, 'full'));
+  this.formatter = this.autoDispose(
+    ko.pureComputed(() => formatterForRec(this, this.column(), docModel, 'full'))
+  );
 
   this.createValueParser = function() {
     const fieldRef = this.useColOptions.peek() ? undefined : this.id.peek();
@@ -264,8 +267,8 @@ export function createViewFieldRec(this: ViewFieldRec, docModel: DocModel): void
   this.headerFontStrikethrough = this.widgetOptionsJson.prop('headerFontStrikethrough');
   this.question = this.widgetOptionsJson.prop('question');
 
-  this.documentSettings = ko.pureComputed(() => docModel.docInfoRow.documentSettingsJson());
-  this.style = ko.pureComputed({
+  this.documentSettings = this.autoDispose(ko.pureComputed(() => docModel.docInfoRow.documentSettingsJson()));
+  this.style = this.autoDispose(ko.pureComputed({
     read: () => ({
       textColor: this.textColor(),
       fillColor: this.fillColor(),
@@ -277,8 +280,8 @@ export function createViewFieldRec(this: ViewFieldRec, docModel: DocModel): void
     write: (style: Style) => {
       this.widgetOptionsJson.update(style);
     },
-  });
-  this.headerStyle = ko.pureComputed({
+  }));
+  this.headerStyle = this.autoDispose(ko.pureComputed({
     read: () => ({
       headerTextColor: this.headerTextColor(),
       headerFillColor: this.headerFillColor(),
@@ -290,19 +293,21 @@ export function createViewFieldRec(this: ViewFieldRec, docModel: DocModel): void
     write: (headerStyle: HeaderStyle) => {
       this.widgetOptionsJson.update(headerStyle);
     },
-  });
+  }));
 
-  this.tableId = ko.pureComputed(() => this.column().table().tableId());
+  this.tableId = this.autoDispose(ko.pureComputed(() => this.column().table().tableId()));
   this.rulesList = modelUtil.savingComputed({
     read: () => this._fieldOrColumn().rules(),
     write: (setter, val) => setter(this._fieldOrColumn().rules, val)
   });
-  this.rulesCols = refListRecords(docModel.columns, ko.pureComputed(() => this._fieldOrColumn().rules()));
-  this.rulesColsIds = ko.pureComputed(() => this.rulesCols().map(c => c.colId()));
+  this.rulesCols = this.autoDispose(
+    refListRecords(docModel.columns, ko.pureComputed(() => this._fieldOrColumn().rules()))
+  );
+  this.rulesColsIds = this.autoDispose(ko.pureComputed(() => this.rulesCols().map(c => c.colId())));
   this.rulesStyles = modelUtil.fieldWithDefault(
     this.widgetOptionsJson.prop("rulesOptions") as modelUtil.KoSaveableObservable<Style[]>,
     []);
-  this.hasRules = ko.pureComputed(() => this.rulesCols().length > 0);
+  this.hasRules = this.autoDispose(ko.pureComputed(() => this.rulesCols().length > 0));
 
   // Helper method to add an empty rule (either initial or additional one).
   // Style options are added to widget options directly and can be briefly out of sync,
diff --git a/app/client/models/errors.ts b/app/client/models/errors.ts
index 7ca826a471a..8f30ae8115f 100644
--- a/app/client/models/errors.ts
+++ b/app/client/models/errors.ts
@@ -10,6 +10,15 @@ const G = getBrowserGlobals('document', 'window');
 
 let _notifier: Notifier;
 
+/**
+ * Doesn't show or trigger any UI when thrown. Use it when you will handle it yourself, but
+ * need to stop any futher actions from the app. Currently only used in the model that tries
+ * to react in response of UNIQUE reference constraint validation.
+ */
+export class MutedError extends Error {
+
+}
+
 export class UserError extends Error {
   public name: string = "UserError";
   public key?: string;
@@ -106,6 +115,9 @@ const unhelpfulErrors = new Set<string>();
  * this function might show a simple toast message.
  */
 export function reportError(err: Error|string, ev?: ErrorEvent): void {
+  if (err instanceof MutedError) {
+    return;
+  }
   log.error(`ERROR:`, err);
   if (String(err).match(/GristWSConnection disposed/)) {
     // This error can be emitted while a page is reloaded, and isn't worth reporting.
diff --git a/app/client/models/gristUrlState.ts b/app/client/models/gristUrlState.ts
index 1d9fa247213..4c5c3b155e2 100644
--- a/app/client/models/gristUrlState.ts
+++ b/app/client/models/gristUrlState.ts
@@ -224,7 +224,7 @@ export class UrlStateImpl {
 
 /**
  * Given value like `foo bar baz`, constructs URL by checking if `baz` is a valid URL and,
- * if not, prepending `http://`.
+ * if not, prepending `https://`.
  */
 export function constructUrl(value: CellValue): string {
   if (typeof value !== 'string') {
@@ -235,8 +235,8 @@ export function constructUrl(value: CellValue): string {
     // Try to construct a valid URL
     return (new URL(url)).toString();
   } catch (e) {
-    // Not a valid URL, so try to prefix it with http
-    return 'http://' + url;
+    // Not a valid URL, so try to prefix it with https
+    return 'https://' + url;
   }
 }
 
diff --git a/app/client/ui/AddNewTip.ts b/app/client/ui/AddNewTip.ts
index 2f34a4973e5..e46f59e69be 100644
--- a/app/client/ui/AddNewTip.ts
+++ b/app/client/ui/AddNewTip.ts
@@ -14,8 +14,10 @@ function shouldShowAddNewTip(home: HomeModel): boolean {
     home.app.isOwnerOrEditor() &&
     // And the tip hasn't been shown before.
     home.shouldShowAddNewTip.get() &&
-    // And the intro isn't being shown.
-    !home.showIntro.get() &&
+    // And the site isn't empty.
+    !home.empty.get() &&
+    // And home page cards aren't being shown.
+    !(home.currentPage.get() === 'all' && !home.onlyShowDocuments.get()) &&
     // And the workspace loaded correctly.
     home.available.get() &&
     // And the current page isn't /p/trash; the Add New button is limited there.
diff --git a/app/client/ui/AdminPanel.ts b/app/client/ui/AdminPanel.ts
index e2cc38bf015..0b1e5404106 100644
--- a/app/client/ui/AdminPanel.ts
+++ b/app/client/ui/AdminPanel.ts
@@ -202,7 +202,10 @@ Please log in as an administrator.`)),
         const success = result?.status === 'success';
         const details = result?.details as SandboxingBootProbeDetails|undefined;
         if (!details) {
-          return cssValueLabel(t('unknown'));
+          // Sandbox details get filled out relatively slowly if
+          // this is first time on admin panel. So show "checking"
+          // if we don't have a reported status yet.
+          return cssValueLabel(result?.status ? t('unknown') : t('checking'));
         }
         const flavor = details.flavor;
         const configured = details.configured;
diff --git a/app/client/ui/CellContextMenu.ts b/app/client/ui/CellContextMenu.ts
index 9bb13702fa3..8e4efbbb364 100644
--- a/app/client/ui/CellContextMenu.ts
+++ b/app/client/ui/CellContextMenu.ts
@@ -38,6 +38,7 @@ export function CellContextMenu(cellOptions: ICellContextMenu, colOptions: IMult
   result.push(
     menuItemCmd(allCommands.contextMenuCut, t('Cut'), disableForReadonlyColumn),
     menuItemCmd(allCommands.contextMenuCopy, t('Copy')),
+    menuItemCmd(allCommands.contextMenuCopyWithHeaders, t('Copy with headers')),
     menuItemCmd(allCommands.contextMenuPaste, t('Paste'), disableForReadonlyColumn),
     menuDivider(),
     colOptions.isFormula ?
diff --git a/app/client/ui/CreateTeamModal.ts b/app/client/ui/CreateTeamModal.ts
index 4dccfc2eb31..d42c6fc1fe1 100644
--- a/app/client/ui/CreateTeamModal.ts
+++ b/app/client/ui/CreateTeamModal.ts
@@ -1,4 +1,5 @@
 import {autoFocus} from 'app/client/lib/domUtils';
+import {makeT} from 'app/client/lib/localization';
 import {ValidationGroup, Validator} from 'app/client/lib/Validator';
 import {AppModel, getHomeUrl} from 'app/client/models/AppModel';
 import {reportError, UserError} from 'app/client/models/errors';
@@ -11,11 +12,7 @@ import {TEAM_PLAN} from 'app/common/Features';
 import {checkSubdomainValidity} from 'app/common/orgNameUtils';
 import {UserAPIImpl} from 'app/common/UserAPI';
 import {PlanSelection} from 'app/common/BillingAPI';
-import {
-  Disposable, dom, DomArg, DomContents, DomElementArg, IDisposableOwner, input, makeTestId,
-  Observable, styled
-} from 'grainjs';
-import { makeT } from '../lib/localization';
+import {Disposable, dom, DomContents, DomElementArg, input, makeTestId, Observable, styled} from 'grainjs';
 
 const t = makeT('CreateTeamModal');
 const testId = makeTestId('test-create-team-');
@@ -87,16 +84,12 @@ export function buildUpgradeModal(owner: Disposable, options: {
   throw new UserError(t(`Billing is not supported in grist-core`));
 }
 
-export interface IUpgradeButton {
-  showUpgradeCard(...args: DomArg<HTMLElement>[]): DomContents;
-  showUpgradeButton(...args: DomArg<HTMLElement>[]): DomContents;
-}
+export class UpgradeButton extends Disposable {
+  constructor(_appModel: AppModel) {
+    super();
+  }
 
-export function buildUpgradeButton(owner: IDisposableOwner, app: AppModel): IUpgradeButton {
-  return {
-    showUpgradeCard: () => null,
-    showUpgradeButton: () => null,
-  };
+  public buildDom() { return null; }
 }
 
 export function buildConfirm({
diff --git a/app/client/ui/DocMenu.ts b/app/client/ui/DocMenu.ts
index af5e490589d..20ad2ca598f 100644
--- a/app/client/ui/DocMenu.ts
+++ b/app/client/ui/DocMenu.ts
@@ -4,6 +4,7 @@
  * Orgs, workspaces and docs are fetched asynchronously on build via the passed in API.
  */
 import {loadUserManager} from 'app/client/lib/imports';
+import {makeT} from 'app/client/lib/localization';
 import {getTimeFromNow} from 'app/client/lib/timeUtils';
 import {reportError} from 'app/client/models/AppModel';
 import {docUrl, urlState} from 'app/client/models/gristUrlState';
@@ -12,17 +13,18 @@ import {getWorkspaceInfo, workspaceName} from 'app/client/models/WorkspaceInfo';
 import {attachAddNewTip} from 'app/client/ui/AddNewTip';
 import * as css from 'app/client/ui/DocMenuCss';
 import {buildHomeIntro, buildWorkspaceIntro} from 'app/client/ui/HomeIntro';
-import {buildUpgradeButton} from 'app/client/ui/ProductUpgrades';
+import {newDocMethods} from 'app/client/ui/NewDocMethods';
 import {buildPinnedDoc, createPinnedDocs} from 'app/client/ui/PinnedDocs';
 import {shadowScroll} from 'app/client/ui/shadowScroll';
 import {makeShareDocUrl} from 'app/client/ui/ShareMenu';
+import {buildTemplateDocs} from 'app/client/ui/TemplateDocs';
 import {transition} from 'app/client/ui/transitions';
 import {shouldShowWelcomeCoachingCall, showWelcomeCoachingCall} from 'app/client/ui/WelcomeCoachingCall';
-import {createVideoTourTextButton} from 'app/client/ui/OpenVideoTour';
+import {bigPrimaryButton} from 'app/client/ui2018/buttons';
 import {buttonSelect, cssButtonSelect} from 'app/client/ui2018/buttonSelect';
-import {isNarrowScreenObs, theme} from 'app/client/ui2018/cssVars';
-import {buildOnboardingCards} from 'app/client/ui/OnboardingCards';
+import {theme} 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 {menu, menuItem, menuText, select} from 'app/client/ui2018/menus';
 import {confirmModal, saveModal} from 'app/client/ui2018/modals';
@@ -30,12 +32,17 @@ import {IHomePage} from 'app/common/gristUrls';
 import {SortPref, ViewPref} from 'app/common/Prefs';
 import * as roles from 'app/common/roles';
 import {Document, Workspace} from 'app/common/UserAPI';
-import {computed, Computed, dom, DomArg, DomContents, DomElementArg, IDisposableOwner,
-        makeTestId, observable, Observable} from 'grainjs';
-import {buildTemplateDocs} from 'app/client/ui/TemplateDocs';
-import {makeT} from 'app/client/lib/localization';
-import {localStorageBoolObs} from 'app/client/lib/localStorageObs';
-import {bigBasicButton} from 'app/client/ui2018/buttons';
+import {
+  computed,
+  Computed,
+  dom,
+  DomArg,
+  DomElementArg,
+  IDisposableOwner,
+  makeTestId,
+  observable,
+  Observable,
+} from 'grainjs';
 import sortBy = require('lodash/sortBy');
 
 const t = makeT(`DocMenu`);
@@ -70,10 +77,7 @@ function attachWelcomePopups(home: HomeModel): (el: Element) => void {
 
 function createLoadedDocMenu(owner: IDisposableOwner, home: HomeModel) {
   const flashDocId = observable<string|null>(null);
-  const upgradeButton = buildUpgradeButton(owner, home.app);
   return css.docList( /* vbox */
-    /* first line */
-    dom.create(buildOnboardingCards, {homeModel: home}),
     /* hbox */
     css.docListContent(
       /* left column - grow 1 */
@@ -85,24 +89,16 @@ function createLoadedDocMenu(owner: IDisposableOwner, home: HomeModel) {
           dom('span', t("(The organization needs a paid plan)")),
         ]),
 
-        // currentWS and showIntro observables change together. We capture both in one domComputed call.
-        dom.domComputed<[IHomePage, Workspace|undefined, boolean]>(
-          (use) => [use(home.currentPage), use(home.currentWS), use(home.showIntro)],
-          ([page, workspace, showIntro]) => {
+        dom.domComputed<[IHomePage, Workspace|undefined]>(
+          (use) => [use(home.currentPage), use(home.currentWS)],
+          ([page, workspace]) => {
             const viewSettings: ViewSettings =
               page === 'trash' ? makeLocalViewSettings(home, 'trash') :
               page === 'templates' ? makeLocalViewSettings(home, 'templates') :
               workspace ? makeLocalViewSettings(home, workspace.id) :
               home;
             return [
-              buildPrefs(
-                viewSettings,
-                // Hide the sort and view options when showing the intro.
-                {hideSort: showIntro, hideView: showIntro && page === 'all'},
-                ['all', 'workspace'].includes(page)
-                  ? upgradeButton.showUpgradeButton(css.upgradeButton.cls(''))
-                  : null,
-              ),
+              page !== 'all' ? null : buildHomeIntro(home),
 
               // Build the pinned docs dom. Builds nothing if the selectedOrg is unloaded.
               // TODO: this is shown on all pages, but there is a hack in currentWSPinnedDocs that
@@ -124,9 +120,8 @@ function createLoadedDocMenu(owner: IDisposableOwner, home: HomeModel) {
 
               dom.maybe(home.available, () => [
                 buildOtherSites(home),
-                (showIntro && page === 'all' ?
-                  null :
-                  css.docListHeader(
+                page === 'all' && home.app.isPersonal && !home.app.currentValidUser ? null : css.docListHeaderWrap(
+                  css.listHeader(
                     (
                       page === 'all' ? t("All Documents") :
                       page === 'templates' ?
@@ -137,24 +132,20 @@ function createLoadedDocMenu(owner: IDisposableOwner, home: HomeModel) {
                       workspace && [css.docHeaderIcon('Folder'), workspaceName(home.app, workspace)]
                     ),
                     testId('doc-header'),
-                  )
+                  ),
+                  buildPrefs(viewSettings),
                 ),
                 (
-                  (page === 'all') ?
-                    dom('div',
-                      showIntro ? buildHomeIntro(home) : null,
-                      buildAllDocsBlock(home, home.workspaces, showIntro, flashDocId, viewSettings),
-                      shouldShowTemplates(home, showIntro) ? buildAllDocsTemplates(home, viewSettings) : null,
-                    ) :
-                  (page === 'trash') ?
+                  page === 'all' ? buildAllDocumentsDocsBlock({home, flashDocId, viewSettings}) :
+                  page === 'trash' ?
                     dom('div',
                       css.docBlock(t("Documents stay in Trash for 30 days, after which they get deleted permanently.")),
                       dom.maybe((use) => use(home.trashWorkspaces).length === 0, () =>
                         css.docBlock(t("Trash is empty."))
                       ),
-                      buildAllDocsBlock(home, home.trashWorkspaces, false, flashDocId, viewSettings),
+                      buildAllDocsBlock(home, home.trashWorkspaces, flashDocId, viewSettings),
                     ) :
-                  (page === 'templates') ?
+                  page === 'templates' ?
                     dom('div',
                       buildAllTemplates(home, home.templateWorkspaces, viewSettings)
                     ) :
@@ -172,30 +163,21 @@ function createLoadedDocMenu(owner: IDisposableOwner, home: HomeModel) {
           }),
         testId('doclist')
       ),
-      dom.maybe(use => !use(isNarrowScreenObs()) && ['all', 'workspace'].includes(use(home.currentPage)),
-        () => {
-          // 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.buildNudgeCard(),
-          ];
-        }),
     ),
   );
 }
 
 function buildAllDocsBlock(
-  home: HomeModel, workspaces: Observable<Workspace[]>,
-  showIntro: boolean, flashDocId: Observable<string|null>, viewSettings: ViewSettings,
+  home: HomeModel,
+  workspaces: Observable<Workspace[]>,
+  flashDocId: Observable<string|null>,
+  viewSettings: ViewSettings
 ) {
   return dom.forEach(workspaces, (ws) => {
     // Don't show the support workspace -- examples/templates are now retrieved from a special org.
     // TODO: Remove once support workspaces are removed from the backend.
     if (ws.isSupportWorkspace) { return null; }
-    // Show docs in regular workspaces. For empty orgs, we show the intro and skip
-    // the empty workspace headers. Workspaces are still listed in the left panel.
-    if (showIntro) { return null; }
+
     return css.docBlock(
       css.docBlockHeaderLink(
         css.wsLeft(
@@ -224,42 +206,50 @@ function buildAllDocsBlock(
   });
 }
 
-/**
- * Builds the collapsible examples and templates section at the bottom of
- * the All Documents page.
- *
- * If there are no featured templates, builds nothing.
- */
-function buildAllDocsTemplates(home: HomeModel, viewSettings: ViewSettings) {
-  return dom.domComputed(home.featuredTemplates, templates => {
-    if (templates.length === 0) { return null; }
-
-    const hideTemplatesObs = localStorageBoolObs('hide-examples');
-    return css.allDocsTemplates(css.templatesDocBlock(
-      dom.autoDispose(hideTemplatesObs),
-      css.templatesHeaderWrap(
-        css.templatesHeader(
-          t("Examples & Templates"),
-          dom.domComputed(hideTemplatesObs, (collapsed) =>
-            collapsed ? css.templatesHeaderIcon('Expand') : css.templatesHeaderIcon('Collapse')
-          ),
-          dom.on('click', () => hideTemplatesObs.set(!hideTemplatesObs.get())),
-          testId('all-docs-templates-header'),
+function buildAllDocumentsDocsBlock(options: {
+  home: HomeModel,
+  flashDocId: Observable<string|null>,
+  viewSettings: ViewSettings
+}) {
+  const {home, flashDocId, viewSettings} = options;
+  if (home.app.isPersonal && !home.app.currentValidUser) { return null; }
+
+  return dom('div',
+    dom.maybe(use => use(home.empty) && !home.app.isOwnerOrEditor(), () => css.docBlock(
+      css.introLine(
+        t("You have read-only access to this site. Currently there are no documents."),
+        dom('br'),
+        t("Any documents created in this site will appear here."),
+        testId('readonly-no-docs-message'),
+      ),
+      css.introLine(
+        t(
+          "Interested in using Grist outside of your team? Visit your free "
+            + "{{personalSiteLink}}.",
+          {
+            personalSiteLink: dom.maybe(use =>
+              use(home.app.topAppModel.orgs).find(o => o.owner), org => cssLink(
+                urlState().setLinkUrl({org: org.domain ?? undefined}),
+                t("personal site"),
+                testId('readonly-personal-site-link')
+              )),
+          }
         ),
-        createVideoTourTextButton(),
+        testId('readonly-personal-site-message'),
       ),
-      dom.maybe((use) => !use(hideTemplatesObs), () => [
-        buildTemplateDocs(home, templates, viewSettings),
-        bigBasicButton(
-          t("Discover More Templates"),
-          urlState().setLinkUrl({homePage: 'templates'}),
-          testId('all-docs-templates-discover-more'),
-        )
-      ]),
-      css.docBlock.cls((use) => '-' + use(home.currentView)),
-      testId('all-docs-templates'),
-    ));
-  });
+    )),
+    dom.maybe(use => use(home.empty) && home.app.isOwnerOrEditor(), () => css.createFirstDocument(
+      css.createFirstDocumentImage({src: 'img/create-document.svg'}),
+      bigPrimaryButton(
+        t('Create my first document'),
+        dom.on('click', () => newDocMethods.createDocAndOpen(home)),
+        dom.boolAttr('disabled', use => !use(home.newDocWorkspace)),
+      ),
+    )),
+    dom.maybe(use => !use(home.empty), () =>
+      buildAllDocsBlock(home, home.workspaces, flashDocId, viewSettings),
+    ),
+  );
 }
 
 /**
@@ -333,20 +323,11 @@ function buildOtherSites(home: HomeModel) {
 
 /**
  * Build the widget for selecting sort and view mode options.
- *
- * Options hideSort and hideView control which options are shown; they should have no effect
- * on the list of examples, so best to hide when those are the only docs shown.
  */
-function buildPrefs(
-  viewSettings: ViewSettings,
-  options: {
-    hideSort: boolean,
-    hideView: boolean,
-  },
-  ...args: DomArg<HTMLElement>[]): DomContents {
+function buildPrefs(viewSettings: ViewSettings, ...args: DomArg<HTMLElement>[]) {
   return css.prefSelectors(
     // The Sort selector.
-    options.hideSort ? null : dom.update(
+    dom.update(
       select<SortPref>(viewSettings.currentSort, [
           {value: 'name', label: t("By Name")},
           {value: 'date', label: t("By Date Modified")},
@@ -357,7 +338,7 @@ function buildPrefs(
     ),
 
     // The View selector.
-    options.hideView ? null : buttonSelect<ViewPref>(viewSettings.currentView, [
+    buttonSelect<ViewPref>(viewSettings.currentView, [
         {value: 'icons', icon: 'TypeTable'},
         {value: 'list', icon: 'TypeCardList'},
       ],
@@ -617,13 +598,3 @@ function scrollIntoViewIfNeeded(target: Element) {
     target.scrollIntoView(true);
   }
 }
-
-/**
- * Returns true if templates should be shown in All Documents.
- */
-function shouldShowTemplates(home: HomeModel, showIntro: boolean): boolean {
-  const org = home.app.currentOrg;
-  const isPersonalOrg = Boolean(org && org.owner);
-  // Show templates for all personal orgs, and for non-personal orgs when showing intro.
-  return isPersonalOrg || showIntro;
-}
diff --git a/app/client/ui/DocMenuCss.ts b/app/client/ui/DocMenuCss.ts
index c6034fae7ee..5144eef843d 100644
--- a/app/client/ui/DocMenuCss.ts
+++ b/app/client/ui/DocMenuCss.ts
@@ -36,14 +36,24 @@ export const docList = styled('div', `
 
 export const docListContent = styled('div', `
   display: flex;
+  width: 100%;
+  max-width: 1340px;
+  margin: 0 auto;
 `);
 
 export const docMenu = styled('div', `
-  flex-grow: 1;
-  max-width: 100%;
+  width: 100%;
 `);
 
-const listHeader = styled('div', `
+export const docListHeaderWrap = styled('div', `
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+  gap: 16px;
+  margin-bottom: 24px;
+`);
+
+export const listHeader = styled('div', `
   min-height: 32px;
   line-height: 32px;
   color: ${theme.text};
@@ -358,3 +368,28 @@ export const upgradeButton = styled('div', `
 export const upgradeCard = styled('div', `
   margin-left: 64px;
 `);
+
+export const createFirstDocument = styled('div', `
+  margin: 32px 0px;
+  display: flex;
+  flex-direction: column;
+  row-gap: 16px;
+  align-items: center;
+  justify-content: center;
+`);
+
+export const createFirstDocumentImage = styled('img', `
+  display: flex;
+  align-items: center;
+  justify-content: center;
+`);
+
+export const paragraph = styled(docBlock, `
+  color: ${theme.text};
+  line-height: 1.6;
+`);
+
+export const introLine = styled(paragraph, `
+  font-size: ${vars.introFontSize};
+  margin-bottom: 8px;
+`);
diff --git a/app/client/ui/DocTutorial.ts b/app/client/ui/DocTutorial.ts
index 2fd1c037b4c..efd537205da 100644
--- a/app/client/ui/DocTutorial.ts
+++ b/app/client/ui/DocTutorial.ts
@@ -503,3 +503,14 @@ const cssSkipIcon = styled(icon, `
   height: 20px;
   margin: 0px -3px;
 `);
+
+// This is aligned with css in ./DocTutorial.css
+export const cssCode = styled('code', `
+  padding: 2px 5px;
+  color: ${theme.tutorialsPopupCodeFg};
+  background: ${theme.tutorialsPopupCodeBg};
+  border: 1px solid ${theme.tutorialsPopupCodeBorder};
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  font-size: max(12.6px, 90%); /* 90% of 13px */
+`);
diff --git a/app/client/ui/FieldConfig.ts b/app/client/ui/FieldConfig.ts
index 934eeadf188..5f528a5df32 100644
--- a/app/client/ui/FieldConfig.ts
+++ b/app/client/ui/FieldConfig.ts
@@ -34,17 +34,18 @@ export function buildNameConfig(
   const saveColId = (val: string) => origColumn.colId.saveOnly(val.startsWith('$') ? val.slice(1) : val);
 
   const isSummaryTable = Computed.create(owner, use => Boolean(use(use(origColumn.table).summarySourceTable)));
-  // We will listen to cursor position and force a blur event on
-  // the text input, which will trigger save before the column observable
+  // We will listen to cursor position and force a blur event on both the id and
+  // the label inputs, which will trigger save before the column observable
   // will change its value.
   // Otherwise, blur will be invoked after column change and save handler will
   // update a different column.
-  let editor: HTMLInputElement | undefined;
+  const editors: HTMLInputElement[] = [];
   owner.autoDispose(
    cursor.subscribe(() => {
-     editor?.blur();
+     editors.forEach(e => e.blur());
    })
   );
+  const setEditor = (id: number) => (el: HTMLInputElement) => { editors[id] = el; };
 
   const toggleUntieColId = () => {
     if (!origColumn.disableModify.peek() && !disabled.peek()) {
@@ -57,11 +58,12 @@ export function buildNameConfig(
     cssRow(
       dom.cls(cssBlockedCursor.className, origColumn.disableModify),
       cssColLabelBlock(
-        editor = cssInput(fromKo(origColumn.label),
+        cssInput(fromKo(origColumn.label),
           async val => { await origColumn.label.saveOnly(val); editedLabel.set(''); },
           dom.on('input', (ev, elem) => { if (!untieColId.peek()) { editedLabel.set(elem.value); } }),
           dom.boolAttr('readonly', use => use(origColumn.disableModify) || use(disabled)),
           testId('field-label'),
+          setEditor(0),
         ),
         cssInput(editableColId,
           saveColId,
@@ -70,6 +72,7 @@ export function buildNameConfig(
           cssCodeBlock.cls(''),
           {style: 'margin-top: 8px'},
           testId('field-col-id'),
+          setEditor(1),
         ),
       ),
       cssColTieBlock(
@@ -109,7 +112,7 @@ export function buildFormulaConfig(
 ) {
 
   // If we can't modify anything about the column.
-  const disableModify = Computed.create(owner, use => use(origColumn.disableModify));
+  const disableModify = Computed.create(owner, use => use(origColumn.disableModify) || use(origColumn.hasReverse));
 
   // Intermediate state - user wants to specify formula, but haven't done yet
   const maybeFormula = Observable.create(owner, false);
@@ -320,8 +323,10 @@ export function buildFormulaConfig(
 
   // Should we disable all other action buttons and formula editor. For now
   // we will disable them when multiple columns are selected, or any of the column selected
-  // can't be modified.
-  const disableOtherActions = Computed.create(owner, use => use(disableModify) || use(isMultiSelect));
+  // can't be modified or if the column has a reverse column.
+  const disableOtherActions = Computed.create(owner,
+    use => use(disableModify) || use(isMultiSelect) || use(origColumn.hasReverse)
+  );
 
   const errorMessage = createFormulaErrorObs(owner, gristDoc, origColumn);
   // Helper that will create different flavors for formula builder.
diff --git a/app/client/ui/GristTooltips.ts b/app/client/ui/GristTooltips.ts
index b3f0c845b39..651ef4f1cbb 100644
--- a/app/client/ui/GristTooltips.ts
+++ b/app/client/ui/GristTooltips.ts
@@ -43,7 +43,10 @@ export type Tooltip =
   | 'accessRulesTableWide'
   | 'setChoiceDropdownCondition'
   | 'setRefDropdownCondition'
-  | 'communityWidgets';
+  | 'communityWidgets'
+  | 'twoWayReferences'
+  | 'twoWayReferencesDisabled'
+  | 'reasignTwoWayReference';
 
 export type TooltipContentFunc = (...domArgs: DomElementArg[]) => DomContents;
 
@@ -162,6 +165,28 @@ see or edit which parts of your document.')
     ),
     ...args,
   ),
+  twoWayReferences: (...args: DomElementArg[]) => cssTooltipContent(
+    dom('div',
+      t('Creates a new Reference List column in the target table, with both this ' +
+        'and the target columns editable and synchronized.')
+    ),
+    ...args,
+  ),
+  twoWayReferencesDisabled: (...args: DomElementArg[]) => cssTooltipContent(
+    dom('div',
+      t('Two-way references are not currently supported for Formula or Trigger Formula columns')
+    ),
+    ...args,
+  ),
+  reasignTwoWayReference: (...args: DomElementArg[]) => cssTooltipContent(
+    dom('div',
+      t('This limitation occurs when one column in a two-way reference has the Reference type.')
+    ),
+    dom('div',
+      t(`To allow multiple assignments, change the referenced column's type to Reference List.`)
+    ),
+    ...args,
+  ),
 };
 
 export interface BehavioralPromptContent {
diff --git a/app/client/ui/HomeIntro.ts b/app/client/ui/HomeIntro.ts
index 32ceeba1e97..40be9a1f0d4 100644
--- a/app/client/ui/HomeIntro.ts
+++ b/app/client/ui/HomeIntro.ts
@@ -1,24 +1,22 @@
 import {makeT} from 'app/client/lib/localization';
-import {getLoginOrSignupUrl, getLoginUrl, getSignupUrl, urlState} from 'app/client/models/gristUrlState';
 import {HomeModel} from 'app/client/models/HomeModel';
 import {productPill} from 'app/client/ui/AppHeader';
 import * as css from 'app/client/ui/DocMenuCss';
+import {buildHomeIntroCards} from 'app/client/ui/HomeIntroCards';
 import {newDocMethods} from 'app/client/ui/NewDocMethods';
-import {manageTeamUsersApp} from 'app/client/ui/OpenUserManager';
-import {bigBasicButton, cssButton} from 'app/client/ui2018/buttons';
+import {bigBasicButton} from 'app/client/ui2018/buttons';
 import {testId, theme, vars} from 'app/client/ui2018/cssVars';
 import {icon} from 'app/client/ui2018/icons';
-import {cssLink} from 'app/client/ui2018/links';
-import {commonUrls, isFeatureEnabled} from 'app/common/gristUrls';
+import {menu, menuCssClass} from 'app/client/ui2018/menus';
+import {toggleSwitch} from 'app/client/ui2018/toggleSwitch';
 import {FullUser} from 'app/common/LoginSessionAPI';
 import * as roles from 'app/common/roles';
-import {getGristConfig} from 'app/common/urlUtils';
-import {Computed, dom, DomContents, styled} from 'grainjs';
+import {dom, DomContents, styled} from 'grainjs';
+import {defaultMenuOptions} from 'popweasel';
 
 const t = makeT('HomeIntro');
 
 export function buildHomeIntro(homeModel: HomeModel): DomContents {
-  const isViewer = homeModel.app.currentOrg?.access === roles.VIEWER;
   const user = homeModel.app.currentValidUser;
   const isAnonym = !user;
   const isPersonal = !homeModel.app.isTeamSite;
@@ -26,185 +24,104 @@ export function buildHomeIntro(homeModel: HomeModel): DomContents {
     return makeAnonIntro(homeModel);
   } else if (isPersonal) {
     return makePersonalIntro(homeModel, user);
-  } else { // isTeamSite
-    if (isViewer) {
-      return makeViewerTeamSiteIntro(homeModel);
-    } else {
-      return makeTeamSiteIntro(homeModel);
-    }
+  } else {
+    return makeTeamSiteIntro(homeModel);
   }
 }
 
 export function buildWorkspaceIntro(homeModel: HomeModel): DomContents {
   const isViewer = homeModel.currentWS.get()?.access === roles.VIEWER;
   const isAnonym = !homeModel.app.currentValidUser;
-  const emptyLine = cssIntroLine(testId('empty-workspace-info'), t("This workspace is empty."));
+  const emptyLine = css.introLine(testId('empty-workspace-info'), t("This workspace is empty."));
   if (isAnonym || isViewer) {
     return emptyLine;
   } else {
     return [
       emptyLine,
-      buildButtons(homeModel, {
-        invite: false,
-        templates: false,
-        import: true,
-        empty: true
-      })
+      cssBtnGroup(
+        cssBtn(cssBtnIcon('Import'), t("Import Document"), testId('intro-import-doc'),
+          dom.on('click', () => newDocMethods.importDocAndOpen(homeModel)),
+        ),
+        cssBtn(cssBtnIcon('Page'), t("Create Empty Document"), testId('intro-create-doc'),
+          dom.on('click', () => newDocMethods.createDocAndOpen(homeModel)),
+        ),
+      ),
     ];
   }
 }
 
-function makeViewerTeamSiteIntro(homeModel: HomeModel) {
-  const personalOrg = Computed.create(null, use => use(homeModel.app.topAppModel.orgs).find(o => o.owner));
-  const docLink = (dom.maybe(personalOrg, org => {
-    return cssLink(
-      urlState().setLinkUrl({org: org.domain ?? undefined}),
-      t("personal site"),
-      testId('welcome-personal-url'));
-  }));
-  return [
-    css.docListHeader(
-      dom.autoDispose(personalOrg),
-      t("Welcome to {{- orgName}}", {orgName: homeModel.app.currentOrgName}),
-      productPill(homeModel.app.currentOrg, {large: true}),
-      testId('welcome-title')
-    ),
-    cssIntroLine(
-      testId('welcome-info'),
-      t("You have read-only access to this site. Currently there are no documents."),
-      dom('br'),
-      t("Any documents created in this site will appear here."),
-    ),
-    cssIntroLine(
-      t("Interested in using Grist outside of your team? Visit your free "), docLink, '.',
-      testId('welcome-text')
-    )
-  ];
-}
-
 function makeTeamSiteIntro(homeModel: HomeModel) {
   return [
-    css.docListHeader(
-      t("Welcome to {{- orgName}}", {orgName: homeModel.app.currentOrgName}),
-      productPill(homeModel.app.currentOrg, {large: true}),
-      testId('welcome-title')
+    css.docListHeaderWrap(
+      cssHeader(
+        t("Welcome to {{- orgName}}", {orgName: homeModel.app.currentOrgName}),
+        productPill(homeModel.app.currentOrg, {large: true}),
+        testId('welcome-title')
+      ),
+      buildPreferencesMenu(homeModel),
     ),
-    cssIntroLine(t("Get started by inviting your team and creating your first Grist document.")),
-    (!isFeatureEnabled('helpCenter') ? null :
-      cssIntroLine(
-        t(
-          'Learn more in our {{helpCenterLink}}.',
-          {helpCenterLink: helpCenterLink()}
-        ),
-        testId('welcome-text')
-      )
-    ),
-    makeCreateButtons(homeModel)
+    dom.create(buildHomeIntroCards, {homeModel}),
   ];
 }
 
 function makePersonalIntro(homeModel: HomeModel, user: FullUser) {
   return [
-    css.docListHeader(t("Welcome to Grist, {{- name}}!", {name: user.name}), testId('welcome-title')),
-    cssIntroLine(t("Get started by creating your first Grist document.")),
-    (!isFeatureEnabled('helpCenter') ? null :
-      cssIntroLine(t("Visit our {{link}} to learn more.", { link: helpCenterLink() }),
-        testId('welcome-text'))
+    css.docListHeaderWrap(
+      cssHeader(
+        t("Welcome to Grist, {{- name}}!", {name: user.name}),
+        testId('welcome-title'),
+      ),
+      buildPreferencesMenu(homeModel),
     ),
-    makeCreateButtons(homeModel),
+    dom.create(buildHomeIntroCards, {homeModel}),
   ];
 }
 
-function makeAnonIntroWithoutPlayground(homeModel: HomeModel) {
-    return [
-      (!isFeatureEnabled('helpCenter') ? null : cssIntroLine(t("Visit our {{link}} to learn more about Grist.", {
-        link: helpCenterLink()
-      }), testId('welcome-text-no-playground'))),
-      cssIntroLine(t("To use Grist, please either sign up or sign in.")),
-      cssBtnGroup(
-        cssBtn(t("Sign up"), cssButton.cls('-primary'), testId('intro-sign-up'),
-          dom.on('click', () => location.href = getSignupUrl())
-        ),
-        cssBtn(t("Sign in"), testId('intro-sign-in'),
-          dom.on('click', () => location.href = getLoginUrl())
-        )
-      )
-    ];
-}
-
 function makeAnonIntro(homeModel: HomeModel) {
-  const welcomeToGrist = css.docListHeader(t("Welcome to Grist!"), testId('welcome-title'));
-
-  if (!getGristConfig().enableAnonPlayground) {
-    return [
-      welcomeToGrist,
-      ...makeAnonIntroWithoutPlayground(homeModel)
-    ];
-  }
+  const welcomeToGrist = css.docListHeaderWrap(
+    cssHeader(
+      t("Welcome to Grist!"),
+      testId('welcome-title'),
+    ),
+  );
 
-  const signUp = cssLink({href: getLoginOrSignupUrl()}, t("Sign up"));
-  return [
+  return cssIntro(
     welcomeToGrist,
-    cssIntroLine(t("Get started by exploring templates, or creating your first Grist document.")),
-    cssIntroLine(t("{{signUp}} to save your work. ", {signUp}),
-      (!isFeatureEnabled('helpCenter') ? null : t("Visit our {{link}} to learn more.", { link: helpCenterLink() })),
-      testId('welcome-text')),
-    makeCreateButtons(homeModel),
-  ];
-}
-
-function helpCenterLink() {
-  return cssLink({href: commonUrls.help, target: '_blank'}, cssInlineIcon('Help'), t("Help Center"));
+    dom.create(buildHomeIntroCards, {homeModel}),
+  );
 }
 
-function buildButtons(homeModel: HomeModel, options: {
-  invite: boolean,
-  templates: boolean,
-  import: boolean,
-  empty: boolean,
-}) {
-  return cssBtnGroup(
-    !options.invite ? null :
-    cssBtn(cssBtnIcon('Help'), t("Invite Team Members"), testId('intro-invite'),
-      cssButton.cls('-primary'),
-      dom.on('click', () => manageTeamUsersApp({app: homeModel.app})),
-    ),
-    !options.templates ? null :
-    cssBtn(cssBtnIcon('FieldTable'), t("Browse Templates"), testId('intro-templates'),
-      cssButton.cls('-primary'),
-      dom.show(isFeatureEnabled("templates")),
-      urlState().setLinkUrl({homePage: 'templates'}),
-    ),
-    !options.import ? null :
-    cssBtn(cssBtnIcon('Import'), t("Import Document"), testId('intro-import-doc'),
-      dom.on('click', () => newDocMethods.importDocAndOpen(homeModel)),
-    ),
-    !options.empty ? null :
-    cssBtn(cssBtnIcon('Page'), t("Create Empty Document"), testId('intro-create-doc'),
-      dom.on('click', () => newDocMethods.createDocAndOpen(homeModel)),
+function buildPreferencesMenu(homeModel: HomeModel) {
+  const {onlyShowDocuments} = homeModel;
+
+  return cssDotsMenu(
+    cssDots(icon('Dots')),
+    menu(
+      () => [
+        toggleSwitch(onlyShowDocuments, {
+          label: t('Only show documents'),
+          args: [
+            testId('welcome-menu-only-show-documents'),
+          ],
+        }),
+      ],
+      {
+        ...defaultMenuOptions,
+        menuCssClass: `${menuCssClass} ${cssPreferencesMenu.className}`,
+        placement: 'bottom-end',
+      }
     ),
+    testId('welcome-menu'),
   );
 }
 
-function makeCreateButtons(homeModel: HomeModel) {
-  const canManageTeam = homeModel.app.isTeamSite &&
-    roles.canEditAccess(homeModel.app.currentOrg?.access || null);
-  return buildButtons(homeModel, {
-    invite: canManageTeam,
-    templates: !canManageTeam,
-    import: true,
-    empty: true
-  });
-}
-
-const cssParagraph = styled(css.docBlock, `
-  color: ${theme.text};
-  line-height: 1.6;
+const cssIntro = styled('div', `
+  margin-bottom: 24px;
 `);
 
-const cssIntroLine = styled(cssParagraph, `
-  font-size: ${vars.introFontSize};
-  margin-bottom: 8px;
+const cssHeader = styled(css.listHeader, `
+  font-size: 24px;
+  line-height: 36px;
 `);
 
 const cssBtnGroup = styled('div', `
@@ -225,6 +142,21 @@ const cssBtnIcon = styled(icon, `
   margin-right: 8px;
 `);
 
-const cssInlineIcon = styled(icon, `
-  margin: -2px 4px 2px 4px;
+const cssPreferencesMenu = styled('div', `
+  padding: 10px 16px;
+`);
+
+const cssDotsMenu = styled('div', `
+  display: flex;
+  cursor: pointer;
+  border-radius: ${vars.controlBorderRadius};
+
+  &:hover, &.weasel-popup-open {
+    background-color: ${theme.hover};
+  }
+`);
+
+const cssDots = styled('div', `
+  --icon-color: ${theme.lightText};
+  padding: 8px;
 `);
diff --git a/app/client/ui/HomeIntroCards.ts b/app/client/ui/HomeIntroCards.ts
new file mode 100644
index 00000000000..b36eed66dca
--- /dev/null
+++ b/app/client/ui/HomeIntroCards.ts
@@ -0,0 +1,386 @@
+import {makeT} from 'app/client/lib/localization';
+import {urlState} from 'app/client/models/gristUrlState';
+import {HomeModel} from 'app/client/models/HomeModel';
+import {newDocMethods} from 'app/client/ui/NewDocMethods';
+import {openVideoTour} from 'app/client/ui/OpenVideoTour';
+import {basicButtonLink, bigPrimaryButton, primaryButtonLink} from 'app/client/ui2018/buttons';
+import {colors, theme, vars} from 'app/client/ui2018/cssVars';
+import {icon} from 'app/client/ui2018/icons';
+import {commonUrls, isFeatureEnabled} from 'app/common/gristUrls';
+import {getGristConfig} from 'app/common/urlUtils';
+import {Computed, dom, IDisposableOwner, makeTestId, styled, subscribeElem} from 'grainjs';
+
+interface BuildHomeIntroCardsOptions {
+  homeModel: HomeModel;
+}
+
+const t = makeT('HomeIntroCards');
+
+const testId = makeTestId('test-intro-');
+
+export function buildHomeIntroCards(
+  owner: IDisposableOwner,
+  {homeModel}: BuildHomeIntroCardsOptions
+) {
+  const {onboardingTutorialDocId, templateOrg} = getGristConfig();
+
+  const percentComplete = Computed.create(owner, (use) => {
+    if (!homeModel.app.currentValidUser) { return 0; }
+
+    const tutorial = use(homeModel.onboardingTutorial);
+    if (!tutorial) { return undefined; }
+
+    return tutorial.forks?.[0]?.options?.tutorial?.percentComplete ?? 0;
+  });
+
+  let videoPlayButtonElement: HTMLElement;
+
+  return dom.maybe(use => !use(homeModel.onlyShowDocuments), () => cssHomeIntroCards(
+    cssVideoTour(
+      cssVideoTourThumbnail(
+        cssVideoTourThumbnailSpacer(),
+        videoPlayButtonElement = cssVideoTourPlayButton(
+          cssVideoTourPlayIcon('VideoPlay2'),
+        ),
+        cssVideoTourThumbnailText(t('3 minute video tour')),
+      ),
+      dom.on('click', () => openVideoTour(videoPlayButtonElement)),
+      testId('video-tour'),
+    ),
+    cssTutorial(
+      dom.hide(() => !isFeatureEnabled('tutorials') || !templateOrg || !onboardingTutorialDocId),
+      cssTutorialHeader(t('Finish our basics tutorial')),
+      cssTutorialBody(
+        cssTutorialProgress(
+          cssTutorialProgressText(
+            cssTutorialProgressPercentage(
+              dom.domComputed(percentComplete, (percent) => percent !== undefined ? `${percent}%` : null),
+              testId('tutorial-percent-complete'),
+            ),
+          ),
+          cssTutorialProgressBar(
+            (elem) => subscribeElem(elem, percentComplete, (val) => {
+              elem.style.setProperty('--percent-complete', String(val ?? 0));
+            })
+          ),
+        ),
+        dom('div',
+          primaryButtonLink(
+            t('Tutorial'),
+            urlState().setLinkUrl({org: templateOrg!, doc: onboardingTutorialDocId}),
+          ),
+        )
+      ),
+      testId('tutorial'),
+    ),
+    cssNewDocument(
+      cssNewDocumentHeader(t('Start a new document')),
+      cssNewDocumentBody(
+        cssNewDocumentButton(
+          cssNewDocumentButtonIcon('Page'),
+          t('Blank document'),
+          dom.on('click', () => newDocMethods.createDocAndOpen(homeModel)),
+          dom.boolAttr('disabled', use => !use(homeModel.newDocWorkspace)),
+          testId('create-doc'),
+        ),
+        cssNewDocumentButton(
+          cssNewDocumentButtonIcon('Import'),
+          t('Import file'),
+          dom.on('click', () => newDocMethods.importDocAndOpen(homeModel)),
+          dom.boolAttr('disabled', use => !use(homeModel.newDocWorkspace)),
+          testId('import-doc'),
+        ),
+        cssNewDocumentButton(
+          dom.show(isFeatureEnabled("templates") && Boolean(templateOrg)),
+          cssNewDocumentButtonIcon('FieldTable'),
+          t('Templates'),
+          urlState().setLinkUrl({homePage: 'templates'}),
+          testId('templates'),
+        ),
+      ),
+    ),
+    cssWebinars(
+      dom.show(isFeatureEnabled('helpCenter')),
+      cssWebinarsImage({src: 'img/webinars.svg'}),
+      t('Learn more {{webinarsLinks}}', {
+        webinarsLinks: cssWebinarsButton(
+          t('Webinars'),
+          {href: commonUrls.webinars, target: '_blank'},
+          testId('webinars'),
+        ),
+      }),
+    ),
+    cssHelpCenter(
+      dom.show(isFeatureEnabled('helpCenter')),
+      cssHelpCenterImage({src: 'img/help-center.svg'}),
+      t('Find solutions and explore more resources {{helpCenterLink}}', {
+        helpCenterLink: cssHelpCenterButton(
+          t('Help center'),
+          {href: commonUrls.help, target: '_blank'},
+          testId('help-center'),
+        ),
+      }),
+    ),
+    testId('cards'),
+  ));
+}
+
+// Cards are hidden at specific breakpoints; we use non-standard ones
+// here, as they work better than the ones defined in `cssVars.ts`.
+const mediaXLarge = `(max-width: ${1440 - 0.02}px)`;
+const mediaLarge = `(max-width: ${1280 - 0.02}px)`;
+const mediaMedium = `(max-width: ${1048 - 0.02}px)`;
+const mediaSmall = `(max-width: ${828 - 0.02}px)`;
+
+const cssHomeIntroCards = styled('div', `
+  display: grid;
+  gap: 24px;
+  margin-bottom: 24px;
+  display: grid;
+  grid-template-columns: 239px minmax(0, 437px) minmax(196px, 1fr) minmax(196px, 1fr);
+  grid-template-rows: repeat(2, 1fr);
+
+  @media ${mediaLarge} {
+    & {
+      grid-template-columns: 239px minmax(0, 437px) minmax(196px, 1fr);
+    }
+  }
+  @media ${mediaMedium} {
+    & {
+      grid-template-columns: 239px minmax(0, 437px);
+    }
+  }
+  @media ${mediaSmall} {
+    & {
+      display: flex;
+      flex-direction: column;
+    }
+  }
+`);
+
+const cssVideoTour = styled('div', `
+  grid-area: 1 / 1 / 2 / 2;
+  flex-shrink: 0;
+  width: 239px;
+  overflow: hidden;
+  cursor: pointer;
+  border-radius: 4px;
+
+  @media ${mediaSmall} {
+    & {
+      width: unset;
+    }
+  }
+`);
+
+const cssVideoTourThumbnail = styled('div', `
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  padding: 36px 32px;
+  background-image: url("img/youtube-screenshot.png");
+  background-color: rgba(0, 0, 0, 0.4);
+  background-blend-mode: multiply;
+  background-size: cover;
+  transform: scale(1.2);
+  width: 100%;
+  height: 100%;
+`);
+
+const cssVideoTourThumbnailSpacer = styled('div', ``);
+
+const cssVideoTourPlayButton = styled('div', `
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  align-self: center;
+  width: 32px;
+  height: 32px;
+  background-color: ${theme.controlPrimaryBg};
+  border-radius: 50%;
+
+  .${cssVideoTourThumbnail.className}:hover & {
+    background-color: ${theme.controlPrimaryHoverBg};
+  }
+`);
+
+const cssVideoTourPlayIcon = styled(icon, `
+  --icon-color: ${theme.controlPrimaryFg};
+  width: 24px;
+  height: 24px;
+`);
+
+const cssVideoTourThumbnailText = styled('div', `
+  color: ${colors.light};
+  font-weight: 700;
+  text-align: center;
+`);
+
+const cssTutorial = styled('div', `
+  grid-area: 1 / 2 / 2 / 3;
+  position: relative;
+  border-radius: 4px;
+  color: ${theme.announcementPopupFg};
+  background-color: ${theme.announcementPopupBg};
+  padding: 16px;
+`);
+
+const cssTutorialHeader = styled('div', `
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 500;
+  margin-bottom: 8px;
+`);
+
+const cssTutorialBody = styled('div', `
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+`);
+
+const cssTutorialProgress = styled('div', `
+  display
+  flex: auto;
+  min-width: 120px;
+`);
+
+const cssTutorialProgressText = styled('div', `
+  display: flex;
+  justify-content: space-between;
+`);
+
+const cssTutorialProgressPercentage = styled('div', `
+  font-size: 18px;
+  font-style: normal;
+  font-weight: 700;
+  min-height: 21.5px;
+`);
+
+const cssTutorialProgressBar = styled('div', `
+  margin-top: 4px;
+  height: 10px;
+  border-radius: 8px;
+  background: ${theme.mainPanelBg};
+  --percent-complete: 0;
+
+  &::after {
+    content: '';
+    border-radius: 8px;
+    background: ${theme.progressBarFg};
+    display: block;
+    height: 100%;
+    width: calc((var(--percent-complete) / 100) * 100%);
+  }
+`);
+
+const cssNewDocument = styled('div', `
+  grid-area: 2 / 1 / 3 / 3;
+  grid-column: span 2;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  position: relative;
+  border-radius: 4px;
+  color: ${theme.announcementPopupFg};
+  background-color: ${theme.announcementPopupBg};
+  padding: 24px;
+`);
+
+const cssNewDocumentHeader = styled('div', `
+  font-weight: 500;
+  font-size: ${vars.xxlargeFontSize};
+`);
+
+const cssNewDocumentBody = styled('div', `
+  display: flex;
+  gap: 16px;
+  margin-top: 16px;
+
+  @media ${mediaSmall} {
+    & {
+      flex-direction: column;
+    }
+  }
+`);
+
+const cssNewDocumentButton = styled(bigPrimaryButton, `
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-grow: 1;
+  padding: 6px;
+`);
+
+const cssNewDocumentButtonIcon = styled(icon, `
+  flex-shrink: 0;
+  margin-right: 8px;
+
+  @media ${mediaXLarge} {
+    & {
+      display: none;
+    }
+  }
+`);
+
+const cssSecondaryCard = styled('div', `
+  font-weight: 500;
+  font-size: 14px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  justify-content: center;
+  min-width: 196px;
+  color: ${theme.text};
+  background-color: ${theme.popupSecondaryBg};
+  position: relative;
+  border-radius: 4px;
+  padding: 16px;
+`);
+
+const cssSecondaryCardImage = styled('img', `
+  display: block;
+  height: auto;
+`);
+
+const cssSecondaryCardButton = styled(basicButtonLink, `
+  font-weight: 400;
+  font-size: ${vars.mediumFontSize};
+  margin-top: 8px;
+`);
+
+const cssWebinars = styled(cssSecondaryCard, `
+  grid-area: 2 / 3 / 3 / 4;
+
+  @media ${mediaMedium} {
+    & {
+      display: none;
+    }
+  }
+`);
+
+const cssWebinarsImage = styled(cssSecondaryCardImage, `
+  width: 105.78px;
+  margin-bottom: 8px;
+`);
+
+const cssWebinarsButton = cssSecondaryCardButton;
+
+const cssHelpCenter = styled(cssSecondaryCard, `
+  grid-area: 2 / 4 / 3 / 5;
+
+  @media ${mediaLarge} {
+    & {
+      display: none;
+    }
+  }
+`);
+
+const cssHelpCenterImage = styled(cssSecondaryCardImage, `
+  width: 67.77px;
+`);
+
+const cssHelpCenterButton = cssSecondaryCardButton;
diff --git a/app/client/ui/ImportProgress.ts b/app/client/ui/ImportProgress.ts
index ce6d52a27bc..e2cb7dfe339 100644
--- a/app/client/ui/ImportProgress.ts
+++ b/app/client/ui/ImportProgress.ts
@@ -55,4 +55,3 @@ export class ImportProgress extends Disposable {
     this._progressUI.setProgress(100 * progress);
   }
 }
-
diff --git a/app/client/ui/MarkdownCellRenderer.ts b/app/client/ui/MarkdownCellRenderer.ts
index 036572ff80c..4151a65b7e0 100644
--- a/app/client/ui/MarkdownCellRenderer.ts
+++ b/app/client/ui/MarkdownCellRenderer.ts
@@ -1,10 +1,11 @@
+import {constructUrl} from 'app/client/models/gristUrlState';
 import {gristIconLink} from 'app/client/ui2018/links';
 import escape from 'lodash/escape';
 import {marked} from 'marked';
 
 export const renderer = new marked.Renderer();
 
-renderer.link = ({href, text}) => gristIconLink(href, text).outerHTML;
+renderer.link = ({href, text}) => gristIconLink(constructUrl(href), text).outerHTML;
 
 // Disable Markdown features that we aren't ready to support yet.
 renderer.hr = ({raw}) => raw;
diff --git a/app/client/ui/OnboardingCards.ts b/app/client/ui/OnboardingCards.ts
deleted file mode 100644
index 4e3571692ab..00000000000
--- a/app/client/ui/OnboardingCards.ts
+++ /dev/null
@@ -1,232 +0,0 @@
-import {makeT} from 'app/client/lib/localization';
-import {urlState} from 'app/client/models/gristUrlState';
-import {HomeModel} from 'app/client/models/HomeModel';
-import {openVideoTour} from 'app/client/ui/OpenVideoTour';
-import {bigPrimaryButtonLink} from 'app/client/ui2018/buttons';
-import {colors, theme} from 'app/client/ui2018/cssVars';
-import {icon} from 'app/client/ui2018/icons';
-import {isFeatureEnabled} from 'app/common/gristUrls';
-import {getGristConfig} from 'app/common/urlUtils';
-import {Computed, dom, IDisposableOwner, makeTestId, styled, subscribeElem} from 'grainjs';
-
-interface BuildOnboardingCardsOptions {
-  homeModel: HomeModel;
-}
-
-const t = makeT('OnboardingCards');
-
-const testId = makeTestId('test-onboarding-');
-
-export function buildOnboardingCards(
-  owner: IDisposableOwner,
-  {homeModel}: BuildOnboardingCardsOptions
-) {
-  const {templateOrg, onboardingTutorialDocId} = getGristConfig();
-  if (!isFeatureEnabled('tutorials') || !templateOrg || !onboardingTutorialDocId) { return null; }
-
-  const percentComplete = Computed.create(owner, (use) => {
-    if (!homeModel.app.currentValidUser) { return 0; }
-
-    const tutorial = use(homeModel.onboardingTutorial);
-    if (!tutorial) { return undefined; }
-
-    return tutorial.forks?.[0]?.options?.tutorial?.percentComplete ?? 0;
-  });
-
-  const shouldShowCards = Computed.create(owner, (use) =>
-    !use(homeModel.app.dismissedPopups).includes('onboardingCards'));
-
-  let videoPlayButtonElement: HTMLElement;
-
-  return dom.maybe(shouldShowCards, () =>
-    cssOnboardingCards(
-      cssTutorialCard(
-        cssDismissCardsButton(
-          icon('CrossBig'),
-          dom.on('click', () => homeModel.app.dismissPopup('onboardingCards', true)),
-          testId('dismiss-cards'),
-        ),
-        cssTutorialCardHeader(
-          t('Complete our basics tutorial'),
-        ),
-        cssTutorialCardSubHeader(
-          t('Learn the basics of reference columns, linked widgets, column types, & cards.')
-        ),
-        cssTutorialCardBody(
-          cssTutorialProgress(
-            cssTutorialProgressText(
-              cssProgressPercentage(
-                dom.domComputed(percentComplete, (percent) => percent !== undefined ? `${percent}%` : null),
-                testId('tutorial-percent-complete'),
-              ),
-              cssStarIcon('Star'),
-            ),
-            cssTutorialProgressBar(
-              (elem) => subscribeElem(elem, percentComplete, (val) => {
-                elem.style.setProperty('--percent-complete', String(val ?? 0));
-              })
-            ),
-          ),
-          bigPrimaryButtonLink(
-            t('Complete the tutorial'),
-            urlState().setLinkUrl({org: templateOrg, doc: onboardingTutorialDocId}),
-          ),
-        ),
-        testId('tutorial-card'),
-      ),
-      cssVideoCard(
-        cssVideoThumbnail(
-          cssVideoThumbnailSpacer(),
-          videoPlayButtonElement = cssVideoPlayButton(
-            cssPlayIcon('VideoPlay2'),
-          ),
-          cssVideoThumbnailText(t('3 minute video tour')),
-        ),
-        dom.on('click', () => openVideoTour(videoPlayButtonElement)),
-      ),
-    )
-  );
-}
-
-const cssOnboardingCards = styled('div', `
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(220px, max-content));
-  gap: 24px;
-  margin: 24px 0;
-`);
-
-const cssTutorialCard = styled('div', `
-  position: relative;
-  border-radius: 4px;
-  color: ${theme.announcementPopupFg};
-  background-color: ${theme.announcementPopupBg};
-  padding: 16px 24px;
-`);
-
-const cssTutorialCardHeader = styled('div', `
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  font-size: 18px;
-  font-style: normal;
-  font-weight: 700;
-`);
-
-const cssDismissCardsButton = styled('div', `
-  position: absolute;
-  top: 8px;
-  right: 8px;
-  padding: 4px;
-  border-radius: 4px;
-  cursor: pointer;
-  --icon-color: ${theme.popupCloseButtonFg};
-
-  &:hover {
-    background-color: ${theme.hover};
-  }
-`);
-
-const cssTutorialCardSubHeader = styled('div', `
-  font-size: 14px;
-  font-style: normal;
-  font-weight: 500;
-  margin: 8px 0;
-`);
-
-const cssTutorialCardBody = styled('div', `
-  display: flex;
-  flex-wrap: wrap;
-  gap: 24px;
-  margin: 16px 0;
-  align-items: end;
-`);
-
-const cssTutorialProgress = styled('div', `
-  flex: auto;
-  min-width: 120px;
-`);
-
-const cssTutorialProgressText = styled('div', `
-  display: flex;
-  justify-content: space-between;
-`);
-
-const cssProgressPercentage = styled('div', `
-  font-size: 20px;
-  font-style: normal;
-  font-weight: 700;
-`);
-
-const cssStarIcon = styled(icon, `
-  --icon-color: ${theme.accentIcon};
-  width: 24px;
-  height: 24px;
-`);
-
-const cssTutorialProgressBar = styled('div', `
-  margin-top: 4px;
-  height: 10px;
-  border-radius: 8px;
-  background: ${theme.mainPanelBg};
-  --percent-complete: 0;
-
-  &::after {
-    content: '';
-    border-radius: 8px;
-    background: ${theme.progressBarFg};
-    display: block;
-    height: 100%;
-    width: calc((var(--percent-complete) / 100) * 100%);
-  }
-`);
-
-const cssVideoCard = styled('div', `
-  width: 220px;
-  height: 158px;
-  overflow: hidden;
-  cursor: pointer;
-  border-radius: 4px;
-`);
-
-const cssVideoThumbnail = styled('div', `
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  padding: 36px 32px;
-  background-image: url("img/youtube-screenshot.png");
-  background-color: rgba(0, 0, 0, 0.4);
-  background-blend-mode: multiply;
-  background-size: cover;
-  transform: scale(1.2);
-  width: 100%;
-  height: 100%;
-`);
-
-const cssVideoThumbnailSpacer = styled('div', ``);
-
-const cssVideoPlayButton = styled('div', `
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  align-self: center;
-  width: 32px;
-  height: 32px;
-  background-color: ${theme.controlPrimaryBg};
-  border-radius: 50%;
-
-  .${cssVideoThumbnail.className}:hover & {
-    background-color: ${theme.controlPrimaryHoverBg};
-  }
-`);
-
-const cssPlayIcon = styled(icon, `
-  --icon-color: ${theme.controlPrimaryFg};
-  width: 24px;
-  height: 24px;
-`);
-
-const cssVideoThumbnailText = styled('div', `
-  color: ${colors.light};
-  font-weight: 700;
-  text-align: center;
-`);
diff --git a/app/client/ui/RightPanel.ts b/app/client/ui/RightPanel.ts
index f94dbabaf78..105cbddfc92 100644
--- a/app/client/ui/RightPanel.ts
+++ b/app/client/ui/RightPanel.ts
@@ -36,7 +36,7 @@ import {GridOptions} from 'app/client/ui/GridOptions';
 import {textarea} from 'app/client/ui/inputs';
 import {attachPageWidgetPicker, IPageWidget, toPageWidget} from 'app/client/ui/PageWidgetPicker';
 import {PredefinedCustomSectionConfig} from "app/client/ui/PredefinedCustomSectionConfig";
-import {cssLabel} from 'app/client/ui/RightPanelStyles';
+import {cssLabel, cssSeparator} from 'app/client/ui/RightPanelStyles';
 import {linkId, NoLink, selectBy} from 'app/client/ui/selectBy';
 import {VisibleFieldsConfig} from 'app/client/ui/VisibleFieldsConfig';
 import {getTelemetryWidgetTypeFromVS, getWidgetTypes} from "app/client/ui/widgetTypesMap";
@@ -1271,10 +1271,6 @@ const cssTabContents = styled('div', `
   overflow: auto;
 `);
 
-const cssSeparator = styled('div', `
-  border-bottom: 1px solid ${theme.pagePanelsBorder};
-  margin-top: 16px;
-`);
 
 const cssConfigContainer = styled('div.test-config-container', `
   overflow: auto;
diff --git a/app/client/ui/RightPanelStyles.ts b/app/client/ui/RightPanelStyles.ts
index 8e7a4723af1..442e250d4e2 100644
--- a/app/client/ui/RightPanelStyles.ts
+++ b/app/client/ui/RightPanelStyles.ts
@@ -15,6 +15,13 @@ export const cssLabel = styled('div', `
   font-size: ${vars.xsmallFontSize};
 `);
 
+export const cssLabelText = styled('span', `
+  color: ${theme.text};
+  text-transform: uppercase;
+  font-size: ${vars.xsmallFontSize};
+`);
+
+
 export const cssHelp = styled('div', `
   color: ${theme.lightText};
   margin: -8px 16px 12px 16px;
diff --git a/app/client/ui/SupportGristNudge.ts b/app/client/ui/SupportGristButton.ts
similarity index 63%
rename from app/client/ui/SupportGristNudge.ts
rename to app/client/ui/SupportGristButton.ts
index e35d16cf4cd..506a275db58 100644
--- a/app/client/ui/SupportGristNudge.ts
+++ b/app/client/ui/SupportGristButton.ts
@@ -1,45 +1,32 @@
 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 {basicButton, basicButtonLink, bigPrimaryButton} from 'app/client/ui2018/buttons';
-import {colors, isNarrowScreenObs, testId, theme, vars} from 'app/client/ui2018/cssVars';
+import {colors, testId, theme, vars} from 'app/client/ui2018/cssVars';
 import {icon} from 'app/client/ui2018/icons';
 import {cssLink} from 'app/client/ui2018/links';
+import {modal} from 'app/client/ui2018/modals';
 import {commonUrls, isFeatureEnabled} from 'app/common/gristUrls';
 import {getGristConfig} from 'app/common/urlUtils';
-import {Computed, Disposable, dom, DomContents, Observable, styled, UseCB} from 'grainjs';
+import {Computed, Disposable, dom, DomContents, Observable, styled} from 'grainjs';
 
 const t = makeT('SupportGristNudge');
 
-type ButtonState =
-  | 'collapsed'
-  | 'expanded';
-
 /**
- * Nudges users to support Grist by opting in to telemetry or sponsoring on Github.
+ * Button that nudges users to support Grist by opting in to telemetry or sponsoring on Github.
  *
- * For installation admins, this includes a card with a nudge which collapses into a "Support
+ * For installation admins, this includes a modal with a nudge which collapses into a "Support
  * Grist" button in the top bar. When that's not applicable, it is only a "Support Grist" button
  * that links to the Github sponsorship page.
  *
- * Users can dismiss these nudges.
+ * Users can dismiss this button.
  */
-export class SupportGristNudge extends Disposable {
+export class SupportGristButton extends Disposable {
+  private readonly _showButton: Computed<null|'link'|'expand'>;
   private readonly _telemetryModel: TelemetryModel = TelemetryModelImpl.create(this, this._appModel);
 
-  private readonly _buttonStateKey = `u=${this._appModel.currentValidUser?.id ?? 0};supportGristNudge`;
-  private _buttonState = localStorageObs(this._buttonStateKey, 'expanded') as Observable<ButtonState>;
-
-  // Whether the nudge just got accepted, and we should temporarily show the "Thanks" version.
-  private _justAccepted = Observable.create(this, false);
-
-  private _showButton: Computed<null|'link'|'expand'>;
-  private _showNudge: Computed<null|'normal'|'accepted'>;
-
   constructor(private _appModel: AppModel) {
     super();
     const {deploymentType, telemetry} = getGristConfig();
@@ -48,28 +35,16 @@ export class SupportGristNudge extends Disposable {
     const isTelemetryOn = (telemetry && telemetry.telemetryLevel !== 'off');
     const isAdminNudgeApplicable = isAdmin && !isTelemetryOn;
 
-    const generallyHide = (use: UseCB) => (
-      !isEnabled ||
-      use(_appModel.dismissedPopups).includes('supportGrist') ||
-      use(isNarrowScreenObs())
-    );
-
     this._showButton = Computed.create(this, use => {
-      if (generallyHide(use)) { return null; }
-      if (!isAdminNudgeApplicable) { return 'link'; }
-      if (use(this._buttonState) !== 'expanded') { return 'expand'; }
-      return null;
-    });
+      if (!isEnabled || use(_appModel.dismissedPopups).includes('supportGrist')) {
+        return null;
+      }
 
-    this._showNudge = Computed.create(this, use => {
-      if (use(this._justAccepted)) { return 'accepted'; }
-      if (generallyHide(use)) { return null; }
-      if (isAdminNudgeApplicable && use(this._buttonState) === 'expanded') { return 'normal'; }
-      return null;
+      return isAdminNudgeApplicable ? 'expand' : 'link';
     });
   }
 
-  public buildTopBarButton(): DomContents {
+  public buildDom(): DomContents {
     return dom.domComputed(this._showButton, (which) => {
       if (!which) { return null; }
       const elemType = (which === 'link') ? basicButtonLink : basicButton;
@@ -77,7 +52,7 @@ export class SupportGristNudge extends Disposable {
         elemType(cssHeartIcon('💛 '), t('Support Grist'),
           (which === 'link' ?
             {href: commonUrls.githubSponsorGristLabs, target: '_blank'} :
-            dom.on('click', () => this._buttonState.set('expanded'))
+            dom.on('click', () => this._buildNudgeModal())
           ),
 
           cssContributeButtonCloseButton(
@@ -85,7 +60,7 @@ export class SupportGristNudge extends Disposable {
             dom.on('click', (ev) => {
               ev.stopPropagation();
               ev.preventDefault();
-              this._dismissAndClose();
+              this._markDismissed();
             }),
             testId('support-grist-button-dismiss'),
           ),
@@ -95,26 +70,31 @@ export class SupportGristNudge extends Disposable {
     });
   }
 
-  public buildNudgeCard() {
-    return dom.domComputed(this._showNudge, nudge => {
-      if (!nudge) { return null; }
-      return cssCard(
-        (nudge === 'normal' ?
-          this._buildSupportGristCardContent() :
-          this._buildOptedInCardContent()
+  private _buildNudgeModal() {
+    return modal((ctl, owner) => {
+      const currentStep = Observable.create<'opt-in' | 'opted-in'>(owner, 'opt-in');
+
+      return [
+        cssModal.cls(''),
+        cssCloseButton(
+          icon('CrossBig'),
+          dom.on('click', () => ctl.close()),
+          testId('support-nudge-close'),
         ),
-        testId('support-nudge'),
-      );
-    });
+        dom.domComputed(currentStep, (step) => {
+          return step === 'opt-in'
+            ? this._buildOptInScreen(async () => {
+              await this._optInToTelemetry();
+              currentStep.set('opted-in');
+            })
+            : this._buildOptedInScreen(() => ctl.close());
+        }),
+      ];
+    }, {});
   }
 
-  private _buildSupportGristCardContent() {
+  private _buildOptInScreen(onOptIn: () => Promise<void>) {
     return [
-      cssCloseButton(
-        icon('CrossBig'),
-        dom.on('click', () => this._buttonState.set('collapsed')),
-        testId('support-nudge-close'),
-      ),
       cssLeftAlignedHeader(t('Support Grist')),
       cssParagraph(t(
         'Opt in to telemetry to help us understand how the product ' +
@@ -132,19 +112,14 @@ export class SupportGristNudge extends Disposable {
       ),
       cssFullWidthButton(
         t('Opt in to Telemetry'),
-        dom.on('click', () => this._optInToTelemetry()),
+        dom.on('click', () => onOptIn()),
         testId('support-nudge-opt-in'),
       ),
     ];
   }
 
-  private _buildOptedInCardContent() {
+  private _buildOptedInScreen(onClose: () => void) {
     return [
-      cssCloseButton(
-        icon('CrossBig'),
-        dom.on('click', () => this._justAccepted.set(false)),
-        testId('support-nudge-close'),
-      ),
       cssCenteredFlex(cssSparks()),
       cssCenterAlignedHeader(t('Opted In')),
       cssParagraph(
@@ -157,7 +132,7 @@ export class SupportGristNudge extends Disposable {
       cssCenteredFlex(
         cssPrimaryButton(
           t('Close'),
-          dom.on('click', () => this._justAccepted.set(false)),
+          dom.on('click', () => onClose()),
           testId('support-nudge-close-button'),
         ),
       ),
@@ -166,19 +141,11 @@ export class SupportGristNudge extends Disposable {
 
   private _markDismissed() {
     this._appModel.dismissPopup('supportGrist', true);
-    // Also cleanup the no-longer-needed button state from localStorage.
-    getStorage().removeItem(this._buttonStateKey);
-  }
-
-  private _dismissAndClose() {
-    this._markDismissed();
-    this._justAccepted.set(false);
   }
 
   private async _optInToTelemetry() {
     await this._telemetryModel.updateTelemetryPrefs({telemetryLevel: 'limited'});
     this._markDismissed();
-    this._justAccepted.set(true);
   }
 }
 
@@ -202,10 +169,7 @@ const cssCenteredFlex = styled('div', `
   align-items: center;
 `);
 
-const cssContributeButton = styled('div', `
-  margin-left: 8px;
-  margin-right: 8px;
-`);
+const cssContributeButton = styled('div', ``);
 
 const cssContributeButtonCloseButton = styled(tokenFieldStyles.cssDeleteButton, `
   margin-left: 4px;
@@ -233,18 +197,6 @@ const cssContributeButtonCloseButton = styled(tokenFieldStyles.cssDeleteButton,
   }
 `);
 
-const cssCard = styled('div', `
-  width: 297px;
-  padding: 24px;
-  color: ${theme.announcementPopupFg};
-  background: ${theme.announcementPopupBg};
-  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;
@@ -303,3 +255,10 @@ const cssSparks = styled('div', `
 const cssHeartIcon = styled('span', `
   line-height: 1;
 `);
+
+const cssModal = styled('div', `
+  position: relative;
+  width: 100%;
+  max-width: 400px;
+  min-width: 0px;
+`);
diff --git a/app/client/ui/TopBar.ts b/app/client/ui/TopBar.ts
index be211c7abb1..b390aad06cc 100644
--- a/app/client/ui/TopBar.ts
+++ b/app/client/ui/TopBar.ts
@@ -8,7 +8,9 @@ import {workspaceName} from 'app/client/models/WorkspaceInfo';
 import {AccountWidget} from 'app/client/ui/AccountWidget';
 import {buildNotifyMenuButton} from 'app/client/ui/NotifyUI';
 import {manageTeamUsersApp} from 'app/client/ui/OpenUserManager';
+import {UpgradeButton} from 'app/client/ui/ProductUpgrades';
 import {buildShareMenuButton} from 'app/client/ui/ShareMenu';
+import {SupportGristButton} from 'app/client/ui/SupportGristButton';
 import {hoverTooltip} from 'app/client/ui/tooltips';
 import {cssHoverCircle, cssTopBarBtn} from 'app/client/ui/TopBarCss';
 import {buildLanguageMenu} from 'app/client/ui/LanguageMenu';
@@ -28,20 +30,20 @@ export function createTopBarHome(appModel: AppModel, onSave?: (personal: boolean
 
   return [
     cssFlexSpace(),
-    (appModel.isTeamSite && roles.canEditAccess(appModel.currentOrg?.access || null) ?
-      [
-        basicButton(
-          t("Manage Team"),
-          dom.on('click', () => manageTeamUsersApp({app: appModel, onSave})),
-          testId('topbar-manage-team')
-        ),
-        cssSpacer()
-      ] :
-      null
+    cssButtons(
+      dom.create(UpgradeButton, appModel),
+      dom.create(SupportGristButton, appModel),
+      (appModel.isTeamSite && roles.canEditAccess(appModel.currentOrg?.access || null) ?
+        [
+          basicButton(
+            t("Manage team"),
+            dom.on('click', () => manageTeamUsersApp({app: appModel, onSave})),
+            testId('topbar-manage-team')
+          ),
+        ] :
+        null
+      ),
     ),
-
-    appModel.supportGristNudge.buildTopBarButton(),
-
     buildLanguageMenu(appModel),
     isAnonymous ? null : buildNotifyMenuButton(appModel.notifier, appModel),
     dom('div', dom.create(AccountWidget, appModel)),
@@ -197,6 +199,12 @@ function topBarUndoBtn(iconName: IconName, ...domArgs: DomElementArg[]): Element
   );
 }
 
+const cssButtons = styled('div', `
+  display: flex;
+  gap: 8px;
+  margin-right: 8px;
+`);
+
 const cssTopBarUndoBtn = styled(cssTopBarBtn, `
   background-color: ${theme.topBarButtonSecondaryFg};
 
diff --git a/app/client/ui/ViewLayoutMenu.ts b/app/client/ui/ViewLayoutMenu.ts
index 301b81b177f..d720ff4f19f 100644
--- a/app/client/ui/ViewLayoutMenu.ts
+++ b/app/client/ui/ViewLayoutMenu.ts
@@ -118,12 +118,11 @@ export function makeViewLayoutMenu(viewSection: ViewSectionRec, isReadonly: bool
  */
 export function makeCollapsedLayoutMenu(viewSection: ViewSectionRec, gristDoc: GristDoc) {
   const isReadonly = gristDoc.isReadonly.get();
-  const isSinglePage = urlState().state.get().params?.style === 'singlePage';
   const sectionId = viewSection.table.peek().rawViewSectionRef.peek();
   const anchorUrlState = { hash: { sectionId, popup: true } };
   const rawUrl = urlState().makeUrl(anchorUrlState);
   return [
-    dom.maybe((use) => !use(viewSection.isRaw) && !isSinglePage && !use(gristDoc.maximizedSectionId),
+    dom.maybe((use) => !use(viewSection.isRaw) && use(gristDoc.canShowRawData),
       () => menuItemLink(
         { href: rawUrl}, t("Show raw data"), testId('show-raw-data'),
         dom.on('click', () => {
diff --git a/app/client/ui/buildReassignModal.ts b/app/client/ui/buildReassignModal.ts
new file mode 100644
index 00000000000..beffdbbecc2
--- /dev/null
+++ b/app/client/ui/buildReassignModal.ts
@@ -0,0 +1,391 @@
+import * as commands from 'app/client/components/commands';
+import {makeT} from 'app/client/lib/localization';
+import {ColumnRec, DocModel} from 'app/client/models/DocModel';
+import {cssCode} from 'app/client/ui/DocTutorial';
+import {withInfoTooltip} from 'app/client/ui/tooltips';
+import {bigBasicButton, bigPrimaryButton, textButton} from 'app/client/ui2018/buttons';
+import {labeledSquareCheckbox} from 'app/client/ui2018/checkbox';
+import {theme} from 'app/client/ui2018/cssVars';
+import {cssModalBody, cssModalButtons, cssModalTitle, cssModalWidth, modal} from 'app/client/ui2018/modals';
+import {DocAction} from 'app/common/DocActions';
+import {cached} from 'app/common/gutil';
+import {decodeObject, encodeObject} from 'app/plugin/objtypes';
+import {dom, Observable, styled} from 'grainjs';
+import mapValues from 'lodash/mapValues';
+
+const t = makeT('ReassignModal');
+
+/**
+ * Builds a modal that shows the user that they can't reassign records because of uniqueness
+ * constraints on the Ref/RefList column. It shows the user the conflicts and provides option
+ * to resolve the confilic and retry the change.
+ *
+ * Currently we support uniquness only on 2-way referenced columns. While it is techincally
+ * possible to support it on plain Ref/RefList columns, the implementation assumes that we
+ * have the reverse column somewhere and can use it to find the conflicts without building
+ * a dedicated index.
+ *
+ * Mental model of data structure:
+ * Left table: Owners
+ * Columns: [Name, Pets: RefList(Pets)]
+ *
+ * Right table: Pets
+ * Columns: [Name, Owner: Ref(Owners)]
+ *
+ * Actions that were send to the server were updating the Owners table.
+ *
+ * Note: They could affect multiple columns, not only the Pets column.
+ */
+export async function buildReassignModal(options: {
+  docModel: DocModel,
+  actions: DocAction[],
+}) {
+  const {docModel, actions} = options;
+
+  const tableRec = cached((tableId: string) => {
+    return docModel.getTableModel(tableId).tableMetaRow;
+  });
+
+  const columnRec = cached((tableId: string, colId: string) => {
+    const result = tableRec(tableId).columns().all().find(c => c.colId() === colId);
+    if (!result) {
+      throw new Error(`Column ${colId} not found in table ${tableId}`);
+    }
+    return result;
+  });
+
+  // Helper that gets records, but caches and copies them, so that we can amend them when needed.
+  const amended = new Map<string, any>();
+  const getRow = (tableId: string, rowId: number) => {
+    const key = `${tableId}:${rowId}`;
+    if (amended.has(key)) {
+      return amended.get(key);
+    }
+    const tableData = docModel.getTableModel(tableId).tableData;
+    const origRow = tableData.getRecord(rowId);
+    if (!origRow) {
+      return null;
+    }
+    const row = structuredClone(origRow);
+    amended.set(key, row);
+    return row;
+  };
+
+  // Helper that returns name of the row (as seen in Ref editor).
+  const rowDisplay = cached((tableId: string, rowId: number, colId: string) => {
+    const col = columnRec(tableId, colId);
+    // Name of the row (for 2-way reference) is the value of visible column in reverse table.
+    const visibleCol = col.reverseColModel().visibleColModel().colId();
+    const record = getRow(tableId, rowId);
+    return record?.[visibleCol] ?? String(rowId);
+  });
+
+  // We will generate set of problems, and then explain it.
+  class Problem {
+    constructor(public data: {
+      tableId: string,
+      colRec: ColumnRec,
+      revRec: ColumnRec,
+      pointer: number,
+      newRowId: number,
+      oldRowId: number,
+    }) {}
+
+    public buildReason() {
+      // Pets record Azor is already assigned to Owners record Bob.
+      const {colRec, revRec, pointer, oldRowId} = this.data;
+      const Pets = revRec.table().tableNameDef();
+      const Owners = colRec.table().tableNameDef();
+      const Azor = rowDisplay(revRec.table().tableId(), pointer, revRec.colId()) as string;
+      const Bob = rowDisplay(colRec.table().tableId(), oldRowId, colRec.colId()) as string;
+      const text = t(
+        `{{targetTable}} record {{targetName}} is already assigned to {{sourceTable}} record \
+         {{oldSourceName}}.`,
+        {
+          targetTable: cssCode(Pets),
+          sourceTable: cssCode(Owners),
+          targetName: cssName(Azor),
+          oldSourceName: cssName(Bob),
+        });
+
+      return cssBulletLine(text);
+    }
+
+    public buildHeader() {
+      // Generally we try to show a text like this:
+      // Each Pets record may only be assigned to a single Owners record.
+      const {colRec, revRec} = this.data;
+      // Task is the name of the revRec table
+      const Pets = revRec.table().tableNameDef();
+      const Owners = colRec.table().tableNameDef();
+      return cssHigherLine([
+        t(`Each {{targetTable}} record may only be assigned to a single {{sourceTable}} record.`,
+          {
+            targetTable: cssCode(Pets),
+            sourceTable: cssCode(Owners),
+          })
+      ]);
+    }
+
+    public fixUserAction() {
+      // Fix action is the action that removes Task 17 from Bob.
+      const tableId = this.data.tableId;
+      const colId = this.data.colRec.colId();
+      const oldRowId = this.data.oldRowId;
+      const oldRecord = getRow(tableId, oldRowId);
+      const oldValue = decodeObject(oldRecord[colId]);
+      let newValue: any = Array.isArray(oldValue)
+              ? oldValue.filter(v => v !== this.data.pointer)
+              : 0;
+      if (Array.isArray(newValue) && newValue.length === 0) {
+        newValue = null;
+      }
+      oldRecord[colId] = encodeObject(newValue);
+      return ['UpdateRecord', tableId, oldRowId, {[colId]: oldRecord[colId]}];
+    }
+
+    public buildAction(checked: Observable<boolean>, multiple: boolean = false) {
+      // Shows a checkbox and explanation what can be done, checkbox has a text
+      // Reassing to People record Ann
+      // Reasing to new Poeple records.
+      const {colRec, newRowId} = this.data;
+      const Ann = rowDisplay(colRec.table().tableId(), newRowId, colRec.colId()) as string;
+      const singleText = () => t(`Reassign to {{sourceTable}} record {{sourceName}}.`,
+        {
+          sourceTable: cssCode(colRec.table().tableNameDef()),
+          sourceName: cssName(Ann),
+        });
+      const multiText = () => t(`Reassign to new {{sourceTable}} records.`,
+        {
+          sourceTable: cssCode(colRec.table().tableNameDef()),
+        });
+      return cssCheckbox(checked, multiple ? multiText() : singleText());
+    }
+  }
+
+  // List of problems we found in actions.
+  const problems: Problem[] = [];
+  const uniqueColumns: ColumnRec[] = [];
+  const newOwners = new Set<number|null>();
+
+  // We will hold changes in references, so that we can clear the action itself.
+  const newValues = new Map<string, Map<number, number>>();
+  const assignPet = (colId: string, petId: number, ownerId: number) => {
+    if (!newValues.has(colId)) {
+      newValues.set(colId, new Map());
+    }
+    newValues.get(colId)!.set(petId, ownerId);
+  };
+  const wasPetJustAssigned = (colId: string, petId: number) => {
+    return newValues.has(colId) && newValues.get(colId)!.get(petId);
+  };
+
+  const properActions = [] as DocAction[];
+  // Helper that unassigns a pet from the owner, by amanding the value stored in Ref/RefList column.
+  function unassign(value: any, pet: number) {
+    const newValue = decodeObject(value);
+    const newValueArray = Array.isArray(newValue) ? newValue : [newValue] as any;
+    const filteredOut = newValueArray.filter((v: any) => v !== pet);
+    const wasArray = Array.isArray(newValue);
+    if (wasArray) {
+      if (newValueArray.length === 0) {
+        return null;
+      }
+      return encodeObject(filteredOut);
+    } else {
+      return filteredOut[0] ?? null;
+    }
+  }
+
+  // We will go one by one for each action (either update or add), we will flat bulk actions
+  // and simulate applying them to the data, to test if the following actions won't produce
+  // conflicts.
+  for(const origAction of bulkToSingle(actions)) {
+    const action = structuredClone(origAction);
+    if (action[0] === 'UpdateRecord' || action[0] === 'AddRecord') {
+      const ownersTable = action[1]; // this is same for each action.
+      const newOwnerId = action[2];
+      newOwners.add(newOwnerId);
+      const valuesInAction = action[3];
+      for(const colId of Object.keys(valuesInAction)) {
+        // We are only interested in uqniue ref columns with reverse column.
+        const petsCol = columnRec(ownersTable, colId);
+        const ownerRevCol = petsCol.reverseColModel();
+        if (!ownerRevCol || !ownerRevCol.id()) {
+          continue;
+        }
+        if (petsCol.reverseColModel().pureType() !== 'Ref') {
+          continue;
+        }
+        const petsTable = ownerRevCol.table().tableId();
+        uniqueColumns.push(petsCol); // TODO: what it does
+
+        // Prepare the data for testing, we will treat Ref as RefList to simplify the code.
+        const newValue = decodeObject(valuesInAction[colId]);
+        let petsAfter: number[] = Array.isArray(newValue) ? newValue : [newValue] as any;
+        const prevValue = decodeObject(getRow(ownersTable, newOwnerId)?.[colId]) ?? [];
+        const petsBefore: number[] = Array.isArray(prevValue) ? prevValue : [prevValue] as any;
+
+        // The new owner will have new pets. We are only interested in a situation
+        // where owner is assigned with a new pet, if pet was removed, we don't care as this
+        // won't cause a conflict.
+        petsAfter = petsAfter.filter(p => !petsBefore.includes(p));
+        if (petsAfter.length === 0) {
+          continue;
+        }
+        // Now find current owners of the pets that will be assigned to the new owner.
+        for(const pet of petsAfter) {
+          // We will use data available in that other table (Pets). Notice that we assume, that
+          // the reverse column (Owner in Pets) is Ref column.
+          const oldOwner = getRow(petsTable, pet)?.[ownerRevCol.colId()] as number;
+          // If the pet didn't have an owner previously, we don't care, we are fine reasigning it.
+          if (!oldOwner || (typeof oldOwner !== 'number')) {
+            // We ignore it, but there might be other actions that will try to move this pet
+            // to other owner, so remember that one.
+
+            // But before remembering, check if that hasn't happend already.
+            const assignedTo = wasPetJustAssigned(petsCol.colId(), pet);
+            if (assignedTo) {
+              // We have two actions that will assign the same pet to two different owners.
+              // We can't allow that, so we will remove this update from the action.
+              valuesInAction[colId] = unassign(valuesInAction[colId], pet);
+            } else {
+              assignPet(colId, pet, newOwnerId);
+            }
+          } else {
+            // If we will assign it to someone else in previous action, ignore this update.
+            if (wasPetJustAssigned(petsCol.colId(), pet)) {
+              valuesInAction[colId] = unassign(valuesInAction[colId], pet);
+              continue;
+            } else {
+              assignPet(colId, pet, newOwnerId);
+              problems.push(new Problem({
+                tableId: ownersTable,
+                pointer: pet,
+                colRec: petsCol,
+                revRec: ownerRevCol,
+                newRowId: newOwnerId,
+                oldRowId: oldOwner,
+              }));
+            }
+          }
+        }
+      }
+
+      properActions.push(action);
+    } else {
+      throw new Error(`Unsupported action ${action[0]}`);
+    }
+  }
+
+  if (!problems.length) {
+    throw new Error('No problems found');
+  }
+
+  const checked = Observable.create(null, false);
+
+  const multipleOrNew = newOwners.size > 1 || newOwners.has(null);
+
+  modal((ctl) => {
+    const reassign = async () => {
+      await docModel.docData.sendActions([
+        ...problems.map(p => p.fixUserAction()).filter(Boolean),
+        ...properActions
+      ]);
+      ctl.close();
+    };
+    const configureReference = async () => {
+      ctl.close();
+      if (!uniqueColumns.length) { return; }
+      const revCol = uniqueColumns[0].reverseColModel();
+      const rawViewSection = revCol.table().rawViewSection();
+      if (!rawViewSection) { return; }
+      await commands.allCommands.showRawData.run(rawViewSection.id());
+      const reverseColId = revCol.colId.peek();
+      if (!reverseColId) { return; } // might happen if it is censored.
+      const targetField = rawViewSection.viewFields.peek().all()
+                                        .find(f => f.colId.peek() === reverseColId);
+      if (!targetField) { return; }
+      await commands.allCommands.setCursor.run(null, targetField);
+      await commands.allCommands.rightPanelOpen.run();
+      await commands.allCommands.fieldTabOpen.run();
+    };
+    return [
+      cssModalWidth('normal'),
+      cssModalTitle(t('Record already assigned', {count: problems.length})),
+      cssModalBody(() => {
+        // Show single problem in a simple way.
+        return dom('div',
+          problems[0].buildHeader(),
+          dom('div',
+            dom.style('margin-top', '18px'),
+            dom('div', problems.slice(0, 4).map(p => p.buildReason())),
+            problems.length <= 4 ? null : dom('div', `... and ${problems.length - 4} more`),
+            dom('div',
+              problems[0].buildAction(checked, multipleOrNew),
+              dom.style('margin-top', '18px'),
+            ),
+          ),
+        );
+      }),
+      cssModalButtons(
+        dom.style('display', 'flex'),
+        dom.style('justify-content', 'space-between'),
+        dom.style('align-items', 'baseline'),
+        dom.domComputed(checked, (v) => [
+          v ? bigPrimaryButton(t('Reassign'), dom.on('click', reassign))
+            : bigBasicButton(t('Cancel'), dom.on('click', () => ctl.close())),
+        ]),
+        dom('div',
+          withInfoTooltip(
+            textButton('Configure reference', dom.on('click', configureReference)),
+            'reasignTwoWayReference',
+          )
+        )
+      )
+    ];
+  });
+}
+
+/**
+ * This function is used to traverse through the actions, and if there are bulk actions, it will
+ * flatten them to equivalent single actions.
+ */
+function* bulkToSingle(actions: DocAction[]): Iterable<DocAction> {
+  for(const a of actions) {
+    if (a[0].startsWith('Bulk')) {
+      const name = a[0].replace('Bulk', '') as 'AddRecord' | 'UpdateRecord';
+      const rowIds = a[2] as number[];
+      const tableId = a[1];
+      const colValues = a[3] as any;
+      for (let i = 0; i < rowIds.length; i++) {
+        yield [name, tableId, rowIds[i], mapValues(colValues, (values) => values[i])];
+      }
+    } else {
+      yield a;
+    }
+  }
+}
+
+const cssBulletLine = styled('div', `
+  margin-bottom: 8px;
+  line-height: 22px;
+  &::before {
+    content: '•';
+    margin-right: 4px;
+    color: ${theme.lightText};
+  }
+`);
+
+const cssHigherLine = styled('div', `
+  line-height: 22px;
+`);
+
+const cssName = (text: string) => dom('span', `"${text}"`);
+
+const cssCheckbox = styled(labeledSquareCheckbox, `
+  line-height: 22px;
+  & > span {
+    overflow: unset; /* make some room for cssCode */
+  }
+`);
diff --git a/app/client/ui/tooltips.ts b/app/client/ui/tooltips.ts
index 778dd3a87fb..48b7e5c38bc 100644
--- a/app/client/ui/tooltips.ts
+++ b/app/client/ui/tooltips.ts
@@ -12,7 +12,7 @@ import {testId, theme, vars} from 'app/client/ui2018/cssVars';
 import {icon} from 'app/client/ui2018/icons';
 import {makeLinks} from 'app/client/ui2018/links';
 import {menuCssClass} from 'app/client/ui2018/menus';
-import {dom, DomContents, DomElementArg, DomElementMethod, styled} from 'grainjs';
+import {BindableValue, dom, DomContents, DomElementArg, DomElementMethod, styled} from 'grainjs';
 import Popper from 'popper.js';
 import {cssMenu, cssMenuItem, defaultMenuOptions, IPopupOptions, setPopupToCreateDom} from 'popweasel';
 import merge = require('lodash/merge');
@@ -324,12 +324,12 @@ export type InfoTooltipVariant = 'click' | 'hover';
  * Renders an info icon that shows a tooltip with the specified `content`.
  */
 export function infoTooltip(
-  tooltip: Tooltip,
+  tooltip: BindableValue<Tooltip>,
   options: InfoTooltipOptions = {},
   ...domArgs: DomElementArg[]
 ) {
   const {variant = 'click'} = options;
-  const content = GristTooltips[tooltip]();
+  const content = dom.domComputed(tooltip, (t) => GristTooltips[t]());
   const onOpen = () => logTelemetryEvent('viewedTip', {full: {tipName: tooltip}});
   switch (variant) {
     case 'click': {
@@ -433,11 +433,11 @@ export interface WithInfoTooltipOptions {
  */
 export function withInfoTooltip(
   domContents: DomContents,
-  tooltip: Tooltip,
+  tooltip: BindableValue<Tooltip>,
   options: WithInfoTooltipOptions = {},
 ) {
   const {variant = 'click', domArgs, iconDomArgs, popupOptions} = options;
-  return cssDomWithTooltip(
+  return cssInfoTooltip(
     domContents,
     infoTooltip(tooltip, {variant, popupOptions}, iconDomArgs),
     ...(domArgs ?? [])
@@ -475,6 +475,12 @@ export function descriptionInfoTooltip(
   );
 }
 
+const cssInfoTooltip = styled('div', `
+  display: flex;
+  align-items: center;
+  column-gap: 8px;
+`);
+
 const cssTooltipCorner = styled('div', `
   position: absolute;
   width: 0;
@@ -606,9 +612,3 @@ const cssInfoTooltipPopupCloseButton = styled('div', `
     background-color: ${theme.hover};
   }
 `);
-
-const cssDomWithTooltip = styled('div', `
-  display: flex;
-  align-items: center;
-  column-gap: 8px;
-`);
diff --git a/app/client/ui2018/cssVars.ts b/app/client/ui2018/cssVars.ts
index f88dc1bf20e..45573e157b1 100644
--- a/app/client/ui2018/cssVars.ts
+++ b/app/client/ui2018/cssVars.ts
@@ -265,6 +265,7 @@ export const theme = {
 
   /* Popups */
   popupBg: new CustomProp('theme-popup-bg', undefined, 'white'),
+  popupSecondaryBg: new CustomProp('theme-popup-secondary-bg', undefined, colors.lightGrey),
   popupInnerShadow: new CustomProp('theme-popup-shadow-inner', undefined,
     'rgba(31, 37, 50, 0.31)'),
   popupOuterShadow: new CustomProp('theme-popup-shadow-outer', undefined,
diff --git a/app/client/ui2018/toggleSwitch.ts b/app/client/ui2018/toggleSwitch.ts
new file mode 100644
index 00000000000..4910bc012dd
--- /dev/null
+++ b/app/client/ui2018/toggleSwitch.ts
@@ -0,0 +1,115 @@
+import {theme} from 'app/client/ui2018/cssVars';
+import {dom, DomElementArg, Observable, styled} from 'grainjs';
+
+interface ToggleSwitchOptions {
+  label?: string;
+  args?: DomElementArg[];
+  inputArgs?: DomElementArg[];
+  labelArgs?: DomElementArg[];
+}
+
+export function toggleSwitch(value: Observable<boolean>, options: ToggleSwitchOptions = {}) {
+  const {label, args = [], inputArgs = [], labelArgs = []} = options;
+
+  return cssToggleSwitch(
+    cssInput(
+      {type: 'checkbox'},
+      dom.prop('checked', value),
+      dom.prop('value', use => use(value) ? '1' : '0'),
+      dom.on('change', (_e, elem) => value.set(elem.checked)),
+      ...inputArgs,
+    ),
+    cssSwitch(
+      cssSwitchSlider(),
+      cssSwitchCircle(),
+    ),
+    !label ? null : cssLabel(
+      label,
+      ...labelArgs,
+    ),
+    ...args,
+  );
+}
+
+const cssToggleSwitch = styled('label', `
+  position: relative;
+  display: inline-flex;
+  margin-top: 8px;
+  cursor: pointer;
+`);
+
+const cssInput = styled('input', `
+  position: absolute;
+  height: 1px;
+  width: 1px;
+  top: 1px;
+  left: 4px;
+  margin: 0;
+
+  &::before, &::after {
+    height: 1px;
+    width: 1px;
+  }
+  &:focus {
+    outline: none;
+  }
+`);
+
+const cssSwitch = styled('div', `
+  position: relative;
+  width: 30px;
+  height: 17px;
+  display: inline-block;
+  flex: none;
+`);
+
+const cssSwitchSlider = styled('div', `
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: ${theme.switchSliderFg};
+  border-radius: 17px;
+  -webkit-transition: background-color .4s;
+  transition: background-color .4s;
+
+  .${cssInput.className}:focus + .${cssSwitch.className} > & {
+    outline: 2px solid ${theme.controlPrimaryHoverBg};
+    outline-offset: 1px;
+  }
+
+  .${cssInput.className}:checked + .${cssSwitch.className} > & {
+    background-color: ${theme.controlPrimaryBg};
+  }
+`);
+
+const cssSwitchCircle = styled('div', `
+  position: absolute;
+  cursor: pointer;
+  content: "";
+  height: 13px;
+  width: 13px;
+  left: 2px;
+  bottom: 2px;
+  background-color: ${theme.switchCircleFg};
+  border-radius: 17px;
+  -webkit-transition: transform .4s;
+  transition: transform .4s;
+
+  .${cssInput.className}:checked + .${cssSwitch.className} > & {
+     -webkit-transform: translateX(13px);
+    -ms-transform: translateX(13px);
+    transform: translateX(13px);
+  }
+`);
+
+const cssLabel = styled('span', `
+  color: ${theme.text};
+  margin-left: 8px;
+  font-size: 13px;
+  font-weight: 400;
+  line-height: 16px;
+  overflow-wrap: anywhere;
+`);
diff --git a/app/client/widgets/FieldBuilder.ts b/app/client/widgets/FieldBuilder.ts
index fdf18dcfa56..ceb6eeac635 100644
--- a/app/client/widgets/FieldBuilder.ts
+++ b/app/client/widgets/FieldBuilder.ts
@@ -2,7 +2,7 @@ import { ColumnTransform } from 'app/client/components/ColumnTransform';
 import { Cursor } from 'app/client/components/Cursor';
 import { FormulaTransform } from 'app/client/components/FormulaTransform';
 import { GristDoc } from 'app/client/components/GristDoc';
-import { addColTypeSuffix, guessWidgetOptionsSync } from 'app/client/components/TypeConversion';
+import { addColTypeSuffix, guessWidgetOptionsSync, inferColTypeSuffix } from 'app/client/components/TypeConversion';
 import { TypeTransform } from 'app/client/components/TypeTransform';
 import { FloatingEditor } from 'app/client/widgets/FloatingEditor';
 import { UnsavedChange } from 'app/client/components/UnsavedChanges';
@@ -365,7 +365,7 @@ export class FieldBuilder extends Disposable {
       // the full type, and set it. If multiple columns are selected (and all are formulas/empty),
       // then we will set the type for all of them using full type guessed from the first column.
       const column = this.field.column(); // same as this.origColumn.
-      const calculatedType = addColTypeSuffix(newType, column, this._docModel);
+      const calculatedType = inferColTypeSuffix(newType, column) ?? addColTypeSuffix(newType, column, this._docModel);
       const fields = this.field.viewSection.peek().selectedFields.peek();
       // If we selected multiple empty/formula columns, make the change for all of them.
       if (
diff --git a/app/client/widgets/Reference.ts b/app/client/widgets/Reference.ts
index 76e9d2dd697..91e643398b8 100644
--- a/app/client/widgets/Reference.ts
+++ b/app/client/widgets/Reference.ts
@@ -1,9 +1,9 @@
+import {DropdownConditionConfig} from 'app/client/components/DropdownConditionConfig';
 import {
   FormFieldRulesConfig,
   FormOptionsSortConfig,
   FormSelectConfig
 } from 'app/client/components/Forms/FormConfig';
-import {DropdownConditionConfig} from 'app/client/components/DropdownConditionConfig';
 import {GristDoc} from 'app/client/components/GristDoc';
 import {makeT} from 'app/client/lib/localization';
 import {DataRowModel} from 'app/client/models/DataRowModel';
@@ -15,6 +15,7 @@ import {hideInPrintView, testId, theme} from 'app/client/ui2018/cssVars';
 import {icon} from 'app/client/ui2018/icons';
 import {IOptionFull, select} from 'app/client/ui2018/menus';
 import {NTextBox} from 'app/client/widgets/NTextBox';
+import {ReverseReferenceConfig} from 'app/client/widgets/ReverseReferenceConfig';
 import {isFullReferencingType, isVersions} from 'app/common/gristTypes';
 import {UIRowId} from 'app/plugin/GristAPI';
 import {Computed, dom, styled} from 'grainjs';
@@ -58,6 +59,7 @@ export class Reference extends NTextBox {
     return [
       this.buildTransformConfigDom(),
       dom.create(DropdownConditionConfig, this.field, gristDoc),
+      dom.create(ReverseReferenceConfig, this.field),
       cssLabel(t('CELL FORMAT')),
       super.buildConfigDom(gristDoc),
     ];
diff --git a/app/client/widgets/ReverseReferenceConfig.ts b/app/client/widgets/ReverseReferenceConfig.ts
new file mode 100644
index 00000000000..cc2e5724e2d
--- /dev/null
+++ b/app/client/widgets/ReverseReferenceConfig.ts
@@ -0,0 +1,249 @@
+import {allCommands} from 'app/client/components/commands';
+import {makeT} from 'app/client/lib/localization';
+import {TableRec} from 'app/client/models/DocModel';
+import {ViewFieldRec} from 'app/client/models/entities/ViewFieldRec';
+import {cssCode} from 'app/client/ui/DocTutorial';
+import {Tooltip} from 'app/client/ui/GristTooltips';
+import {
+  cssLabelText,
+  cssRow,
+  cssSeparator
+} from 'app/client/ui/RightPanelStyles';
+import {withInfoTooltip} from 'app/client/ui/tooltips';
+import {textButton} from 'app/client/ui2018/buttons';
+import {testId, theme, vars} from 'app/client/ui2018/cssVars';
+import {cssIconButton, icon} from 'app/client/ui2018/icons';
+import {confirmModal} from 'app/client/ui2018/modals';
+import {not} from 'app/common/gutil';
+import {Computed, Disposable, dom, styled} from 'grainjs';
+
+const t = makeT('ReverseReferenceConfig');
+
+/**
+ * Configuratino for two-way reference column shown in the right panel.
+ */
+export class ReverseReferenceConfig extends Disposable {
+  private _refTable: Computed<TableRec | null>;
+  private _isConfigured: Computed<boolean>;
+  private _reverseTable: Computed<string>;
+  private _reverseColumn: Computed<string>;
+  private _reverseType: Computed<string>;
+  private _disabled: Computed<boolean>;
+  private _tooltip: Computed<Tooltip>;
+
+  constructor(private _field: ViewFieldRec) {
+    super();
+
+    this._refTable = Computed.create(this, (use) => use(use(this._field.column).refTable));
+    this._isConfigured = Computed.create(this, (use) => {
+      const column = use(this._field.column);
+      return use(column.hasReverse);
+    });
+    this._reverseTable = Computed.create(this, this._refTable, (use, refTable) => {
+      return refTable ? use(refTable.tableNameDef) : '';
+    });
+    this._reverseColumn = Computed.create(this, (use) => {
+      const column = use(this._field.column);
+      const reverseCol = use(column.reverseColModel);
+      return reverseCol ? use(reverseCol.label) ?? use(reverseCol.colId) : '';
+    });
+    this._reverseType = Computed.create(this, (use) => {
+      const column = use(this._field.column);
+      const reverseCol = use(column.reverseColModel);
+      return reverseCol ? use(reverseCol.pureType) : '';
+    });
+    this._disabled = Computed.create(this, (use) => {
+      // If is formula or is trigger formula.
+      const column = use(this._field.column);
+      return Boolean(use(column.formula));
+    });
+    this._tooltip = Computed.create(this, (use) => {
+      return use(this._disabled)
+        ? 'twoWayReferencesDisabled'
+        : 'twoWayReferences';
+    });
+  }
+
+  public buildDom() {
+    return dom('div',
+      dom.maybe(not(this._isConfigured), () => [
+        cssRow(
+          dom.style('margin-top', '16px'),
+          cssRow.cls('-disabled', this._disabled),
+          withInfoTooltip(
+            textButton(
+              t('Add two-way reference'),
+              dom.on('click', (e) => this._toggle(e)),
+              testId('add-reverse-columm'),
+              dom.prop('disabled', this._disabled),
+            ),
+            this._tooltip
+          )
+        ),
+      ]),
+      dom.maybe(this._isConfigured, () => cssTwoWayConfig(
+        // TWO-WAY REFERENCE  (?)  [Remove]
+        cssRow(
+          dom.style('justify-content', 'space-between'),
+          withInfoTooltip(
+            cssLabelText(
+              t('Two-way Reference'),
+            ),
+            'twoWayReferences'
+          ),
+          cssIconButton(
+            icon('Remove'),
+            dom.on('click', (e) => this._toggle(e)),
+            dom.style('cursor', 'pointer'),
+            testId('remove-reverse-column'),
+          ),
+        ),
+        cssRow(
+          cssContent(
+            cssClipLine(
+              cssClipItem(
+                cssCapitalize(t('Target table'), dom.style('margin-right', '8px')),
+                dom('span', dom.text(this._reverseTable)),
+              ),
+            ),
+            cssFlexBetween(
+              cssClipItem(
+                cssCapitalize(t('Column'), dom.style('margin-right', '8px')),
+                dom('span', dom.text(this._reverseColumn)),
+                cssGrayText('(', dom.text(this._reverseType), ')')
+              ),
+              cssIconButton(
+                cssShowOnHover.cls(''),
+                cssNoClip.cls(''),
+                cssIconAccent('Pencil'),
+                dom.on('click', () => this._editConfigClick()),
+                dom.style('cursor', 'pointer'),
+                testId('edit-reverse-column'),
+              ),
+            ),
+          ),
+          testId('reverse-column-label'),
+        ),
+        cssSeparator(
+          dom.style('margin-top', '16px'),
+        ),
+      )),
+    );
+  }
+
+  private async _toggle(e: Event) {
+    e.stopPropagation();
+    e.preventDefault();
+    const column = this._field.column.peek();
+    if (!this._isConfigured.get()) {
+      await column.addReverseColumn();
+      return;
+    }
+    const onConfirm = async () => {
+      await column.removeReverseColumn();
+    };
+
+    const refCol = column.reverseColModel.peek().label.peek() || column.reverseColModel.peek().colId.peek();
+    const refTable = column.reverseColModel.peek().table.peek().tableNameDef.peek();
+
+    const promptTitle = t('Delete two-way reference?');
+
+    const myTable = column.table.peek().tableNameDef.peek();
+    const myName = column.label.peek() || column.colId.peek();
+
+    const explanation = t(
+      'This will delete the reference column {{refCol}} in table {{refTable}}. The reference column ' +
+      '{{myName}} will remain in the current table {{myTable}}.', {
+      refCol: dom('b', refCol),
+      refTable: cssCode(refTable),
+      myName: dom('b', myName),
+      myTable: cssCode(myTable),
+    });
+
+    confirmModal(
+      promptTitle,
+      t('Delete'),
+      onConfirm,
+      {
+        explanation: cssHigherLine(explanation),
+        width: 'fixed-wide'
+      }
+    );
+  }
+
+  private async _editConfigClick() {
+    const rawViewSection = this._refTable.get()?.rawViewSection.peek();
+    if (!rawViewSection) { return; }
+    await allCommands.showRawData.run(this._refTable.get()?.rawViewSectionRef.peek());
+    const reverseColId = this._field.column.peek().reverseColModel.peek().colId.peek();
+    if (!reverseColId) { return; } // might happen if it is censored.
+    const targetField = rawViewSection.viewFields.peek().all()
+                                      .find(f => f.colId.peek() === reverseColId);
+    if (!targetField) { return; }
+    await allCommands.setCursor.run(null, targetField);
+  }
+}
+
+const cssTwoWayConfig = styled('div', ``);
+const cssShowOnHover = styled('div', `
+  visibility: hidden;
+  .${cssTwoWayConfig.className}:hover & {
+    visibility: visible;
+  }
+`);
+
+const cssContent = styled('div', `
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  flex: 1;
+`);
+
+
+const cssFlexRow = styled('div', `
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+`);
+
+const cssFlexBetween = styled(cssFlexRow, `
+  justify-content: space-between;
+  overflow: hidden;
+`);
+
+const cssCapitalize = styled('span', `
+  text-transform: uppercase;
+  font-size: ${vars.xsmallFontSize};
+  color: ${theme.lightText};
+`);
+
+const cssClipLine = styled('div', `
+  display: flex;
+  align-items: baseline;
+  gap: 3px;
+  overflow: hidden;
+  flex: 1;
+`);
+
+const cssClipItem = styled('div', `
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+`);
+
+const cssNoClip = styled('div', `
+  flex: none;
+`);
+
+const cssGrayText = styled('span', `
+  color: ${theme.lightText};
+  margin-left: 4px;
+`);
+
+const cssIconAccent = styled(icon, `
+  --icon-color: ${theme.accentIcon};
+`);
+
+const cssHigherLine = styled('div', `
+  line-height: 1.5;
+`);
diff --git a/app/common/AuditEvent.ts b/app/common/AuditEvent.ts
index 47a5da3a964..89950f4ad65 100644
--- a/app/common/AuditEvent.ts
+++ b/app/common/AuditEvent.ts
@@ -1,31 +1,603 @@
+import {BasicRole, NonGuestRole} from 'app/common/roles';
+import {StringUnion} from 'app/common/StringUnion';
+
 export interface AuditEvent<Name extends AuditEventName> {
+  /**
+   * The event.
+   */
   event: {
-    /** The event name. */
+    /**
+     * The name of the event.
+     */
     name: Name;
-    /** The user that triggered the event. */
-    user: AuditEventUser | null;
-    /** Additional event details. */
-    details: AuditEventDetails[Name] | null;
+    /**
+     * The user that triggered the event.
+     */
+    user: AuditEventUser;
+    /**
+     * Event-specific details (e.g. IDs of affected resources).
+     */
+    details: AuditEventDetails[Name] | {};
+    /**
+     * The context that the event occurred in (e.g. workspace, document).
+     */
+    context: AuditEventContext;
+    /**
+     * Information about the source of the event (e.g. IP address).
+     */
+    source: AuditEventSource;
   };
-  /** ISO 8601 timestamp of when the event was logged. */
+  /**
+   * ISO 8601 timestamp (e.g. `2024-09-04T14:54:50Z`) of when the event occurred.
+   */
   timestamp: string;
 }
 
-export type AuditEventName =
-  | 'createDocument';
+export const SiteAuditEventName = StringUnion(
+  'createDocument',
+  'sendToGoogleDrive',
+  'renameDocument',
+  'pinDocument',
+  'unpinDocument',
+  'moveDocument',
+  'removeDocument',
+  'deleteDocument',
+  'restoreDocumentFromTrash',
+  'changeDocumentAccess',
+  'openDocument',
+  'duplicateDocument',
+  'forkDocument',
+  'replaceDocument',
+  'reloadDocument',
+  'truncateDocumentHistory',
+  'deliverWebhookEvents',
+  'clearWebhookQueue',
+  'clearAllWebhookQueues',
+  'runSQLQuery',
+  'createWorkspace',
+  'renameWorkspace',
+  'removeWorkspace',
+  'deleteWorkspace',
+  'restoreWorkspaceFromTrash',
+  'changeWorkspaceAccess',
+  'renameSite',
+  'changeSiteAccess',
+);
+
+export type SiteAuditEventName = typeof SiteAuditEventName.type;
+
+export const AuditEventName = StringUnion(
+  ...SiteAuditEventName.values,
+  'createSite',
+  'deleteSite',
+  'changeUserName',
+  'createUserAPIKey',
+  'deleteUserAPIKey',
+  'deleteUser',
+);
+
+export type AuditEventName = typeof AuditEventName.type;
+
+export type AuditEventUser =
+  | User
+  | Anonymous
+  | System
+  | Unknown;
+
+interface User {
+  type: 'user';
+  id: number;
+  email: string;
+  name: string;
+}
 
-export interface AuditEventUser {
-  /** The user's id. */
-  id: number | null;
-  /** The user's email address. */
-  email: string | null;
-  /** The user's name. */
-  name: string | null;
+interface Anonymous {
+  type: 'anonymous';
+}
+
+interface System {
+  type: 'system';
+}
+
+interface Unknown {
+  type: 'unknown';
 }
 
 export interface AuditEventDetails {
   createDocument: {
-    /** The ID of the document. */
+    /**
+     * The ID of the document.
+     */
+    id: string;
+    /**
+     * The name of the document.
+     */
+    name?: string;
+  };
+  sendToGoogleDrive: {
+    /**
+     * The ID of the document.
+     */
+    id: string;
+  };
+  renameDocument: {
+    /**
+     * The ID of the document.
+     */
+    id: string;
+    /**
+     * The previous name of the document.
+     */
+    previousName: string;
+    /**
+     * The current name of the document.
+     */
+    currentName: string;
+  };
+  pinDocument: {
+    /**
+     * The ID of the document.
+     */
+    id: string;
+    /**
+     * The name of the document.
+     */
+    name: string;
+  };
+  unpinDocument: {
+    /**
+     * The ID of the document.
+     */
+    id: string;
+    /**
+     * The name of the document.
+     */
+    name: string;
+  };
+  moveDocument: {
+    /**
+     * The ID of the document.
+     */
+    id: string;
+    /**
+     * The workspace the document was moved from.
+     */
+    previousWorkspace: {
+      /**
+       * The ID of the workspace.
+       */
+      id: number;
+      /**
+       * The name of the workspace.
+       */
+      name: string;
+    };
+    /**
+     * The workspace the document was moved to.
+     */
+    newWorkspace: {
+      /**
+       * The ID of the workspace.
+       */
+      id: number;
+      /**
+       * The name of the workspace.
+       */
+      name: string;
+    };
+  };
+  removeDocument: {
+    /**
+     * The ID of the document.
+     */
+    id: string;
+    /**
+     * The name of the document.
+     */
+    name: string;
+  };
+  deleteDocument: {
+    /**
+     * The ID of the document.
+     */
+    id: string;
+    /**
+     * The name of the document.
+     */
+    name: string;
+  };
+  restoreDocumentFromTrash: {
+    /**
+     * The ID of the document.
+     */
+    id: string;
+    /**
+     * The name of the document.
+     */
+    name: string;
+    /**
+     * The workspace of the document.
+     */
+    workspace: {
+      /**
+       * The ID of the workspace.
+       */
+      id: number;
+      /**
+       * The name of the workspace.
+       */
+      name: string;
+    };
+  };
+  changeDocumentAccess: {
+    /**
+     * The ID of the document.
+     */
     id: string;
+    /**
+     * The access level of the document.
+     */
+    access: {
+      /**
+       * The max inherited role.
+       */
+      maxInheritedRole?: BasicRole | null;
+      /**
+       * The access level by user ID.
+       */
+      users?: Record<string, NonGuestRole | null>;
+    };
+  };
+  openDocument: {
+    /**
+     * The ID of the document.
+     */
+    id: string;
+    /**
+     * The name of the document.
+     */
+    name: string;
+    /**
+     * The URL ID of the document.
+     */
+    urlId: string;
+    /**
+     * The ID of the fork, if the document is a fork.
+     */
+    forkId?: string;
+    /**
+     * The ID of the snapshot, if the document is a snapshot.
+     */
+    snapshotId?: string;
+  };
+  duplicateDocument: {
+    /**
+     * The document that was duplicated.
+     */
+    original: {
+      /**
+       * The ID of the document.
+       */
+      id: string;
+      /**
+       * The name of the document.
+       */
+      name: string;
+      /**
+       * The workspace of the document.
+       */
+      workspace: {
+        /**
+         * The ID of the workspace.
+         */
+        id: number;
+        /**
+         * The name of the workspace.
+         */
+        name: string;
+      };
+    };
+    /**
+     * The newly-duplicated document.
+     */
+    duplicate: {
+      /**
+       * The ID of the document.
+       */
+      id: string;
+      /**
+       * The name of the document.
+       */
+      name: string;
+    };
+    /**
+     * If the document was duplicated without any data from the original document.
+     */
+    asTemplate: boolean;
+  };
+  forkDocument: {
+    /**
+     * The document that was forked.
+     */
+    original: {
+      /**
+       * The ID of the document.
+       */
+      id: string;
+      /**
+       * The name of the document.
+       */
+      name: string;
+    };
+    /**
+     * The newly-forked document.
+     */
+    fork: {
+      /**
+       * The ID of the fork.
+       */
+      id: string;
+      /**
+       * The ID of the fork with the trunk ID.
+       */
+      documentId: string;
+      /**
+       * The ID of the fork with the trunk URL ID.
+       */
+      urlId: string;
+    };
+  };
+  replaceDocument: {
+    /**
+     * The document that was replaced.
+     */
+    previous: {
+      /**
+       * The ID of the document.
+       */
+      id: string;
+    };
+    /**
+     * The newly-replaced document.
+     */
+    current: {
+      /**
+       * The ID of the document.
+       */
+      id: string;
+      /**
+       * The ID of the snapshot, if the document was replaced with one.
+       */
+      snapshotId?: string;
+    };
+  };
+  reloadDocument: {},
+  truncateDocumentHistory: {
+    /**
+     * The number of history items kept.
+     */
+    keep: number;
+  },
+  deliverWebhookEvents: {
+    /**
+     * The ID of the webhook.
+     */
+    id: string;
+    /**
+     * The host the webhook events were delivered to.
+     */
+    host: string;
+    /**
+     * The number of webhook events delivered.
+     */
+    quantity: number;
+  },
+  clearWebhookQueue: {
+    /**
+     * The ID of the webhook.
+     */
+    id: string;
+  },
+  clearAllWebhookQueues: {},
+  runSQLQuery: {
+    /**
+     * The SQL query.
+     */
+    query: string;
+    /**
+     * The arguments used for query parameters, if any.
+     */
+    arguments?: Array<string | number>;
+    /**
+     * The query execution timeout duration in milliseconds.
+     */
+    timeoutMs?: number;
+  };
+  createWorkspace: {
+    /**
+     * The ID of the workspace.
+     */
+    id: number;
+    /**
+     * The name of the workspace.
+     */
+    name: string;
+  };
+  renameWorkspace: {
+    /**
+     * The ID of the workspace.
+     */
+    id: number;
+    /**
+     * The previous name of the workspace.
+     */
+    previousName: string;
+    /**
+     * The current name of the workspace.
+     */
+    currentName: string;
   };
+  removeWorkspace: {
+    /**
+     * The ID of the workspace.
+     */
+    id: number;
+    /**
+     * The name of the workspace.
+     */
+    name: string;
+  };
+  deleteWorkspace: {
+    /**
+     * The ID of the workspace.
+     */
+    id: number;
+    /**
+     * The name of the workspace.
+     */
+    name: string;
+  };
+  restoreWorkspaceFromTrash: {
+    /**
+     * The ID of the workspace.
+     */
+    id: number;
+    /**
+     * The name of the workspace.
+     */
+    name: string;
+  };
+  changeWorkspaceAccess: {
+    /**
+     * The ID of the workspace.
+     */
+    id: number;
+    /**
+     * The access level of the workspace.
+     */
+    access: {
+      /**
+       * The max inherited role.
+       */
+      maxInheritedRole?: BasicRole | null;
+      /**
+       * The access level by user ID.
+       */
+      users?: Record<string, NonGuestRole | null>;
+    };
+  };
+  createSite: {
+    /**
+     * The ID of the site.
+     */
+    id: number;
+    /**
+     * The name of the site.
+     */
+    name: string;
+    /**
+     * The domain of the site.
+     */
+    domain: string;
+  };
+  renameSite: {
+    /**
+     * The ID of the site.
+     */
+    id: number;
+    /**
+     * The previous name and domain of the site.
+     */
+    previous: {
+      /**
+       * The name of the site.
+       */
+      name: string;
+      /**
+       * The domain of the site.
+       */
+      domain: string;
+    };
+    /**
+     * The current name and domain of the site.
+     */
+    current: {
+      /**
+       * The name of the site.
+       */
+      name: string;
+      /**
+       * The domain of the site.
+       */
+      domain: string;
+    };
+  };
+  deleteSite: {
+    /**
+     * The ID of the site.
+     */
+    id: number;
+    /**
+     * The name of the site.
+     */
+    name: string;
+  };
+  changeSiteAccess: {
+    /**
+     * The ID of the site.
+     */
+    id: number;
+    /**
+     * The access level of the site.
+     */
+    access: {
+      /**
+       * The access level by user ID.
+       */
+      users?: Record<string, NonGuestRole | null>;
+    };
+  };
+  changeUserName: {
+    /**
+     * The previous name of the user.
+     */
+    previousName: string;
+    /**
+     * The current name of the user.
+     */
+    currentName: string;
+  };
+  createUserAPIKey: {};
+  deleteUserAPIKey: {};
+  deleteUser: {};
+}
+
+export interface AuditEventContext {
+  /**
+   * The ID of the workspace the event occurred in.
+   */
+  workspaceId?: number;
+  /**
+   * The ID of the document the event occurred in.
+   */
+  documentId?: string;
+}
+
+export interface AuditEventSource {
+  /**
+   * The domain of the site tied to the originating request.
+   */
+  org?: string;
+  /**
+   * The IP address of the originating request.
+   */
+  ipAddress?: string;
+  /**
+   * The User-Agent HTTP header of the originating request.
+   */
+  userAgent?: string;
+  /**
+   * The ID of the session tied to the originating request.
+   */
+  sessionId?: string;
 }
diff --git a/app/common/Prefs.ts b/app/common/Prefs.ts
index f7863924b11..a8bd60614b8 100644
--- a/app/common/Prefs.ts
+++ b/app/common/Prefs.ts
@@ -33,6 +33,8 @@ export interface UserPrefs extends Prefs {
   dismissedWelcomePopups?: DismissedReminder[];
   // Localization support.
   locale?: string;
+  // If only documents should be shown on the All Documents page.
+  onlyShowDocuments?: boolean;
 }
 
 // A collection of preferences related to a combination of user and org.
@@ -112,9 +114,9 @@ export const DismissedPopup = StringUnion(
   'supportGrist',         // nudge to opt in to telemetry
   'publishForm',          // confirmation for publishing a form
   'unpublishForm',        // confirmation for unpublishing a form
-  'onboardingCards',      // onboarding cards shown on the doc menu
 
   /* Deprecated */
+  'onboardingCards',      // onboarding cards shown on the doc menu
   'tutorialFirstCard',    // first card of the tutorial
 );
 export type DismissedPopup = typeof DismissedPopup.type;
diff --git a/app/common/ThemePrefs-ti.ts b/app/common/ThemePrefs-ti.ts
index ef8ae2e06ea..e8dbcbd56aa 100644
--- a/app/common/ThemePrefs-ti.ts
+++ b/app/common/ThemePrefs-ti.ts
@@ -90,6 +90,7 @@ export const ThemeColors = t.iface([], {
   "modal-backdrop-close-button-fg": "string",
   "modal-backdrop-close-button-hover-fg": "string",
   "popup-bg": "string",
+  "popup-secondary-bg": "string",
   "popup-shadow-inner": "string",
   "popup-shadow-outer": "string",
   "popup-close-button-fg": "string",
diff --git a/app/common/ThemePrefs.ts b/app/common/ThemePrefs.ts
index 49fe9587a83..671fba0cf36 100644
--- a/app/common/ThemePrefs.ts
+++ b/app/common/ThemePrefs.ts
@@ -106,6 +106,7 @@ export interface ThemeColors {
 
   /* Popups */
   'popup-bg': string;
+  'popup-secondary-bg': string;
   'popup-shadow-inner': string;
   'popup-shadow-outer': string;
   'popup-close-button-fg': string;
diff --git a/app/common/UserAPI.ts b/app/common/UserAPI.ts
index dda2d28b7d3..efc08042840 100644
--- a/app/common/UserAPI.ts
+++ b/app/common/UserAPI.ts
@@ -367,7 +367,7 @@ export interface UserAPI {
   getOrg(orgId: number|string): Promise<Organization>;
   getOrgWorkspaces(orgId: number|string, includeSupport?: boolean): Promise<Workspace[]>;
   getOrgUsageSummary(orgId: number|string): Promise<OrgUsageSummary>;
-  getTemplates(onlyFeatured?: boolean): Promise<Workspace[]>;
+  getTemplates(): Promise<Workspace[]>;
   getTemplate(docId: string): Promise<Document>;
   getDoc(docId: string): Promise<Document>;
   newOrg(props: Partial<OrganizationProperties>): Promise<number>;
@@ -584,8 +584,8 @@ export class UserAPIImpl extends BaseAPI implements UserAPI {
     return this.requestJson(`${this._url}/api/orgs/${orgId}/usage`, { method: 'GET' });
   }
 
-  public async getTemplates(onlyFeatured: boolean = false): Promise<Workspace[]> {
-    return this.requestJson(`${this._url}/api/templates?onlyFeatured=${onlyFeatured ? 1 : 0}`, { method: 'GET' });
+  public async getTemplates(): Promise<Workspace[]> {
+    return this.requestJson(`${this._url}/api/templates`, { method: 'GET' });
   }
 
   public async getTemplate(docId: string): Promise<Document> {
diff --git a/app/common/gristUrls.ts b/app/common/gristUrls.ts
index 6cbe7d77ee6..a1603df53d3 100644
--- a/app/common/gristUrls.ts
+++ b/app/common/gristUrls.ts
@@ -96,6 +96,7 @@ export const commonUrls = {
   plans: "https://www.getgrist.com/pricing",
   contact: "https://www.getgrist.com/contact",
   templates: 'https://www.getgrist.com/templates',
+  webinars: getWebinarsUrl(),
   community: 'https://community.getgrist.com',
   functions: 'https://support.getgrist.com/functions',
   formulaSheet: 'https://support.getgrist.com/formula-cheat-sheet',
@@ -703,6 +704,9 @@ export interface GristLoadConfig {
   // Url for "contact support" button on Grist's "not found" error page
   contactSupportUrl?: string;
 
+  // Url for webinars.
+  webinarsUrl?: string;
+
   // When set, this directs the client to encode org information in path, not in domain.
   pathOnly?: boolean;
 
@@ -907,7 +911,7 @@ export function getKnownOrg(): string|null {
 
 export function getHelpCenterUrl(): string {
   const defaultUrl = "https://support.getgrist.com";
-  if(isClient()) {
+  if (isClient()) {
     const gristConfig: GristLoadConfig = (window as any).gristConfig;
     return gristConfig && gristConfig.helpCenterUrl || defaultUrl;
   } else {
@@ -916,7 +920,7 @@ export function getHelpCenterUrl(): string {
 }
 
 export function getTermsOfServiceUrl(): string|undefined {
-  if(isClient()) {
+  if (isClient()) {
     const gristConfig: GristLoadConfig = (window as any).gristConfig;
     return gristConfig && gristConfig.termsOfServiceUrl || undefined;
   } else {
@@ -926,7 +930,7 @@ export function getTermsOfServiceUrl(): string|undefined {
 
 export function getFreeCoachingCallUrl(): string {
   const defaultUrl = "https://calendly.com/grist-team/grist-free-coaching-call";
-  if(isClient()) {
+  if (isClient()) {
     const gristConfig: GristLoadConfig = (window as any).gristConfig;
     return gristConfig && gristConfig.freeCoachingCallUrl || defaultUrl;
   } else {
@@ -935,8 +939,8 @@ export function getFreeCoachingCallUrl(): string {
 }
 
 export function getContactSupportUrl(): string {
-  const defaultUrl = "https://www.getgrist.com/contact/";
-  if(isClient()) {
+  const defaultUrl = "https://www.getgrist.com/contact";
+  if (isClient()) {
     const gristConfig: GristLoadConfig = (window as any).gristConfig;
     return gristConfig && gristConfig.contactSupportUrl || defaultUrl;
   } else {
@@ -944,6 +948,16 @@ export function getContactSupportUrl(): string {
   }
 }
 
+export function getWebinarsUrl(): string {
+  const defaultUrl = "https://www.getgrist.com/webinars";
+  if (isClient()) {
+    const gristConfig: GristLoadConfig = (window as any).gristConfig;
+    return gristConfig && gristConfig.webinarsUrl || defaultUrl;
+  } else {
+    return process.env.GRIST_WEBINARS_URL || defaultUrl;
+  }
+}
+
 /**
  * Like getKnownOrg, but respects singleOrg/GRIST_SINGLE_ORG strictly.
  * The main difference in behavior would be for orgs with custom domains
diff --git a/app/common/gutil.ts b/app/common/gutil.ts
index bea94bf1dce..be9a8b1a18f 100644
--- a/app/common/gutil.ts
+++ b/app/common/gutil.ts
@@ -1069,3 +1069,19 @@ export function computedOwned<T>(
 }
 
 export type Constructor<T> = new (...args: any[]) => T;
+
+/**
+ * Simple memoization function that caches the result of a function call based on its arguments.
+ * Unlike lodash's memoize, it uses all arguments to generate the key.
+ */
+export function cached<T>(fn: T): T {
+  const dict = new Map();
+  const impl = (...args: any[]) => {
+    const key = JSON.stringify(args);
+    if (!dict.has(key)) {
+      dict.set(key, (fn as any)(...args));
+    }
+    return dict.get(key);
+  };
+  return impl as any as T;
+}
diff --git a/app/common/themes/GristDark.ts b/app/common/themes/GristDark.ts
index 7d2a4eebbb7..3892c876639 100644
--- a/app/common/themes/GristDark.ts
+++ b/app/common/themes/GristDark.ts
@@ -85,6 +85,7 @@ export const GristDark: ThemeColors = {
 
   /* Popups */
   'popup-bg': '#32323F',
+  'popup-secondary-bg': '#262633',
   'popup-shadow-inner': '#000000',
   'popup-shadow-outer': '#000000',
   'popup-close-button-fg': '#A4A4B1',
diff --git a/app/common/themes/GristLight.ts b/app/common/themes/GristLight.ts
index 0183dbbfc76..125e8a9331d 100644
--- a/app/common/themes/GristLight.ts
+++ b/app/common/themes/GristLight.ts
@@ -85,6 +85,7 @@ export const GristLight: ThemeColors = {
 
   /* Popups */
   'popup-bg': 'white',
+  'popup-secondary-bg': '#F7F7F7',
   'popup-shadow-inner': 'rgba(31, 37, 50, 0.31)',
   'popup-shadow-outer': 'rgba(76, 86, 103, 0.24)',
   'popup-close-button-fg': '#929299',
diff --git a/app/gen-server/ApiServer.ts b/app/gen-server/ApiServer.ts
index 467c702d828..1289db666f1 100644
--- a/app/gen-server/ApiServer.ts
+++ b/app/gen-server/ApiServer.ts
@@ -8,8 +8,12 @@ import {ApiError} from 'app/common/ApiError';
 import {FullUser} from 'app/common/LoginSessionAPI';
 import {BasicRole} from 'app/common/roles';
 import {OrganizationProperties, PermissionDelta} from 'app/common/UserAPI';
+import {Document} from "app/gen-server/entity/Document";
+import {Organization} from 'app/gen-server/entity/Organization';
 import {User} from 'app/gen-server/entity/User';
-import {BillingOptions, HomeDBManager, QueryResult, Scope} from 'app/gen-server/lib/homedb/HomeDBManager';
+import {Workspace} from 'app/gen-server/entity/Workspace';
+import {BillingOptions, HomeDBManager, Scope} from 'app/gen-server/lib/homedb/HomeDBManager';
+import {PreviousAndCurrent, QueryResult} from 'app/gen-server/lib/homedb/Interfaces';
 import {getAuthorizedUserId, getUserId, getUserProfiles, RequestWithLogin} from 'app/server/lib/Authorizer';
 import {getSessionUser, linkOrgWithEmail} from 'app/server/lib/BrowserSession';
 import {expressWrap} from 'app/server/lib/expressWrap';
@@ -75,7 +79,7 @@ export function addOrg(
     product?: string,
     billing?: BillingOptions,
   }
-): Promise<number> {
+): Promise<Organization> {
   return dbManager.connection.transaction(async manager => {
     const user = await manager.findOne(User, {where: {id: userId}});
     if (!user) { return handleDeletedUser(); }
@@ -165,8 +169,9 @@ export class ApiServer {
       // doesn't have access to that information yet, so punting on this.
       // TODO: figure out who should be allowed to create organizations
       const userId = getAuthorizedUserId(req);
-      const orgId = await addOrg(this._dbManager, userId, req.body);
-      return sendOkReply(req, res, orgId);
+      const org = await addOrg(this._dbManager, userId, req.body);
+      this._logCreateSiteEvents(req, org);
+      return sendOkReply(req, res, org.id);
     }));
 
     // PATCH /api/orgs/:oid
@@ -174,32 +179,30 @@ export class ApiServer {
     // Update the specified org.
     this._app.patch('/api/orgs/:oid', expressWrap(async (req, res) => {
       const org = getOrgKey(req);
-      const query = await this._dbManager.updateOrg(getScope(req), org, req.body);
-      return sendReply(req, res, query);
+      const {data, ...result} = await this._dbManager.updateOrg(getScope(req), org, req.body);
+      if (data && (req.body.name || req.body.domain)) {
+        this._logRenameSiteEvents(req as RequestWithLogin, data);
+      }
+      return sendReply(req, res, result);
     }));
 
     // DELETE /api/orgs/:oid
     // Delete the specified org and all included workspaces and docs.
     this._app.delete('/api/orgs/:oid', expressWrap(async (req, res) => {
       const org = getOrgKey(req);
-      const query = await this._dbManager.deleteOrg(getScope(req), org);
-      return sendReply(req, res, query);
+      const {data, ...result} = await this._dbManager.deleteOrg(getScope(req), org);
+      if (data) { this._logDeleteSiteEvents(req, data); }
+      return sendReply(req, res, {...result, data: data?.id});
     }));
 
     // POST /api/orgs/:oid/workspaces
     // Body params: name
     // Create a new workspace owned by the specific organization.
     this._app.post('/api/orgs/:oid/workspaces', expressWrap(async (req, res) => {
-      const mreq = req as RequestWithLogin;
       const org = getOrgKey(req);
-      const query = await this._dbManager.addWorkspace(getScope(req), org, req.body);
-      this._gristServer.getTelemetry().logEvent(mreq, 'createdWorkspace', {
-        full: {
-          workspaceId: query.data,
-          userId: mreq.userId,
-        },
-      });
-      return sendReply(req, res, query);
+      const {data, ...result} = await this._dbManager.addWorkspace(getScope(req), org, req.body);
+      if (data) { this._logCreateWorkspaceEvents(req, data); }
+      return sendReply(req, res, {...result, data: data?.id});
     }));
 
     // PATCH /api/workspaces/:wid
@@ -207,23 +210,18 @@ export class ApiServer {
     // Update the specified workspace.
     this._app.patch('/api/workspaces/:wid', expressWrap(async (req, res) => {
       const wsId = integerParam(req.params.wid, 'wid');
-      const query = await this._dbManager.updateWorkspace(getScope(req), wsId, req.body);
-      return sendReply(req, res, query);
+      const {data, ...result} = await this._dbManager.updateWorkspace(getScope(req), wsId, req.body);
+      if (data && 'name' in req.body) { this._logRenameWorkspaceEvents(req, data); }
+      return sendReply(req, res, {...result, data: data?.current.id});
     }));
 
     // DELETE /api/workspaces/:wid
     // Delete the specified workspace and all included docs.
     this._app.delete('/api/workspaces/:wid', expressWrap(async (req, res) => {
-      const mreq = req as RequestWithLogin;
       const wsId = integerParam(req.params.wid, 'wid');
-      const query = await this._dbManager.deleteWorkspace(getScope(req), wsId);
-      this._gristServer.getTelemetry().logEvent(mreq, 'deletedWorkspace', {
-        full: {
-          workspaceId: wsId,
-          userId: mreq.userId,
-        },
-      });
-      return sendReply(req, res, query);
+      const {data, ...result} = await this._dbManager.deleteWorkspace(getScope(req), wsId);
+      if (data) { this._logDeleteWorkspaceEvents(req, data); }
+      return sendReply(req, res, {...result, data: data?.id});
     }));
 
     // POST /api/workspaces/:wid/remove
@@ -232,17 +230,12 @@ export class ApiServer {
     this._app.post('/api/workspaces/:wid/remove', expressWrap(async (req, res) => {
       const wsId = integerParam(req.params.wid, 'wid');
       if (isParameterOn(req.query.permanent)) {
-        const mreq = req as RequestWithLogin;
-        const query = await this._dbManager.deleteWorkspace(getScope(req), wsId);
-        this._gristServer.getTelemetry().logEvent(mreq, 'deletedWorkspace', {
-          full: {
-            workspaceId: query.data,
-            userId: mreq.userId,
-          },
-        });
-        return sendReply(req, res, query);
+        const {data, ...result} = await this._dbManager.deleteWorkspace(getScope(req), wsId);
+        if (data) { this._logDeleteWorkspaceEvents(req, data); }
+        return sendReply(req, res, {...result, data: data?.id});
       } else {
-        await this._dbManager.softDeleteWorkspace(getScope(req), wsId);
+        const {data} = await this._dbManager.softDeleteWorkspace(getScope(req), wsId);
+        if (data) { this._logRemoveWorkspaceEvents(req, data); }
         return sendOkReply(req, res);
       }
     }));
@@ -252,59 +245,29 @@ export class ApiServer {
     // still available.
     this._app.post('/api/workspaces/:wid/unremove', expressWrap(async (req, res) => {
       const wsId = integerParam(req.params.wid, 'wid');
-      await this._dbManager.undeleteWorkspace(getScope(req), wsId);
+      const {data} = await this._dbManager.undeleteWorkspace(getScope(req), wsId);
+      if (data) { this._logRestoreWorkspaceEvents(req, data); }
       return sendOkReply(req, res);
     }));
 
     // POST /api/workspaces/:wid/docs
     // Create a new doc owned by the specific workspace.
     this._app.post('/api/workspaces/:wid/docs', expressWrap(async (req, res) => {
-      const mreq = req as RequestWithLogin;
       const wsId = integerParam(req.params.wid, 'wid');
-      const query = await this._dbManager.addDocument(getScope(req), wsId, req.body);
-      const docId = query.data!;
-      this._gristServer.getTelemetry().logEvent(mreq, 'documentCreated', {
-        limited: {
-          docIdDigest: docId,
-          sourceDocIdDigest: undefined,
-          isImport: false,
-          fileType: undefined,
-          isSaved: true,
-        },
-        full: {
-          userId: mreq.userId,
-          altSessionId: mreq.altSessionId,
-        },
-      });
-      this._gristServer.getTelemetry().logEvent(mreq, 'createdDoc-Empty', {
-        full: {
-          docIdDigest: docId,
-          userId: mreq.userId,
-          altSessionId: mreq.altSessionId,
-        },
-      });
-      this._gristServer.getAuditLogger().logEvent(mreq, {
-        event: {
-          name: 'createDocument',
-          details: {id: docId},
-        },
-      });
-      return sendReply(req, res, query);
+      const {data, ...result} = await this._dbManager.addDocument(getScope(req), wsId, req.body);
+      if (data) { this._logCreateDocumentEvents(req, data); }
+      return sendReply(req, res, {...result, data: data?.id});
     }));
 
     // GET /api/templates/
-    // Get all templates (or only featured templates if `onlyFeatured` is set).
+    // Get all templates.
     this._app.get('/api/templates/', expressWrap(async (req, res) => {
       const templateOrg = getTemplateOrg();
       if (!templateOrg) {
-        throw new ApiError('Template org is not configured', 500);
+        throw new ApiError('Template org is not configured', 501);
       }
 
-      const onlyFeatured = isParameterOn(req.query.onlyFeatured);
-      const query = await this._dbManager.getOrgWorkspaces(
-        {...getScope(req), showOnlyPinned: onlyFeatured},
-        templateOrg
-      );
+      const query = await this._dbManager.getOrgWorkspaces(getScope(req), templateOrg);
       return sendReply(req, res, query);
     }));
 
@@ -330,15 +293,17 @@ export class ApiServer {
     // PATCH /api/docs/:did
     // Update the specified doc.
     this._app.patch('/api/docs/:did', expressWrap(async (req, res) => {
-      const query = await this._dbManager.updateDocument(getDocScope(req), req.body);
-      return sendReply(req, res, query);
+      const {data, ...result} = await this._dbManager.updateDocument(getDocScope(req), req.body);
+      if (data && 'name' in req.body) { this._logRenameDocumentEvents(req, data); }
+      return sendReply(req, res, {...result, data: data?.current.id});
     }));
 
     // POST /api/docs/:did/unremove
     // Recover the specified doc if it was previously soft-deleted and is
     // still available.
     this._app.post('/api/docs/:did/unremove', expressWrap(async (req, res) => {
-      await this._dbManager.undeleteDocument(getDocScope(req));
+      const {data} = await this._dbManager.undeleteDocument(getDocScope(req));
+      if (data) { this._logRestoreDocumentEvents(req, data); }
       return sendOkReply(req, res);
     }));
 
@@ -347,8 +312,9 @@ export class ApiServer {
     this._app.patch('/api/orgs/:oid/access', expressWrap(async (req, res) => {
       const org = getOrgKey(req);
       const delta = req.body.delta;
-      const query = await this._dbManager.updateOrgPermissions(getScope(req), org, delta);
-      return sendReply(req, res, query);
+      const {data, ...result} = await this._dbManager.updateOrgPermissions(getScope(req), org, delta);
+      if (data) { this._logChangeSiteAccessEvents(req as RequestWithLogin, data); }
+      return sendReply(req, res, result);
     }));
 
     // PATCH /api/workspaces/:wid/access
@@ -356,8 +322,9 @@ export class ApiServer {
     this._app.patch('/api/workspaces/:wid/access', expressWrap(async (req, res) => {
       const workspaceId = integerParam(req.params.wid, 'wid');
       const delta = req.body.delta;
-      const query = await this._dbManager.updateWorkspacePermissions(getScope(req), workspaceId, delta);
-      return sendReply(req, res, query);
+      const {data, ...result} = await this._dbManager.updateWorkspacePermissions(getScope(req), workspaceId, delta);
+      if (data) { this._logChangeWorkspaceAccessEvents(req as RequestWithLogin, data); }
+      return sendReply(req, res, result);
     }));
 
     // GET /api/docs/:did
@@ -371,27 +338,30 @@ export class ApiServer {
     // Update the specified doc acl rules.
     this._app.patch('/api/docs/:did/access', expressWrap(async (req, res) => {
       const delta = req.body.delta;
-      const query = await this._dbManager.updateDocPermissions(getDocScope(req), delta);
-      this._logInvitedDocUserTelemetryEvents(req as RequestWithLogin, delta);
-      return sendReply(req, res, query);
+      const {data, ...result} = await this._dbManager.updateDocPermissions(getDocScope(req), delta);
+      if (data) { this._logChangeDocumentAccessEvents(req as RequestWithLogin, data); }
+      return sendReply(req, res, result);
     }));
 
     // PATCH /api/docs/:did/move
     // Move the doc to the workspace specified in the body.
     this._app.patch('/api/docs/:did/move', expressWrap(async (req, res) => {
-      const workspaceId = req.body.workspace;
-      const query = await this._dbManager.moveDoc(getDocScope(req), workspaceId);
-      return sendReply(req, res, query);
+      const workspaceId = integerParam(req.body.workspace, 'workspace');
+      const {data, ...result} = await this._dbManager.moveDoc(getDocScope(req), workspaceId);
+      if (data) { this._logMoveDocumentEvents(req, data); }
+      return sendReply(req, res, {...result, data: data?.current.id});
     }));
 
     this._app.patch('/api/docs/:did/pin', expressWrap(async (req, res) => {
-      const query = await this._dbManager.pinDoc(getDocScope(req), true);
-      return sendReply(req, res, query);
+      const {data, ...result} = await this._dbManager.pinDoc(getDocScope(req), true);
+      if (data) { this._logPinDocumentEvents(req, data); }
+      return sendReply(req, res, result);
     }));
 
     this._app.patch('/api/docs/:did/unpin', expressWrap(async (req, res) => {
-      const query = await this._dbManager.pinDoc(getDocScope(req), false);
-      return sendReply(req, res, query);
+      const {data, ...result} = await this._dbManager.pinDoc(getDocScope(req), false);
+      if (data) { this._logUnpinDocumentEvents(req, data); }
+      return sendReply(req, res, result);
     }));
 
     // GET /api/orgs/:oid/access
@@ -435,7 +405,8 @@ export class ApiServer {
         throw new ApiError('Name expected in the body', 400);
       }
       const name = req.body.name;
-      await this._dbManager.updateUser(userId, { name });
+      const {previous, current} = await this._dbManager.updateUser(userId, { name });
+      this._logChangeUserNameEvents(req, {previous, current});
       res.sendStatus(200);
     }));
 
@@ -516,6 +487,7 @@ export class ApiServer {
       if (!user) { return handleDeletedUser(); }
       if (!user.apiKey || force) {
         user = await updateApiKeyWithRetry(manager, user);
+        this._logCreateUserAPIKeyEvents(req);
         res.status(200).send(user.apiKey);
       } else {
         res.status(400).send({error: "An apikey is already set, use `{force: true}` to override it."});
@@ -531,6 +503,7 @@ export class ApiServer {
         if (!user) { return handleDeletedUser(); }
         user.apiKey = null;
         await manager.save(User, user);
+        this._logDeleteUserAPIKeyEvents(req);
       });
       res.sendStatus(200);
     }));
@@ -651,6 +624,93 @@ export class ApiServer {
     return result;
   }
 
+  private _logCreateDocumentEvents(req: Request, document: Document) {
+    const mreq = req as RequestWithLogin;
+    const {id, name, workspace: {id: workspaceId}} = document;
+    this._gristServer.getAuditLogger().logEvent(mreq, {
+      event: {
+        name: 'createDocument',
+        details: {id, name},
+        context: {workspaceId},
+      },
+    });
+    this._gristServer.getTelemetry().logEvent(mreq, 'documentCreated', {
+      limited: {
+        docIdDigest: id,
+        sourceDocIdDigest: undefined,
+        isImport: false,
+        fileType: undefined,
+        isSaved: true,
+      },
+      full: {
+        userId: mreq.userId,
+        altSessionId: mreq.altSessionId,
+      },
+    });
+    this._gristServer.getTelemetry().logEvent(mreq, 'createdDoc-Empty', {
+      full: {
+        docIdDigest: id,
+        userId: mreq.userId,
+        altSessionId: mreq.altSessionId,
+      },
+    });
+  }
+
+  private _logRenameDocumentEvents(
+    req: Request,
+    {previous, current}: PreviousAndCurrent<Document>
+  ) {
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'renameDocument',
+        details: {
+          id: current.id,
+          previousName: previous.name,
+          currentName: current.name,
+        },
+        context: {workspaceId: current.workspace.id},
+      },
+    });
+  }
+
+  private _logRestoreDocumentEvents(req: Request, document: Document) {
+    const {id, name, workspace} = document;
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'restoreDocumentFromTrash',
+        details: {
+          id,
+          name,
+          workspace: {
+            id: workspace.id,
+            name: workspace.name,
+          },
+        },
+      },
+    });
+  }
+
+  private _logChangeDocumentAccessEvents(
+    req: RequestWithLogin,
+    {document, maxInheritedRole, users}: PermissionDelta & {document: Document}
+  ) {
+    const {id, workspace: {id: workspaceId}} = document;
+    this._gristServer.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'changeDocumentAccess',
+        details: {
+          id,
+          access: {
+            maxInheritedRole,
+            users,
+          },
+        },
+        context: {workspaceId},
+      },
+    });
+    this._logInvitedDocUserTelemetryEvents(req, {maxInheritedRole, users});
+  }
+
   private _logInvitedDocUserTelemetryEvents(mreq: RequestWithLogin, delta: PermissionDelta) {
     if (!delta.users) { return; }
 
@@ -691,6 +751,214 @@ export class ApiServer {
       );
     }
   }
+
+  private _logMoveDocumentEvents(req: Request, {previous, current}: PreviousAndCurrent<Document>) {
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'moveDocument',
+        details: {
+          id: current.id,
+          previousWorkspace: {
+            id: previous.workspace.id,
+            name: previous.workspace.name,
+          },
+          newWorkspace: {
+            id: current.workspace.id,
+            name: current.workspace.name,
+          },
+        },
+        context: {
+          workspaceId: previous.workspace.id,
+        },
+      },
+    });
+  }
+
+  private _logPinDocumentEvents(req: Request, document: Document) {
+    const {id, name, workspace: {id: workspaceId}} = document;
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'pinDocument',
+        details: {id, name},
+        context: {workspaceId},
+      },
+    });
+  }
+
+  private _logUnpinDocumentEvents(req: Request, document: Document) {
+    const {id, name, workspace: {id: workspaceId}} = document;
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'unpinDocument',
+        details: {id, name},
+        context: {workspaceId},
+      },
+    });
+  }
+
+  private _logCreateWorkspaceEvents(req: Request, {id, name}: Workspace) {
+    const mreq = req as RequestWithLogin;
+    this._gristServer.getAuditLogger().logEvent(mreq, {
+      event: {
+        name: 'createWorkspace',
+        details: {id, name},
+      },
+    });
+    this._gristServer.getTelemetry().logEvent(mreq, 'createdWorkspace', {
+      full: {
+        workspaceId: id,
+        userId: mreq.userId,
+      },
+    });
+  }
+
+  private _logRenameWorkspaceEvents(
+    req: Request,
+    {previous, current}: PreviousAndCurrent<Workspace>
+  ) {
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'renameWorkspace',
+        details: {
+          id: current.id,
+          previousName: previous.name,
+          currentName: current.name,
+        },
+      },
+    });
+  }
+
+  private _logRemoveWorkspaceEvents(req: Request, {id, name}: Workspace) {
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'removeWorkspace',
+        details: {id, name},
+      },
+    });
+  }
+
+  private _logDeleteWorkspaceEvents(req: Request, {id, name}: Workspace) {
+    const mreq = req as RequestWithLogin;
+    this._gristServer.getAuditLogger().logEvent(mreq, {
+      event: {
+        name: 'deleteWorkspace',
+        details: {id, name},
+      },
+    });
+    this._gristServer.getTelemetry().logEvent(mreq, 'deletedWorkspace', {
+      full: {
+        workspaceId: id,
+        userId: mreq.userId,
+      },
+    });
+  }
+
+  private _logRestoreWorkspaceEvents(req: Request, {id, name}: Workspace) {
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'restoreWorkspaceFromTrash',
+        details: {id, name},
+      },
+    });
+  }
+
+  private _logChangeWorkspaceAccessEvents(
+    req: RequestWithLogin,
+    {workspace: {id}, maxInheritedRole, users}: PermissionDelta & {workspace: Workspace}
+  ) {
+    this._gristServer.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'changeWorkspaceAccess',
+        details: {
+          id,
+          access: {
+            maxInheritedRole,
+            users,
+          },
+        },
+      },
+    });
+  }
+
+  private _logCreateSiteEvents(req: Request, {id, name, domain}: Organization) {
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'createSite',
+        details: {id, name, domain},
+      },
+    });
+  }
+
+  private _logRenameSiteEvents(
+    req: Request,
+    {previous, current}: PreviousAndCurrent<Organization>
+  ) {
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'renameSite',
+        details: {
+          id: current.id,
+          previous: {
+            name: previous.name,
+            domain: previous.domain,
+          },
+          current: {
+            name: current.name,
+            domain: current.domain,
+          },
+        },
+      },
+    });
+  }
+
+  private _logDeleteSiteEvents(req: Request, {id, name}: Organization) {
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'deleteSite',
+        details: {id, name},
+      },
+    });
+  }
+
+  private _logChangeSiteAccessEvents(
+    req: RequestWithLogin,
+    {organization: {id}, users}: PermissionDelta & {organization: Organization}
+  ) {
+    this._gristServer.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'changeSiteAccess',
+        details: {id, access: {users}},
+      },
+    });
+  }
+
+  private _logChangeUserNameEvents(
+    req: Request,
+    {previous: {name: previousName}, current: {name: currentName}}: PreviousAndCurrent<User>
+  ) {
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'changeUserName',
+        details: {previousName, currentName},
+      },
+    });
+  }
+
+  private _logCreateUserAPIKeyEvents(req: Request) {
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'createUserAPIKey',
+      },
+    });
+  }
+
+  private _logDeleteUserAPIKeyEvents(req: Request) {
+    this._gristServer.getAuditLogger().logEvent(req as RequestWithLogin, {
+      event: {
+        name: 'deleteUserAPIKey',
+      },
+    });
+  }
 }
 
 /**
diff --git a/app/gen-server/lib/Housekeeper.ts b/app/gen-server/lib/Housekeeper.ts
index c3012bec6b3..d380dd11c65 100644
--- a/app/gen-server/lib/Housekeeper.ts
+++ b/app/gen-server/lib/Housekeeper.ts
@@ -2,10 +2,8 @@ import { ApiError } from 'app/common/ApiError';
 import { delay } from 'app/common/delay';
 import { buildUrlId } from 'app/common/gristUrls';
 import { normalizedDateTimeString } from 'app/common/normalizedDateTimeString';
-import { BillingAccount } from 'app/gen-server/entity/BillingAccount';
 import { Document } from 'app/gen-server/entity/Document';
 import { Organization } from 'app/gen-server/entity/Organization';
-import { Product } from 'app/gen-server/entity/Product';
 import { Workspace } from 'app/gen-server/entity/Workspace';
 import { HomeDBManager, Scope } from 'app/gen-server/lib/homedb/HomeDBManager';
 import { fromNow } from 'app/gen-server/sqlUtils';
@@ -438,63 +436,3 @@ async function forEachWithBreaks<T>(logText: string, items: T[], callback: (item
   }
   log.rawInfo(logText, {itemsProcesssed, itemsTotal, timeMs: Date.now() - start});
 }
-
-/**
- * For a brief moment file `stubs/app/server/server.ts` was ignoring the GRIST_DEFAULT_PRODUCT
- * variable, which is currently set for all deployment types to 'Free' product. As a result orgs
- * created after 2024-06-12 (1.1.15) were created with 'teamFree' product instead of 'Free'.
- * It only affected deployments that were using:
- * - GRIST_DEFAULT_PRODUCT variable set to 'Free'
- * - GRIST_SINGLE_ORG set to enforce single org mode.
- *
- * This method fixes the product for all orgs created with 'teamFree' product, if the default
- * product that should be used is 'Free' and the deployment type is not 'saas' ('saas' deployment
- * isn't using GRIST_DEFAULT_PRODUCT variable). This method should be removed after 2024.10.01.
- *
- * There is a corresponding test that will fail if this method (and that test) are not removed.
- *
- * @returns true if the method was run, false otherwise.
- */
-export async function fixSiteProducts(options: {
-  deploymentType: string,
-  db: HomeDBManager
-}) {
-  const {deploymentType, db} = options;
-
-  const hasDefaultProduct = () => Boolean(process.env.GRIST_DEFAULT_PRODUCT);
-  const defaultProductIsFree = () => process.env.GRIST_DEFAULT_PRODUCT === 'Free';
-  const notSaasDeployment = () => deploymentType !== 'saas';
-  const mustRun = hasDefaultProduct() && defaultProductIsFree() && notSaasDeployment();
-  if (!mustRun) {
-    return false;
-  }
-  const removeMeDate = new Date('2024-10-01');
-  const warningMessage = `WARNING: This method should be removed after ${removeMeDate.toDateString()}.`;
-  if (new Date() > removeMeDate) {
-    console.warn(warningMessage);
-  }
-
-  // Find all billing accounts on teamFree product and change them to the Free.
-  return await db.connection.transaction(async (t) => {
-    const freeProduct = await t.findOne(Product, {where: {name: 'Free'}});
-    const freeTeamProduct = await t.findOne(Product, {where: {name: 'teamFree'}});
-
-    if (!freeTeamProduct) {
-      console.warn('teamFree product not found.');
-      return false;
-    }
-
-    if (!freeProduct) {
-      console.warn('Free product not found.');
-      return false;
-    }
-
-    await t.createQueryBuilder()
-        .update(BillingAccount)
-        .set({product: freeProduct.id})
-        .where({product: freeTeamProduct.id})
-        .execute();
-
-    return true;
-  });
-}
diff --git a/app/gen-server/lib/homedb/HomeDBManager.ts b/app/gen-server/lib/homedb/HomeDBManager.ts
index e28a2c87c83..58e6a5618ae 100644
--- a/app/gen-server/lib/homedb/HomeDBManager.ts
+++ b/app/gen-server/lib/homedb/HomeDBManager.ts
@@ -41,7 +41,13 @@ 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 {
-  AvailableUsers, GetUserOptions, NonGuestGroup, Resource, UserProfileChange
+  AvailableUsers,
+  GetUserOptions,
+  NonGuestGroup,
+  PreviousAndCurrent,
+  QueryResult,
+  Resource,
+  UserProfileChange,
 } from 'app/gen-server/lib/homedb/Interfaces';
 import {SUPPORT_EMAIL, UsersManager} from 'app/gen-server/lib/homedb/UsersManager';
 import {Permissions} from 'app/gen-server/lib/Permissions';
@@ -111,12 +117,6 @@ const listPublicSites = appSettings.section('access').flag('listPublicSites').re
 // which is a burden under heavy traffic.
 const DOC_AUTH_CACHE_TTL = 5000;
 
-export interface QueryResult<T> {
-  status: number;
-  data?: T;
-  errMessage?: string;
-}
-
 // Maps from userId to group name, or null to inherit.
 export interface UserIdDelta {
   [userId: string]: roles.NonGuestRole|null;
@@ -170,7 +170,6 @@ export interface Scope {
   users?: AvailableUsers;        // Set if available identities.
   includeSupport?: boolean;      // When set, include sample resources shared by support to scope.
   showRemoved?: boolean;         // When set, query is scoped to removed workspaces/docs.
-  showOnlyPinned?: boolean;      // When set, query is scoped only to pinned docs.
   showAll?: boolean;             // When set, return both removed and regular resources.
   specialPermit?: Permit;        // When set, extra rights are granted on a specific resource.
 }
@@ -460,11 +459,15 @@ export class HomeDBManager extends EventEmitter {
     return await this._usersManager.ensureExternalUser(profile);
   }
 
-  public async updateUser(userId: number, props: UserProfileChange) {
-    const { user, isWelcomed } = await this._usersManager.updateUser(userId, props);
-    if (user && isWelcomed) {
-      this.emit('firstLogin', this.makeFullUser(user));
+  public async updateUser(
+    userId: number,
+    props: UserProfileChange
+  ): Promise<PreviousAndCurrent<User>> {
+    const {previous, current, isWelcomed} = await this._usersManager.updateUser(userId, props);
+    if (current && isWelcomed) {
+      this.emit('firstLogin', this.makeFullUser(current));
     }
+    return {previous, current};
   }
 
   public async updateUserOptions(userId: number, props: Partial<UserOptions>) {
@@ -1059,7 +1062,7 @@ export class HomeDBManager extends EventEmitter {
 
   /**
    *
-   * Adds an org with the given name. Returns a query result with the id of the added org.
+   * Adds an org with the given name. Returns a query result with the added org.
    *
    * @param user: user doing the adding
    * @param name: desired org name
@@ -1074,12 +1077,17 @@ export class HomeDBManager extends EventEmitter {
    *   meaningful for team sites currently.
    * @param billing: if set, controls the billing account settings for the org.
    */
-  public async addOrg(user: User, props: Partial<OrganizationProperties>,
-                      options: { setUserAsOwner: boolean,
-                                 useNewPlan: boolean,
-                                 product?: string, // Default to PERSONAL_FREE_PLAN or TEAM_FREE_PLAN env variable.
-                                 billing?: BillingOptions},
-                      transaction?: EntityManager): Promise<QueryResult<number>> {
+  public async addOrg(
+    user: User,
+    props: Partial<OrganizationProperties>,
+    options: {
+      setUserAsOwner: boolean,
+      useNewPlan: boolean,
+      product?: string, // Default to PERSONAL_FREE_PLAN or TEAM_FREE_PLAN env variable.
+      billing?: BillingOptions
+    },
+    transaction?: EntityManager
+  ): Promise<QueryResult<Organization>> {
     const notifications: Array<() => void> = [];
     const name = props.name;
     const domain = props.domain;
@@ -1220,10 +1228,7 @@ export class HomeDBManager extends EventEmitter {
         // Emit a notification.
         notifications.push(this._teamCreatorNotification(user.id));
       }
-      return {
-        status: 200,
-        data: savedOrg.id
-      };
+      return {status: 200, data: savedOrg};
     });
     for (const notification of notifications) { notification(); }
     return orgResult;
@@ -1231,8 +1236,8 @@ export class HomeDBManager extends EventEmitter {
 
   // If setting anything more than prefs:
   //   Checks that the user has UPDATE permissions to the given org. If not, throws an
-  //   error. Otherwise updates the given org with the given name. Returns an empty
-  //   query result with status 200 on success.
+  //   error. Otherwise updates the given org with the given name. Returns a query
+  //   result with status 200 on success.
   // For setting userPrefs or userOrgPrefs:
   //   These are user-specific setting, so are allowed with VIEW access (that includes
   //   guests).  Prefs are replaced in their entirety, not merged.
@@ -1243,7 +1248,7 @@ export class HomeDBManager extends EventEmitter {
     orgKey: string|number,
     props: Partial<OrganizationProperties>,
     transaction?: EntityManager,
-  ): Promise<QueryResult<number>> {
+  ): Promise<QueryResult<PreviousAndCurrent<Organization>>> {
 
     // Check the scope of the modifications.
     let markPermissions: number = Permissions.VIEW;
@@ -1273,11 +1278,12 @@ export class HomeDBManager extends EventEmitter {
       });
       const queryResult = await verifyEntity(orgQuery);
       if (queryResult.status !== 200) {
-        // If the query for the workspace failed, return the failure result.
+        // If the query for the org failed, return the failure result.
         return queryResult;
       }
       // Update the fields and save.
       const org: Organization = queryResult.data;
+      const previous = structuredClone(org);
       org.checkProperties(props);
       if (modifyOrg) {
         if (props.domain) {
@@ -1313,15 +1319,18 @@ export class HomeDBManager extends EventEmitter {
             .execute();
         }
       }
-      return {status: 200};
+      return {status: 200, data: {previous, current: org}};
     });
   }
 
   // Checks that the user has REMOVE permissions to the given org. If not, throws an
-  // error. Otherwise deletes the given org. Returns an empty query result with
-  // status 200 on success.
-  public async deleteOrg(scope: Scope, orgKey: string|number,
-                         transaction?: EntityManager): Promise<QueryResult<number>> {
+  // error. Otherwise deletes the given org. Returns a query result with status 200
+  // on success.
+  public async deleteOrg(
+    scope: Scope,
+    orgKey: string|number,
+    transaction?: EntityManager
+  ): Promise<QueryResult<Organization>> {
     return await this._runInTransaction(transaction, async manager => {
       const orgQuery = this.org(scope, orgKey, {
         manager,
@@ -1345,6 +1354,7 @@ export class HomeDBManager extends EventEmitter {
         return queryResult;
       }
       const org: Organization = queryResult.data;
+      const deletedOrg = structuredClone(org);
       // Delete the org, org ACLs/groups, workspaces, workspace ACLs/groups, workspace docs
       // and doc ACLs/groups.
       const orgGroups = org.aclRules.map(orgAcl => orgAcl.group);
@@ -1364,15 +1374,18 @@ export class HomeDBManager extends EventEmitter {
       if (billingAccount && billingAccount.orgs.length === 0) {
         await manager.remove([billingAccount]);
       }
-      return {status: 200};
+      return {status: 200, data: deletedOrg};
     });
   }
 
   // Checks that the user has ADD permissions to the given org. If not, throws an error.
-  // Otherwise adds a workspace with the given name. Returns a query result with the id
-  // of the added workspace.
-  public async addWorkspace(scope: Scope, orgKey: string|number,
-                            props: Partial<WorkspaceProperties>): Promise<QueryResult<number>> {
+  // Otherwise adds a workspace with the given name. Returns a query result with the
+  // added workspace.
+  public async addWorkspace(
+    scope: Scope,
+    orgKey: string|number,
+    props: Partial<WorkspaceProperties>
+  ): Promise<QueryResult<Workspace>> {
     const name = props.name;
     if (!name) {
       return {
@@ -1415,18 +1428,18 @@ export class HomeDBManager extends EventEmitter {
         }
       }
       const workspace = await this._doAddWorkspace({org, props, ownerId: scope.userId}, manager);
-      return {
-        status: 200,
-        data: workspace.id
-      };
+      return {status: 200, data: workspace};
     });
   }
 
   // Checks that the user has UPDATE permissions to the given workspace. If not, throws an
-  // error. Otherwise updates the given workspace with the given name. Returns an empty
-  // query result with status 200 on success.
-  public async updateWorkspace(scope: Scope, wsId: number,
-                               props: Partial<WorkspaceProperties>): Promise<QueryResult<number>> {
+  // error. Otherwise updates the given workspace with the given name. Returns a query result
+  // with status 200 on success.
+  public async updateWorkspace(
+    scope: Scope,
+    wsId: number,
+    props: Partial<WorkspaceProperties>
+  ): Promise<QueryResult<PreviousAndCurrent<Workspace>>> {
     return await this._connection.transaction(async manager => {
       const wsQuery = this._workspace(scope, wsId, {
         manager,
@@ -1439,17 +1452,18 @@ export class HomeDBManager extends EventEmitter {
       }
       // Update the name and save.
       const workspace: Workspace = queryResult.data;
+      const previous = structuredClone(workspace);
       workspace.checkProperties(props);
       workspace.updateFromProperties(props);
       await manager.save(workspace);
-      return {status: 200};
+      return {status: 200, data: {previous, current: workspace}};
     });
   }
 
   // Checks that the user has REMOVE permissions to the given workspace. If not, throws an
-  // error. Otherwise deletes the given workspace. Returns an empty query result with
-  // status 200 on success.
-  public async deleteWorkspace(scope: Scope, wsId: number): Promise<QueryResult<number>> {
+  // error. Otherwise deletes the given workspace. Returns a query result with status 200
+  // on success.
+  public async deleteWorkspace(scope: Scope, wsId: number): Promise<QueryResult<Workspace>> {
     return await this._connection.transaction(async manager => {
       const wsQuery = this._workspace(scope, wsId, {
         manager,
@@ -1470,6 +1484,7 @@ export class HomeDBManager extends EventEmitter {
         return queryResult;
       }
       const workspace: Workspace = queryResult.data;
+      const deletedWorkspace = structuredClone(workspace);
       // Delete the workspace, workspace docs, doc ACLs/groups and workspace ACLs/groups.
       const wsGroups = workspace.aclRules.map(wsAcl => wsAcl.group);
       const docAcls = ([] as AclRule[]).concat(...workspace.docs.map(doc => doc.aclRules));
@@ -1478,15 +1493,15 @@ export class HomeDBManager extends EventEmitter {
         ...workspace.aclRules, ...docGroups]);
       // Update the guests in the org after removing this workspace.
       await this._repairOrgGuests(scope, workspace.org.id, manager);
-      return {status: 200};
+      return {status: 200, data: deletedWorkspace};
     });
   }
 
-  public softDeleteWorkspace(scope: Scope, wsId: number): Promise<void> {
+  public softDeleteWorkspace(scope: Scope, wsId: number): Promise<QueryResult<Workspace>> {
     return this._setWorkspaceRemovedAt(scope, wsId, new Date());
   }
 
-  public async undeleteWorkspace(scope: Scope, wsId: number): Promise<void> {
+  public async undeleteWorkspace(scope: Scope, wsId: number): Promise<QueryResult<Workspace>> {
     return this._setWorkspaceRemovedAt(scope, wsId, null);
   }
 
@@ -1497,8 +1512,12 @@ export class HomeDBManager extends EventEmitter {
   // by makeId().  The client should not be given control of the choice of docId.
   // This option is used during imports, where it is convenient not to add a row to the
   // document database until the document has actually been imported.
-  public async addDocument(scope: Scope, wsId: number, props: Partial<DocumentProperties>,
-                           docId?: string): Promise<QueryResult<string>> {
+  public async addDocument(
+    scope: Scope,
+    wsId: number,
+    props: Partial<DocumentProperties>,
+    docId?: string
+  ): Promise<QueryResult<Document>> {
     const name = props.name;
     if (!name) {
       return {
@@ -1578,7 +1597,12 @@ export class HomeDBManager extends EventEmitter {
       });
       // Saves the document as well as its new ACL Rules and Group.
       const groups = doc.aclRules.map(rule => rule.group);
-      const result = await manager.save([doc, ...doc.aclRules, ...doc.aliases, ...groups]);
+      const [data] = await manager.save<[Document, ...(AclRuleDoc|Alias|Group)[]]>([
+        doc,
+        ...doc.aclRules,
+        ...doc.aliases,
+        ...groups,
+      ]);
       // Ensure that the creator is in the ws and org's guests group. Creator already has
       // access to the workspace (he is at least an editor), but we need to be sure that
       // even if he is removed from the workspace, he will still have access to this doc.
@@ -1588,10 +1612,7 @@ export class HomeDBManager extends EventEmitter {
       // time), but they are ignoring any unique constraints errors.
       await this._repairWorkspaceGuests(scope, workspace.id, manager);
       await this._repairOrgGuests(scope, workspace.org.id, manager);
-      return {
-        status: 200,
-        data: (result[0] as Document).id
-      };
+      return {status: 200, data};
     });
   }
 
@@ -1686,15 +1707,15 @@ export class HomeDBManager extends EventEmitter {
   }
 
   // Checks that the user has SCHEMA_EDIT permissions to the given doc. If not, throws an
-  // error. Otherwise updates the given doc with the given name. Returns an empty
-  // query result with status 200 on success.
+  // error. Otherwise updates the given doc with the given name. Returns a query result with
+  // status 200 on success.
   // NOTE: This does not update the updateAt date indicating the last modified time of the doc.
   // We may want to make it do so.
   public async updateDocument(
     scope: DocScope,
     props: Partial<DocumentProperties>,
     transaction?: EntityManager
-  ): Promise<QueryResult<number>> {
+  ): Promise<QueryResult<PreviousAndCurrent<Document>>> {
     const markPermissions = Permissions.SCHEMA_EDIT;
     return await this._runInTransaction(transaction, async (manager) => {
       const {forkId} = parseUrlId(scope.urlId);
@@ -1716,6 +1737,7 @@ export class HomeDBManager extends EventEmitter {
       }
       // Update the name and save.
       const doc: Document = queryResult.data;
+      const previous = structuredClone(doc);
       doc.checkProperties(props);
       doc.updateFromProperties(props);
       if (forkId) {
@@ -1747,14 +1769,14 @@ export class HomeDBManager extends EventEmitter {
           .execute();
         // TODO: we could limit the max number of aliases stored per document.
       }
-      return {status: 200};
+      return {status: 200, data: {previous, current: doc}};
     });
   }
 
   // Checks that the user has REMOVE permissions to the given document. If not, throws an
-  // error. Otherwise deletes the given document. Returns an empty query result with
-  // status 200 on success.
-  public async deleteDocument(scope: DocScope): Promise<QueryResult<number>> {
+  // error. Otherwise deletes the given document. Returns a query result with status 200
+  // and the deleted document on success.
+  public async deleteDocument(scope: DocScope): Promise<QueryResult<Document>> {
     return await this._connection.transaction(async manager => {
       const {forkId} = parseUrlId(scope.urlId);
       if (forkId) {
@@ -1768,8 +1790,9 @@ export class HomeDBManager extends EventEmitter {
           return queryResult;
         }
         const fork: Document = queryResult.data;
-        await manager.remove([fork]);
-        return {status: 200};
+        const data = structuredClone(fork);
+        await manager.remove(fork);
+        return {status: 200, data};
       } else {
         const docQuery = this._doc(scope, {
           manager,
@@ -1786,22 +1809,23 @@ export class HomeDBManager extends EventEmitter {
           return queryResult;
         }
         const doc: Document = queryResult.data;
-        // Delete the doc and doc ACLs/groups.
+        const data = structuredClone(doc);
         const docGroups = doc.aclRules.map(docAcl => docAcl.group);
+        // Delete the doc and doc ACLs/groups.
         await manager.remove([doc, ...docGroups, ...doc.aclRules]);
         // Update guests of the workspace and org after removing this doc.
         await this._repairWorkspaceGuests(scope, doc.workspace.id, manager);
         await this._repairOrgGuests(scope, doc.workspace.org.id, manager);
-        return {status: 200};
+        return {status: 200, data};
       }
     });
   }
 
-  public softDeleteDocument(scope: DocScope): Promise<void> {
+  public softDeleteDocument(scope: DocScope): Promise<QueryResult<Document>> {
     return this._setDocumentRemovedAt(scope, new Date());
   }
 
-  public async undeleteDocument(scope: DocScope): Promise<void> {
+  public async undeleteDocument(scope: DocScope): Promise<QueryResult<Document>> {
     return this._setDocumentRemovedAt(scope, null);
   }
 
@@ -1902,7 +1926,7 @@ export class HomeDBManager extends EventEmitter {
     scope: Scope,
     orgKey: string|number,
     delta: PermissionDelta
-  ): Promise<QueryResult<void>> {
+  ): Promise<QueryResult<PermissionDelta & {organization: Organization}>> {
     const {userId} = scope;
     const notifications: Array<() => void> = [];
     const result = await this._connection.transaction(async manager => {
@@ -1948,7 +1972,10 @@ export class HomeDBManager extends EventEmitter {
         // Notify any added users that they've been added to this resource.
         notifications.push(this._inviteNotification(userId, org, userIdDelta, membersBefore));
       }
-      return {status: 200};
+      return {status: 200, data: {
+        organization: org,
+        users: userIdDelta ?? undefined,
+      }};
     });
     for (const notification of notifications) { notification(); }
     return result;
@@ -1959,7 +1986,7 @@ export class HomeDBManager extends EventEmitter {
     scope: Scope,
     wsId: number,
     delta: PermissionDelta
-  ): Promise<QueryResult<void>> {
+  ): Promise<QueryResult<PermissionDelta & {workspace: Workspace}>> {
     const {userId} = scope;
     const notifications: Array<() => void> = [];
     const result = await this._connection.transaction(async manager => {
@@ -2024,7 +2051,14 @@ export class HomeDBManager extends EventEmitter {
         await this._repairOrgGuests(scope, ws.org.id, manager);
         notifications.push(this._inviteNotification(userId, ws, userIdDelta, membersBefore));
       }
-      return {status: 200};
+      return {
+        status: 200,
+        data: {
+          workspace: ws,
+          maxInheritedRole: delta.maxInheritedRole,
+          users: userIdDelta ?? undefined,
+        },
+      };
     });
     for (const notification of notifications) { notification(); }
     return result;
@@ -2034,7 +2068,7 @@ export class HomeDBManager extends EventEmitter {
   public async updateDocPermissions(
     scope: DocScope,
     delta: PermissionDelta
-  ): Promise<QueryResult<void>> {
+  ): Promise<QueryResult<PermissionDelta & {document: Document}>> {
     const notifications: Array<() => void> = [];
     const result = await this._connection.transaction(async manager => {
       const {userId} = scope;
@@ -2075,7 +2109,14 @@ export class HomeDBManager extends EventEmitter {
         await this._repairOrgGuests(scope, doc.workspace.org.id, manager);
         notifications.push(this._inviteNotification(userId, doc, userIdDelta, membersBefore));
       }
-      return {status: 200};
+      return {
+        status: 200,
+        data: {
+          document: doc,
+          maxInheritedRole: delta.maxInheritedRole,
+          users: userIdDelta ?? undefined,
+        },
+      };
     });
     for (const notification of notifications) { notification(); }
     return result;
@@ -2264,7 +2305,7 @@ export class HomeDBManager extends EventEmitter {
   public async moveDoc(
     scope: DocScope,
     wsId: number
-  ): Promise<QueryResult<void>> {
+  ): Promise<QueryResult<PreviousAndCurrent<Document>>> {
     return await this._connection.transaction(async manager => {
       // Get the doc
       const docQuery = this._doc(scope, {
@@ -2286,6 +2327,7 @@ export class HomeDBManager extends EventEmitter {
         return docQueryResult;
       }
       const doc: Document = docQueryResult.data;
+      const previous = structuredClone(doc);
       if (doc.workspace.id === wsId) {
         return {
           status: 400,
@@ -2355,7 +2397,11 @@ export class HomeDBManager extends EventEmitter {
       doc.aliases = undefined as any;
       // Saves the document as well as its new ACL Rules and Groups and the
       // updated guest group in the workspace.
-      await manager.save([doc, ...doc.aclRules, ...docGroups]);
+      const [current] = await manager.save<[Document, ...(AclRuleDoc|Group)[]]>([
+        doc,
+        ...doc.aclRules,
+        ...docGroups,
+      ]);
       if (firstLevelUsers.length > 0) {
         // If the doc has first-level users, update the source and destination workspaces.
         await this._repairWorkspaceGuests(scope, oldWs.id, manager);
@@ -2366,9 +2412,7 @@ export class HomeDBManager extends EventEmitter {
           await this._repairOrgGuests(scope, doc.workspace.org.id, manager);
         }
       }
-      return {
-        status: 200
-      };
+      return {status: 200, data: {previous, current}};
     });
   }
 
@@ -2376,7 +2420,7 @@ export class HomeDBManager extends EventEmitter {
   public async pinDoc(
     scope: DocScope,
     setPinned: boolean
-  ): Promise<QueryResult<void>> {
+  ): Promise<QueryResult<Document>> {
     return await this._connection.transaction(async manager => {
       // Find the doc to assert that it exists. Assert that the user has edit access to the
       // parent org.
@@ -2400,7 +2444,7 @@ export class HomeDBManager extends EventEmitter {
         // Save and return success status.
         await manager.save(doc);
       }
-      return { status: 200 };
+      return {status: 200, data: doc};
     });
   }
 
@@ -3399,8 +3443,6 @@ export class HomeDBManager extends EventEmitter {
     const onDefault = 'docs.workspace_id = workspaces.id';
     if (scope.showAll) {
       return onDefault;
-    } else if (scope.showOnlyPinned) {
-      return `${onDefault} AND docs.is_pinned = TRUE AND (workspaces.removed_at IS NULL AND docs.removed_at IS NULL)`;
     } else if (scope.showRemoved) {
       return `${onDefault} AND (workspaces.removed_at IS NOT NULL OR docs.removed_at IS NOT NULL)`;
     } else {
@@ -4283,9 +4325,9 @@ export class HomeDBManager extends EventEmitter {
         markPermissions: Permissions.REMOVE
       });
       const workspace: Workspace = this.unwrapQueryResult(await verifyEntity(wsQuery));
-      await manager.createQueryBuilder()
-        .update(Workspace).set({removedAt}).where({id: workspace.id})
-        .execute();
+      workspace.removedAt = removedAt;
+      const data = await manager.save(workspace);
+      return {status: 200, data};
     });
   }
 
@@ -4304,9 +4346,9 @@ export class HomeDBManager extends EventEmitter {
       if (!removedAt) {
         await this._checkRoomForAnotherDoc(doc.workspace, manager);
       }
-      await manager.createQueryBuilder()
-        .update(Document).set({removedAt}).where({id: doc.id})
-        .execute();
+      doc.removedAt = removedAt;
+      const data = await manager.save(doc);
+      return {status: 200, data};
     });
   }
 
diff --git a/app/gen-server/lib/homedb/Interfaces.ts b/app/gen-server/lib/homedb/Interfaces.ts
index 22eec24969c..6a0b5ff5b5a 100644
--- a/app/gen-server/lib/homedb/Interfaces.ts
+++ b/app/gen-server/lib/homedb/Interfaces.ts
@@ -14,6 +14,11 @@ export interface QueryResult<T> {
   errMessage?: string;
 }
 
+export interface PreviousAndCurrent<T> {
+  previous: T;
+  current: T;
+}
+
 export interface GetUserOptions {
   manager?: EntityManager;
   profile?: UserProfile;
diff --git a/app/gen-server/lib/homedb/UsersManager.ts b/app/gen-server/lib/homedb/UsersManager.ts
index 295e4de1958..e2be5b1d21b 100644
--- a/app/gen-server/lib/homedb/UsersManager.ts
+++ b/app/gen-server/lib/homedb/UsersManager.ts
@@ -256,14 +256,17 @@ export class UsersManager {
     });
   }
 
-  public async updateUser(userId: number, props: UserProfileChange) {
-    let isWelcomed: boolean = false;
-    let user: User|null = null;
-    await this._connection.transaction(async manager => {
-      user = await manager.findOne(User, {relations: ['logins'],
-                                          where: {id: userId}});
+  public async updateUser(userId: number, props: UserProfileChange){
+    return await this._connection.transaction(async manager => {
+      let isWelcomed = false;
       let needsSave = false;
+      const user = await manager.findOne(User, {
+        relations: ['logins'],
+        where: {id: userId},
+      });
       if (!user) { throw new ApiError("unable to find user", 400); }
+
+      const previous = structuredClone(user);
       if (props.name && props.name !== user.name) {
         user.name = props.name;
         needsSave = true;
@@ -279,8 +282,8 @@ export class UsersManager {
       if (needsSave) {
         await manager.save(user);
       }
+      return {previous, current: user, isWelcomed};
     });
-    return { user, isWelcomed };
   }
 
   // TODO: rather use the updateUser() method, if that makes sense?
@@ -454,9 +457,9 @@ export class UsersManager {
 
         // We just created a personal org; set userOrgPrefs that should apply for new users only.
         const userOrgPrefs: UserOrgPrefs = {showGristTour: true};
-        const orgId = result.data;
-        if (orgId) {
-          await this._homeDb.updateOrg({userId: user.id}, orgId, {userOrgPrefs}, manager);
+        const org = result.data;
+        if (org) {
+          await this._homeDb.updateOrg({userId: user.id}, org.id, {userOrgPrefs}, manager);
         }
       }
       if (needUpdate) {
diff --git a/app/server/MergedServer.ts b/app/server/MergedServer.ts
index ba307e80603..2ac994d1698 100644
--- a/app/server/MergedServer.ts
+++ b/app/server/MergedServer.ts
@@ -192,12 +192,6 @@ export class MergedServer {
       this.flexServer.checkOptionCombinations();
       this.flexServer.summary();
       this.flexServer.ready();
-
-      // Some tests have their timing perturbed by having this earlier
-      // TODO: update those tests.
-      if (this.hasComponent("docs")) {
-        await this.flexServer.checkSandbox();
-      }
     } catch(e) {
       await this.flexServer.close();
       throw e;
diff --git a/app/server/companion.ts b/app/server/companion.ts
index ab454cb5a4e..e4ed8c939d6 100644
--- a/app/server/companion.ts
+++ b/app/server/companion.ts
@@ -9,6 +9,7 @@ import { getDatabaseUrl } from 'app/server/lib/serverUtils';
 import { getTelemetryPrefs } from 'app/server/lib/Telemetry';
 import { Gristifier } from 'app/server/utils/gristify';
 import { pruneActionHistory } from 'app/server/utils/pruneActionHistory';
+import { showAuditLogEvents } from 'app/server/utils/showAuditLogEvents';
 import * as commander from 'commander';
 import { Connection } from 'typeorm';
 
@@ -43,6 +44,7 @@ export function getProgram(): commander.Command {
                               // want to reserve "grist" for electron app?
     .description('a toolbox of handy Grist-related utilities');
 
+  addAuditLogsCommand(program, {nested: true});
   addDbCommand(program, {nested: true});
   addHistoryCommand(program, {nested: true});
   addSettingsCommand(program, {nested: true});
@@ -52,6 +54,18 @@ export function getProgram(): commander.Command {
   return program;
 }
 
+function addAuditLogsCommand(program: commander.Command, options: CommandOptions) {
+  const sub = section(program, {
+    sectionName: 'audit-logs',
+    sectionDescription: 'show information about audit logs',
+    ...options,
+  });
+  sub('events')
+    .description('show audit log events')
+    .addOption(new commander.Option('--type <type>').choices(['installation', 'site']))
+    .action(showAuditLogEvents);
+}
+
 // Add commands related to document history:
 //   history prune <docId> [N]
 export function addHistoryCommand(program: commander.Command, options: CommandOptions) {
diff --git a/app/server/devServerMain.ts b/app/server/devServerMain.ts
index c2b3960be79..57b069023df 100644
--- a/app/server/devServerMain.ts
+++ b/app/server/devServerMain.ts
@@ -97,8 +97,8 @@ export async function main() {
       process.env.APP_HOME_URL = `http://localhost:${port}`;
     }
     const mergedServer = await MergedServer.create(port, ["home", "docs", "static"]);
-    await mergedServer.flexServer.addTestingHooks();
     await mergedServer.run();
+    await mergedServer.flexServer.addTestingHooks();
     return;
   }
 
@@ -149,7 +149,9 @@ export async function main() {
   }
   const workers = new Array<FlexServer>();
   for (const port of ports) {
-    workers.push((await MergedServer.create(port, ["docs"])).flexServer);
+    const mergedServer = await MergedServer.create(port, ["docs"]);
+    workers.push(mergedServer.flexServer);
+    await mergedServer.run();
   }
 
   await homeServer.flexServer.addTestingHooks(workers);
diff --git a/app/server/lib/ActiveDoc.ts b/app/server/lib/ActiveDoc.ts
index 4a1ff82ebdd..ed512b03ffa 100644
--- a/app/server/lib/ActiveDoc.ts
+++ b/app/server/lib/ActiveDoc.ts
@@ -36,6 +36,7 @@ import {
 import {ApiError} from 'app/common/ApiError';
 import {mapGetOrSet, MapWithTTL} from 'app/common/AsyncCreate';
 import {AttachmentColumns, gatherAttachmentIds, getAttachmentColumns} from 'app/common/AttachmentColumns';
+import {AuditEventName} from 'app/common/AuditEvent';
 import {WebhookMessageType} from 'app/common/CommTypes';
 import {
   BulkAddRecord,
@@ -92,6 +93,7 @@ import {ParseFileResult, ParseOptions} from 'app/plugin/FileParserAPI';
 import {AccessTokenOptions, AccessTokenResult, GristDocAPI, UIRowId} from 'app/plugin/GristAPI';
 import {AssistanceSchemaPromptV1Context} from 'app/server/lib/Assistance';
 import {AssistanceContext} from 'app/common/AssistancePrompts';
+import {AuditEventProperties} from 'app/server/lib/AuditLogger';
 import {Authorizer, RequestWithLogin} from 'app/server/lib/Authorizer';
 import {checksumFile} from 'app/server/lib/checksumFile';
 import {Client} from 'app/server/lib/Client';
@@ -107,6 +109,16 @@ import {LogMethods} from "app/server/lib/LogMethods";
 import {ISandboxOptions} from 'app/server/lib/NSandbox';
 import {NullSandbox, UnavailableSandboxMethodError} from 'app/server/lib/NullSandbox';
 import {DocRequests} from 'app/server/lib/Requests';
+import {
+  getAltSessionId,
+  getDocSessionAccess,
+  getDocSessionAccessOrNull,
+  getDocSessionUsage,
+  getFullUser,
+  getLogMeta,
+  getUserId,
+  RequestOrSession,
+} from 'app/server/lib/sessionUtils';
 import {shortDesc} from 'app/server/lib/shortDesc';
 import {TableMetadataLoader} from 'app/server/lib/TableMetadataLoader';
 import {DocTriggers} from "app/server/lib/Triggers";
@@ -127,21 +139,12 @@ import {ActionHistoryImpl} from './ActionHistoryImpl';
 import {ActiveDocImport, FileImportOptions} from './ActiveDocImport';
 import {DocClients} from './DocClients';
 import {DocPluginManager} from './DocPluginManager';
-import {
-  DocSession,
-  getDocSessionAccess,
-  getDocSessionAltSessionId,
-  getDocSessionUsage,
-  getDocSessionUser,
-  getDocSessionUserId,
-  makeExceptionalDocSession,
-  OptDocSession
-} from './DocSession';
+import {DocSession, makeExceptionalDocSession, OptDocSession} from './DocSession';
 import {createAttachmentsIndex, DocStorage, REMOVE_UNUSED_ATTACHMENTS_DELAY} from './DocStorage';
 import {expandQuery, getFormulaErrorForExpandQuery} from './ExpandedQuery';
 import {GranularAccess, GranularAccessForBundle} from './GranularAccess';
 import {OnDemandActions} from './OnDemandActions';
-import {getLogMetaFromDocSession, getPubSubPrefix, getTelemetryMetaFromDocSession} from './serverUtils';
+import {getPubSubPrefix} from './serverUtils';
 import {findOrAddAllEnvelope, Sharing} from './Sharing';
 import cloneDeep = require('lodash/cloneDeep');
 import flatten = require('lodash/flatten');
@@ -455,7 +458,7 @@ export class ActiveDoc extends EventEmitter {
   // Constructs metadata for logging, given a Client or an OptDocSession.
   public getLogMeta(docSession: OptDocSession|null, docMethod?: string): log.ILogMeta {
     return {
-      ...(docSession ? getLogMetaFromDocSession(docSession) : {}),
+      ...getLogMeta(docSession),
       docId: this._docName,
       ...(docMethod ? {docMethod} : {}),
     };
@@ -819,7 +822,7 @@ export class ActiveDoc extends EventEmitter {
    * It returns the list of rowIds for the rows created in the _grist_Attachments table.
    */
   public async addAttachments(docSession: OptDocSession, uploadId: number): Promise<number[]> {
-    const userId = getDocSessionUserId(docSession);
+    const userId = getUserId(docSession);
     const upload: UploadInfo = globalUploadSet.getUploadInfo(uploadId, this.makeAccessId(userId));
     try {
       // We'll assert that the upload won't cause limits to be exceeded, retrying once after
@@ -1212,7 +1215,7 @@ export class ActiveDoc extends EventEmitter {
     const options = sanitizeApplyUAOptions(unsanitizedOptions);
     const actionBundles = await this._actionHistory.getActions(actionNums);
     let fromOwnHistory: boolean = true;
-    const user = getDocSessionUser(docSession);
+    const user = getFullUser(docSession);
     let oldestSource: number = Date.now();
     for (const [index, bundle] of actionBundles.entries()) {
       const actionNum = actionNums[index];
@@ -1403,7 +1406,7 @@ export class ActiveDoc extends EventEmitter {
    */
   public async fork(docSession: OptDocSession): Promise<ForkResult> {
     const dbManager = this._getHomeDbManagerOrFail();
-    const user = getDocSessionUser(docSession);
+    const user = getFullUser(docSession);
     // For now, fork only if user can read everything (or is owner).
     // TODO: allow forks with partial content.
     if (!user || !await this.canDownload(docSession)) {
@@ -1451,17 +1454,7 @@ export class ActiveDoc extends EventEmitter {
       }
 
       await dbManager.forkDoc(userId, doc, forkIds.forkId);
-
-      const isTemplate = doc.type === 'template';
-      this.logTelemetryEvent(docSession, 'documentForked', {
-        limited: {
-          forkIdDigest: forkIds.forkId,
-          forkDocIdDigest: forkIds.docId,
-          trunkIdDigest: doc.trunkId,
-          isTemplate,
-          lastActivity: doc.updatedAt,
-        },
-      });
+      this._logForkDocumentEvents(docSession, {originalDocument: doc, forkIds});
     } finally {
       await permitStore.removePermit(permitKey);
     }
@@ -1471,7 +1464,7 @@ export class ActiveDoc extends EventEmitter {
 
   public async getAccessToken(docSession: OptDocSession, options: AccessTokenOptions): Promise<AccessTokenResult> {
     const tokens = this._docManager.gristServer.getAccessTokens();
-    const userId = getDocSessionUserId(docSession);
+    const userId = getUserId(docSession);
     const docId = this.docName;
     const access = getDocSessionAccess(docSession);
     // If we happen to be using a "readOnly" connection, max out at "readOnly"
@@ -1585,7 +1578,7 @@ export class ActiveDoc extends EventEmitter {
     };
     const isShared = new Set<string>();
 
-    const userId = getDocSessionUserId(docSession);
+    const userId = getUserId(docSession);
     if (!userId) { throw new Error('Cannot determine user'); }
 
     const parsed = parseUrlId(this.docName);
@@ -1865,6 +1858,13 @@ export class ActiveDoc extends EventEmitter {
     });
   }
 
+  public logAuditEvent<Name extends AuditEventName>(
+    requestOrSession: RequestOrSession,
+    properties: AuditEventProperties<Name>
+  ) {
+    this._docManager.gristServer.getAuditLogger().logEvent(requestOrSession, properties);
+  }
+
   public logTelemetryEvent(
     docSession: OptDocSession | null,
     event: TelemetryEvent,
@@ -2747,9 +2747,9 @@ export class ActiveDoc extends EventEmitter {
   }
 
   private _getTelemetryMeta(docSession: OptDocSession|null): TelemetryMetadataByLevel {
-    const altSessionId = docSession ? getDocSessionAltSessionId(docSession) : undefined;
+    const altSessionId = getAltSessionId(docSession);
     return merge(
-      docSession ? getTelemetryMetaFromDocSession(docSession) : {},
+      getTelemetryMeta(docSession),
       altSessionId ? {altSessionId} : {},
       {
         limited: {
@@ -2961,6 +2961,38 @@ export class ActiveDoc extends EventEmitter {
     return  this._pyCall('start_timing');
   }
 
+  private _logForkDocumentEvents(docSession: OptDocSession, options: {
+    originalDocument: Document;
+    forkIds: ForkResult;
+  }) {
+    const {originalDocument, forkIds} = options;
+    this.logAuditEvent(docSession, {
+      event: {
+        name: 'forkDocument',
+        details: {
+          original: {
+            id: originalDocument.id,
+            name: originalDocument.name,
+          },
+          fork: {
+            id: forkIds.forkId,
+            documentId: forkIds.docId,
+            urlId: forkIds.urlId,
+          },
+        },
+        context: {documentId: originalDocument.id},
+      },
+    });
+    this.logTelemetryEvent(docSession, 'documentForked', {
+      limited: {
+        forkIdDigest: forkIds.forkId,
+        forkDocIdDigest: forkIds.docId,
+        trunkIdDigest: originalDocument.trunkId,
+        isTemplate: originalDocument.type === 'template',
+        lastActivity: originalDocument.updatedAt,
+      },
+    });
+  }
 }
 
 // Helper to initialize a sandbox action bundle with no values.
@@ -3048,3 +3080,23 @@ export function createSandbox(options: {
     sandboxOptions,
   });
 }
+
+/**
+ * Extract telemetry metadata from session.
+ */
+function getTelemetryMeta(docSession: OptDocSession|null): TelemetryMetadataByLevel {
+  if (!docSession) { return {}; }
+
+  const access = getDocSessionAccessOrNull(docSession);
+  const user = getFullUser(docSession);
+  const {client} = docSession;
+  return {
+    limited: {
+      access,
+    },
+    full: {
+      ...(user ? {userId: user.id} : {}),
+      ...(client ? client.getFullTelemetryMeta() : {}),   // Client if present will repeat and add to user info.
+    },
+  };
+}
diff --git a/app/server/lib/AppEndpoint.ts b/app/server/lib/AppEndpoint.ts
index 8147bfcf1f8..09a88191558 100644
--- a/app/server/lib/AppEndpoint.ts
+++ b/app/server/lib/AppEndpoint.ts
@@ -153,30 +153,8 @@ export function attachAppEndpoint(options: AttachOptions): void {
       docStatus = workerInfo.docStatus;
       body = await workerInfo.resp.json();
     }
-
-    const isPublic = ((doc as unknown) as APIDocument).public ?? false;
-    const isSnapshot = Boolean(parseUrlId(urlId).snapshotId);
-    const isTemplate = doc.type === 'template';
-    if (isPublic || isTemplate) {
-      gristServer.getTelemetry().logEvent(mreq, 'documentOpened', {
-        limited: {
-          docIdDigest: docId,
-          access: doc.access,
-          isPublic,
-          isSnapshot,
-          isTemplate,
-          lastUpdated: doc.updatedAt,
-        },
-        full: {
-          siteId: doc.workspace.org.id,
-          siteType: doc.workspace.org.billingAccount.product.name,
-          userId: mreq.userId,
-          altSessionId: mreq.altSessionId,
-        },
-      });
-    }
-
-    if (isTemplate) {
+    logOpenDocumentEvents(mreq, {server: gristServer, doc, urlId});
+    if (doc.type === 'template') {
       // Keep track of the last template a user visited in the last hour.
       // If a sign-up occurs within that time period, we'll know which
       // template, if any, was viewed most recently.
@@ -232,3 +210,39 @@ export function attachAppEndpoint(options: AttachOptions): void {
   app.get('/:urlId([^-/]{12,})(/:slug([^/]+):remainder(*))?',
           ...docMiddleware, docHandler);
 }
+
+function logOpenDocumentEvents(req: RequestWithLogin, options: {
+  server: GristServer;
+  doc: Document;
+  urlId: string;
+}) {
+  const {server, doc, urlId} = options;
+  const {forkId, snapshotId} = parseUrlId(urlId);
+  server.getAuditLogger().logEvent(req, {
+    event: {
+      name: 'openDocument',
+      details: {id: doc.id, name: doc.name, urlId, forkId, snapshotId},
+    },
+  });
+
+  const isPublic = ((doc as unknown) as APIDocument).public ?? false;
+  const isTemplate = doc.type === 'template';
+  if (isPublic || isTemplate) {
+    server.getTelemetry().logEvent(req, 'documentOpened', {
+      limited: {
+        docIdDigest: doc.id,
+        access: doc.access,
+        isPublic,
+        isSnapshot: Boolean(snapshotId),
+        isTemplate,
+        lastUpdated: doc.updatedAt,
+      },
+      full: {
+        siteId: doc.workspace.org.id,
+        siteType: doc.workspace.org.billingAccount.product.name,
+        userId: req.userId,
+        altSessionId: req.altSessionId,
+      },
+    });
+  }
+}
diff --git a/app/server/lib/Assistance.ts b/app/server/lib/Assistance.ts
index e57b0e7bbb0..24d73203ae2 100644
--- a/app/server/lib/Assistance.ts
+++ b/app/server/lib/Assistance.ts
@@ -6,16 +6,16 @@ import {
   AssistanceContext,
   AssistanceMessage,
   AssistanceRequest,
-  AssistanceResponse
+  AssistanceResponse,
 } from 'app/common/AssistancePrompts';
 import {delay} from 'app/common/delay';
 import {DocAction} from 'app/common/DocActions';
 import {ActiveDoc} from 'app/server/lib/ActiveDoc';
-import {getDocSessionUser, OptDocSession} from 'app/server/lib/DocSession';
+import {OptDocSession} from 'app/server/lib/DocSession';
 import log from 'app/server/lib/log';
+import {getFullUser, getLogMeta} from 'app/server/lib/sessionUtils';
+import {createHash} from 'crypto';
 import fetch from 'node-fetch';
-import {createHash} from "crypto";
-import {getLogMetaFromDocSession} from "./serverUtils";
 
 // These are mocked/replaced in tests.
 // fetch is also replacing in the runCompletion script to add caching.
@@ -158,8 +158,7 @@ export class OpenAIAssistant implements Assistant {
   private _maxTokens = process.env.ASSISTANT_MAX_TOKENS ?
       parseInt(process.env.ASSISTANT_MAX_TOKENS, 10) : undefined;
 
-  public constructor() {
-    const apiKey = process.env.ASSISTANT_API_KEY || process.env.OPENAI_API_KEY;
+  public constructor(apiKey: string | undefined) {
     const endpoint = process.env.ASSISTANT_CHAT_COMPLETION_ENDPOINT;
     if (!apiKey && !endpoint) {
       throw new Error('Please set either OPENAI_API_KEY or ASSISTANT_CHAT_COMPLETION_ENDPOINT');
@@ -485,11 +484,13 @@ class EchoAssistant implements Assistant {
  * Instantiate an assistant, based on environment variables.
  */
 export function getAssistant() {
-  if (process.env.OPENAI_API_KEY === 'test') {
+  const apiKey = process.env.ASSISTANT_API_KEY || process.env.OPENAI_API_KEY;
+
+  if (apiKey === 'test') {
     return new EchoAssistant();
   }
-  if (process.env.OPENAI_API_KEY || process.env.ASSISTANT_CHAT_COMPLETION_ENDPOINT) {
-    return new OpenAIAssistant();
+  if (apiKey || process.env.ASSISTANT_CHAT_COMPLETION_ENDPOINT) {
+    return new OpenAIAssistant(apiKey);
   }
   throw new Error('Please set OPENAI_API_KEY or ASSISTANT_CHAT_COMPLETION_ENDPOINT');
 }
@@ -559,13 +560,13 @@ async function completionToResponse(
 }
 
 function getUserHash(session: OptDocSession): string {
-  const user = getDocSessionUser(session);
+  const user = getFullUser(session);
   // Make it a bit harder to guess the user ID.
   const salt = "7a8sb6987asdb678asd687sad6boas7f8b6aso7fd";
   const hashSource = `${user?.id} ${user?.ref} ${salt}`;
   const hash = createHash('sha256').update(hashSource).digest('base64');
   // So that if we get feedback about a user ID hash, we can
   // search for the hash in the logs to find the original user ID.
-  log.rawInfo("getUserHash", {...getLogMetaFromDocSession(session), userRef: user?.ref, hash});
+  log.rawInfo("getUserHash", {...getLogMeta(session), userRef: user?.ref, hash});
   return hash;
 }
diff --git a/app/server/lib/AuditLogger.ts b/app/server/lib/AuditLogger.ts
index 38cc7e00d79..732ba2f7cbc 100644
--- a/app/server/lib/AuditLogger.ts
+++ b/app/server/lib/AuditLogger.ts
@@ -1,5 +1,5 @@
-import {AuditEventDetails, AuditEventName} from 'app/common/AuditEvent';
-import {RequestOrSession} from 'app/server/lib/requestUtils';
+import {AuditEvent, AuditEventContext, AuditEventDetails, AuditEventName, AuditEventUser} from 'app/common/AuditEvent';
+import {RequestOrSession} from 'app/server/lib/sessionUtils';
 
 export interface IAuditLogger {
   /**
@@ -7,34 +7,54 @@ export interface IAuditLogger {
    */
   logEvent<Name extends AuditEventName>(
     requestOrSession: RequestOrSession,
-    props: AuditEventProperties<Name>
+    properties: AuditEventProperties<Name>
   ): void;
   /**
-   * Asynchronous variant of `logEvent`.
+   * Logs an audit event.
    *
-   * Throws on failure to log an event.
+   * Throws a `LogAuditEventError` on failure.
    */
   logEventAsync<Name extends AuditEventName>(
     requestOrSession: RequestOrSession,
-    props: AuditEventProperties<Name>
+    properties: AuditEventProperties<Name>
   ): Promise<void>;
 }
 
 export interface AuditEventProperties<Name extends AuditEventName> {
   event: {
     /**
-     * The event name.
+     * The name of the event.
      */
     name: Name;
     /**
-     * Additional event details.
+     * Event-specific details (e.g. properties of affected resources).
      */
     details?: AuditEventDetails[Name];
+    /**
+     * The context that the event occurred in (e.g. workspace, document).
+     */
+    context?: AuditEventContext;
+    /**
+     * The user that triggered the event.
+     */
+    user?: AuditEventUser;
   };
   /**
-   * ISO 8601 timestamp (e.g. `2024-09-04T14:54:50Z`) of when the event occured.
+   * ISO 8601 timestamp (e.g. `2024-09-04T14:54:50Z`) of when the event occurred.
    *
    * Defaults to now.
    */
   timestamp?: string;
 }
+
+export class LogAuditEventError<Name extends AuditEventName> extends Error {
+  public name = 'LogAuditEventError';
+
+  constructor(public auditEvent: AuditEvent<Name>, ...params: any[]) {
+    super(...params);
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, LogAuditEventError);
+    }
+  }
+}
diff --git a/app/server/lib/Authorizer.ts b/app/server/lib/Authorizer.ts
index 0386a6d3041..8d2eefd98be 100644
--- a/app/server/lib/Authorizer.ts
+++ b/app/server/lib/Authorizer.ts
@@ -18,7 +18,7 @@ import {makeId} from 'app/server/lib/idUtils';
 import log from 'app/server/lib/log';
 import {IPermitStore, Permit} from 'app/server/lib/Permit';
 import {AccessTokenInfo} from 'app/server/lib/AccessTokens';
-import {allowHost, getOriginUrl, optStringParam} from 'app/server/lib/requestUtils';
+import {allowHost, buildXForwardedForHeader, getOriginUrl, optStringParam} from 'app/server/lib/requestUtils';
 import * as cookie from 'cookie';
 import {NextFunction, Request, RequestHandler, Response} from 'express';
 import {IncomingMessage} from 'http';
@@ -704,6 +704,7 @@ export function getTransitiveHeaders(
   const PermitHeader = req.get('Permit');
   const Organization = (req as RequestWithOrg).org;
   const XRequestedWith = req.get('X-Requested-With');
+  const UserAgent = req.get('User-Agent');
   const Origin = req.get('Origin');  // Pass along the original Origin since it may
                                      // play a role in granular access control.
 
@@ -713,6 +714,8 @@ export function getTransitiveHeaders(
     ...(Organization ? { Organization } : undefined),
     ...(PermitHeader ? { Permit: PermitHeader } : undefined),
     ...(XRequestedWith ? { 'X-Requested-With': XRequestedWith } : undefined),
+    ...(UserAgent ? { 'User-Agent': UserAgent } : undefined),
+    ...buildXForwardedForHeader(req),
     ...((includeOrigin && Origin) ? { Origin } : undefined),
   };
   const extraHeader = process.env.GRIST_FORWARD_AUTH_HEADER;
diff --git a/app/server/lib/BootProbes.ts b/app/server/lib/BootProbes.ts
index 36c3786c561..df0f202efd0 100644
--- a/app/server/lib/BootProbes.ts
+++ b/app/server/lib/BootProbes.ts
@@ -265,7 +265,7 @@ const _sandboxingProbe: Probe = {
   id: 'sandboxing',
   name: 'Is document sandboxing effective',
   apply: async (server, req) => {
-    const details = server.getSandboxInfo();
+    const details = await server.getSandboxInfo();
     return {
       status: (details?.configured && details?.functional) ? 'success' : 'fault',
       details,
diff --git a/app/server/lib/Client.ts b/app/server/lib/Client.ts
index ce2a9b0bc6f..a16e93a2ee3 100644
--- a/app/server/lib/Client.ts
+++ b/app/server/lib/Client.ts
@@ -1,28 +1,29 @@
 import {ApiError} from 'app/common/ApiError';
 import {BrowserSettings} from 'app/common/BrowserSettings';
-import {delay} from 'app/common/delay';
 import {CommClientConnect, CommMessage, CommResponse, CommResponseError} from 'app/common/CommTypes';
+import {delay} from 'app/common/delay';
+import {normalizeEmail} from 'app/common/emails';
 import {ErrorWithCode} from 'app/common/ErrorWithCode';
 import {FullUser, UserProfile} from 'app/common/LoginSessionAPI';
 import {TelemetryMetadata} from 'app/common/Telemetry';
 import {ANONYMOUS_USER_EMAIL} from 'app/common/UserAPI';
-import {normalizeEmail} from 'app/common/emails';
 import {User} from 'app/gen-server/entity/User';
-import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager';
 import {ActiveDoc} from 'app/server/lib/ActiveDoc';
 import {Authorizer} from 'app/server/lib/Authorizer';
 import {ScopedSession} from 'app/server/lib/BrowserSession';
 import type {Comm} from 'app/server/lib/Comm';
 import {DocSession} from 'app/server/lib/DocSession';
+import {GristServerSocket} from 'app/server/lib/GristServerSocket';
+import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager';
 import log from 'app/server/lib/log';
-import {LogMethods} from "app/server/lib/LogMethods";
+import {LogMethods} from 'app/server/lib/LogMethods';
 import {MemoryPool} from 'app/server/lib/MemoryPool';
-import {shortDesc} from 'app/server/lib/shortDesc';
 import {fromCallback} from 'app/server/lib/serverUtils';
-import {i18n} from 'i18next';
+import {shortDesc} from 'app/server/lib/shortDesc';
 import * as crypto from 'crypto';
+import {IncomingMessage} from 'http';
+import {i18n} from 'i18next';
 import moment from 'moment';
-import {GristServerSocket} from 'app/server/lib/GristServerSocket';
 
 // How many messages and bytes to accumulate for a disconnected client before booting it.
 // The benefit is that a client who temporarily disconnects and reconnects without missing much,
@@ -97,7 +98,8 @@ export class Client {
   private _missedMessagesTotalLength: number = 0;
   private _destroyTimer: NodeJS.Timer|null = null;
   private _destroyed: boolean = false;
-  private _websocket: GristServerSocket|null;
+  private _websocket: GristServerSocket|null = null;
+  private _req: IncomingMessage|null = null;
   private _org: string|null = null;
   private _profile: UserProfile|null = null;
   private _user: FullUser|undefined = undefined;
@@ -130,8 +132,15 @@ export class Client {
     return this._locale;
   }
 
-  public setConnection(websocket: GristServerSocket, counter: string|null, browserSettings: BrowserSettings) {
+  public setConnection(options: {
+    websocket: GristServerSocket;
+    req: IncomingMessage;
+    counter: string|null;
+    browserSettings: BrowserSettings;
+  }) {
+    const {websocket, req, counter, browserSettings} = options;
     this._websocket = websocket;
+    this._req = req;
     this._counter = counter;
     this.browserSettings = browserSettings;
 
@@ -140,6 +149,10 @@ export class Client {
     websocket.onmessage = (msg: string) => this._onMessage(msg);
   }
 
+  public getConnectionRequest(): IncomingMessage|null {
+    return this._req;
+  }
+
   /**
    * Returns DocSession for the given docFD, or throws an exception if this doc is not open.
    */
diff --git a/app/server/lib/Comm.ts b/app/server/lib/Comm.ts
index b414661aaf4..d4174fc1f7e 100644
--- a/app/server/lib/Comm.ts
+++ b/app/server/lib/Comm.ts
@@ -232,7 +232,7 @@ export class Comm extends EventEmitter {
     client.setSession(scopedSession);                 // Add a Session object to the client.
     client.setOrg((req as RequestWithOrg).org || "");
     client.setProfile(profile);
-    client.setConnection(websocket, counter, browserSettings);
+    client.setConnection({websocket, req, counter, browserSettings});
 
     await client.sendConnectMessage(newClient, reuseClient, lastSeqId, {
       serverVersion: this._serverVersion || version.gitcommit,
diff --git a/app/server/lib/DocApi.ts b/app/server/lib/DocApi.ts
index ba2062b0079..be2fce479e9 100644
--- a/app/server/lib/DocApi.ts
+++ b/app/server/lib/DocApi.ts
@@ -26,11 +26,11 @@ import {SchemaTypes} from "app/common/schema";
 import {SortFunc} from 'app/common/SortFunc';
 import {Sort} from 'app/common/SortSpec';
 import {MetaRowRecord} from 'app/common/TableData';
-import {TelemetryMetadataByLevel} from "app/common/Telemetry";
 import {WebhookFields} from "app/common/Triggers";
 import TriggersTI from 'app/common/Triggers-ti';
 import {DocReplacementOptions, DocState, DocStateComparison, DocStates, NEW_DOCUMENT_CODE} from 'app/common/UserAPI';
 import {HomeDBManager, makeDocAuthResult} from 'app/gen-server/lib/homedb/HomeDBManager';
+import {QueryResult} from 'app/gen-server/lib/homedb/Interfaces';
 import * as Types from "app/plugin/DocApiTypes";
 import DocApiTypesTI from "app/plugin/DocApiTypes-ti";
 import {GristObjCode} from "app/plugin/GristData";
@@ -54,8 +54,11 @@ import {
   RequestWithLogin
 } from 'app/server/lib/Authorizer';
 import {DocManager} from "app/server/lib/DocManager";
-import {docSessionFromRequest, getDocSessionShare, makeExceptionalDocSession,
-        OptDocSession} from "app/server/lib/DocSession";
+import {
+  docSessionFromRequest,
+  makeExceptionalDocSession,
+  OptDocSession,
+} from "app/server/lib/DocSession";
 import {DocWorker} from "app/server/lib/DocWorker";
 import {IDocWorkerMap} from "app/server/lib/DocWorkerMap";
 import {DownloadOptions, parseExportParameters} from "app/server/lib/Export";
@@ -85,6 +88,7 @@ import {
 } from 'app/server/lib/requestUtils';
 import {ServerColumnGetters} from 'app/server/lib/ServerColumnGetters';
 import {localeFromRequest} from "app/server/lib/ServerLocale";
+import {getDocSessionShare} from "app/server/lib/sessionUtils";
 import {isUrlAllowed, WebhookAction, WebHookSecret} from "app/server/lib/Triggers";
 import {fetchDoc, globalUploadSet, handleOptionalUpload, handleUpload,
         makeAccessId} from "app/server/lib/uploads";
@@ -902,8 +906,10 @@ export class DocWorkerApi {
     // Clears all outgoing webhooks in the queue for this document.
     this._app.delete('/api/docs/:docId/webhooks/queue', isOwner,
       withDocTriggersLock(async (activeDoc, req, res) => {
+        const docId = getDocId(req);
         await activeDoc.clearWebhookQueue();
         await activeDoc.sendWebhookNotification();
+        this._logClearAllWebhookQueueEvents(req, {docId});
         res.json({success: true});
       })
     );
@@ -929,7 +935,7 @@ export class DocWorkerApi {
         const webhookId = req.params.webhookId;
         const {fields, url, authorization} = await getWebhookSettings(activeDoc, req, webhookId, req.body);
         if (fields.enabled === false) {
-          await activeDoc.triggers.clearSingleWebhookQueue(webhookId);
+          await activeDoc.clearSingleWebhookQueue(webhookId);
         }
 
         const triggerRowId = activeDoc.triggers.getWebhookTriggerRecord(webhookId).id;
@@ -956,9 +962,11 @@ export class DocWorkerApi {
     // Clears a single webhook in the queue for this document.
     this._app.delete('/api/docs/:docId/webhooks/queue/:webhookId', isOwner,
       withDocTriggersLock(async (activeDoc, req, res) => {
+        const docId = getDocId(req);
         const webhookId = req.params.webhookId;
         await activeDoc.clearSingleWebhookQueue(webhookId);
         await activeDoc.sendWebhookNotification();
+        this._logClearWebhookQueueEvents(req, {docId, webhookId});
         res.json({success: true});
       })
     );
@@ -974,8 +982,10 @@ export class DocWorkerApi {
     // reopened on use).
     this._app.post('/api/docs/:docId/force-reload', canEdit, async (req, res) => {
       const mreq = req as RequestWithLogin;
+      const docId = getDocId(req);
       const activeDoc = await this._getActiveDoc(mreq);
       await activeDoc.reloadDoc();
+      this._logReloadDocumentEvents(mreq, {docId});
       res.json(null);
     });
 
@@ -993,14 +1003,16 @@ export class DocWorkerApi {
     // DELETE /api/docs/:docId
     // Delete the specified doc.
     this._app.delete('/api/docs/:docId', canEditMaybeRemoved, throttled(async (req, res) => {
-      await this._removeDoc(req, res, true);
+      const {data} = await this._removeDoc(req, res, true);
+      if (data) { this._logDeleteDocumentEvents(req, data); }
     }));
 
     // POST /api/docs/:docId/remove
     // Soft-delete the specified doc.  If query parameter "permanent" is set,
     // delete permanently.
     this._app.post('/api/docs/:docId/remove', canEditMaybeRemoved, throttled(async (req, res) => {
-      await this._removeDoc(req, res, isParameterOn(req.query.permanent));
+      const {data} = await this._removeDoc(req, res, isParameterOn(req.query.permanent));
+      if (data) { this._logRemoveDocumentEvents(req, data); }
     }));
 
     this._app.get('/api/docs/:docId/snapshots', canView, withDoc(async (activeDoc, req, res) => {
@@ -1094,6 +1106,7 @@ export class DocWorkerApi {
     // This endpoint cannot use withDoc since it is expected behavior for the ActiveDoc it
     // starts with to become muted.
     this._app.post('/api/docs/:docId/replace', canEdit, throttled(async (req, res) => {
+      const docId = getDocId(req);
       const docSession = docSessionFromRequest(req);
       const activeDoc = await this._getActiveDoc(req);
       const options: DocReplacementOptions = {};
@@ -1154,6 +1167,9 @@ export class DocWorkerApi {
         options.snapshotId = String(req.body.snapshotId);
       }
       await activeDoc.replace(docSession, options);
+      const previous = {id: docId};
+      const current = {id: options.sourceDocId || docId, snapshotId: options.snapshotId};
+      this._logReplaceDocumentEvents(req, {previous, current});
       res.json(null);
     }));
 
@@ -1163,9 +1179,12 @@ export class DocWorkerApi {
     }));
 
     this._app.post('/api/docs/:docId/states/remove', isOwner, withDoc(async (activeDoc, req, res) => {
+      const docId = getDocId(req);
       const docSession = docSessionFromRequest(req);
       const keep = integerParam(req.body.keep, 'keep');
-      res.json(await activeDoc.deleteActions(docSession, keep));
+      await activeDoc.deleteActions(docSession, keep);
+      this._logTruncateDocumentHistoryEvents(req, {docId, keep});
+      res.json(null);
     }));
 
     this._app.get('/api/docs/:docId/compare/:docId2', canView, withDoc(async (activeDoc, req, res) => {
@@ -1253,11 +1272,7 @@ export class DocWorkerApi {
           },
         },
       });
-      this._logCreatedFileImportDocTelemetryEvent(req, {
-        full: {
-          docIdDigest: result.id,
-        },
-      });
+      this._logImportDocumentEvents(mreq, result);
       res.json(result);
     }));
 
@@ -1402,11 +1417,7 @@ export class DocWorkerApi {
           },
         });
         docId = result.id;
-        this._logCreatedFileImportDocTelemetryEvent(req, {
-          full: {
-            docIdDigest: docId,
-          },
-        });
+        this._logImportDocumentEvents(mreq, result);
       } else if (workspaceId !== undefined) {
         docId = await this._createNewSavedDoc(req, {
           workspaceId: workspaceId,
@@ -1661,7 +1672,7 @@ export class DocWorkerApi {
     }
 
     // Then, import the copy to the workspace.
-    const result = await this._docManager.importDocToWorkspace(mreq, {
+    const {id, title: name} = await this._docManager.importDocToWorkspace(mreq, {
       userId,
       uploadId: uploadResult.uploadId,
       documentName,
@@ -1677,31 +1688,13 @@ export class DocWorkerApi {
         },
       },
     });
-
-    const sourceDocument = await this._dbManager.getRawDocById(sourceDocumentId);
-    const isTemplateCopy = sourceDocument.type === 'template';
-    if (isTemplateCopy) {
-      this._grist.getTelemetry().logEvent(mreq, 'copiedTemplate', {
-        full: {
-          templateId: parseUrlId(sourceDocument.urlId || sourceDocument.id).trunkId,
-          userId: mreq.userId,
-          altSessionId: mreq.altSessionId,
-        },
-      });
-    }
-    this._grist.getTelemetry().logEvent(
-      mreq,
-      `createdDoc-${isTemplateCopy ? 'CopyTemplate' : 'CopyDoc'}`,
-      {
-        full: {
-          docIdDigest: result.id,
-          userId: mreq.userId,
-          altSessionId: mreq.altSessionId,
-        },
-      }
-    );
-
-    return result.id;
+    this._logDuplicateDocumentEvents(mreq, {
+      originalDocument: {id: sourceDocumentId},
+      duplicateDocument: {id, name},
+      asTemplate,
+    })
+      .catch(e => log.error('DocApi failed to log duplicate document events', e));
+    return id;
   }
 
   private async _createNewSavedDoc(req: Request, options: {
@@ -1712,31 +1705,13 @@ export class DocWorkerApi {
     const {status, data, errMessage} = await this._dbManager.addDocument(getScope(req), workspaceId, {
       name: documentName ?? 'Untitled document',
     });
-    const docId = data!;
     if (status !== 200) {
       throw new ApiError(errMessage || 'unable to create document', status);
     }
-    this._logDocumentCreatedTelemetryEvent(req, {
-      limited: {
-        docIdDigest: docId,
-        sourceDocIdDigest: undefined,
-        isImport: false,
-        fileType: undefined,
-        isSaved: true,
-      },
-    });
-    this._logCreatedEmptyDocTelemetryEvent(req, {
-      full: {
-        docIdDigest: docId,
-      },
-    });
-    this._grist.getAuditLogger().logEvent(req as RequestWithLogin, {
-      event: {
-        name: 'createDocument',
-        details: {id: docId},
-      },
-    });
-    return docId;
+
+    const {id, name, workspace} = data!;
+    this._logCreateDocumentEvents(req, {id, name, workspaceId: workspace.id});
+    return id;
   }
 
   private async _createNewUnsavedDoc(req: Request, options: {
@@ -1752,64 +1727,13 @@ export class DocWorkerApi {
       trunkDocId: NEW_DOCUMENT_CODE,
       trunkUrlId: NEW_DOCUMENT_CODE,
     });
-    const docId = result.docId;
-    await this._docManager.createNamedDoc(
+    const id = result.docId;
+    const name = await this._docManager.createNamedDoc(
       makeExceptionalDocSession('nascent', {req: mreq, browserSettings}),
-      docId
+      id
     );
-    this._logDocumentCreatedTelemetryEvent(req, {
-      limited: {
-        docIdDigest: docId,
-        sourceDocIdDigest: undefined,
-        isImport: false,
-        fileType: undefined,
-        isSaved: false,
-      },
-    });
-    this._logCreatedEmptyDocTelemetryEvent(req, {
-      full: {
-        docIdDigest: docId,
-      },
-    });
-    this._grist.getAuditLogger().logEvent(mreq, {
-      event: {
-        name: 'createDocument',
-        details: {id: docId},
-      },
-    });
-    return docId;
-  }
-
-  private _logDocumentCreatedTelemetryEvent(req: Request, metadata: TelemetryMetadataByLevel) {
-    const mreq = req as RequestWithLogin;
-    this._grist.getTelemetry().logEvent(mreq, 'documentCreated', _.merge({
-      full: {
-        userId: mreq.userId,
-        altSessionId: mreq.altSessionId,
-      },
-    }, metadata));
-  }
-
-  private _logCreatedEmptyDocTelemetryEvent(req: Request, metadata: TelemetryMetadataByLevel) {
-    this._logCreatedDocTelemetryEvent(req, 'createdDoc-Empty', metadata);
-  }
-
-  private _logCreatedFileImportDocTelemetryEvent(req: Request, metadata: TelemetryMetadataByLevel) {
-    this._logCreatedDocTelemetryEvent(req, 'createdDoc-FileImport', metadata);
-  }
-
-  private _logCreatedDocTelemetryEvent(
-    req: Request,
-    event: 'createdDoc-Empty' | 'createdDoc-FileImport',
-    metadata: TelemetryMetadataByLevel,
-  ) {
-    const mreq = req as RequestWithLogin;
-    this._grist.getTelemetry().logEvent(mreq, event, _.merge({
-      full: {
-        userId: mreq.userId,
-        altSessionId: mreq.altSessionId,
-      },
-    }, metadata));
+    this._logCreateDocumentEvents(req as RequestWithLogin, {id, name});
+    return id;
   }
 
   /**
@@ -2091,10 +2015,10 @@ export class DocWorkerApi {
     return result;
   }
 
-  private async _removeDoc(req: Request, res: Response, permanent: boolean) {
-    const mreq = req as RequestWithLogin;
+  private async _removeDoc(req: Request, res: Response, permanent: boolean): Promise<QueryResult<Document>> {
     const scope = getDocScope(req);
     const docId = getDocId(req);
+    let result: QueryResult<Document>;
     if (permanent) {
       const {forkId} = parseUrlId(docId);
       if (!forkId) {
@@ -2110,26 +2034,25 @@ export class DocWorkerApi {
       ];
       await Promise.all(docsToDelete.map(docName => this._docManager.deleteDoc(null, docName, true)));
       // Permanently delete from database.
-      const query = await this._dbManager.deleteDocument(scope);
-      this._dbManager.checkQueryResult(query);
-      this._grist.getTelemetry().logEvent(mreq, 'deletedDoc', {
-        full: {
-          docIdDigest: docId,
-          userId: mreq.userId,
-          altSessionId: mreq.altSessionId,
-        },
-      });
-      await sendReply(req, res, query);
+      result = await this._dbManager.deleteDocument(scope);
+      this._dbManager.checkQueryResult(result);
+      await sendReply(req, res, {...result, data: result.data!.id});
     } else {
-      await this._dbManager.softDeleteDocument(scope);
+      result = await this._dbManager.softDeleteDocument(scope);
       await sendOkReply(req, res);
     }
     await this._dbManager.flushSingleDocAuthCache(scope, docId);
     await this._docManager.interruptDocClients(docId);
+    return result;
   }
 
-  private async _runSql(activeDoc: ActiveDoc, req: RequestWithLogin, res: Response,
-      options: Types.SqlPost) {
+  private async _runSql(
+    activeDoc: ActiveDoc,
+    req: RequestWithLogin,
+    res: Response,
+    options: Types.SqlPost
+  ) {
+    const docId = getDocId(req);
     if (!await activeDoc.canCopyEverything(docSessionFromRequest(req))) {
       throw new ApiError('insufficient document access', 403);
     }
@@ -2170,6 +2093,7 @@ export class DocWorkerApi {
     try {
       const records = await activeDoc.docStorage.all(wrappedStatement,
                                                      ...(options.args || []));
+      this._logRunSQLQueryEvents(req, {docId, ...options});
       res.status(200).json({
         statement,
         records: records.map(
@@ -2194,6 +2118,215 @@ export class DocWorkerApi {
       clearTimeout(interrupt);
     }
   }
+
+  private _logCreateDocumentEvents(
+    req: Request,
+    document: {id: string; name?: string; workspaceId?: number}
+  ) {
+    const mreq = req as RequestWithLogin;
+    const {id, name, workspaceId} = document;
+    this._grist.getAuditLogger().logEvent(mreq, {
+      event: {
+        name: 'createDocument',
+        details: {id, name},
+        context: {workspaceId},
+      },
+    });
+    this._grist.getTelemetry().logEvent(mreq, 'documentCreated', {
+      limited: {
+        docIdDigest: id,
+        sourceDocIdDigest: undefined,
+        isImport: false,
+        fileType: undefined,
+        isSaved: workspaceId !== undefined,
+      },
+      full: {
+        userId: mreq.userId,
+        altSessionId: mreq.altSessionId,
+      },
+    });
+    this._grist.getTelemetry().logEvent(mreq, 'createdDoc-Empty', {
+      full: {
+        docIdDigest: id,
+        userId: mreq.userId,
+        altSessionId: mreq.altSessionId,
+      },
+    });
+  }
+
+  private _logRemoveDocumentEvents(req: RequestWithLogin, document: Document) {
+    const {id, name, workspace: {id: workspaceId}} = document;
+    this._grist.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'removeDocument',
+        details: {id, name},
+        context: {workspaceId},
+      },
+    });
+  }
+
+  private _logDeleteDocumentEvents(req: RequestWithLogin, {id, name}: Document) {
+    this._grist.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'deleteDocument',
+        details: {id, name},
+      },
+    });
+    this._grist.getTelemetry().logEvent(req, 'deletedDoc', {
+      full: {
+        docIdDigest: id,
+        userId: req.userId,
+        altSessionId: req.altSessionId,
+      },
+    });
+  }
+
+  private _logImportDocumentEvents(
+    req: RequestWithLogin,
+    {id}: {id: string}
+  ) {
+    this._grist.getTelemetry().logEvent(req, 'createdDoc-FileImport', {
+      full: {
+        docIdDigest: id,
+        userId: req.userId,
+        altSessionId: req.altSessionId,
+      },
+    });
+  }
+
+  private _logReplaceDocumentEvents(req: RequestWithLogin, options: {
+    previous: {id: string};
+    current: {id: string; snapshotId?: string};
+  }) {
+    const {previous, current} = options;
+    this._grist.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'replaceDocument',
+        details: {
+          previous: {
+            id: previous.id,
+          },
+          current: {
+            id: current.id,
+            snapshotId: current.snapshotId,
+          },
+        },
+        context: {documentId: previous.id},
+      },
+    });
+  }
+
+  private async _logDuplicateDocumentEvents(req: RequestWithLogin, options: {
+    originalDocument: {id: string};
+    duplicateDocument: {id: string; name: string};
+    asTemplate: boolean;
+  }) {
+    const {originalDocument: {id}, duplicateDocument, asTemplate} = options;
+    const originalDocument = await this._dbManager.getRawDocById(id);
+    this._grist.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'duplicateDocument',
+        details: {
+          original: {
+            id: originalDocument.id,
+            name: originalDocument.name,
+            workspace: {
+              id: originalDocument.workspace.id,
+              name: originalDocument.workspace.name,
+            },
+          },
+          duplicate: {
+            id: duplicateDocument.id,
+            name: duplicateDocument.name,
+          },
+          asTemplate,
+        },
+        context: {
+          workspaceId: originalDocument.workspace.id,
+          documentId: originalDocument.id,
+        },
+      },
+    });
+    const isTemplateCopy = originalDocument.type === 'template';
+    if (isTemplateCopy) {
+      this._grist.getTelemetry().logEvent(req, 'copiedTemplate', {
+        full: {
+          templateId: parseUrlId(originalDocument.urlId || originalDocument.id).trunkId,
+          userId: req.userId,
+          altSessionId: req.altSessionId,
+        },
+      });
+    }
+    this._grist.getTelemetry().logEvent(
+      req,
+      `createdDoc-${isTemplateCopy ? 'CopyTemplate' : 'CopyDoc'}`,
+      {
+        full: {
+          docIdDigest: duplicateDocument.id,
+          userId: req.userId,
+          altSessionId: req.altSessionId,
+        },
+      }
+    );
+  }
+
+  private _logReloadDocumentEvents(req: RequestWithLogin, {docId: documentId}: {docId: string}) {
+    this._grist.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'reloadDocument',
+        context: {documentId},
+      },
+    });
+  }
+
+  private _logTruncateDocumentHistoryEvents(
+    req: RequestWithLogin,
+    {docId: documentId, keep}: {docId: string; keep: number}
+  ) {
+    this._grist.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'truncateDocumentHistory',
+        details: {keep},
+        context: {documentId},
+      },
+    });
+  }
+
+  private _logClearWebhookQueueEvents(
+    req: RequestWithLogin,
+    {docId: documentId, webhookId: id}: {docId: string; webhookId: string}
+  ) {
+    this._grist.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'clearWebhookQueue',
+        details: {id},
+        context: {documentId},
+      },
+    });
+  }
+
+  private _logClearAllWebhookQueueEvents(
+    req: RequestWithLogin,
+    {docId: documentId}: {docId: string}
+  ) {
+    this._grist.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'clearAllWebhookQueues',
+        context: {documentId},
+      },
+    });
+  }
+
+  private _logRunSQLQueryEvents(req: RequestWithLogin, options: {docId: string} & Types.SqlPost) {
+    const {docId: documentId, sql: query, args, timeout: timeoutMs} = options;
+    this._grist.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'runSQLQuery',
+        details: {query, arguments: args, timeoutMs},
+        context: {documentId},
+      },
+    });
+  }
 }
 
 export function addDocApiRoutes(
diff --git a/app/server/lib/DocManager.ts b/app/server/lib/DocManager.ts
index 460469043b2..6a9f7c6e3c8 100644
--- a/app/server/lib/DocManager.ts
+++ b/app/server/lib/DocManager.ts
@@ -19,17 +19,13 @@ import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager';
 import {assertAccess, Authorizer, DocAuthorizer, DummyAuthorizer, isSingleUserMode,
         RequestWithLogin} from 'app/server/lib/Authorizer';
 import {Client} from 'app/server/lib/Client';
-import {
-  getDocSessionCachedDoc,
-  makeExceptionalDocSession,
-  makeOptDocSession,
-  OptDocSession
-} from 'app/server/lib/DocSession';
+import {makeExceptionalDocSession, makeOptDocSession, OptDocSession} from 'app/server/lib/DocSession';
 import * as docUtils from 'app/server/lib/docUtils';
 import {GristServer} from 'app/server/lib/GristServer';
 import {IDocStorageManager} from 'app/server/lib/IDocStorageManager';
 import {makeForkIds, makeId} from 'app/server/lib/idUtils';
 import {checkAllegedGristDoc} from 'app/server/lib/serverUtils';
+import {getDocSessionCachedDoc} from 'app/server/lib/sessionUtils';
 import log from 'app/server/lib/log';
 import {ActiveDoc} from './ActiveDoc';
 import {PluginManager} from './PluginManager';
@@ -246,7 +242,6 @@ export class DocManager extends EventEmitter {
       register,
       userId,
     });
-
     this.gristServer.getTelemetry().logEvent(mreq, 'documentCreated', merge({
       limited: {
         docIdDigest: docCreationInfo.id,
@@ -254,13 +249,6 @@ export class DocManager extends EventEmitter {
         isSaved: workspaceId !== undefined,
       },
     }, telemetryMetadata));
-    this.gristServer.getAuditLogger().logEvent(mreq, {
-      event: {
-        name: 'createDocument',
-        details: {id: docCreationInfo.id},
-      },
-    });
-
     return docCreationInfo;
     // The imported document is associated with the worker that did the import.
     // We could break that association (see /api/docs/:docId/assign for how) if
diff --git a/app/server/lib/DocSession.ts b/app/server/lib/DocSession.ts
index 2036a01d74c..2efa465d0cf 100644
--- a/app/server/lib/DocSession.ts
+++ b/app/server/lib/DocSession.ts
@@ -1,10 +1,6 @@
 import {BrowserSettings} from 'app/common/BrowserSettings';
-import {DocumentUsage} from 'app/common/DocUsage';
-import {Role} from 'app/common/roles';
-import {FullUser} from 'app/common/UserAPI';
-import {Document} from 'app/gen-server/entity/Document';
 import {ActiveDoc} from 'app/server/lib/ActiveDoc';
-import {Authorizer, getUser, getUserId, RequestWithLogin} from 'app/server/lib/Authorizer';
+import {Authorizer, RequestWithLogin} from 'app/server/lib/Authorizer';
 import {Client} from 'app/server/lib/Client';
 
 /**
@@ -82,125 +78,3 @@ export class DocSession implements OptDocSession {
   // Browser settings (like timezone) obtained from the Client.
   public get browserSettings(): BrowserSettings { return this.client.browserSettings; }
 }
-
-/**
- * Extract userId from OptDocSession.  Use Authorizer if available (for web socket
- * sessions), or get it from the Request if that is available (for rest api calls),
- * or from the Client if that is available.  Returns null if userId information is
- * not available or not cached.
- */
-export function getDocSessionUserId(docSession: OptDocSession): number|null {
-  if (docSession.authorizer) {
-    return docSession.authorizer.getUserId();
-  }
-  if (docSession.req) {
-    return getUserId(docSession.req);
-  }
-  if (docSession.client) {
-    return docSession.client.getCachedUserId();
-  }
-  return null;
-}
-
-export function getDocSessionAltSessionId(docSession: OptDocSession): string|null {
-  if (docSession.req) {
-    return docSession.req.altSessionId || null;
-  }
-  if (docSession.client) {
-    return docSession.client.getAltSessionId() || null;
-  }
-  return null;
-}
-
-/**
- * Get as much of user profile as we can (id, name, email).
- */
-export function getDocSessionUser(docSession: OptDocSession): FullUser|null {
-  if (docSession.authorizer) {
-    return docSession.authorizer.getUser();
-  }
-  if (docSession.req) {
-    const user = getUser(docSession.req);
-    const email = user.loginEmail;
-    if (email) {
-      return {id: user.id, name: user.name, email, ref: user.ref, locale: user.options?.locale};
-    }
-  }
-  if (docSession.client) {
-    const id = docSession.client.getCachedUserId();
-    const ref = docSession.client.getCachedUserRef();
-    const profile = docSession.client.getProfile();
-    if (id && profile) {
-      return {
-        id,
-        ref,
-        ...profile
-      };
-    }
-  }
-  return null;
-}
-
-/**
- * Extract user's role from OptDocSession.  Method depends on whether using web
- * sockets or rest api.  Assumes that access has already been checked by wrappers
- * for api methods and that cached access information is therefore available.
- */
-export function getDocSessionAccess(docSession: OptDocSession): Role {
-  // "nascent" DocSessions are for when a document is being created, and user is
-  // its only owner as yet.
-  // "system" DocSessions are for access without access control.
-  if (docSession.mode === 'nascent' || docSession.mode === 'system') { return 'owners'; }
-  // "plugin" DocSessions are for access from plugins, which is currently quite crude,
-  // and granted only to editors.
-  if (docSession.mode === 'plugin') { return 'editors'; }
-  if (docSession.authorizer) {
-    const access = docSession.authorizer.getCachedAuth().access;
-    if (!access) { throw new Error('getDocSessionAccess expected authorizer.getCachedAuth'); }
-    return access;
-  }
-  if (docSession.req) {
-    const access =  docSession.req.docAuth?.access;
-    if (!access) { throw new Error('getDocSessionAccess expected req.docAuth.access'); }
-    return access;
-  }
-  throw new Error('getDocSessionAccess could not find access information in DocSession');
-}
-
-export function getDocSessionShare(docSession: OptDocSession): string|null {
-  return _getCachedDoc(docSession)?.linkId || null;
-}
-
-/**
- * Get document usage seen in db when we were last checking document
- * access. Not necessarily a live value when using a websocket
- * (although we do recheck access periodically).
- */
-export function getDocSessionUsage(docSession: OptDocSession): DocumentUsage|null {
-  return _getCachedDoc(docSession)?.usage || null;
-}
-
-export function _getCachedDoc(docSession: OptDocSession): Document|null {
-  if (docSession.authorizer) {
-    return docSession.authorizer.getCachedAuth().cachedDoc || null;
-  }
-  if (docSession.req) {
-    return docSession.req.docAuth?.cachedDoc || null;
-  }
-  return null;
-}
-
-export function getDocSessionAccessOrNull(docSession: OptDocSession): Role|null {
-  try {
-    return getDocSessionAccess(docSession);
-  } catch (err) {
-    return null;
-  }
-}
-
-/**
- * Get cached information about the document, if available.  May be stale.
- */
-export function getDocSessionCachedDoc(docSession: OptDocSession): Document|undefined {
-  return (docSession.req as RequestWithLogin)?.docAuth?.cachedDoc;
-}
diff --git a/app/server/lib/FlexServer.ts b/app/server/lib/FlexServer.ts
index b295ca963b0..45297904bba 100644
--- a/app/server/lib/FlexServer.ts
+++ b/app/server/lib/FlexServer.ts
@@ -42,6 +42,7 @@ import {DocWorkerInfo, IDocWorkerMap} from 'app/server/lib/DocWorkerMap';
 import {expressWrap, jsonErrorHandler, secureJsonErrorHandler} from 'app/server/lib/expressWrap';
 import {Hosts, RequestWithOrg} from 'app/server/lib/extractOrg';
 import {addGoogleAuthEndpoint} from "app/server/lib/GoogleAuth";
+import {GristBullMQJobs, GristJobs} from 'app/server/lib/GristJobs';
 import {DocTemplate, GristLoginMiddleware, GristLoginSystem, GristServer,
   RequestWithGrist} from 'app/server/lib/GristServer';
 import {initGristSessions, SessionStore} from 'app/server/lib/gristSessions';
@@ -186,6 +187,7 @@ export class FlexServer implements GristServer {
   private _isReady: boolean = false;
   private _updateManager: UpdateManager;
   private _sandboxInfo: SandboxInfo;
+  private _jobs?: GristJobs;
 
   constructor(public port: number, public name: string = 'flexServer',
               public readonly options: FlexServerOptions = {}) {
@@ -339,6 +341,14 @@ export class FlexServer implements GristServer {
     return this.server ? (this.server.address() as AddressInfo).port : this.port;
   }
 
+  /**
+   * Get interface to job queues.
+   */
+  public getJobs(): GristJobs {
+    const jobs = this._jobs || new GristBullMQJobs();
+    return jobs;
+  }
+
   /**
    * Get a url to an org that should be accessible by all signed-in users. For now, this
    * returns the base URL of the personal org (typically docs[-s]).
@@ -915,9 +925,9 @@ export class FlexServer implements GristServer {
   }
 
   public addAuditLogger() {
-    if (this._check('audit-logger')) { return; }
+    if (this._check('audit-logger', 'homedb')) { return; }
 
-    this._auditLogger = this.create.AuditLogger();
+    this._auditLogger = this.create.AuditLogger(this._dbManager);
   }
 
   public async addTelemetry() {
@@ -943,6 +953,7 @@ export class FlexServer implements GristServer {
     if (this.server)      { this.server.close(); }
     if (this.httpsServer) { this.httpsServer.close(); }
     if (this.housekeeper) { await this.housekeeper.stop(); }
+    if (this._jobs)       { await this._jobs.stop(); }
     await this._shutdown();
     if (this._accessTokens) { await this._accessTokens.close(); }
     // Do this after _shutdown, since DocWorkerMap is used during shutdown.
@@ -1295,6 +1306,7 @@ export class FlexServer implements GristServer {
   }
 
   public async addTestingHooks(workerServers?: FlexServer[]) {
+    this._check('testinghooks', 'comm');
     if (process.env.GRIST_TESTING_SOCKET) {
       await startTestingHooks(process.env.GRIST_TESTING_SOCKET, this.port, this._comm, this,
                               workerServers || []);
@@ -1385,8 +1397,9 @@ export class FlexServer implements GristServer {
     }
   }
 
-  public async checkSandbox() {
-    if (this._check('sandbox', 'doc')) { return; }
+  public async getSandboxInfo(): Promise<SandboxInfo> {
+    if (this._sandboxInfo) { return this._sandboxInfo; }
+
     const flavor = process.env.GRIST_SANDBOX_FLAVOR || 'unknown';
     const info = this._sandboxInfo = {
       flavor,
@@ -1396,6 +1409,8 @@ export class FlexServer implements GristServer {
       sandboxed: false,
       lastSuccessfulStep: 'none',
     } as SandboxInfo;
+    // Only meaningful on instances that handle documents.
+    if (!this._docManager) { return info; }
     try {
       const sandbox = createSandbox({
         server: this,
@@ -1420,10 +1435,7 @@ export class FlexServer implements GristServer {
     } catch (e) {
       info.error = String(e);
     }
-  }
-
-  public getSandboxInfo(): SandboxInfo|undefined {
-    return this._sandboxInfo;
+    return info;
   }
 
   public getInfo(key: string): any {
@@ -1480,7 +1492,7 @@ export class FlexServer implements GristServer {
         // to other (not public) team sites.
         const doom = await createDoom();
         await doom.deleteUser(userId);
-        this.getTelemetry().logEvent(req as RequestWithLogin, 'deletedAccount');
+        this._logDeleteUserEvents(req as RequestWithLogin);
         return resp.status(200).json(true);
       }));
 
@@ -1511,16 +1523,10 @@ export class FlexServer implements GristServer {
         }
 
         // Reuse Doom cli tool for org deletion. Note, this removes everything as a super user.
+        const deletedOrg = structuredClone(org);
         const doom = await createDoom();
         await doom.deleteOrg(org.id);
-
-        this.getTelemetry().logEvent(req as RequestWithLogin, 'deletedSite', {
-          full: {
-            siteId: org.id,
-            userId: mreq.userId,
-          },
-        });
-
+        this._logDeleteSiteEvents(mreq, deletedOrg);
         return resp.status(200).send();
       }));
     }
@@ -2536,6 +2542,30 @@ export class FlexServer implements GristServer {
 
     return isGristLogHttpEnabled || deprecatedOptionEnablesLog;
   }
+
+  private _logDeleteUserEvents(req: RequestWithLogin) {
+    this.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'deleteUser',
+      },
+    });
+    this.getTelemetry().logEvent(req, 'deletedAccount');
+  }
+
+  private _logDeleteSiteEvents(req: RequestWithLogin, {id, name}: Organization) {
+    this.getAuditLogger().logEvent(req, {
+      event: {
+        name: 'deleteSite',
+        details: {id, name},
+      }
+    });
+    this.getTelemetry().logEvent(req, 'deletedSite', {
+      full: {
+        siteId: id,
+        userId: req.userId,
+      },
+    });
+  }
 }
 
 /**
diff --git a/app/server/lib/GoogleExport.ts b/app/server/lib/GoogleExport.ts
index c4e228bc459..caccce6cdfb 100644
--- a/app/server/lib/GoogleExport.ts
+++ b/app/server/lib/GoogleExport.ts
@@ -3,7 +3,7 @@ import {ActiveDoc} from 'app/server/lib/ActiveDoc';
 import {RequestWithLogin} from 'app/server/lib/Authorizer';
 import {streamXLSX} from 'app/server/lib/ExportXLSX';
 import log from 'app/server/lib/log';
-import {optStringParam} from 'app/server/lib/requestUtils';
+import {getDocId, optStringParam} from 'app/server/lib/requestUtils';
 import {Request, Response} from 'express';
 import {PassThrough, Stream} from 'stream';
 
@@ -22,6 +22,7 @@ export async function exportToDrive(
     throw new Error("No access token - Can't send file to Google Drive");
   }
 
+  const docId = getDocId(req);
   const mreq = req as RequestWithLogin;
   const meta = {
     docId: activeDoc.docName,
@@ -39,6 +40,13 @@ export async function exportToDrive(
       streamXLSX(activeDoc, req, stream, {tableId: ''}),
       sendFileToDrive(name, stream, access_token),
     ]);
+    activeDoc.logAuditEvent(mreq, {
+      event: {
+        name: 'sendToGoogleDrive',
+        details: {id: docId},
+        context: {documentId: docId},
+      },
+    });
     log.debug(`Export to drive - File exported, redirecting to Google Spreadsheet ${url}`, meta);
     res.json({ url });
   } catch (err) {
diff --git a/app/server/lib/GranularAccess.ts b/app/server/lib/GranularAccess.ts
index 95af9aac50a..315fcd47b04 100644
--- a/app/server/lib/GranularAccess.ts
+++ b/app/server/lib/GranularAccess.ts
@@ -38,8 +38,7 @@ import { FullUser, UserAccessData } from 'app/common/UserAPI';
 import { HomeDBManager } from 'app/gen-server/lib/homedb/HomeDBManager';
 import { GristObjCode } from 'app/plugin/GristData';
 import { DocClients } from 'app/server/lib/DocClients';
-import { getDocSessionAccess, getDocSessionAltSessionId, getDocSessionShare,
-         getDocSessionUser, OptDocSession } from 'app/server/lib/DocSession';
+import { OptDocSession } from 'app/server/lib/DocSession';
 import { DocStorage, REMOVE_UNUSED_ATTACHMENTS_DELAY } from 'app/server/lib/DocStorage';
 import log from 'app/server/lib/log';
 import { IPermissionInfo, MixedPermissionSetWithContext,
@@ -47,6 +46,12 @@ import { IPermissionInfo, MixedPermissionSetWithContext,
 import { TablePermissionSetWithContext } from 'app/server/lib/PermissionInfo';
 import { integerParam } from 'app/server/lib/requestUtils';
 import { getRelatedRows, getRowIdsFromDocAction } from 'app/server/lib/RowAccess';
+import {
+  getAltSessionId,
+  getDocSessionAccess,
+  getDocSessionShare,
+  getFullUser,
+} from 'app/server/lib/sessionUtils';
 import cloneDeep = require('lodash/cloneDeep');
 import fromPairs = require('lodash/fromPairs');
 import get = require('lodash/get');
@@ -379,7 +384,7 @@ export class GranularAccess implements GranularAccessForBundle {
         fullUser = attrs.override.user;
       }
     } else {
-      fullUser = getDocSessionUser(docSession);
+      fullUser = getFullUser(docSession);
     }
     const user = new User();
     user.Access = access;
@@ -395,7 +400,7 @@ export class GranularAccess implements GranularAccessForBundle {
     // Include origin info if accessed via the rest api.
     // TODO: could also get this for websocket access, just via a different route.
     user.Origin = docSession.req?.get('origin') || null;
-    user.SessionID = isAnonymous ? `a${getDocSessionAltSessionId(docSession)}` : `u${user.UserID}`;
+    user.SessionID = isAnonymous ? `a${getAltSessionId(docSession)}` : `u${user.UserID}`;
     user.IsLoggedIn = !isAnonymous;
     user.UserRef = fullUser?.ref || null; // Empty string should be treated as null.
 
diff --git a/app/server/lib/GristJobs.ts b/app/server/lib/GristJobs.ts
new file mode 100644
index 00000000000..d1a87581ead
--- /dev/null
+++ b/app/server/lib/GristJobs.ts
@@ -0,0 +1,339 @@
+import { makeId } from 'app/server/lib/idUtils';
+import log from 'app/server/lib/log';
+import { Queue, Worker } from 'bullmq';
+import IORedis from 'ioredis';
+
+/**
+ *
+ * Support for queues.
+ *
+ * We use BullMQ for queuing, since it seems currently the best the
+ * node ecosystem has to offer. BullMQ relies on Redis. Since queuing
+ * is so handy, but we'd like most of Grist to be usable without Redis,
+ * we make some effort to support queuing without BullMQ. This
+ * may not be sustainable, we'll see.
+ *
+ * Important: if you put a job in a queue, it can outlast your process.
+ * That has implications for testing and deployment, so be careful.
+ *
+ * Long running jobs may be a challenge. BullMQ cancelation
+ * relies on non-open source features:
+ *  https://docs.bullmq.io/bullmq-pro/observables/cancelation
+ *
+ */
+export interface GristJobs {
+  /**
+   * All workers and jobs are scoped to individual named queues,
+   * with the real interfaces operating at that level.
+   */
+  queue(queueName?: string): GristQueueScope;
+
+  /**
+   * Shut everything down that we're responsible for.
+   * Set obliterate flag to destroy jobs even if they are
+   * stored externally (useful for testing).
+   */
+  stop(options?: {
+    obliterate?: boolean,
+  }): Promise<void>;
+}
+
+/**
+ * For a given queue, we can add jobs, or methods to process jobs,
+ */
+export interface GristQueueScope {
+  /**
+   * Add a job.
+   */
+  add(name: string, data: any, options?: JobAddOptions): Promise<void>;
+
+
+  /**
+   * Add a job handler for all jobs regardless of name.
+   * Handlers given by handleName take priority, but no
+   * job handling will happen until handleDefault has been
+   * called.
+   */
+  handleDefault(defaultCallback: JobHandler): void;
+
+  /**
+   * Add a job handler for jobs with a specific name.
+   * Handler will only be effective once handleAll is called
+   * to specify what happens to jobs not matching expected
+   * names.
+   */
+  handleName(name: string,
+             callback: (job: GristJob) => Promise<any>): void;
+
+  /**
+   * Shut everything down that we're responsible for.
+   * Set obliterate flag to destroy jobs even if they are
+   * stored externally (useful for testing).
+   */
+  stop(options?: {
+    obliterate?: boolean,
+  }): Promise<void>;
+}
+
+/**
+ * The type of a function for handling jobs on a queue.
+ */
+export type JobHandler = (job: GristJob) => Promise<any>;
+
+/**
+ * The name used for a queue if no specific name is given.
+ */
+export const DEFAULT_QUEUE_NAME = 'default';
+
+/**
+ * BullMQ jobs are a string name, and then a data object.
+ */
+interface GristJob {
+  name: string;
+  data: any;
+}
+
+/**
+ * Options when adding a job. BullMQ has many more.
+ */
+interface JobAddOptions {
+  delay?: number;
+  jobId?: string;
+  repeat?: {
+    every: number;
+  }
+}
+
+/**
+ * Implementation for job functionality across the application.
+ * Will use BullMQ, with an in-memory fallback if Redis is
+ * unavailable.
+ */
+export class GristBullMQJobs implements GristJobs {
+  private _connection?: IORedis;
+  private _checkedForConnection: boolean = false;
+  private _queues = new Map<string, GristQueueScope>();
+
+  /**
+   * Get BullMQ-compatible options for the queue.
+   */
+  public getQueueOptions() {
+    // Following BullMQ, queue options contain the connection
+    // to redis, if any.
+    if (!this._checkedForConnection) {
+      this._connect();
+      this._checkedForConnection = true;
+    }
+    if (!this._connection) {
+      return {};
+    }
+    return {
+      connection: this._connection,
+      maxRetriesPerRequest: null,
+    };
+  }
+
+  /**
+   * Get an interface scoped to a particular queue by name.
+   */
+  public queue(queueName: string = DEFAULT_QUEUE_NAME): GristQueueScope {
+    if (!this._queues.get(queueName)) {
+      this._queues.set(
+        queueName,
+        new GristBullMQQueueScope(queueName, this),
+      );
+    }
+    return this._queues.get(queueName)!;
+  }
+
+  public async stop(options: {
+    obliterate?: boolean,
+  } = {}) {
+    for (const q of this._queues.values()) {
+      await q.stop(options);
+    }
+    this._queues.clear();
+    this._connection?.disconnect();
+  }
+
+  /**
+   * Connect to Redis if available.
+   */
+  private _connect() {
+    // Connect to Redis for use with BullMQ, if REDIS_URL is set.
+    const urlTxt = process.env.REDIS_URL || process.env.TEST_REDIS_URL;
+    if (!urlTxt) {
+      this._connection = undefined;
+      log.warn('Using in-memory queues, Redis is unavailable');
+      return;
+    }
+    const url = new URL(urlTxt);
+    const conn = new IORedis({
+      host: url.hostname,
+      port: url.port ? parseInt(url.port, 10) : undefined,
+      db: (url.pathname.charAt(0) === '/') ?
+          parseInt(url.pathname.substring(1), 10) : undefined,
+      maxRetriesPerRequest: null,
+    });
+    this._connection = conn;
+    log.info('Storing queues externally in Redis');
+  }
+}
+
+/**
+ * Work with a particular named queue.
+ */
+export class GristBullMQQueueScope implements GristQueueScope {
+  private _queue: Queue|GristWorker|undefined;
+  private _worker: Worker|GristWorker|undefined;
+  private _namedProcessors: Record<string, JobHandler> = {};
+
+  public constructor(public readonly queueName: string,
+                     private _owner: GristBullMQJobs) {}
+
+  public handleDefault(defaultCallback: JobHandler) {
+    // The default callback passes any recognized named jobs to
+    // processors added with handleName(), then, if there is no
+    // specific processor, calls the defaultCallback.
+    const callback = async (job: GristJob) => {
+      const processor = this._namedProcessors[job.name] || defaultCallback;
+      return processor(job);
+    };
+    const options = this._owner.getQueueOptions();
+    if (!options.connection) {
+      // If Redis isn't available, we go our own way, not
+      // using BullMQ.
+      const worker = new GristWorker(this.queueName, callback);
+      this._worker = worker;
+      return worker;
+    }
+    const worker = new Worker(this.queueName, callback, options);
+    this._worker = worker;
+    return worker;
+  }
+
+  public handleName(name: string,
+                    callback: (job: GristJob) => Promise<any>) {
+    this._namedProcessors[name] = callback;
+  }
+
+  public async stop(options: {
+    obliterate?: boolean,
+  } = {}) {
+    await this._worker?.close();
+    if (options.obliterate) {
+      await this._queue?.obliterate({force: true});
+    }
+  }
+
+  public async add(name: string, data: any, options?: JobAddOptions) {
+    await this._getQueue().add(name, data, {
+      ...options,
+      // These settings are quite arbitrary, and should be
+      // revised when it matters, or made controllable.
+      removeOnComplete: {
+        age: 3600, // keep up to 1 hour
+        count: 1000, // keep up to 1000 jobs
+      },
+      removeOnFail: {
+        age: 24 * 3600, // keep up to 24 hours
+      },
+    });
+  }
+
+  private _getQueue(): Queue|GristWorker {
+    if (this._queue) { return this._queue; }
+    const queue = this._pickQueueImplementation();
+    this._queue = queue;
+    return queue;
+  }
+
+  private _pickQueueImplementation() {
+    const name = this.queueName;
+    const queueOptions = this._owner.getQueueOptions();
+    // If we have Redis, get a proper BullMQ interface.
+    // Otherwise, make do.
+    if (queueOptions.connection) {
+      return new Queue(name, queueOptions);
+    }
+    // If in memory, we hand a job directly to the single worker for their
+    // queue. This is very crude.
+    const worker = this._worker;
+    if (!worker) {
+      throw new Error(`no handler yet for ${this.queueName}`);
+    }
+    // We only access workers directly when working in-memory, to
+    // hand jobs directly to them.
+    if (isBullMQWorker(worker)) {
+      // Not expected! Somehow we have a BullMQ worker.
+      throw new Error(`wrong kind of worker for ${this.queueName}`);
+    }
+    return worker;
+  }
+}
+
+/**
+ * If running in memory without Redis, all jobs need to be
+ * created and served by the the same process. This class
+ * pretends to be a BullMQ worker, but accepts jobs directly
+ * without any intermediate queue. This could be elaborated
+ * in future if needed.
+ */
+class GristWorker {
+  private _jobs: Map<string, NodeJS.Timeout> = new Map();
+
+  public constructor(public queueName: string,
+                     private _callback: (job: GristJob) => Promise<void>) {
+  }
+
+  public async close() {
+    for (const job of this._jobs.keys()) {
+      // Key deletion is safe with the keys() iterator.
+      this._clearJob(job);
+    }
+  }
+
+  public async add(name: string, data: any, options?: JobAddOptions) {
+    if (options?.delay) {
+      if (options.repeat) {
+        // Unexpected combination.
+        throw new Error('cannot delay and repeat');
+      }
+      const jobId = options.jobId || makeId();
+      this._clearJob(jobId);
+      this._jobs.set(jobId, setTimeout(() => this._callback({name, data}),
+                                       options.delay));
+      return;
+    }
+    if (options?.repeat) {
+      const jobId = options.jobId || makeId();
+      this._clearJob(jobId);
+      this._jobs.set(jobId, setInterval(() => this._callback({name, data}),
+                                        options.repeat.every));
+      return;
+    }
+    await this._callback({name, data});
+  }
+
+  public async obliterate() {
+    await this.close();
+  }
+
+  private _clearJob(id: string) {
+    const job = this._jobs.get(id);
+    if (!job) { return; }
+    // We don't know if the job is a once-off or repeating,
+    // so we call both clearInterval and clearTimeout, which
+    // apparently works.
+    clearInterval(job);
+    clearTimeout(job);
+    this._jobs.delete(id);
+  }
+}
+
+/**
+ * Check if a worker is a real BullMQ worker, or just pretend.
+ */
+function isBullMQWorker(worker: Worker|GristWorker): worker is Worker {
+  return 'isNextJob' in worker;
+}
diff --git a/app/server/lib/GristServer.ts b/app/server/lib/GristServer.ts
index 23feb8c03c7..555d18ba089 100644
--- a/app/server/lib/GristServer.ts
+++ b/app/server/lib/GristServer.ts
@@ -15,6 +15,7 @@ import { RequestWithLogin } from 'app/server/lib/Authorizer';
 import { Comm } from 'app/server/lib/Comm';
 import { create } from 'app/server/lib/create';
 import { Hosts } from 'app/server/lib/extractOrg';
+import { GristJobs } from 'app/server/lib/GristJobs';
 import { ICreate } from 'app/server/lib/ICreate';
 import { IDocStorageManager } from 'app/server/lib/IDocStorageManager';
 import { INotifier } from 'app/server/lib/INotifier';
@@ -69,8 +70,9 @@ export interface GristServer {
   servesPlugins(): boolean;
   getBundledWidgets(): ICustomWidget[];
   getBootKey(): string|undefined;
-  getSandboxInfo(): SandboxInfo|undefined;
+  getSandboxInfo(): Promise<SandboxInfo>;
   getInfo(key: string): any;
+  getJobs(): GristJobs;
 }
 
 export interface GristLoginSystem {
@@ -163,8 +165,9 @@ export function createDummyGristServer(): GristServer {
     getPlugins() { return []; },
     getBundledWidgets() { return []; },
     getBootKey() { return undefined; },
-    getSandboxInfo() { return undefined; },
-    getInfo(key: string) { return undefined; }
+    getSandboxInfo() { throw new Error('no sandbox'); },
+    getInfo(key: string) { return undefined; },
+    getJobs(): GristJobs { throw new Error('no job system'); },
   };
 }
 
diff --git a/app/server/lib/HTTPAuditLogger.ts b/app/server/lib/HTTPAuditLogger.ts
index 62e349c7351..be7bbdaf853 100644
--- a/app/server/lib/HTTPAuditLogger.ts
+++ b/app/server/lib/HTTPAuditLogger.ts
@@ -1,11 +1,19 @@
-import {AuditEvent, AuditEventName, AuditEventUser} from 'app/common/AuditEvent';
-import {AuditEventProperties, IAuditLogger} from 'app/server/lib/AuditLogger';
-import {getDocSessionUser} from 'app/server/lib/DocSession';
-import {ILogMeta, LogMethods} from 'app/server/lib/LogMethods';
-import {RequestOrSession} from 'app/server/lib/requestUtils';
-import {getLogMetaFromDocSession} from 'app/server/lib/serverUtils';
+import {AuditEvent, AuditEventName, AuditEventSource, AuditEventUser} from 'app/common/AuditEvent';
+import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager';
+import {AuditEventProperties, IAuditLogger, LogAuditEventError} from 'app/server/lib/AuditLogger';
+import {LogMethods} from 'app/server/lib/LogMethods';
+import {getOriginIpAddress} from 'app/server/lib/requestUtils';
+import {
+  getAltSessionId,
+  getFullUser,
+  getLogMeta,
+  getOrg,
+  getRequest,
+  RequestOrSession,
+} from 'app/server/lib/sessionUtils';
 import moment from 'moment-timezone';
 import fetch from 'node-fetch';
+import {inspect} from 'util';
 
 interface HTTPAuditLoggerOptions {
   /**
@@ -31,35 +39,40 @@ const MAX_PENDING_REQUESTS = 25;
  * See `GristAuditLogger` for an example.
  */
 export abstract class HTTPAuditLogger implements IAuditLogger {
-  private _endpoint = this._options.endpoint;
-  private _authorizationHeader = this._options.authorizationHeader;
   private _numPendingRequests = 0;
-  private readonly _logger = new LogMethods('AuditLogger ', (requestOrSession: RequestOrSession | undefined) =>
+  private readonly _endpoint = this._options.endpoint;
+  private readonly _authorizationHeader = this._options.authorizationHeader;
+  private readonly _logger = new LogMethods<RequestOrSession | undefined>('AuditLogger ', (requestOrSession) =>
     getLogMeta(requestOrSession));
 
-  constructor(private _options: HTTPAuditLoggerOptions) {}
+  constructor(private _db: HomeDBManager, private _options: HTTPAuditLoggerOptions) {}
 
   /**
    * Logs an audit event.
    */
   public logEvent<Name extends AuditEventName>(
     requestOrSession: RequestOrSession,
-    event: AuditEventProperties<Name>
+    properties: AuditEventProperties<Name>
   ): void {
-    this._logEventOrThrow(requestOrSession, event)
-      .catch((e) => this._logger.error(requestOrSession, `failed to log audit event`, event, e));
+    this._logEventOrThrow(requestOrSession, properties)
+      .catch((e) => {
+        this._logger.error(requestOrSession, `failed to log audit event`, e);
+        this._logger.warn(requestOrSession, 'skipping audit event ', inspect(e.auditEvent, {
+          depth: Infinity,
+        }));
+      });
   }
 
   /**
-   * Asynchronous variant of `logEvent`.
+   * Logs an audit event.
    *
-   * Throws on failure to log an event.
+   * Throws a LogAuditEventError on failure.
    */
   public async logEventAsync<Name extends AuditEventName>(
     requestOrSession: RequestOrSession,
-    event: AuditEventProperties<Name>
+    properties: AuditEventProperties<Name>
   ): Promise<void> {
-    await this._logEventOrThrow(requestOrSession, event);
+    await this._logEventOrThrow(requestOrSession, properties);
   }
 
   /**
@@ -69,10 +82,14 @@ export abstract class HTTPAuditLogger implements IAuditLogger {
 
   private async _logEventOrThrow<Name extends AuditEventName>(
     requestOrSession: RequestOrSession,
-    {event: {name, details}, timestamp}: AuditEventProperties<Name>
+    properties: AuditEventProperties<Name>
   ) {
+    const event: AuditEvent<Name> = this._buildAuditEvent(requestOrSession, properties);
     if (this._numPendingRequests === MAX_PENDING_REQUESTS) {
-      throw new Error(`exceeded the maximum number of pending audit event calls (${MAX_PENDING_REQUESTS})`);
+      throw new LogAuditEventError(
+        event,
+        `exceeded the maximum number of pending audit event calls (${MAX_PENDING_REQUESTS})`
+      );
     }
 
     try {
@@ -83,53 +100,58 @@ export abstract class HTTPAuditLogger implements IAuditLogger {
           ...(this._authorizationHeader ? {'Authorization': this._authorizationHeader} : undefined),
           'Content-Type': 'application/json',
         },
-        body: this.toJSON({
-          event: {
-            name,
-            user: getAuditEventUser(requestOrSession),
-            details: details ?? null,
-          },
-          timestamp: timestamp ?? moment().toISOString(),
-        }),
+        body: this.toJSON(event),
       });
       if (!resp.ok) {
         throw new Error(`received a non-200 response from ${resp.url}: ${resp.status} ${await resp.text()}`);
       }
+    } catch (e) {
+      throw new LogAuditEventError(
+        event,
+        e?.message ?? `failed to POST audit event to ${this._endpoint}`,
+        {cause: e}
+      );
     } finally {
       this._numPendingRequests -= 1;
     }
   }
-}
 
-function getAuditEventUser(requestOrSession: RequestOrSession): AuditEventUser | null {
-  if (!requestOrSession) { return null; }
-
-  if ('get' in requestOrSession) {
+  private _buildAuditEvent<Name extends AuditEventName>(
+    requestOrSession: RequestOrSession,
+    properties: AuditEventProperties<Name>
+  ): AuditEvent<Name> {
+    const {event: {name, details = {}, context = {}}, timestamp = moment().toISOString()} = properties;
     return {
-      id: requestOrSession.userId ?? null,
-      email: requestOrSession.user?.loginEmail ?? null,
-      name: requestOrSession.user?.name ?? null,
+      event: {
+        name,
+        user: this._getAuditEventUser(requestOrSession),
+        details,
+        context,
+        source: getAuditEventSource(requestOrSession),
+      },
+      timestamp,
     };
-  } else {
-    const user = getDocSessionUser(requestOrSession);
-    if (!user) { return null; }
+  }
 
-    const {id, email, name} = user;
-    return {id, email, name};
+  private _getAuditEventUser(requestOrSession: RequestOrSession): AuditEventUser {
+    const user = getFullUser(requestOrSession);
+    if (!user) {
+      return {type: 'unknown'};
+    } else if (user.id === this._db.getAnonymousUserId()) {
+      return {type: 'anonymous'};
+    } else {
+      const {id, email, name} = user;
+      return {type: 'user', id, email, name};
+    }
   }
 }
 
-function getLogMeta(requestOrSession?: RequestOrSession): ILogMeta {
-  if (!requestOrSession) { return {}; }
-
-  if ('get' in requestOrSession) {
-    return {
-      org: requestOrSession.org,
-      email: requestOrSession.user?.loginEmail,
-      userId: requestOrSession.userId,
-      altSessionId: requestOrSession.altSessionId,
-    };
-  } else {
-    return getLogMetaFromDocSession(requestOrSession);
-  }
+function getAuditEventSource(requestOrSession: RequestOrSession): AuditEventSource {
+  const request = getRequest(requestOrSession);
+  return {
+    org: getOrg(requestOrSession) || undefined,
+    ipAddress: request ? getOriginIpAddress(request) : undefined,
+    userAgent: request?.headers['user-agent'] || undefined,
+    sessionId: getAltSessionId(requestOrSession) || undefined,
+  };
 }
diff --git a/app/server/lib/ICreate.ts b/app/server/lib/ICreate.ts
index af234f393de..77d2a8a225b 100644
--- a/app/server/lib/ICreate.ts
+++ b/app/server/lib/ICreate.ts
@@ -70,7 +70,7 @@ export interface ICreate {
 
   Billing(dbManager: HomeDBManager, gristConfig: GristServer): IBilling;
   Notifier(dbManager: HomeDBManager, gristConfig: GristServer): INotifier;
-  AuditLogger(): IAuditLogger;
+  AuditLogger(dbManager: HomeDBManager): IAuditLogger;
   Telemetry(dbManager: HomeDBManager, gristConfig: GristServer): ITelemetry;
   Shell?(): IShell;  // relevant to electron version of Grist only.
 
@@ -120,7 +120,7 @@ export interface ICreateBillingOptions {
 export interface ICreateAuditLoggerOptions {
   name: 'grist'|'hec';
   check(): boolean;
-  create(): IAuditLogger|undefined;
+  create(dbManager: HomeDBManager): IAuditLogger|undefined;
 }
 
 export interface ICreateTelemetryOptions {
@@ -177,8 +177,8 @@ export function makeSimpleCreator(opts: {
       }
       return undefined;
     },
-    AuditLogger() {
-      return auditLogger?.find(({check}) => check())?.create() ?? createDummyAuditLogger();
+    AuditLogger(dbManager) {
+      return auditLogger?.find(({check}) => check())?.create(dbManager) ?? createDummyAuditLogger();
     },
     Telemetry(dbManager, gristConfig) {
       return telemetry?.create(dbManager, gristConfig) ?? createDummyTelemetry();
@@ -245,4 +245,3 @@ const createDefaultHostedStorageManager: HostedDocStorageManagerCreator = async
 const createDefaultLocalStorageManager: LocalDocStorageManagerCreator = async (
   docsRoot, samplesRoot, comm, shell
 ) => new DocStorageManager(docsRoot, samplesRoot, comm, shell);
-
diff --git a/app/server/lib/Telemetry.ts b/app/server/lib/Telemetry.ts
index 0cabb127c16..982d9cf988b 100644
--- a/app/server/lib/Telemetry.ts
+++ b/app/server/lib/Telemetry.ts
@@ -19,13 +19,12 @@ import {Activation} from 'app/gen-server/entity/Activation';
 import {Activations} from 'app/gen-server/lib/Activations';
 import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager';
 import {RequestWithLogin} from 'app/server/lib/Authorizer';
-import {getDocSessionUser} from 'app/server/lib/DocSession';
 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 {RequestOrSession, stringParam} from 'app/server/lib/requestUtils';
-import {getLogMetaFromDocSession} from 'app/server/lib/serverUtils';
+import {stringParam} from 'app/server/lib/requestUtils';
+import {getFullUser, getLogMeta, isRequest, RequestOrSession} from 'app/server/lib/sessionUtils';
 import * as cookie from 'cookie';
 import * as express from 'express';
 import fetch from 'node-fetch';
@@ -73,8 +72,8 @@ export class Telemetry implements ITelemetry {
   private readonly _forwardTelemetryEventsUrl = process.env.GRIST_TELEMETRY_URL ||
     'https://telemetry.getgrist.com/api/telemetry';
   private _numPendingForwardEventRequests = 0;
-  private readonly _logger = new LogMethods('Telemetry ', (requestOrSession: RequestOrSession | undefined) =>
-    this._getLogMeta(requestOrSession));
+  private readonly _logger = new LogMethods<RequestOrSession | undefined>('Telemetry ', (requestOrSession) =>
+    getLogMeta(requestOrSession));
   private readonly _telemetryLogger = new LogMethods<string>('Telemetry ', (eventType) => ({
     eventType,
   }));
@@ -273,14 +272,14 @@ export class Telemetry implements ITelemetry {
     if (requestOrSession) {
       let email: string | undefined;
       let org: string | undefined;
-      if ('get' in requestOrSession) {
+      if (isRequest(requestOrSession)) {
         email = requestOrSession.user?.loginEmail;
         org = requestOrSession.org;
         if (isAnonymousUser) {
           visitorId = this._getAndSetMatomoVisitorId(requestOrSession);
         }
       } else {
-        email = getDocSessionUser(requestOrSession)?.email;
+        email = getFullUser(requestOrSession)?.email;
         org = requestOrSession.client?.getOrg() ?? requestOrSession.req?.org;
       }
       if (email) {
@@ -378,21 +377,6 @@ export class Telemetry implements ITelemetry {
       throw new ApiError('Telemetry is not ready', 500);
     }
   }
-
-  private _getLogMeta(requestOrSession?: RequestOrSession) {
-    if (!requestOrSession) { return {}; }
-
-    if ('get' in requestOrSession) {
-      return {
-        org: requestOrSession.org,
-        email: requestOrSession.user?.loginEmail,
-        userId: requestOrSession.userId,
-        altSessionId: requestOrSession.altSessionId,
-      };
-    } else {
-      return getLogMetaFromDocSession(requestOrSession);
-    }
-  }
 }
 
 export async function getTelemetryPrefs(
diff --git a/app/server/lib/Triggers.ts b/app/server/lib/Triggers.ts
index e9d51484b56..db2626083be 100644
--- a/app/server/lib/Triggers.ts
+++ b/app/server/lib/Triggers.ts
@@ -691,17 +691,16 @@ export class DocTriggers {
       if (this._loopAbort.signal.aborted) {
         continue;
       }
-      let meta: Record<string, any>|undefined;
-
+      let meta: {webhookId: string; host: string, quantity: number} | undefined;
       let success: boolean;
       if (!url) {
         success = true;
       } else {
         await this._stats.logStatus(id, 'sending');
-        meta = {numEvents: batch.length, webhookId: id, host: new URL(url).host};
+        meta = {webhookId: id, host: new URL(url).host, quantity: batch.length};
         this._log("Sending batch of webhook events", meta);
         this._activeDoc.logTelemetryEvent(null, 'sendingWebhooks', {
-          limited: {numEvents: meta.numEvents},
+          limited: {numEvents: meta.quantity},
         });
         success = await this._sendWebhookWithRetries(
           id, url, authorization, body, batch.length, this._loopAbort.signal);
@@ -743,6 +742,14 @@ export class DocTriggers {
         await this._stats.logStatus(id, 'idle');
         if (meta) {
           this._log("Successfully sent batch of webhook events", meta);
+          const {webhookId, host, quantity} = meta;
+          this._activeDoc.logAuditEvent(null, {
+            event: {
+              name: 'deliverWebhookEvents',
+              details: {id: webhookId, host, quantity},
+              user: {type: 'system'},
+            },
+          });
         }
       }
 
diff --git a/app/server/lib/WidgetRepository.ts b/app/server/lib/WidgetRepository.ts
index d94ed92befb..b4fd71998ef 100644
--- a/app/server/lib/WidgetRepository.ts
+++ b/app/server/lib/WidgetRepository.ts
@@ -9,6 +9,7 @@ import {GristServer} from 'app/server/lib/GristServer';
 import LRUCache from 'lru-cache';
 import * as url from 'url';
 import { AsyncCreate } from 'app/common/AsyncCreate';
+import { proxyAgent } from 'app/server/lib/ProxyAgent';
 
 // Static url for UrlWidgetRepository
 const STATIC_URL = process.env.GRIST_WIDGET_LIST_URL;
@@ -109,7 +110,7 @@ export class UrlWidgetRepository implements IWidgetRepository {
       return [];
     }
     try {
-      const response = await fetch(this._staticUrl);
+      const response = await fetch(this._staticUrl, { agent: proxyAgent(new URL(this._staticUrl)) });
       if (!response.ok) {
         if (response.status === 404) {
           throw new ApiError('WidgetRepository: Remote widget list not found', 404);
diff --git a/app/server/lib/configureGristAuditLogger.ts b/app/server/lib/configureGristAuditLogger.ts
index 45f53726787..120bb6eed21 100644
--- a/app/server/lib/configureGristAuditLogger.ts
+++ b/app/server/lib/configureGristAuditLogger.ts
@@ -1,11 +1,12 @@
+import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager';
 import {appSettings} from 'app/server/lib/AppSettings';
 import {GristAuditLogger} from 'app/server/lib/GristAuditLogger';
 
-export function configureGristAuditLogger() {
+export function configureGristAuditLogger(db: HomeDBManager) {
   const options = checkGristAuditLogger();
   if (!options) { return undefined; }
 
-  return new GristAuditLogger(options);
+  return new GristAuditLogger(db, options);
 }
 
 export function checkGristAuditLogger() {
diff --git a/app/server/lib/requestUtils.ts b/app/server/lib/requestUtils.ts
index 842e9b6527f..5ed0ae4dfa4 100644
--- a/app/server/lib/requestUtils.ts
+++ b/app/server/lib/requestUtils.ts
@@ -1,9 +1,9 @@
 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/homedb/HomeDBManager';
+import {DocScope, Scope} from 'app/gen-server/lib/homedb/HomeDBManager';
+import {QueryResult} from 'app/gen-server/lib/homedb/Interfaces';
 import {getUserId, RequestWithLogin} from 'app/server/lib/Authorizer';
-import {OptDocSession} from 'app/server/lib/DocSession';
 import {RequestWithOrg} from 'app/server/lib/extractOrg';
 import {RequestWithGrist} from 'app/server/lib/GristServer';
 import log from 'app/server/lib/log';
@@ -13,8 +13,6 @@ import {IncomingMessage} from 'http';
 import {Writable} from 'stream';
 import {TLSSocket} from 'tls';
 
-export type RequestOrSession = RequestWithLogin | OptDocSession | null;
-
 // log api details outside of dev environment (when GRIST_HOSTED_VERSION is set)
 const shouldLogApiDetails = Boolean(process.env.GRIST_HOSTED_VERSION);
 
@@ -347,6 +345,38 @@ export function getOriginUrl(req: IncomingMessage) {
   return `${protocol}://${host}`;
 }
 
+/**
+ * Returns the original request IP address.
+ *
+ * If the request was made through a proxy or load balancer, the IP address
+ * is read from forwarded headers. See:
+ *
+ *  - https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For
+ *  - https://docs.aws.amazon.com/elasticloadbalancing/latest/classic/x-forwarded-headers.html
+ */
+export function getOriginIpAddress(req: IncomingMessage) {
+  return (
+    // May contain multiple comma-separated values; the first one is the original.
+    (req.headers['x-forwarded-for'] as string | undefined)
+      ?.split(',')
+      .map(value => value.trim())[0] ||
+    req.socket?.remoteAddress ||
+    undefined
+  );
+}
+
+/**
+ * Returns the request's "X-Forwarded-For" header, with the request's IP address
+ * appended to its value.
+ *
+ * If the header is absent from the request, a new header will be returned.
+ */
+export function buildXForwardedForHeader(req: Request): {'X-Forwarded-For': string}|undefined {
+  const values = req.get('X-Forwarded-For')?.split(',').map(value => value.trim()) ?? [];
+  if (req.socket.remoteAddress) { values.push(req.socket.remoteAddress); }
+  return values.length > 0 ? { 'X-Forwarded-For': values.join(', ') } : undefined;
+}
+
 /**
  * Get the protocol to use in Grist URLs that are intended to be reachable
  * from a user's browser. Use the protocol in APP_HOME_URL if available,
diff --git a/app/server/lib/sendAppPage.ts b/app/server/lib/sendAppPage.ts
index 7774b017969..cc086341e34 100644
--- a/app/server/lib/sendAppPage.ts
+++ b/app/server/lib/sendAppPage.ts
@@ -89,7 +89,9 @@ export function makeGristConfig(options: MakeGristConfigOptions): GristLoadConfi
     supportedLngs: readLoadedLngs(req?.i18n),
     namespaces: readLoadedNamespaces(req?.i18n),
     featureComments: isAffirmative(process.env.COMMENTS),
-    featureFormulaAssistant: Boolean(process.env.OPENAI_API_KEY || process.env.ASSISTANT_CHAT_COMPLETION_ENDPOINT),
+    featureFormulaAssistant: Boolean(process.env.OPENAI_API_KEY ||
+      process.env.ASSISTANT_API_KEY  ||
+      process.env.ASSISTANT_CHAT_COMPLETION_ENDPOINT),
     assistantService: process.env.OPENAI_API_KEY ? 'OpenAI' : undefined,
     permittedCustomWidgets: getPermittedCustomWidgets(server),
     supportEmail: SUPPORT_EMAIL,
diff --git a/app/server/lib/serverUtils.ts b/app/server/lib/serverUtils.ts
index ad14b7082cc..43859b08541 100644
--- a/app/server/lib/serverUtils.ts
+++ b/app/server/lib/serverUtils.ts
@@ -1,16 +1,15 @@
+import {EngineCode} from 'app/common/DocumentSettings';
+import {OptDocSession} from 'app/server/lib/DocSession';
+import log from 'app/server/lib/log';
+import {getLogMeta} from 'app/server/lib/sessionUtils';
+import {OpenMode, SQLiteDB} from 'app/server/lib/SQLiteDB';
 import bluebird from 'bluebird';
-import { ChildProcess } from 'child_process';
+import {ChildProcess} from 'child_process';
 import * as net from 'net';
+import {AbortSignal} from 'node-abort-controller';
 import * as path from 'path';
-import { ConnectionOptions } from 'typeorm';
+import {ConnectionOptions} from 'typeorm';
 import uuidv4 from 'uuid/v4';
-import {AbortSignal} from 'node-abort-controller';
-
-import {EngineCode} from 'app/common/DocumentSettings';
-import {TelemetryMetadataByLevel} from 'app/common/Telemetry';
-import log from 'app/server/lib/log';
-import {OpenMode, SQLiteDB} from 'app/server/lib/SQLiteDB';
-import {getDocSessionAccessOrNull, getDocSessionUser, OptDocSession} from './DocSession';
 
 // This method previously lived in this file. Re-export to avoid changing imports all over.
 export {timeoutReached} from 'app/common/gutil';
@@ -130,8 +129,11 @@ export async function checkAllegedGristDoc(docSession: OptDocSession, fname: str
     const integrityCheckResults = await db.all('PRAGMA integrity_check');
     if (integrityCheckResults.length !== 1 || integrityCheckResults[0].integrity_check !== 'ok') {
       const uuid = uuidv4();
-      log.info('Integrity check failure on import', {uuid, integrityCheckResults,
-                                                     ...getLogMetaFromDocSession(docSession)});
+      log.info('Integrity check failure on import', {
+        uuid,
+        integrityCheckResults,
+        ...getLogMeta(docSession),
+      });
       throw new Error(`Document failed integrity checks - is it corrupted? Event ID: ${uuid}`);
     }
   } finally {
@@ -139,39 +141,6 @@ export async function checkAllegedGristDoc(docSession: OptDocSession, fname: str
   }
 }
 
-/**
- * Extract access, userId, email, and client (if applicable) from session, for logging purposes.
- */
-export function getLogMetaFromDocSession(docSession: OptDocSession) {
-  const client = docSession.client;
-  const access = getDocSessionAccessOrNull(docSession);
-  const user = getDocSessionUser(docSession);
-  const email = user?.loginEmail || user?.email;
-  return {
-    access,
-    ...(user ? {userId: user.id, email} : {}),
-    ...(client ? client.getLogMeta() : {}),   // Client if present will repeat and add to user info.
-  };
-}
-
-/**
- * Extract telemetry metadata from session.
- */
-export function getTelemetryMetaFromDocSession(docSession: OptDocSession): TelemetryMetadataByLevel {
-  const client = docSession.client;
-  const access = getDocSessionAccessOrNull(docSession);
-  const user = getDocSessionUser(docSession);
-  return {
-    limited: {
-      access,
-    },
-    full: {
-      ...(user ? {userId: user.id} : {}),
-      ...(client ? client.getFullTelemetryMeta() : {}),   // Client if present will repeat and add to user info.
-    },
-  };
-}
-
 /**
  * Only offer choices of engine on experimental deployments (staging/dev).
  */
diff --git a/app/server/lib/sessionUtils.ts b/app/server/lib/sessionUtils.ts
new file mode 100644
index 00000000000..88c7bc9baa7
--- /dev/null
+++ b/app/server/lib/sessionUtils.ts
@@ -0,0 +1,255 @@
+import {DocumentUsage} from 'app/common/DocUsage';
+import {FullUser} from 'app/common/LoginSessionAPI';
+import {Role} from 'app/common/roles';
+import {Document} from 'app/gen-server/entity/Document';
+import {getUserId as getRequestUserId, getUser, RequestWithLogin} from 'app/server/lib/Authorizer';
+import {OptDocSession} from 'app/server/lib/DocSession';
+import {ILogMeta} from 'app/server/lib/log';
+import {IncomingMessage} from 'http';
+
+export type RequestOrSession = RequestWithLogin | OptDocSession | null;
+
+export function isRequest(
+  requestOrSession: RequestOrSession
+): requestOrSession is RequestWithLogin {
+  return Boolean(requestOrSession && 'get' in requestOrSession);
+}
+
+/**
+ * Extract the raw `IncomingMessage` from `requestOrSession`, if available.
+ */
+export function getRequest(requestOrSession: RequestOrSession): IncomingMessage | null {
+  if (!requestOrSession) { return null; }
+
+  // The location of the request depends on the context, which include REST
+  // API calls to document endpoints and WebSocket sessions.
+  if (isRequest(requestOrSession)) {
+    return requestOrSession;
+  } else if (requestOrSession.req) {
+    // A REST API call to a document endpoint.
+    return requestOrSession.req;
+  } else if (requestOrSession.client) {
+    // A WebSocket session.
+    return requestOrSession.client.getConnectionRequest();
+  } else {
+    return null;
+  }
+}
+
+export function getAltSessionId(requestOrSession: RequestOrSession): string | null {
+  if (!requestOrSession) { return null; }
+
+  if (isRequest(requestOrSession)) {
+    return requestOrSession.altSessionId || null;
+  } else {
+    return getDocSessionAltSessionId(requestOrSession);
+  }
+}
+
+function getDocSessionAltSessionId(docSession: OptDocSession): string|null {
+  if (docSession.req) {
+    return docSession.req.altSessionId || null;
+  }
+  if (docSession.client) {
+    return docSession.client.getAltSessionId() || null;
+  }
+  return null;
+}
+
+export function getUserId(requestOrSession: RequestOrSession): number|null {
+  if (!requestOrSession) { return null; }
+
+  if (isRequest(requestOrSession)) {
+    return getRequestUserId(requestOrSession);
+  } else {
+    return getDocSessionUserId(requestOrSession);
+  }
+}
+
+/**
+ * Extract userId from OptDocSession.  Use Authorizer if available (for web socket
+ * sessions), or get it from the Request if that is available (for rest api calls),
+ * or from the Client if that is available.  Returns null if userId information is
+ * not available or not cached.
+ */
+function getDocSessionUserId(docSession: OptDocSession): number|null {
+  if (docSession.authorizer) {
+    return docSession.authorizer.getUserId();
+  }
+  if (docSession.req) {
+    return getUserId(docSession.req);
+  }
+  if (docSession.client) {
+    return docSession.client.getCachedUserId();
+  }
+  return null;
+}
+
+/**
+ * Get as much of user profile as we can (id, name, email).
+ */
+export function getFullUser(requestOrSession: RequestOrSession): FullUser | null {
+  if (!requestOrSession) { return null; }
+
+  if (isRequest(requestOrSession)) {
+    return getRequestFullUser(requestOrSession);
+  } else {
+    return getDocSessionFullUser(requestOrSession);
+  }
+}
+
+function getRequestFullUser(request: RequestWithLogin): FullUser|null {
+  const user = getUser(request);
+  if (!user.loginEmail) { return null; }
+
+  const {id, name, loginEmail: email, ref, options} = user;
+  return {
+    id,
+    name,
+    email,
+    ref,
+    locale: options?.locale,
+  };
+}
+
+function getDocSessionFullUser(docSession: OptDocSession): FullUser|null {
+  if (docSession.authorizer) {
+    return docSession.authorizer.getUser();
+  }
+  if (docSession.req) {
+    return getRequestFullUser(docSession.req);
+  }
+  if (docSession.client) {
+    const id = docSession.client.getCachedUserId();
+    const ref = docSession.client.getCachedUserRef();
+    const profile = docSession.client.getProfile();
+    if (id && profile) {
+      return {
+        id,
+        ref,
+        ...profile
+      };
+    }
+  }
+  return null;
+}
+
+export function getOrg(requestOrSession: RequestOrSession): string | null {
+  if (!requestOrSession) { return null; }
+
+  if (isRequest(requestOrSession)) {
+    return requestOrSession.org || null;
+  } else {
+    return getDocSessionOrg(requestOrSession);
+  }
+}
+
+function getDocSessionOrg(docSession: OptDocSession): string | null {
+  if (docSession.req) {
+    return docSession.req.org || null;
+  }
+  if (docSession.client) {
+    return docSession.client.getOrg() || null;
+  }
+  return null;
+}
+
+/**
+ * Extract access, userId, email, and client (if applicable) from
+ * `requestOrSession`, for logging purposes.
+ */
+export function getLogMeta(requestOrSession: RequestOrSession | undefined): ILogMeta {
+  if (!requestOrSession) { return {}; }
+
+  if (isRequest(requestOrSession)) {
+    return getRequestLogMeta(requestOrSession);
+  } else {
+    return getDocSessionLogMeta(requestOrSession);
+  }
+}
+
+function getRequestLogMeta(request: RequestWithLogin): ILogMeta {
+  const {org, user, userId, altSessionId} = request;
+  return {
+    org,
+    email: user?.loginEmail,
+    userId,
+    altSessionId,
+  };
+}
+
+function getDocSessionLogMeta(docSession: OptDocSession): ILogMeta {
+  const client = docSession.client;
+  const access = getDocSessionAccessOrNull(docSession);
+  const user = getDocSessionFullUser(docSession);
+  const email = user?.loginEmail || user?.email;
+  return {
+    access,
+    ...(user ? {userId: user.id, email} : {}),
+    ...(client ? client.getLogMeta() : {}),   // Client if present will repeat and add to user info.
+  };
+}
+
+/**
+ * Extract user's role from OptDocSession.  Method depends on whether using web
+ * sockets or rest api.  Assumes that access has already been checked by wrappers
+ * for api methods and that cached access information is therefore available.
+ */
+export function getDocSessionAccess(docSession: OptDocSession): Role {
+  // "nascent" DocSessions are for when a document is being created, and user is
+  // its only owner as yet.
+  // "system" DocSessions are for access without access control.
+  if (docSession.mode === 'nascent' || docSession.mode === 'system') { return 'owners'; }
+  // "plugin" DocSessions are for access from plugins, which is currently quite crude,
+  // and granted only to editors.
+  if (docSession.mode === 'plugin') { return 'editors'; }
+  if (docSession.authorizer) {
+    const access = docSession.authorizer.getCachedAuth().access;
+    if (!access) { throw new Error('getDocSessionAccess expected authorizer.getCachedAuth'); }
+    return access;
+  }
+  if (docSession.req) {
+    const access =  docSession.req.docAuth?.access;
+    if (!access) { throw new Error('getDocSessionAccess expected req.docAuth.access'); }
+    return access;
+  }
+  throw new Error('getDocSessionAccess could not find access information in DocSession');
+}
+
+export function getDocSessionShare(docSession: OptDocSession): string|null {
+  return _getCachedDoc(docSession)?.linkId || null;
+}
+
+/**
+ * Get document usage seen in db when we were last checking document
+ * access. Not necessarily a live value when using a websocket
+ * (although we do recheck access periodically).
+ */
+export function getDocSessionUsage(docSession: OptDocSession): DocumentUsage|null {
+  return _getCachedDoc(docSession)?.usage || null;
+}
+
+export function _getCachedDoc(docSession: OptDocSession): Document|null {
+  if (docSession.authorizer) {
+    return docSession.authorizer.getCachedAuth().cachedDoc || null;
+  }
+  if (docSession.req) {
+    return docSession.req.docAuth?.cachedDoc || null;
+  }
+  return null;
+}
+
+export function getDocSessionAccessOrNull(docSession: OptDocSession): Role|null {
+  try {
+    return getDocSessionAccess(docSession);
+  } catch (err) {
+    return null;
+  }
+}
+
+/**
+ * Get cached information about the document, if available.  May be stale.
+ */
+export function getDocSessionCachedDoc(docSession: OptDocSession): Document | undefined {
+  return (docSession.req as RequestWithLogin)?.docAuth?.cachedDoc;
+}
diff --git a/app/server/utils/showAuditLogEvents.ts b/app/server/utils/showAuditLogEvents.ts
new file mode 100644
index 00000000000..1e02a975af2
--- /dev/null
+++ b/app/server/utils/showAuditLogEvents.ts
@@ -0,0 +1,688 @@
+import {AuditEventDetails, AuditEventName, SiteAuditEventName} from 'app/common/AuditEvent';
+
+interface Options {
+  /**
+   * The type of audit log events to show.
+   *
+   * Defaults to `"installation"`.
+   */
+  type?: AuditEventType;
+}
+
+type AuditEventType = 'installation' | 'site';
+
+export function showAuditLogEvents({type = 'installation'}: Options) {
+  showTitle(type);
+  const events = getAuditEvents(type);
+  showTableOfContents(events);
+  showEvents(events);
+}
+
+function showTitle(type: AuditEventType) {
+  if (type === 'installation') {
+    console.log('# Installation audit log events {: .tag-core .tag-ee }\n');
+  } else {
+    console.log('# Site audit log events\n');
+  }
+}
+
+function getAuditEvents(type: AuditEventType): [string, AuditEvent<AuditEventName>][] {
+  if (type === 'installation') {
+    return Object.entries(AuditEvents).filter(([name]) => AuditEventName.guard(name));
+  } else {
+    return Object.entries(AuditEvents).filter(([name]) => SiteAuditEventName.guard(name));
+  }
+}
+
+function showTableOfContents(events: [string, AuditEvent<AuditEventName>][]) {
+  for (const [name] of events) {
+    console.log(` - [${name}](#${name.toLowerCase()})`);
+  }
+  console.log('');
+}
+
+function showEvents(events: [string, AuditEvent<AuditEventName>][]) {
+  for (const [name, event] of events) {
+    const {description, properties} = event;
+    console.log(`## ${name}\n`);
+    console.log(`${description}\n`);
+    if (Object.keys(properties).length === 0) { continue; }
+
+    console.log('### Properties\n');
+    console.log('| Name | Type | Description |');
+    console.log('| ---- | ---- | ----------- |');
+    showEventProperties(properties);
+    console.log('');
+  }
+}
+
+function showEventProperties(
+  properties: AuditEventProperties<object>,
+  prefix = ''
+) {
+  for (const [key, {type, description, optional, ...rest}] of Object.entries(properties)) {
+    const name = prefix + key + (optional ? ' *(optional)*' : '');
+    const types = (Array.isArray(type) ? type : [type]).map(t => `\`${t}\``);
+    console.log(`| ${name} | ${types.join(' or ')} | ${description} |`);
+    if ('properties' in rest) {
+      showEventProperties(rest.properties, prefix + `${name}.`);
+    }
+  }
+}
+
+type AuditEvents = {
+  [Name in keyof AuditEventDetails]: Name extends AuditEventName
+  ? AuditEvent<Name>
+  : never
+}
+
+interface AuditEvent<Name extends AuditEventName> {
+  description: string;
+  properties: AuditEventProperties<AuditEventDetails[Name]>;
+}
+
+type AuditEventProperties<T> = {
+  [K in keyof T]: T[K] extends object
+  ? AuditEventProperty & {properties: AuditEventProperties<T[K]>}
+  : AuditEventProperty
+}
+
+interface AuditEventProperty {
+  type: string | string[];
+  description: string;
+  optional?: boolean;
+}
+
+const AuditEvents: AuditEvents = {
+  createDocument: {
+    description: 'A new document was created.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the document.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the document.',
+        optional: true,
+      },
+    },
+  },
+  sendToGoogleDrive: {
+    description: 'A document was sent to Google Drive.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the document.',
+      },
+    },
+  },
+  renameDocument: {
+    description: 'A document was renamed.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the document.',
+      },
+      previousName: {
+        type: 'string',
+        description: 'The previous name of the document.',
+      },
+      currentName: {
+        type: 'string',
+        description: 'The current name of the document.',
+      },
+    },
+  },
+  pinDocument: {
+    description: 'A document was pinned.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the document.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the document.',
+      },
+    },
+  },
+  unpinDocument: {
+    description: 'A document was unpinned.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the document.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the document.',
+      },
+    },
+  },
+  moveDocument: {
+    description: 'A document was moved to a new workspace.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the document.',
+      },
+      previousWorkspace: {
+        type: 'object',
+        description: 'The workspace the document was moved from.',
+        properties: {
+          id: {
+            type: 'number',
+            description: 'The ID of the workspace.',
+          },
+          name: {
+            type: 'string',
+            description: 'The name of the workspace.',
+          },
+        },
+      },
+      newWorkspace: {
+        type: 'object',
+        description: 'The workspace the document was moved to.',
+        properties: {
+          id: {
+            type: 'number',
+            description: 'The ID of the workspace.',
+          },
+          name: {
+            type: 'string',
+            description: 'The name of the workspace.',
+          },
+        },
+      },
+    },
+  },
+  removeDocument: {
+    description: 'A document was moved to the trash.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the document.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the document.',
+      },
+    },
+  },
+  deleteDocument: {
+    description: 'A document was permanently deleted.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the document.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the document.',
+      },
+    },
+  },
+  restoreDocumentFromTrash: {
+    description: 'A document was restored from the trash.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the document.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the document.',
+      },
+      workspace: {
+        type: 'object',
+        description: 'The workspace of the document.',
+        properties: {
+          id: {
+            type: 'number',
+            description: 'The ID of the workspace.',
+          },
+          name: {
+            type: 'string',
+            description: 'The name of the workspace.',
+          },
+        },
+      },
+    },
+  },
+  changeDocumentAccess: {
+    description: 'Access to a document was changed.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the document.',
+      },
+      access: {
+        type: 'object',
+        description: 'The access level of the document.',
+        properties: {
+          maxInheritedRole: {
+            type: ['"owners"', '"editors"', '"viewers"', 'null'],
+            description: 'The max inherited role.',
+            optional: true,
+          },
+          users: {
+            type: 'object',
+            description: 'The access level by user ID.',
+            optional: true,
+          },
+        },
+      },
+    },
+  },
+  openDocument: {
+    description: 'A document was opened.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the document.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the document.',
+      },
+      urlId: {
+        type: 'string',
+        description: 'The URL ID of the document.',
+      },
+      forkId: {
+        type: 'string',
+        description: 'The fork ID of the document, if the document is a fork.',
+      },
+      snapshotId: {
+        type: 'string',
+        description: 'The snapshot ID of the document, if the document is a snapshot.',
+      },
+    },
+  },
+  duplicateDocument: {
+    description: 'A document was duplicated.',
+    properties: {
+      original: {
+        type: 'object',
+        description: 'The document that was duplicated.',
+        properties: {
+          id: {
+            type: 'string',
+            description: 'The ID of the document.',
+          },
+          name: {
+            type: 'string',
+            description: 'The name of the document.',
+          },
+          workspace: {
+            type: 'object',
+            description: 'The workspace of the document.',
+            properties: {
+              id: {
+                type: 'number',
+                description: 'The ID of the workspace',
+              },
+              name: {
+                type: 'string',
+                description: 'The name of the workspace.',
+              },
+            },
+          },
+        },
+      },
+      duplicate: {
+        description: 'The newly-duplicated document.',
+        type: 'object',
+        properties: {
+          id: {
+            type: 'string',
+            description: 'The ID of the document.',
+          },
+          name: {
+            type: 'string',
+            description: 'The name of the document.',
+          },
+        },
+      },
+      asTemplate: {
+        type: 'boolean',
+        description: 'If the document was duplicated without any data.',
+      },
+    },
+  },
+  forkDocument: {
+    description: 'A document was forked.',
+    properties: {
+      original: {
+        type: 'object',
+        description: 'The document that was forked.',
+        properties: {
+          id: {
+            type: 'string',
+            description: 'The ID of the document.',
+          },
+          name: {
+            type: 'string',
+            description: 'The name of the document.',
+          },
+        },
+      },
+      fork: {
+        type: 'object',
+        description: 'The newly-forked document.',
+        properties: {
+          id: {
+            type: 'string',
+            description: 'The ID of the fork.',
+          },
+          documentId: {
+            type: 'string',
+            description: 'The ID of the fork with the trunk ID.',
+          },
+          urlId: {
+            type: 'string',
+            description: 'The ID of the fork with the trunk URL ID.',
+          },
+        },
+      },
+    },
+  },
+  replaceDocument: {
+    description: 'A document was replaced.',
+    properties: {
+      previous: {
+        type: 'object',
+        description: 'The document that was replaced.',
+        properties: {
+          id: {
+            type: 'string',
+            description: 'The ID of the document.',
+          },
+        },
+      },
+      current: {
+        type: 'object',
+        description: 'The newly-replaced document.',
+        properties: {
+          id: {
+            type: 'string',
+            description: 'The ID of the document.',
+          },
+          snapshotId: {
+            type: 'string',
+            description: 'The ID of the snapshot, if the document was replaced with one.',
+          },
+        },
+      },
+    },
+  },
+  reloadDocument: {
+    description: 'A document was reloaded.',
+    properties: {},
+  },
+  truncateDocumentHistory: {
+    description: "A document's history was truncated.",
+    properties: {
+      keep: {
+        type: 'number',
+        description: 'The number of history items kept.',
+      },
+    },
+  },
+  deliverWebhookEvents: {
+    description: 'A batch of webhook events was delivered.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the webhook.',
+      },
+      host: {
+        type: 'string',
+        description: 'The host the webhook events were delivered to.',
+      },
+      quantity: {
+        type: 'number',
+        description: 'The number of webhook events delivered.',
+      },
+    },
+  },
+  clearWebhookQueue: {
+    description: 'A webhook queue was cleared.',
+    properties: {
+      id: {
+        type: 'string',
+        description: 'The ID of the webhook.',
+      },
+    },
+  },
+  clearAllWebhookQueues: {
+    description: 'All webhook queues were cleared.',
+    properties: {},
+  },
+  runSQLQuery: {
+    description: 'A SQL query was run on a document.',
+    properties: {
+      query: {
+        type: 'string',
+        description: 'The SQL query.'
+      },
+      arguments: {
+        type: 'Array<string | number>',
+        description: 'The arguments used for query parameters, if any.',
+        optional: true,
+      },
+      timeoutMs: {
+        type: 'number',
+        description: 'The query execution timeout duration in milliseconds.',
+        optional: true,
+      },
+    },
+  },
+  createWorkspace: {
+    description: 'A new workspace was created.',
+    properties: {
+      id: {
+        type: 'number',
+        description: 'The ID of the workspace.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the workspace.',
+      },
+    },
+  },
+  renameWorkspace: {
+    description: 'A workspace was renamed.',
+    properties: {
+      id: {
+        type: 'number',
+        description: 'The ID of the workspace.',
+      },
+      previousName: {
+        type: 'string',
+        description: 'The previous name of the workspace.',
+      },
+      currentName: {
+        type: 'string',
+        description: 'The current name of the workspace.',
+      },
+    },
+  },
+  removeWorkspace: {
+    description: 'A workspace was moved to the trash.',
+    properties: {
+      id: {
+        type: 'number',
+        description: 'The ID of the workspace.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the workspace.',
+      },
+    },
+  },
+  deleteWorkspace: {
+    description: 'A workspace was permanently deleted.',
+    properties: {
+      id: {
+        type: 'number',
+        description: 'The ID of the workspace.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the workspace.',
+      },
+    },
+  },
+  restoreWorkspaceFromTrash: {
+    description: 'A workspace was restored from the trash.',
+    properties: {
+      id: {
+        type: 'number',
+        description: 'The ID of the workspace.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the workspace.',
+      },
+    },
+  },
+  changeWorkspaceAccess: {
+    description: 'Access to a workspace was changed.',
+    properties: {
+      id: {
+        type: 'number',
+        description: 'The ID of the workspace.',
+      },
+      access: {
+        type: 'object',
+        description: 'The access level of the workspace.',
+        properties: {
+          maxInheritedRole: {
+            type: ['"owners"', '"editors"', '"viewers"', 'null'],
+            description: 'The max inherited role.',
+            optional: true,
+          },
+          users: {
+            type: 'object',
+            description: 'The access level by user ID.',
+            optional: true,
+          },
+        },
+      },
+    },
+  },
+  createSite: {
+    description: 'A new site was created.',
+    properties: {
+      id: {
+        type: 'number',
+        description: 'The ID of the site.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the site.',
+      },
+      domain: {
+        type: 'string',
+        description: 'The domain of the site.',
+      },
+    },
+  },
+  renameSite: {
+    description: 'A site was renamed.',
+    properties: {
+      id: {
+        type: 'number',
+        description: 'The ID of the site.',
+      },
+      previous: {
+        type: 'object',
+        description: 'The previous name and domain of the site.',
+        properties: {
+          name: {
+            type: 'string',
+            description: 'The name of the site.',
+          },
+          domain: {
+            type: 'string',
+            description: 'The domain of the site.',
+          },
+        },
+      },
+      current: {
+        type: 'object',
+        description: 'The current name and domain of the site.',
+        properties: {
+          name: {
+            type: 'string',
+            description: 'The name of the site.',
+          },
+          domain: {
+            type: 'string',
+            description: 'The domain of the site.',
+          },
+        },
+      },
+    },
+  },
+  changeSiteAccess: {
+    description: 'Access to a site was changed.',
+    properties: {
+      id: {
+        type: 'number',
+        description: 'The ID of the site.',
+      },
+      access: {
+        type: 'object',
+        description: 'The access level of the site.',
+        properties: {
+          users: {
+            type: 'object',
+            description: 'The access level by user ID.',
+            optional: true,
+          },
+        },
+      },
+    },
+  },
+  deleteSite: {
+    description: 'A site was deleted.',
+    properties: {
+      id: {
+        type: 'number',
+        description: 'The ID of the site.',
+      },
+      name: {
+        type: 'string',
+        description: 'The name of the site.',
+      },
+    },
+  },
+  changeUserName: {
+    description: 'The name of a user was changed.',
+    properties: {
+      previousName: {
+        type: 'string',
+        description: 'The previous name of the user.',
+      },
+      currentName: {
+        type: 'string',
+        description: 'The current name of the user.',
+      },
+    },
+  },
+  createUserAPIKey: {
+    description: 'A user API key was created.',
+    properties: {},
+  },
+  deleteUserAPIKey: {
+    description: 'A user API key was deleted.',
+    properties: {},
+  },
+  deleteUser: {
+    description: 'A user was deleted.',
+    properties: {},
+  },
+};
diff --git a/buildtools/.grist-ee-version b/buildtools/.grist-ee-version
index 7e310bae199..56f3151140c 100644
--- a/buildtools/.grist-ee-version
+++ b/buildtools/.grist-ee-version
@@ -1 +1 @@
-0.9.9
+0.9.10
diff --git a/package.json b/package.json
index 9d55221351e..773f1ed7824 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grist-core",
-  "version": "1.1.18",
+  "version": "1.2.0",
   "license": "Apache-2.0",
   "description": "Grist is the evolution of spreadsheets",
   "homepage": "https://github.com/gristlabs/grist-core",
@@ -115,7 +115,7 @@
     "@googleapis/oauth2": "0.2.0",
     "@gristlabs/connect-sqlite3": "0.9.11-grist.5",
     "@gristlabs/express-session": "1.17.0",
-    "@gristlabs/grist-widget": "^0.0.4",
+    "@gristlabs/grist-widget": "^0.0.5",
     "@gristlabs/moment-guess": "1.2.4-grist.1",
     "@gristlabs/pidusage": "2.0.17",
     "@gristlabs/sqlite3": "5.1.4-grist.8",
@@ -128,6 +128,7 @@
     "bootstrap": "3.4.1",
     "bootstrap-datepicker": "1.9.0",
     "bowser": "2.7.0",
+    "bullmq": "5.8.7",
     "collect-js-deps": "^0.1.1",
     "color-convert": "2.0.1",
     "commander": "9.3.0",
diff --git a/sandbox/grist/column.py b/sandbox/grist/column.py
index 7912e1e6953..b0a2b529740 100644
--- a/sandbox/grist/column.py
+++ b/sandbox/grist/column.py
@@ -545,6 +545,8 @@ def _lookup(self, reference_lookup, value):
     value = objtypes.decode_object(value)
     return self._target_table.lookup_one_record(**{col_id: value})
 
+class UniqueReferenceError(ValueError):
+  pass
 
 class ReferenceColumn(BaseReferenceColumn):
   """
@@ -564,7 +566,7 @@ def _value_iterable(self, value):
 
   def _list_to_value(self, value_as_list):
     if len(value_as_list) > 1:
-      raise ValueError("UNIQUE reference constraint failed for action")
+      raise UniqueReferenceError("UNIQUE reference constraint violated")
     return value_as_list[0] if value_as_list else 0
 
   def _clean_up_value(self, value):
diff --git a/sandbox/grist/test_summary.py b/sandbox/grist/test_summary.py
index 6af9e2a8af4..3787cf88455 100644
--- a/sandbox/grist/test_summary.py
+++ b/sandbox/grist/test_summary.py
@@ -4,6 +4,7 @@
 """
 
 import logging
+import unittest
 
 import actions
 import summary
@@ -960,49 +961,49 @@ def widgetOptions(n, o):
     old = '{"widget":"Spinner","alignment":"center"}'
     self.assertTrue(widgetOptions(new, old))
 
-    # Can update but must leave other options.
-    new = '{"widget":"TextBox","cant":"center"}'
-    old = '{"widget":"Spinner","cant":"center"}'
+    # Can update but must leave choices options.
+    new = '{"widget":"TextBox","choices":"center"}'
+    old = '{"widget":"Spinner","choices":"center"}'
     self.assertTrue(widgetOptions(new, old))
 
     # Can't add protected property when old was empty.
-    new = '{"widget":"TextBox","cant":"new"}'
+    new = '{"widget":"TextBox","choices":"new"}'
     old = None
     self.assertFalse(widgetOptions(new, old))
 
     # Can't remove when there was a protected property.
     new = None
-    old = '{"widget":"TextBox","cant":"old"}'
+    old = '{"widget":"TextBox","choices":"old"}'
     self.assertFalse(widgetOptions(new, old))
 
     # Can't update by omitting.
     new = '{"widget":"TextBox"}'
-    old = '{"widget":"TextBox","cant":"old"}'
+    old = '{"widget":"TextBox","choices":"old"}'
     self.assertFalse(widgetOptions(new, old))
 
     # Can't update by changing.
-    new = '{"widget":"TextBox","cant":"new"}'
-    old = '{"widget":"TextBox","cant":"old"}'
+    new = '{"widget":"TextBox","choices":"new"}'
+    old = '{"widget":"TextBox","choices":"old"}'
     self.assertFalse(widgetOptions(new, old))
 
     # Can't update by adding.
-    new = '{"widget":"TextBox","cant":"new"}'
+    new = '{"widget":"TextBox","choices":"new"}'
     old = '{"widget":"TextBox"}'
     self.assertFalse(widgetOptions(new, old))
 
     # Can update objects
-    new = '{"widget":"TextBox","alignment":{"prop":1},"cant":{"prop":1}}'
-    old = '{"widget":"TextBox","alignment":{"prop":2},"cant":{"prop":1}}'
+    new = '{"widget":"TextBox","alignment":{"prop":1},"choices":{"prop":1}}'
+    old = '{"widget":"TextBox","alignment":{"prop":2},"choices":{"prop":1}}'
     self.assertTrue(widgetOptions(new, old))
 
     # Can't update objects
-    new = '{"widget":"TextBox","cant":{"prop":1}}'
-    old = '{"widget":"TextBox","cant":{"prop":2}}'
+    new = '{"widget":"TextBox","choices":{"prop":1}}'
+    old = '{"widget":"TextBox","choices":{"prop":2}}'
     self.assertFalse(widgetOptions(new, old))
 
     # Can't update lists
-    new = '{"widget":"TextBox","cant":[1, 2]}'
-    old = '{"widget":"TextBox","cant":[2, 1]}'
+    new = '{"widget":"TextBox","choices":[1, 2]}'
+    old = '{"widget":"TextBox","choices":[2, 1]}'
     self.assertFalse(widgetOptions(new, old))
 
     # Can update lists
@@ -1011,7 +1012,10 @@ def widgetOptions(n, o):
     self.assertTrue(widgetOptions(new, old))
 
     # Can update without changing list.
-    new = '{"widget":"TextBox","dontChange":[1, 2]}'
-    old = '{"widget":"Spinner","dontChange":[1, 2]}'
+    new = '{"widget":"TextBox","choices":[1, 2]}'
+    old = '{"widget":"Spinner","choices":[1, 2]}'
     self.assertTrue(widgetOptions(new, old))
   # pylint: enable=R0915
+
+if __name__ == "__main__":
+  unittest.main()
diff --git a/sandbox/grist/test_twoway_refs.py b/sandbox/grist/test_twoway_refs.py
index 1b4aed6063f..263f0888240 100644
--- a/sandbox/grist/test_twoway_refs.py
+++ b/sandbox/grist/test_twoway_refs.py
@@ -20,6 +20,9 @@
 Penny = 3
 EmptyList = None
 
+def uniqueReferences(rec):
+  return rec.reverseCol and rec.reverseCol.type.startswith('Ref:')
+
 class TestTwoWayReferences(test_engine.EngineTestCase):
 
   def get_col_rec(self, tableId, colId):
@@ -319,6 +322,16 @@ def load_pets(self):
     # Add a pet named Rex with Bob as owner
     self.apply_user_action(["AddRecord", "Pets", 1, {"Name": "Rex", "Owner": Bob}])
 
+    self.assertTableData("Owners", cols="subset", data=[
+      ["id", "Name"],
+      [Alice, "Alice"],
+      [Bob, "Bob"],
+    ])
+    self.assertTableData("Pets", cols="subset", data=[
+      ["id", "Name", "Owner"],
+      [Rex, "Rex", Bob],
+    ])
+
 
   def test_uniques(self):
     self.load_pets()
@@ -1157,9 +1170,113 @@ def test_convert_column(self):
       [Azor, "Azor", Alice],
     ])
 
+  def test_back_update_empty_column(self):
+    """
+    There was a bug. When user cretes a reverse column for an empty column, and then updates the
+    reverse column first, the empty column wasn't updated (as it was seen as empty).
+    """
 
-def uniqueReferences(rec):
-  return rec.reverseCol and rec.reverseCol.type.startswith('Ref:')
+    # Load pets sample
+    self.load_pets()
+
+    # Remove owner and add it back as empty column.
+    self.apply_user_action(["RemoveColumn", "Pets", "Owner"])
+    self.apply_user_action(["AddColumn", "Pets", "Owner", {
+      "type": "Ref:Owners",
+      "isFormula": True,
+      "formula": '',
+    }])
+
+    # Now add reverse column for Owner
+    self.apply_user_action(["AddReverseColumn", 'Pets', 'Owner'])
+
+    # And now add Rex with Alice as an owner using Owners table
+    self.apply_user_action(["UpdateRecord", "Owners", Alice, {"Pets": ['L', Rex]}])
+
+    # Make sure we see the data
+    self.assertTableData("Owners", cols="subset", data=[
+      ["id", "Name", "Pets"],
+      [1, "Alice", [Rex]],
+      [2, "Bob", EmptyList],
+    ])
+
+    self.assertTableData("Pets", cols="subset", data=[
+      ["id", "Name", "Owner"],
+      [Rex, "Rex", Alice],
+    ])
+
+  def test_back_loop(self):
+    """
+    Test that updating reverse column doesn't cause infinite loop.
+    """
+
+    # Load pets sample.
+    self.load_pets()
+
+    # Add reverse column for Owner.
+    self.apply_user_action(["AddReverseColumn", 'Pets', 'Owner'])
+
+    # Convert Pets to Ref:Owners.
+    self.apply_user_action(["ModifyColumn", "Owners", "Pets", {"type": "Ref:Pets"}])
+
+    # Check the data.
+    self.assertTableData("Pets", cols="subset", data=[
+      ["id", "Name", "Owner"],
+      [1, "Rex", Bob],
+    ])
+
+    self.assertTableData("Owners", cols="subset", data=[
+      ["id", "Name", "Pets"],
+      [1, "Alice", Empty],
+      [2, "Bob", Rex],
+    ])
+
+    # Now move Rex to Alice using Pets table.
+    self.apply_user_action(["UpdateRecord", "Pets", Rex, {"Owner": Alice}])
+
+
+  def test_remove_in_bulk(self):
+    """
+    Test that we can remove many rows at the same time. PReviously it ended up in an error,
+    as the reverse column was trying to update the removed row.
+    """
+
+    # Load pets sample.
+    self.load_pets()
+
+    # Add another dog.
+    self.apply_user_action(["AddRecord", "Pets", Pluto, {"Name": "Pluto"}])
+
+    # Add reverse column for Owner.
+    self.apply_user_action(["AddReverseColumn", 'Pets', 'Owner'])
+
+    # Add Pluto to Bob.
+    self.apply_user_action(["UpdateRecord", "Pets", Pluto, {"Owner": Alice}])
+
+    # Test the data.
+    self.assertTableData("Pets", cols="subset", data=[
+      ["id", "Name", "Owner"],
+      [Rex, "Rex", Bob],
+      [Pluto, "Pluto", Alice],
+    ])
+    self.assertTableData("Owners", cols="subset", data=[
+      ["id", "Name", "Pets"],
+      [1, "Alice", [Pluto]],
+      [2, "Bob", [Rex]],
+    ])
+
+    # Now remove both dogs.
+    self.apply_user_action(["BulkRemoveRecord", "Pets", [Rex, Pluto]])
+
+    # Make sure we see the data.
+    self.assertTableData("Pets", cols="subset", data=[
+      ["id", "Name", "Owner"],
+    ])
+    self.assertTableData("Owners", cols="subset", data=[
+      ["id", "Name", "Pets"],
+      [1, "Alice", EmptyList],
+      [2, "Bob", EmptyList],
+    ])
 
 
 if __name__ == "__main__":
diff --git a/sandbox/grist/useractions.py b/sandbox/grist/useractions.py
index 7801af11927..3ffb77fe490 100644
--- a/sandbox/grist/useractions.py
+++ b/sandbox/grist/useractions.py
@@ -192,8 +192,8 @@ def allowed_summary_change(key, updated, original):
   """
   Checks if summary group by column can be modified.
   """
-  # Conditional styles are allowed
-  if updated == original or key == 'rules':
+  allowed_fields_to_change = {'rules', 'description'}
+  if updated == original or key in allowed_fields_to_change:
     return True
   elif key == 'widgetOptions':
     try:
@@ -201,18 +201,12 @@ def allowed_summary_change(key, updated, original):
       original_options = json.loads(original or '{}')
     except ValueError:
       return False
-    # Unfortunately all widgetOptions are allowed to change, except choice items. But it is
-    # better to list those that can be changed.
-    # TODO: move choice items to separate column
-    allowed_to_change = {'widget', 'dateFormat', 'timeFormat', 'isCustomDateFormat', 'alignment',
-                         'fillColor', 'textColor', 'isCustomTimeFormat', 'isCustomDateFormat',
-                         'numMode', 'numSign', 'decimals', 'maxDecimals', 'currency',
-                         'fontBold', 'fontItalic', 'fontUnderline', 'fontStrikethrough',
-                         'rulesOptions'}
+    # Can do anything, but those options must be the same
+    must_be_the_same = {'choices', 'choiceOptions'}
     # Helper function to remove protected keys from dictionary.
-    def trim(options):
-      return {k: v for k, v in options.items() if k not in allowed_to_change}
-    return trim(updated_options) == trim(original_options)
+    def protected_options(options):
+      return {k: v for k, v in options.items() if k in must_be_the_same}
+    return protected_options(updated_options) == protected_options(original_options)
   else:
     return False
 
@@ -263,6 +257,26 @@ def _do_doc_action(self, action):
       self._engine.out_actions.direct.append(self._indirection_level == DIRECT_ACTION)
       self._engine.apply_doc_action(action)
 
+  def _do_extra_doc_action(self, action):
+    # It this is Update, Add (or Bulks), run thouse actions through ensure_column_accepts_data
+    # to ensure that the data is valid.
+
+    converted_action = action
+
+    if isinstance(action, (actions.BulkAddRecord, actions.BulkUpdateRecord)):
+      if isinstance(action, actions.BulkAddRecord):
+        ActionType = actions.BulkAddRecord
+      else:
+        ActionType = actions.BulkUpdateRecord
+
+      # Iterate over every column and make sure it accepts data.
+      table_id, row_ids, column_values = action
+      for col_id, values in six.iteritems(column_values):
+        column_values[col_id] = self._ensure_column_accepts_data(table_id, col_id, values)
+      converted_action = ActionType(table_id, row_ids, column_values)
+
+    return self._do_doc_action(converted_action)
+
   def _bulk_action_iter(self, table_id, row_ids, col_values=None):
     """
     Helper for processing Bulk actions, which generates a list of (i, record, value_dict) tuples,
@@ -414,7 +428,7 @@ def doBulkAddOrReplace(self, table_id, row_ids, column_values, replace=False):
 
     # If any extra actions were generated (e.g. to adjust positions), apply them.
     for a in extra_actions:
-      self._do_doc_action(a)
+      self._do_extra_doc_action(a)
 
     # We could set static default values for omitted data columns, or we can ensure that other
     # code (JS, DocStorage) is aware of the static defaults. Since other code is already aware,
@@ -510,7 +524,7 @@ def doBulkUpdateRecord(self, table_id, row_ids, columns):
 
     # If any extra actions were generated (e.g. to adjust positions), apply them.
     for a in extra_actions:
-      self._do_doc_action(a)
+      self._do_extra_doc_action(a)
 
     # Finally, update the record
     self._do_doc_action(action)
@@ -1150,13 +1164,19 @@ def doBulkRemoveRecord(self, table_id, row_ids_or_records):
         continue
       updates = ref_col.get_updates_for_removed_target_rows(row_id_set)
       if updates:
-        # Previously we sent this as a docaction. Now we do a proper useraction with all the
-        # processing that involves, e.g. triggering two-way-reference updates, and also all the
-        # metadata checks and updates.
-        self._BulkUpdateRecord_decoded(ref_col.table_id,
-          [row_id for (row_id, value) in updates],
-          { ref_col.col_id: [value for (row_id, value) in updates] }
-        )
+        table_id = ref_col.table_id
+        rows = [row_id for (row_id, value) in updates]
+        columns = {ref_col.col_id: [value for (row_id, value) in updates]}
+        if ref_col.table_id.startswith('_grist_'):
+          # Previously we sent this as a docaction. Now we do a proper useraction with all the
+          # processing that involves, e.g. triggering two-way-reference updates, and also all the
+          # metadata checks and updates.
+          self._BulkUpdateRecord_decoded(table_id, rows, columns)
+        else:
+          # But for normal user tables (with two-way references), we must still use the docaction,
+          # otherwise we'd invoke two-way update logic, and the reverse column would try to update
+          # rows that we just deleted.
+          self._do_doc_action(actions.BulkUpdateRecord(table_id, rows, columns))
 
   @useraction
   def RemoveRecord(self, table_id, row_id):
@@ -1787,6 +1807,13 @@ def CopyFromColumn(self, table_id, src_col_id, dst_col_id, widgetOptions):
     if widgetOptions is None:
       widgetOptions = src_col.widgetOptions
 
+    # If we are changing type, and this column is reverse column, make sure it is compatible.
+    # If not, break the connection first, UI should have already warned the user.
+    existing_type = dst_col.type
+    new_type = src_col.type
+    if not is_compatible_ref_type(new_type, existing_type) and dst_col.reverseCol:
+      self._docmodel.update([dst_col, src_col], reverseCol=0)
+
     # Update the destination column to match the source's type and options. Also unset displayCol,
     # except if src_col has a displayCol, then keep it unchanged until SetDisplayFormula below.
     self._docmodel.update([dst_col], type=src_col.type, widgetOptions=[widgetOptions],
@@ -1942,6 +1969,7 @@ def AddReverseColumn(self, table_id, col_id):
     ret = self.AddVisibleColumn(target_table_id, reverse_label, {
       "isFormula": False,
       "type": "RefList:" + table_id,
+      "label": reverse_label,
     })
     added_col = self._docmodel.columns.table.get_record(ret['colRef'])
     self._docmodel.update([col_rec], reverseCol=added_col.id)
diff --git a/static/img/create-document.svg b/static/img/create-document.svg
new file mode 100644
index 00000000000..2ce098419fd
--- /dev/null
+++ b/static/img/create-document.svg
@@ -0,0 +1,32 @@
+<svg width="150" height="140" viewBox="0 0 150 140" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.5883 140L15 139.989C15.2275 133.508 15.9255 127.052 17.0885 120.67C19.6326 107.007 23.863 98.034 29.6622 94L30 94.477C16.453 103.9 15.5952 139.64 15.5883 140Z" fill="#494949"/>
+<path d="M22.6089 139L22 138.989C22.0131 138.346 22.3937 123.189 28.6503 119L29 119.475C22.9958 123.495 22.6119 138.845 22.6089 139Z" fill="#494949"/>
+<path d="M33 94C34.6569 94 36 92.6568 36 91C36 89.3431 34.6569 88 33 88C31.3431 88 30 89.3431 30 91C30 92.6568 31.3431 94 33 94Z" fill="#16B378"/>
+<path d="M31 119C32.6569 119 34 117.657 34 116C34 114.343 32.6569 113 31 113C29.3431 113 28 114.343 28 116C28 117.657 29.3431 119 31 119Z" fill="#16B378"/>
+<path d="M20.8746 96.1993C21.4233 99.7892 19.9934 103 19.9934 103C19.9934 103 17.674 100.391 17.1254 96.8007C16.5767 93.2108 18.0066 90 18.0066 90C18.0066 90 20.326 92.6095 20.8746 96.1993Z" fill="#494949"/>
+<path d="M30.6081 104.375C27.2943 105.576 24 104.676 24 104.676C24 104.676 26.0782 101.827 29.3919 100.625C32.7056 99.4235 36 100.324 36 100.324C36 100.324 33.9218 103.173 30.6081 104.375Z" fill="#494949"/>
+<path d="M30.4054 126.629C28.9789 127.053 27.4598 127.115 26 126.809C26.9269 125.695 28.1752 124.857 29.5946 124.398C31.014 123.938 32.5439 123.875 34 124.218C33.0461 125.305 31.8065 126.137 30.4054 126.629Z" fill="#494949"/>
+<path d="M107.999 136H103.934L102 121L108 121L107.999 136Z" fill="#FFF3DE"/>
+<path d="M108 140L96 140V139.842C96.0001 138.558 96.4922 137.326 97.3681 136.418C98.244 135.51 99.432 135 100.671 135L108 135L108 140Z" fill="#494949"/>
+<path d="M84.9994 136H80.9339L79 121L85 121L84.9994 136Z" fill="#FFF3DE"/>
+<path d="M84.9998 140L73 140V139.842C73.0001 138.558 73.4922 137.326 74.3681 136.418C75.244 135.51 76.432 135 77.6707 135H77.671L85 135L84.9998 140Z" fill="#494949"/>
+<path d="M74 53.8448L68.7607 53L67.068 55.8431L48.8528 60.6883L48.9021 60.9503C48.3869 60.389 47.7106 60.0182 46.9755 59.8938C46.2404 59.7694 45.4865 59.8983 44.8278 60.261C44.1691 60.6236 43.6416 61.2003 43.325 61.9037C43.0085 62.6072 42.9201 63.399 43.0733 64.1595C43.2265 64.9201 43.613 65.6078 44.1741 66.1187C44.7353 66.6295 45.4407 66.9357 46.1836 66.991C46.9264 67.0462 47.6663 66.8474 48.2912 66.4247C48.9161 66.0019 49.3921 65.3783 49.647 64.6481L71.7062 59.8473L74 53.8448Z" fill="#FFF3DE"/>
+<path d="M127.561 50.0617C127.129 50.0621 126.7 50.1453 126.298 50.3069L126.403 50.1222L103.168 38L100 43.1689L124.157 53.9924C124.244 54.6529 124.519 55.274 124.947 55.7812C125.376 56.2885 125.94 56.6604 126.572 56.8526C127.204 57.0448 127.878 57.0491 128.513 56.865C129.147 56.6808 129.716 56.3161 130.15 55.8143C130.585 55.3126 130.867 54.6951 130.963 54.0357C131.06 53.3763 130.965 52.7029 130.692 52.096C130.419 51.4892 129.979 50.9746 129.423 50.6139C128.868 50.2531 128.222 50.0614 127.561 50.0617Z" fill="#FFF3DE"/>
+<path d="M91.4035 18.0095C92.3294 12.2849 88.4401 6.88869 82.7165 5.95678C76.9929 5.02486 71.6024 8.91011 70.6765 14.6347C69.7506 20.3593 73.6399 25.7555 79.3635 26.6874C85.0872 27.6193 90.4776 23.734 91.4035 18.0095Z" fill="#494949"/>
+<path d="M80.5 27C84.0899 27 87 24.0899 87 20.5C87 16.9101 84.0899 14 80.5 14C76.9102 14 74 16.9101 74 20.5C74 24.0899 76.9102 27 80.5 27Z" fill="#FFF3DE"/>
+<path d="M80 19C83.866 19 87 16.9853 87 14.5C87 12.0147 83.866 10 80 10C76.134 10 73 12.0147 73 14.5C73 16.9853 76.134 19 80 19Z" fill="#494949"/>
+<path d="M81.5 11C83.9853 11 86 8.98528 86 6.5C86 4.01472 83.9853 2 81.5 2C79.0147 2 77 4.01472 77 6.5C77 8.98528 79.0147 11 81.5 11Z" fill="#494949"/>
+<path d="M75.9391 4.49998C75.9392 3.38767 76.3542 2.3148 77.1041 1.48831C77.854 0.66183 78.8856 0.140301 80 0.024332C79.8431 0.0081623 79.6855 4.01157e-05 79.5278 0C78.3265 0.00139078 77.1748 0.476108 76.3259 1.31987C75.4769 2.16363 75 3.30743 75 4.5C75 5.69257 75.4769 6.83636 76.3259 7.68013C77.1748 8.52389 78.3265 8.99861 79.5278 9C79.6855 8.99996 79.8431 8.99184 80 8.97567C78.8856 8.8597 77.854 8.33817 77.1041 7.51168C76.3542 6.68519 75.9392 5.6123 75.9391 4.49998Z" fill="#494949"/>
+<path d="M76.6948 36.9326L77.2211 31.8285C77.2211 31.8285 84.3618 27.0813 86.7887 29.887L101.294 54.9226C101.294 54.9226 110.31 58.1564 109.992 70.5046L109.561 130.192L99.3364 131.323L93.1277 84.7871L87.5181 133L75.6148 132.624L76.6857 100.862L82.3616 70.0724L82.3073 59.8557L79.8075 55.7325C79.8075 55.7325 75.2283 53.8768 75.1003 48.6324L75 41.2606L76.6948 36.9326Z" fill="#494949"/>
+<path d="M84 31.3536L84.14 29C84.14 29 105.607 34.648 103.904 38.6864C102.201 42.7247 99.0077 44 99.0077 44L86.6609 39.1115L84 31.3536Z" fill="#494949"/>
+<path d="M78.1294 36.7761L76.5437 35C76.5437 35 63.8958 53.641 67.7205 55.7238C71.5452 57.8066 74.7569 56.7131 74.7569 56.7131L81 44.6897L78.1294 36.7761Z" fill="#494949"/>
+<path d="M52.8642 97L135 80.5341L128.136 46L46 62.4659L52.8642 97Z" fill="white"/>
+<path d="M135 81.4211L52.0609 98L45 62.5789L127.939 46L135 81.4211ZM52.9544 96.6589L133.661 80.5263L127.046 47.3411L46.3392 63.4737L52.9544 96.6589Z" fill="#D9D9D9"/>
+<path d="M122.676 57.646L56 71L56.3903 72.9616L123.066 59.6076L122.676 57.646Z" fill="#D9D9D9"/>
+<path d="M123.676 63.646L57 77L57.3903 78.9616L124.066 65.6076L123.676 63.646Z" fill="#D9D9D9"/>
+<path d="M125.676 70.646L59 84L59.3903 85.9616L126.066 72.6076L125.676 70.646Z" fill="#D9D9D9"/>
+<path d="M90.4449 67.5415L87.9873 67.988C87.8078 68.0204 87.6215 67.9867 87.4692 67.8942C87.3169 67.8018 87.2112 67.6581 87.1751 67.4948L86.0132 62.1976C85.9776 62.0342 86.0146 61.8646 86.1162 61.7261C86.2178 61.5875 86.3756 61.4913 86.5551 61.4585L89.0127 61.012C89.1922 60.9796 89.3786 61.0133 89.5308 61.1058C89.6831 61.1982 89.7888 61.3419 89.8249 61.5052L90.9868 66.8024C91.0224 66.9658 90.9854 67.1354 90.8838 67.2739C90.7822 67.4125 90.6244 67.5087 90.4449 67.5415Z" fill="#16B378"/>
+<path d="M117.445 69.5415L114.987 69.988C114.808 70.0204 114.621 69.9867 114.469 69.8942C114.317 69.8018 114.211 69.6581 114.175 69.4948L113.013 64.1976C112.978 64.0342 113.015 63.8646 113.116 63.7261C113.218 63.5875 113.376 63.4913 113.555 63.4585L116.013 63.012C116.192 62.9796 116.379 63.0133 116.531 63.1058C116.683 63.1982 116.789 63.3419 116.825 63.5052L117.987 68.8024C118.022 68.9658 117.985 69.1354 117.884 69.2739C117.782 69.4125 117.624 69.5087 117.445 69.5415Z" fill="#16B378"/>
+<path d="M102.445 79.5415L99.9873 79.988C99.8078 80.0204 99.6215 79.9867 99.4692 79.8942C99.3169 79.8018 99.2112 79.6581 99.1752 79.4948L98.0132 74.1976C97.9776 74.0342 98.0146 73.8646 98.1162 73.7261C98.2178 73.5875 98.3756 73.4913 98.5551 73.4585L101.013 73.012C101.192 72.9796 101.379 73.0133 101.531 73.1058C101.683 73.1982 101.789 73.3419 101.825 73.5052L102.987 78.8024C103.022 78.9658 102.985 79.1354 102.884 79.2739C102.782 79.4125 102.624 79.5087 102.445 79.5415Z" fill="#16B378"/>
+<path d="M130.826 140H0.173971C0.127831 140 0.0835806 139.947 0.0509547 139.854C0.0183289 139.76 0 139.633 0 139.5C0 139.367 0.0183289 139.24 0.0509547 139.146C0.0835806 139.053 0.127831 139 0.173971 139H130.826C130.872 139 130.916 139.053 130.949 139.146C130.982 139.24 131 139.367 131 139.5C131 139.633 130.982 139.76 130.949 139.854C130.916 139.947 130.872 140 130.826 140Z" fill="#CACACA"/>
+</svg>
diff --git a/static/img/help-center.svg b/static/img/help-center.svg
new file mode 100644
index 00000000000..41d89105876
--- /dev/null
+++ b/static/img/help-center.svg
@@ -0,0 +1,10 @@
+<svg width="68" height="40" viewBox="0 0 68 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M34.6532 0.5H64.3471C66.2978 0.5 67.8872 2.11518 67.8872 4.09745V24.2321C67.8872 26.2144 66.2978 27.8296 64.3471 27.8296H61.8364V34.8226L54.9548 27.8296H34.6532C32.7025 27.8296 31.113 26.2144 31.113 24.2321V4.09745C31.113 2.11518 32.7025 0.5 34.6532 0.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60.6106 26.6038V31.8293L55.4683 26.6038H34.6532C33.3979 26.6038 32.3388 25.556 32.3388 24.2321V4.09745C32.3388 2.77355 33.3979 1.72581 34.6532 1.72581H64.3471C65.6023 1.72581 66.6614 2.77355 66.6614 4.09745V24.2321C66.6614 25.556 65.6023 26.6038 64.3471 26.6038H60.6106ZM61.8364 34.8226V27.8296H64.3471C66.2978 27.8296 67.8872 26.2144 67.8872 24.2321V4.09745C67.8872 2.11518 66.2978 0.5 64.3471 0.5H34.6532C32.7025 0.5 31.113 2.11518 31.113 4.09745V24.2321C31.113 26.2144 32.7025 27.8296 34.6532 27.8296H54.9548L61.8364 34.8226Z" fill="#D9D9D9"/>
+<path d="M34.79 6.62935C34.79 5.27536 35.8877 4.17773 37.2417 4.17773H61.7578C63.1118 4.17773 64.2094 5.27536 64.2094 6.62935V21.339C64.2094 22.693 63.1118 23.7906 61.7578 23.7906H37.2417C35.8877 23.7906 34.79 22.693 34.79 21.339V6.62935Z" fill="#16B378" fill-opacity="0.15"/>
+<path d="M50.2033 7.07422L49.9734 17.1453H47.7307L47.5079 7.07422H50.2033ZM48.8521 21.4914C48.4296 21.4914 48.0674 21.3428 47.7656 21.0456C47.4684 20.7485 47.3198 20.3863 47.3198 19.9591C47.3198 19.5412 47.4684 19.1837 47.7656 18.8865C48.0674 18.5894 48.4296 18.4408 48.8521 18.4408C49.2653 18.4408 49.6229 18.5894 49.9247 18.8865C50.2311 19.1837 50.3843 19.5412 50.3843 19.9591C50.3843 20.2424 50.3124 20.5001 50.1684 20.7322C50.0291 20.9644 49.8434 21.1501 49.6112 21.2894C49.3837 21.424 49.1307 21.4914 48.8521 21.4914Z" fill="#16B378"/>
+<path d="M33.3468 5.17773H3.65294C1.70225 5.17773 0.112793 6.79291 0.112793 8.77518V28.9099C0.112793 30.8921 1.70225 32.5073 3.65294 32.5073H6.16356V39.5003L13.0452 32.5073H33.3468C35.2975 32.5073 36.887 30.8921 36.887 28.9099V8.77518C36.887 6.79291 35.2975 5.17773 33.3468 5.17773Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.38936 31.2815V36.507L12.5317 31.2815H33.3468C34.6021 31.2815 35.6612 30.2338 35.6612 28.9099V8.77518C35.6612 7.45128 34.6021 6.40354 33.3468 6.40354H3.65294C2.39772 6.40354 1.3386 7.45128 1.3386 8.77518V28.9099C1.3386 30.2338 2.39772 31.2815 3.65294 31.2815H7.38936ZM6.16356 39.5003V32.5073H3.65294C1.70225 32.5073 0.112793 30.8921 0.112793 28.9099V8.77518C0.112793 6.79291 1.70225 5.17773 3.65294 5.17773H33.3468C35.2975 5.17773 36.887 6.79291 36.887 8.77518V28.9099C36.887 30.8921 35.2975 32.5073 33.3468 32.5073H13.0452L6.16356 39.5003Z" fill="#D9D9D9"/>
+<path d="M3.79004 11.3071C3.79004 9.95309 4.88766 8.85547 6.24165 8.85547H30.7578C32.1118 8.85547 33.2094 9.95309 33.2094 11.3071V26.0168C33.2094 27.3707 32.1118 28.4684 30.7578 28.4684H6.24165C4.88766 28.4684 3.79004 27.3707 3.79004 26.0168V11.3071Z" fill="#16B378" fill-opacity="0.15"/>
+<path d="M17.3021 21.8228V21.6417C17.3067 20.8013 17.3856 20.1326 17.5389 19.6358C17.6967 19.139 17.9196 18.7397 18.2075 18.4379C18.4954 18.1314 18.8459 17.8505 19.2592 17.5951C19.5424 17.4187 19.7955 17.226 20.0183 17.0171C20.2459 16.8035 20.4246 16.5667 20.5546 16.3066C20.6846 16.042 20.7497 15.7471 20.7497 15.4221C20.7497 15.0553 20.6638 14.7372 20.492 14.4679C20.3202 14.1986 20.088 13.9897 19.7955 13.8411C19.5076 13.6925 19.1849 13.6182 18.8274 13.6182C18.4977 13.6182 18.1843 13.6902 17.8871 13.8341C17.5946 13.9734 17.3508 14.187 17.1558 14.4749C16.9654 14.7581 16.8586 15.118 16.8354 15.5544H14.356C14.3792 14.6722 14.5928 13.934 14.9967 13.3396C15.4053 12.7453 15.9439 12.2996 16.6126 12.0024C17.2858 11.7052 18.0287 11.5566 18.8413 11.5566C19.7281 11.5566 20.5082 11.7122 21.1815 12.0233C21.8594 12.3344 22.3864 12.7778 22.7625 13.3536C23.1432 13.9247 23.3336 14.6026 23.3336 15.3873C23.3336 15.9166 23.2477 16.3902 23.0759 16.8081C22.9087 17.226 22.6696 17.5975 22.3585 17.9225C22.0474 18.2475 21.6783 18.5377 21.2511 18.7931C20.875 19.0252 20.5662 19.2667 20.3248 19.5174C20.088 19.7682 19.9116 20.063 19.7955 20.4019C19.684 20.7363 19.626 21.1495 19.6214 21.6417V21.8228H17.3021ZM18.5139 26.1688C18.0961 26.1688 17.7362 26.0202 17.4344 25.7231C17.1326 25.4259 16.9817 25.0637 16.9817 24.6366C16.9817 24.2187 17.1326 23.8611 17.4344 23.564C17.7362 23.2668 18.0961 23.1182 18.5139 23.1182C18.9272 23.1182 19.2847 23.2668 19.5865 23.564C19.893 23.8611 20.0462 24.2187 20.0462 24.6366C20.0462 24.9198 19.9742 25.1775 19.8303 25.4096C19.691 25.6418 19.5053 25.8275 19.2731 25.9668C19.0456 26.1015 18.7925 26.1688 18.5139 26.1688Z" fill="#16B378"/>
+</svg>
diff --git a/static/img/webinars.svg b/static/img/webinars.svg
new file mode 100644
index 00000000000..a09229f522b
--- /dev/null
+++ b/static/img/webinars.svg
@@ -0,0 +1,14 @@
+<svg width="107" height="42" viewBox="0 0 107 42" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M45.1257 5.21875H2.64915C1.69143 5.21875 0.915039 5.99536 0.915039 6.95336V35.4722C0.915039 36.4302 1.69143 37.2068 2.64915 37.2068H45.1257C46.0834 37.2068 46.8598 36.4302 46.8598 35.4722V6.95336C46.8598 5.99536 46.0834 5.21875 45.1257 5.21875Z" fill="white"/>
+<path d="M45.1223 5.77642C45.7722 5.77642 46.2995 6.30386 46.2995 6.95387V35.4727C46.2995 36.1227 45.7722 36.6502 45.1223 36.6502H2.64951C1.99968 36.6502 1.47239 36.1227 1.47239 35.4727V6.95387C1.47239 6.30386 1.99968 5.77642 2.64951 5.77642H45.1223ZM45.1223 4.66211H2.64951C1.38327 4.66211 0.358398 5.68727 0.358398 6.95387V35.4727C0.358398 36.7393 1.38327 37.7645 2.64951 37.7645H45.1223C46.3886 37.7645 47.4135 36.7393 47.4135 35.4727V6.95387C47.4135 5.68727 46.3886 4.66211 45.1223 4.66211Z" fill="#D9D9D9"/>
+<path d="M41.2008 8.80078H6.93063C5.9442 8.80078 5.14453 9.60067 5.14453 10.5874V32.0564C5.14453 33.0431 5.9442 33.843 6.93063 33.843H41.2008C42.1872 33.843 42.9869 33.0431 42.9869 32.0564V10.5874C42.9869 9.60067 42.1872 8.80078 41.2008 8.80078Z" fill="#D6EEE5"/>
+<path d="M29.0251 22.3705C30.0153 21.7985 30.0152 20.3688 29.0249 19.797L20.2727 14.7441C19.2825 14.1725 18.0449 14.8873 18.0449 16.0309V26.1392C18.0449 27.283 19.2828 27.9978 20.273 27.4258L29.0251 22.3705Z" fill="#16B378"/>
+<path d="M103.854 5.21875H61.3772C60.4195 5.21875 59.6431 5.99536 59.6431 6.95336V35.4722C59.6431 36.4302 60.4195 37.2068 61.3772 37.2068H103.854C104.811 37.2068 105.588 36.4302 105.588 35.4722V6.95336C105.588 5.99536 104.811 5.21875 103.854 5.21875Z" fill="white"/>
+<path d="M103.85 5.77642C104.5 5.77642 105.027 6.30386 105.027 6.95387V35.4727C105.027 36.1227 104.5 36.6502 103.85 36.6502H61.377C60.7272 36.6502 60.1999 36.1227 60.1999 35.4727V6.95387C60.1999 6.30386 60.7272 5.77642 61.377 5.77642H103.85ZM103.85 4.66211H61.377C60.1108 4.66211 59.0859 5.68727 59.0859 6.95387V35.4727C59.0859 36.7393 60.1108 37.7645 61.377 37.7645H103.85C105.116 37.7645 106.141 36.7393 106.141 35.4727V6.95387C106.141 5.68727 105.116 4.66211 103.85 4.66211Z" fill="#D9D9D9"/>
+<path d="M99.9288 8.80078H65.6587C64.6722 8.80078 63.8726 9.60067 63.8726 10.5874V32.0564C63.8726 33.0431 64.6722 33.843 65.6587 33.843H99.9288C100.915 33.843 101.715 33.0431 101.715 32.0564V10.5874C101.715 9.60067 100.915 8.80078 99.9288 8.80078Z" fill="#D6EEE5"/>
+<path d="M87.7527 22.3705C88.7429 21.7985 88.7427 20.3688 87.7524 19.797L79.0003 14.7441C78.0101 14.1725 76.7725 14.8873 76.7725 16.0309V26.1392C76.7725 27.283 78.0103 27.9978 79.0005 27.4258L87.7527 22.3705Z" fill="#16B378"/>
+<path d="M80.4243 1.31445H28.1469C26.9682 1.31445 26.0127 2.27025 26.0127 3.44929V38.5484C26.0127 39.7275 26.9682 40.6833 28.1469 40.6833H80.4243C81.603 40.6833 82.5586 39.7275 82.5586 38.5484V3.44929C82.5586 2.27025 81.603 1.31445 80.4243 1.31445Z" fill="white"/>
+<path d="M80.4197 2.00032C81.2195 2.00032 81.8684 2.64946 81.8684 3.44945V38.5486C81.8684 39.3486 81.2195 39.9977 80.4197 39.9977H28.1469C27.3471 39.9977 26.6982 39.3486 26.6982 38.5486V3.44945C26.6982 2.64946 27.3471 2.00032 28.1469 2.00032H80.4197ZM80.4197 0.628906H28.1469C26.5885 0.628906 25.3271 1.89061 25.3271 3.44945V38.5486C25.3271 40.1074 26.5885 41.3691 28.1469 41.3691H80.4197C81.9781 41.3691 83.2395 40.1074 83.2395 38.5486V3.44945C83.2395 1.89061 81.9781 0.628906 80.4197 0.628906Z" fill="#D9D9D9"/>
+<path d="M75.5934 5.72266H33.416C32.2019 5.72266 31.2178 6.70711 31.2178 7.9215V34.3441C31.2178 35.5585 32.2019 36.543 33.416 36.543H75.5934C76.8075 36.543 77.7917 35.5585 77.7917 34.3441V7.9215C77.7917 6.70711 76.8075 5.72266 75.5934 5.72266Z" fill="#D6EEE5"/>
+<path d="M60.608 22.4226C61.8267 21.7187 61.8265 19.9591 60.6076 19.2554L49.8361 13.0366C48.6174 12.3331 47.0942 13.2128 47.0942 14.6203V27.0609C47.0942 28.4686 48.6177 29.3484 49.8364 28.6445L60.608 22.4226Z" fill="#16B378"/>
+</svg>
diff --git a/static/locales/en.client.json b/static/locales/en.client.json
index 889fbf18d47..f12cec1acf6 100644
--- a/static/locales/en.client.json
+++ b/static/locales/en.client.json
@@ -148,7 +148,8 @@
         "Comment": "Comment",
         "Copy": "Copy",
         "Cut": "Cut",
-        "Paste": "Paste"
+        "Paste": "Paste",
+        "Copy with headers": "Copy with headers"
     },
     "ChartView": {
         "Create separate series for each value of the selected column.": "Create separate series for each value of the selected column.",
@@ -277,7 +278,11 @@
         "Workspace not found": "Workspace not found",
         "You are on the {{siteName}} site. You also have access to the following sites:": "You are on the {{siteName}} site. You also have access to the following sites:",
         "You are on your personal site. You also have access to the following sites:": "You are on your personal site. You also have access to the following sites:",
-        "You may delete a workspace forever once it has no documents in it.": "You may delete a workspace forever once it has no documents in it."
+        "You may delete a workspace forever once it has no documents in it.": "You may delete a workspace forever once it has no documents in it.",
+        "Any documents created in this site will appear here.": "Any documents created in this site will appear here.",
+        "Create my first document": "Create my first document",
+        "You have read-only access to this site. Currently there are no documents.": "You have read-only access to this site. Currently there are no documents.",
+        "personal site": "personal site"
     },
     "DocPageModel": {
         "Add Empty Table": "Add Empty Table",
@@ -531,7 +536,8 @@
         "Sign in": "Sign in",
         "To use Grist, please either sign up or sign in.": "To use Grist, please either sign up or sign in.",
         "Visit our {{link}} to learn more about Grist.": "Visit our {{link}} to learn more about Grist.",
-        "Learn more in our {{helpCenterLink}}.": "Learn more in our {{helpCenterLink}}."
+        "Learn more in our {{helpCenterLink}}.": "Learn more in our {{helpCenterLink}}.",
+        "Only show documents": "Only show documents"
     },
     "HomeLeftPane": {
         "Access Details": "Access Details",
@@ -793,7 +799,8 @@
         "API Console": "API Console"
     },
     "TopBar": {
-        "Manage Team": "Manage Team"
+        "Manage Team": "Manage Team",
+        "Manage team": "Manage team"
     },
     "TriggerFormulas": {
         "Any field": "Any field",
@@ -1204,7 +1211,13 @@
         "These rules are applied after all column rules have been processed, if applicable.": "These rules are applied after all column rules have been processed, if applicable.",
         "Example: {{example}}": "Example: {{example}}",
         "Filter displayed dropdown values with a condition.": "Filter displayed dropdown values with a condition.",
-        "Community widgets are created and maintained by Grist community members.": "Community widgets are created and maintained by Grist community members."
+        "Community widgets are created and maintained by Grist community members.": "Community widgets are created and maintained by Grist community members.",
+        "Creates a reverse column in target table that can be edited from either end.": "Creates a reverse column in target table that can be edited from either end.",
+        "This limitation occurs when one end of a two-way reference is configured as a single Reference.": "This limitation occurs when one end of a two-way reference is configured as a single Reference.",
+        "To allow multiple assignments, change the type of the Reference column to Reference List.": "To allow multiple assignments, change the type of the Reference column to Reference List.",
+        "This limitation occurs when one column in a two-way reference has the Reference type.": "This limitation occurs when one column in a two-way reference has the Reference type.",
+        "To allow multiple assignments, change the referenced column's type to Reference List.": "To allow multiple assignments, change the referenced column's type to Reference List.",
+        "Two-way references are not currently supported for Formula or Trigger Formula columns": "Two-way references are not currently supported for Formula or Trigger Formula columns"
     },
     "DescriptionConfig": {
         "DESCRIPTION": "DESCRIPTION"
@@ -1585,7 +1598,8 @@
         "Key to sign sessions with": "Key to sign sessions with",
         "Session Secret": "Session Secret",
         "Enable Grist Enterprise": "Enable Grist Enterprise",
-        "Enterprise": "Enterprise"
+        "Enterprise": "Enterprise",
+        "checking": "checking"
     },
     "Columns": {
         "Remove Column": "Remove Column"
@@ -1731,5 +1745,48 @@
         },
         "The toggle is **off**": "The toggle is **off**",
         "The toggle is **on**": "The toggle is **on**"
+    },
+    "HomeIntroCards": {
+        "3 minute video tour": "3 minute video tour",
+        "Blank document": "Blank document",
+        "Find solutions and explore more resources {{helpCenterLink}}": "Find solutions and explore more resources {{helpCenterLink}}",
+        "Finish our basics tutorial": "Finish our basics tutorial",
+        "Help center": "Help center",
+        "Import file": "Import file",
+        "Learn more {{webinarsLinks}}": "Learn more {{webinarsLinks}}",
+        "Start a new document": "Start a new document",
+        "Templates": "Templates",
+        "Tutorial": "Tutorial",
+        "Webinars": "Webinars"
+    },
+    "ReverseReferenceConfig": {
+        "Add two-way reference": "Add two-way reference",
+        "Column": "Column",
+        "Delete": "Delete",
+        "Delete column {{column}} in table {{table}}?": "Delete column {{column}} in table {{table}}?",
+        "It is the reverse of the reference column {{column}} in table {{table}}.": "It is the reverse of the reference column {{column}} in table {{table}}.",
+        "Table": "Table",
+        "Two-way Reference": "Two-way Reference",
+        "Delete two-way reference?": "Delete two-way reference?",
+        "Target table": "Target table"
+    },
+    "SupportGristButton": {
+        "Admin Panel": "Admin Panel",
+        "Close": "Close",
+        "Help Center": "Help Center",
+        "Opt in to Telemetry": "Opt in to Telemetry",
+        "Opted In": "Opted In",
+        "Support Grist": "Support Grist",
+        "Thank you! Your trust and support is greatly appreciated. Opt out any time from the {{link}} in the user menu.": "Thank you! Your trust and support is greatly appreciated. Opt out any time from the {{link}} in the user menu."
+    },
+    "buildReassignModal": {
+        "Cancel": "Cancel",
+        "Each {{targetTable}} record may only be assigned to a single {{sourceTable}} record.": "Each {{targetTable}} record may only be assigned to a single {{sourceTable}} record.",
+        "Reassign": "Reassign",
+        "Reassign to new {{sourceTable}} records.": "Reassign to new {{sourceTable}} records.",
+        "Reassign to {{sourceTable}} record {{sourceName}}.": "Reassign to {{sourceTable}} record {{sourceName}}.",
+        "Record already assigned_one": "Record already assigned",
+        "Record already assigned_other": "Record already assigned",
+        "{{targetTable}} record {{targetName}} is already assigned to {{sourceTable}} record          {{oldSourceName}}.": "{{targetTable}} record {{targetName}} is already assigned to {{sourceTable}} record          {{oldSourceName}}."
     }
 }
diff --git a/static/locales/eu.client.json b/static/locales/eu.client.json
index d332690b443..beca96efb80 100644
--- a/static/locales/eu.client.json
+++ b/static/locales/eu.client.json
@@ -192,7 +192,12 @@
         "No {{columnType}} columns in table.": "Ez dago {{columnType}} zutaberik taulan.",
         " (optional)": " (aukerakoa)",
         "{{wrongTypeCount}} non-{{columnType}} columns are not shown_other": "{{wrongTypeCount}} ez dira {{columnType}} zutabeak erakusten",
-        "Full document access": "Sarbide osoa dokumentura"
+        "Full document access": "Sarbide osoa dokumentura",
+        "Accept": "Onartu",
+        "Developer:": "Garatzailea:",
+        "Last updated:": "Azkenekoz eguneratua:",
+        "Missing description and author information.": "Ez dago deskribapen ezta egilearen informaziorik ere.",
+        "Reject": "Baztertu"
     },
     "DataTables": {
         "Click to copy": "Egin klik kopiatzeko",
@@ -257,7 +262,8 @@
         "Workspace not found": "Ez da lan-eremua aurkitu",
         "You are on the {{siteName}} site. You also have access to the following sites:": "{{siteName}} gunean zaude. Honako gune hauetara ere sar zaitezke:",
         "You are on your personal site. You also have access to the following sites:": "Zure leku pertsonalean zaude. Honako gune hauetara ere sar zaitezke:",
-        "You may delete a workspace forever once it has no documents in it.": "Lan-eremu bat betiko ezabatzeko ezin du barruan dokumenturik izan."
+        "You may delete a workspace forever once it has no documents in it.": "Lan-eremu bat betiko ezabatzeko ezin du barruan dokumenturik izan.",
+        "Create my first document": "Sortu nire lehen dokumentua"
     },
     "DocPageModel": {
         "Add Empty Table": "Gehitu taula hutsa",
@@ -493,7 +499,8 @@
         "Get started by exploring templates, or creating your first Grist document.": "Has zaitez txantiloiak arakatuz edo zure lehen Grist dokumentua sortuz.",
         "Get started by inviting your team and creating your first Grist document.": "Has zaitez zure taldea gonbidatuz eta zure lehen Grist dokumentua sortuz.",
         "Interested in using Grist outside of your team? Visit your free ": "Grist zure taldetik kanpo erabili nahi duzu? Bisitatu zure doako ",
-        "Sprouts Program": "Kimuen programa"
+        "Sprouts Program": "Kimuen programa",
+        "Only show documents": "Erakutsi dokumentuak bakarrik"
     },
     "HomeLeftPane": {
         "All Documents": "Dokumentu guztiak",
@@ -720,7 +727,8 @@
         "API Console": "API kontsola"
     },
     "TopBar": {
-        "Manage Team": "Kudeatu taldea"
+        "Manage Team": "Kudeatu taldea",
+        "Manage team": "Kudeatu taldea"
     },
     "TriggerFormulas": {
         "Cancel": "Utzi",
@@ -1537,7 +1545,8 @@
         "Grist allows for very powerful formulas, using Python. We recommend setting the environment variable GRIST_SANDBOX_FLAVOR to gvisor if your hardware supports it (most will), to run formulas in each document within a sandbox isolated from other documents and isolated from the network.": "Gristek formula oso boteretsuak onartzen ditu, Python erabiliz. Dokumentu bakoitzean beste dokumentu batzuetatik eta saretik isolatutako sandbox baten barruan formulak exekutatzeko, GRIST_SANDBOX_FLAVOR aldagaia gvisor-era aldatzea gomendatzen dugu, zure hardwarea bateragarria bada (gehienak badira).",
         "Session Secret": "Saioaren gakoa",
         "Enable Grist Enterprise": "Gaitu Grist Enterprise",
-        "Enterprise": "Enterprise"
+        "Enterprise": "Enterprise",
+        "checking": "egiaztatzen"
     },
     "Columns": {
         "Remove Column": "Kendu zutabea"
@@ -1680,5 +1689,40 @@
         "Table {{tableName}} will no longer be visible": "{{tableName}} taula ez da ikusgai egongo aurrerantzean",
         "raw data page": "datu gordinen orria",
         "Delete": "Ezabatu"
+    },
+    "CustomWidgetGallery": {
+        "Add Your Own Widget": "Gehitu zure widgeta",
+        "Cancel": "Utzi",
+        "Change Widget": "Aldatu widgeta",
+        "Developer:": "Garatzailea:",
+        "Last updated:": "Azkenekoz eguneratua:",
+        "Search": "Bilatu",
+        "Widget URL": "Widgetaren URLa",
+        "Add Widget": "Gehitu widgeta",
+        "(Missing info)": "(Informaziorik gabe)",
+        "Grist Widget": "Grist widgeta",
+        "No matching widgets": "Ez dago bat datorren widgetik"
+    },
+    "HomeIntroCards": {
+        "Help center": "Laguntza gunea",
+        "Learn more {{webinarsLinks}}": "Ikasi gehiago {{webinarsLinks}}",
+        "Start a new document": "Hasi dokuemntu berria",
+        "Templates": "Txantiloiak",
+        "Blank document": "Dokumentu zuria",
+        "Import file": "Inportatu fitxategia"
+    },
+    "ReverseReferenceConfig": {
+        "Delete": "Ezabatu",
+        "Table": "Taula",
+        "Target table": "Helmugako taula",
+        "Delete column {{column}} in table {{table}}?": "{{table}} taulako {{column}} zutabea ezabatu nahi duzu?",
+        "Column": "Zutabea"
+    },
+    "SupportGristButton": {
+        "Close": "Itxi",
+        "Help Center": "Laguntza gunea"
+    },
+    "buildReassignModal": {
+        "Cancel": "Utzi"
     }
 }
diff --git a/static/locales/sl.client.json b/static/locales/sl.client.json
index 5c4b9cf3cda..ef522c56fe6 100644
--- a/static/locales/sl.client.json
+++ b/static/locales/sl.client.json
@@ -133,7 +133,8 @@
         "Cut": "Izreži",
         "Paste": "Prilepi",
         "Clear values": "Izbriši vrednosti",
-        "Clear cell": "Čista celica"
+        "Clear cell": "Čista celica",
+        "Copy with headers": "Kopiraj z glavami"
     },
     "DocMenu": {
         "Document will be moved to Trash.": "Dokument se bo premaknil v koš.",
@@ -174,7 +175,11 @@
         "Restore": "Obnovi",
         "Move {{name}} to workspace": "Premakni {{name}} v delovni prostor",
         "You are on the {{siteName}} site. You also have access to the following sites:": "Nahajate se na spletnem mestu {{siteName}}. Prav tako imate dostop do naslednjih spletnih mest:",
-        "Examples & Templates": "Primeri & predloge"
+        "Examples & Templates": "Primeri & predloge",
+        "Any documents created in this site will appear here.": "Vsi dokumenti, ustvarjeni na tem mestu, bodo prikazani tukaj.",
+        "Create my first document": "Ustvari moj prvi dokument",
+        "personal site": "osebno spletno mesto",
+        "You have read-only access to this site. Currently there are no documents.": "Do tega mesta imate dostop samo za branje. Trenutno ni dokumentov."
     },
     "GridViewMenus": {
         "Rename column": "Preimenuj stolpec",
@@ -407,7 +412,15 @@
         "{{wrongTypeCount}} non-{{columnType}} columns are not shown_other": "{{wrongTypeCount}} stolpci, ki niso{{columnType}}, niso prikazani",
         "Widget needs to {{read}} the current table.": "Widget mora {{read}} trenutno tabelo.",
         "No {{columnType}} columns in table.": "V tabeli ni stolpcev tipa {{columnType}}.",
-        "Clear selection": "Briši izbor"
+        "Clear selection": "Briši izbor",
+        "Custom URL": "URL po meri",
+        "Developer:": "Razvijalec:",
+        "ACCESS LEVEL": "STOPNJA DOSTOPOV",
+        "Reject": "Zavrni",
+        "Accept": "Sprejmi",
+        "Last updated:": "Zadnja posodobitev:",
+        "Missing description and author information.": "Manjka opis in podatki o avtorju.",
+        "Widget": "Widget"
     },
     "DocHistory": {
         "Activity": "Dejavnost",
@@ -784,7 +797,14 @@
         "Build simple forms right in Grist and share in a click with our new widget. {{learnMoreButton}}": "Ustvari preproste obrazce neposredno v Gristu in jih deli z enim klikom z našim novim pripomočkom. {{learnMoreButton}}",
         "These rules are applied after all column rules have been processed, if applicable.": "Ta pravila se uporabijo, ko so obdelana vsa pravila stolpcev, če so na voljo.",
         "Filter displayed dropdown values with a condition.": "Filtriraj prikazane vrednosti .",
-        "Example: {{example}}": "Primer: {{example}}"
+        "Example: {{example}}": "Primer: {{example}}",
+        "Creates a reverse column in target table that can be edited from either end.": "Ustvari vzvratni stolpec v ciljni tabeli, ki ga je mogoče urejati z obeh koncev.",
+        "To allow multiple assignments, change the type of the Reference column to Reference List.": "Če želiš dovoliti več dodelitev, spremeni vrsto stolpca Reference v Seznam referenc.",
+        "To allow multiple assignments, change the referenced column's type to Reference List.": "Če želiš omogočiti več dodelitev, spremeni vrsto referenčnega stolpca v Referenčni seznam.",
+        "Two-way references are not currently supported for Formula or Trigger Formula columns": "Dvosmerne reference trenutno niso podprte za stolpce formule ali formule sprožilca",
+        "Community widgets are created and maintained by Grist community members.": "Pripomočke skupnosti ustvarjajo in vzdržujejo člani skupnosti Grist.",
+        "This limitation occurs when one end of a two-way reference is configured as a single Reference.": "Do te omejitve pride, ko je en konec dvosmerne reference konfiguriran kot ena sama referenca.",
+        "This limitation occurs when one column in a two-way reference has the Reference type.": "Do te omejitve pride, ko ima en stolpec v dvosmernem sklicu vrsto Reference."
     },
     "UserManager": {
         "Anyone with link ": "Vsakdo s povezavo ",
@@ -922,7 +942,8 @@
         "Visit our {{link}} to learn more about Grist.": "Obiščite našo spletno stran {{link}} da izveste več o Grisstu.",
         "Sign in": "Prijavi se",
         "To use Grist, please either sign up or sign in.": "Če želiš uporabljati Grist, se prijavi ali prvič prijavi.",
-        "Learn more in our {{helpCenterLink}}.": "Izvedi več v našem {{helpCenterLink}}."
+        "Learn more in our {{helpCenterLink}}.": "Izvedi več v našem {{helpCenterLink}}.",
+        "Only show documents": "Pokaži samo dokumente"
     },
     "WelcomeSitePicker": {
         "You have access to the following Grist sites.": "Imate dostop do naslednjih Grist spletnih mest .",
@@ -1101,7 +1122,8 @@
         "Rule {{length}}": "Pravilo {{length}}"
     },
     "TopBar": {
-        "Manage Team": "Upravljanje ekipe"
+        "Manage Team": "Upravljanje ekipe",
+        "Manage team": "Uredi ekipo"
     },
     "UserManagerModel": {
         "View & Edit": "Ogled in urejanje",
@@ -1175,7 +1197,9 @@
         "Build your own form": "Ustvari svoj obrazec",
         "Powered by": "Poganja ga",
         "An unknown error occurred.": "Prišlo je do neznane napake.",
-        "Form not found": "Ne najdem obrazca"
+        "Form not found": "Ne najdem obrazca",
+        "Sign-in failed{{suffix}}": "Prijava ni uspela{{suffix}}",
+        "Failed to log in.{{separator}}Please try again or contact support.": "Prijava ni uspela.{{separator}}Poskusi znova ali se obrni na podporo."
     },
     "WidgetTitle": {
         "DATA TABLE NAME": "IME PODATKOVNE TABELE",
@@ -1560,7 +1584,8 @@
         "Grist signs user session cookies with a secret key. Please set this key via the environment variable GRIST_SESSION_SECRET. Grist falls back to a hard-coded default when it is not set. We may remove this notice in the future since session IDs have been updated to be inherently cryptographically secure.": "Grist podpisuje piškotke uporabniške seje s skrivnim ključem. Ta ključ nastavite prek spremenljivke okolja GRIST_SESSION_SECRET. Grist se vrne na trdo kodirano privzeto vrednost, če ni nastavljena. To obvestilo bomo morda odstranili v prihodnosti, saj so ID-ji sej, ustvarjeni od različice 1.1.16, sami po sebi kriptografsko varni.",
         "Grist signs user session cookies with a secret key. Please set this key via the environment variable GRIST_SESSION_SECRET. Grist falls back to a hard-coded default when it is not set. We may remove this notice in the future as session IDs generated since v1.1.16 are inherently cryptographically secure.": "Grist podpisuje piškotke uporabniške seje s skrivnim ključem. Ta ključ nastavite prek spremenljivke okolja GRIST_SESSION_SECRET. Grist se vrne na trdo kodirano privzeto vrednost, če ni nastavljena. To obvestilo bomo morda odstranili v prihodnosti, saj so ID-ji sej, ustvarjeni od različice 1.1.16, sami po sebi kriptografsko varni.",
         "Enable Grist Enterprise": "Omogoči Grist Enterprise",
-        "Enterprise": "Podjetje"
+        "Enterprise": "Podjetje",
+        "checking": "preverjanje"
     },
     "ChoiceEditor": {
         "Error in dropdown condition": "Napaka v spustnem meniju",
@@ -1649,7 +1674,8 @@
         "3 minute video tour": "3 minutni video ogled",
         "Complete our basics tutorial": "Dokončaj našo vadnico o osnovah",
         "Complete the tutorial": "Dokončaj vadnico",
-        "Learn the basic of reference columns, linked widgets, column types, & cards.": "Nauči se osnov referenčnih stolpcev, povezanih pripomočkov, vrst stolpcev in kartic."
+        "Learn the basic of reference columns, linked widgets, column types, & cards.": "Nauči se osnov referenčnih stolpcev, povezanih pripomočkov, vrst stolpcev in kartic.",
+        "Learn the basics of reference columns, linked widgets, column types, & cards.": "Naučite se osnov referenčnih stolpcev, povezanih pripomočkov, vrst stolpcev in kartic."
     },
     "OnboardingPage": {
         "Back": "Nazaj",
@@ -1680,5 +1706,68 @@
         "Keep data and delete widget. Table will remain available in {{rawDataLink}}": "Ohranite podatke in izbrišite pripomoček. Tabela bo ostala na voljo v {{rawDataLink}}",
         "Table {{tableName}} will no longer be visible": "Tabela {{tableName}} ne bo več vidna",
         "raw data page": "stran z neobdelanimi podatki"
+    },
+    "AdminPanelName": {
+        "Admin Panel": "Skrbniška plošča"
+    },
+    "CustomWidgetGallery": {
+        "(Missing info)": "(Manjkajo informacije)",
+        "Add Widget": "Dodaj pripomoček",
+        "Add Your Own Widget": "Dodajte svoj pripomoček",
+        "Add a widget from outside this gallery.": "Dodaj pripomoček zunaj te galerije.",
+        "Cancel": "Prekliči",
+        "Change Widget": "Spremeni pripomoček",
+        "Developer:": "razvijalec:",
+        "Grist Widget": "Grist Pripomoček",
+        "Learn more about Custom Widgets": "Izvedite več o pripomočkih po meri",
+        "No matching widgets": "Ni ujemajočih se pripomočkov",
+        "Search": "Iskanje",
+        "Widget URL": "URL pripomočka",
+        "Choose Custom Widget": "Izberite Pripomoček po meri",
+        "Community Widget": "Pripomoček skupnosti",
+        "Custom URL": "URL po meri",
+        "Last updated:": "Zadnja posodobitev:"
+    },
+    "markdown": {
+        "The toggle is **off**": "Preklop je **izklopljen**",
+        "The toggle is **on**": "Preklop je **vklopljen**",
+        "# New Markdown Function\n *\n *      We can _write_ [the usual Markdown](https:": {
+            "": {
+                "markdownguide.org) *inside*\n *      a Grainjs element.": "# Nova funkcija Markdown\n *\n * Lahko _napišemo_ [običajni Markdown](https://markdownguide.org) *znotraj*\n * element Grainjs."
+            }
+        }
+    },
+    "markdown.d": {
+        "The toggle is **on**": "Preklop je **vklopljen**",
+        "The toggle is **off**": "Preklop je **izklopljen**"
+    },
+    "HomeIntroCards": {
+        "3 minute video tour": "3 minutni video ogled",
+        "Blank document": "Prazen dokument",
+        "Finish our basics tutorial": "Dokončaj našo vadnico o osnovah",
+        "Learn more {{webinarsLinks}}": "Več o tem {{webinarsLinks}}",
+        "Start a new document": "Začni nov dokument",
+        "Templates": "Predloge",
+        "Tutorial": "Vadnica",
+        "Find solutions and explore more resources {{helpCenterLink}}": "Poiščite rešitve in raziščite več virov {{helpCenterLink}}",
+        "Help center": "Center za pomoč",
+        "Import file": "Uvozi datoteko",
+        "Webinars": "Spletni seminarji"
+    },
+    "ReverseReferenceConfig": {
+        "Add two-way reference": "Dodaj dvosmerno referenco",
+        "Delete column {{column}} in table {{table}}?": "Želiš izbrisati stolpec {{column}} v tabeli {{table}}?",
+        "It is the reverse of the reference column {{column}} in table {{table}}.": "Je obratna stran referenčnega stolpca {{column}} v tabeli {{table}}.",
+        "Two-way Reference": "Dvosmerna referenca",
+        "Delete two-way reference?": "Želiš izbrisati dvosmerno referenco?",
+        "Target table": "Ciljna tabela",
+        "Column": "Stolpec",
+        "Delete": "Izbriši",
+        "Table": "Tabela"
+    },
+    "SupportGristButton": {
+        "Admin Panel": "Skrbniška plošča",
+        "Close": "Zapri",
+        "Help Center": "Center za pomoč"
     }
 }
diff --git a/stubs/app/server/server.ts b/stubs/app/server/server.ts
index c7e5b9eb5e1..6f5f63fae2a 100644
--- a/stubs/app/server/server.ts
+++ b/stubs/app/server/server.ts
@@ -7,7 +7,6 @@
 import {commonUrls} from 'app/common/gristUrls';
 import {isAffirmative} from 'app/common/gutil';
 import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager';
-import {fixSiteProducts} from 'app/gen-server/lib/Housekeeper';
 
 const debugging = isAffirmative(process.env.DEBUG) || isAffirmative(process.env.VERBOSE);
 
@@ -132,10 +131,6 @@ export async function main() {
   if (process.env.GRIST_SERVE_PLUGINS_PORT) {
     await mergedServer.flexServer.startCopy('pluginServer', parseInt(process.env.GRIST_SERVE_PLUGINS_PORT, 10));
   }
-  await fixSiteProducts({
-    deploymentType: mergedServer.flexServer.getDeploymentType(),
-    db: mergedServer.flexServer.getHomeDBManager()
-  });
 
   return mergedServer.flexServer;
 }
diff --git a/test/fixtures/docs/DocTutorial.grist b/test/fixtures/docs/DocTutorial.grist
deleted file mode 100644
index 5b3d01bf4e5..00000000000
Binary files a/test/fixtures/docs/DocTutorial.grist and /dev/null differ
diff --git a/test/fixtures/docs/Grist Basics.grist b/test/fixtures/docs/Grist Basics.grist
new file mode 100644
index 00000000000..e671835920b
Binary files /dev/null and b/test/fixtures/docs/Grist Basics.grist differ
diff --git a/test/gen-server/ApiServer.ts b/test/gen-server/ApiServer.ts
index b79355ca1ef..7be5a268dfe 100644
--- a/test/gen-server/ApiServer.ts
+++ b/test/gen-server/ApiServer.ts
@@ -2301,15 +2301,6 @@ describe('ApiServer', function() {
       assert.deepEqual(resp.data[0].docs.map((doc: any) => doc.name), ['Lightweight CRM']);
       assert.deepEqual(resp.data[1].docs.map((doc: any) => doc.name), ['Expense Report', 'Timesheet']);
 
-      // Make a request to retrieve only the featured (pinned) templates.
-      const resp2 = await axios.get(`${homeUrl}/api/templates/?onlyFeatured=1`, nobody);
-      // Assert that the response includes only pinned documents.
-      assert.equal(resp2.status, 200);
-      assert.lengthOf(resp2.data, 2);
-      assert.deepEqual(resp.data.map((ws: any) => ws.name), ['CRM', 'Invoice']);
-      assert.deepEqual(resp2.data[0].docs.map((doc: any) => doc.name), ['Lightweight CRM']);
-      assert.deepEqual(resp2.data[1].docs, []);
-
       // Add a new document to the CRM workspace, but don't share it with everyone.
       await axios.post(`${homeUrl}/api/workspaces/${crmWsId}/docs`,
         {name: 'Draft CRM Template', isPinned: true}, support);
diff --git a/test/gen-server/lib/HomeDBManager.ts b/test/gen-server/lib/HomeDBManager.ts
index a22c55474e6..d5ccb2d1f2f 100644
--- a/test/gen-server/lib/HomeDBManager.ts
+++ b/test/gen-server/lib/HomeDBManager.ts
@@ -90,7 +90,7 @@ describe('HomeDBManager', function() {
 
   it('can add an org', async function() {
     const user = await home.getUserByLogin('chimpy@getgrist.com');
-    const orgId = (await home.addOrg(user, {name: 'NewOrg', domain: 'novel-org'}, teamOptions)).data!;
+    const orgId = (await home.addOrg(user, {name: 'NewOrg', domain: 'novel-org'}, teamOptions)).data!.id;
     const org = await home.getOrg({userId: user.id}, orgId);
     assert.equal(org.data!.name, 'NewOrg');
     assert.equal(org.data!.domain, 'novel-org');
@@ -109,7 +109,7 @@ describe('HomeDBManager', function() {
         useNewPlan: true,
         // omit plan, to use a default one (teamInitial)
         // it will either be 'stub' or anything set in GRIST_DEFAULT_PRODUCT
-      })).data!;
+      })).data!.id;
       let org = await home.getOrg({userId: user.id}, orgId);
       assert.equal(org.data!.name, 'NewOrg');
       assert.equal(org.data!.domain, 'novel-org');
@@ -121,7 +121,7 @@ describe('HomeDBManager', function() {
       orgId = (await home.addOrg(user, {name: 'NewOrg', domain: 'novel-org'}, {
         setUserAsOwner: false,
         useNewPlan: true,
-      })).data!;
+      })).data!.id;
 
       org = await home.getOrg({userId: user.id}, orgId);
       assert.equal(org.data!.billingAccount.product.name, STUB_PLAN);
@@ -135,7 +135,7 @@ describe('HomeDBManager', function() {
     const user = await home.getUserByLogin('chimpy@getgrist.com');
     const domain = 'repeated-domain';
     const result = await home.addOrg(user, {name: `${domain}!`, domain}, teamOptions);
-    const orgId = result.data!;
+    const orgId = result.data!.id;
     assert.equal(result.status, 200);
     await assert.isRejected(home.addOrg(user, {name: `${domain}!`, domain}, teamOptions),
                             /Domain already in use/);
diff --git a/test/gen-server/lib/mergedOrgs.ts b/test/gen-server/lib/mergedOrgs.ts
index eb71fd616e3..42fefa303d2 100644
--- a/test/gen-server/lib/mergedOrgs.ts
+++ b/test/gen-server/lib/mergedOrgs.ts
@@ -1,7 +1,7 @@
 import {Workspace} from 'app/common/UserAPI';
 import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager';
 import {FlexServer} from 'app/server/lib/FlexServer';
-import {MergedServer} from "app/server/MergedServer";
+import {MergedServer} from 'app/server/MergedServer';
 import axios from 'axios';
 import {assert} from 'chai';
 import {createInitialDb, removeConnection, setUpDB} from 'test/gen-server/seed';
diff --git a/test/nbrowser/BehavioralPrompts.ts b/test/nbrowser/BehavioralPrompts.ts
index a49b44da041..b42248a9b5b 100644
--- a/test/nbrowser/BehavioralPrompts.ts
+++ b/test/nbrowser/BehavioralPrompts.ts
@@ -4,7 +4,7 @@ import {setupTestSuite} from 'test/nbrowser/testUtils';
 
 describe('BehavioralPrompts', function() {
   this.timeout(20000);
-  const cleanup = setupTestSuite();
+  const cleanup = setupTestSuite({tutorial: true});
 
   let session: gu.Session;
   let docId: string;
@@ -148,15 +148,14 @@ describe('BehavioralPrompts', function() {
   describe('for the Add New button', function() {
     it('should not be shown if site is empty', async function() {
       session = await gu.session().user('user4').login({showTips: true});
-      await gu.dismissCoachingCall();
-      await driver.navigate().refresh();
-      await gu.loadDocMenu('/');
+      await session.loadDocMenu('/');
       await assertPromptTitle(null);
     });
 
     it('should be shown if site has documents', async function() {
       await session.tempNewDoc(cleanup, 'BehavioralPromptsAddNew');
-      await session.loadDocMenu('/');
+      await driver.find('.test-bc-workspace').click();
+      await gu.waitForDocMenuToLoad();
       await assertPromptTitle('Add New');
     });
 
@@ -166,16 +165,31 @@ describe('BehavioralPrompts', function() {
       await assertPromptTitle(null);
     });
 
-    it('should only be shown once each visit to the doc menu', async function() {
-      // Navigate to another page without reloading; the tip should now be shown.
-      await driver.find('.test-dm-all-docs').click();
-      await gu.waitForDocMenuToLoad();
+    it('should only be shown on the All Documents page if intro is hidden', async function() {
+      await session.loadDocMenu('/');
+      await assertPromptTitle(null);
+      await driver.find('.test-welcome-menu').click();
+      await driver.find('.test-welcome-menu-only-show-documents').click();
+      await gu.waitForServer();
+      await assertPromptTitle(null);
+      await gu.loadDocMenu('/');
       await assertPromptTitle('Add New');
+    });
 
-      // Navigate to another page; the tip should no longer be shown.
+    it('should only be shown once on each visit', async function() {
+      // Navigate to the home page for the first time; the tip should be shown.
+      await gu.loadDocMenu('/');
+      await assertPromptTitle('Add New');
+
+      // Switch to a different page; the tip should no longer be shown.
       await driver.findContent('.test-dm-workspace', /Home/).click();
       await gu.waitForDocMenuToLoad();
       await assertPromptTitle(null);
+
+      // Reload the page; the tip should be shown again.
+      await driver.navigate().refresh();
+      await gu.waitForDocMenuToLoad();
+      await assertPromptTitle('Add New');
     });
   });
 
@@ -214,16 +228,19 @@ describe('BehavioralPrompts', function() {
   });
 
   describe('when in a tutorial', function() {
-    gu.withEnvironmentSnapshot({'GRIST_UI_FEATURES': 'tutorials'});
+    gu.withEnvironmentSnapshot({
+      'GRIST_UI_FEATURES': 'tutorials',
+      'GRIST_TEMPLATE_ORG': 'templates',
+      'GRIST_ONBOARDING_TUTORIAL_DOC_ID': 'grist-basics',
+    });
 
     before(async () => {
       const tutorialSession = await gu.session().user('user3').login({
         showTips: true,
       });
-      const doc = await tutorialSession.tempDoc(cleanup, 'DocTutorial.grist', {load: false});
-      const api = tutorialSession.createHomeApi();
-      await api.updateDoc(doc.id, {type: 'tutorial'});
-      await tutorialSession.loadDoc(`/doc/${doc.id}`);
+      await tutorialSession.loadDocMenu('/');
+      await driver.find('.test-dm-basic-tutorial').click();
+      await gu.waitForDocToLoad();
     });
 
     it('should not be shown', async function() {
diff --git a/test/nbrowser/CopyPaste.ts b/test/nbrowser/CopyPaste.ts
index 1da7857f3a7..16c1c3953c5 100644
--- a/test/nbrowser/CopyPaste.ts
+++ b/test/nbrowser/CopyPaste.ts
@@ -637,7 +637,7 @@ async function copyAndCheck(
   }
 }
 
-function createDummyTextArea() {
+export function createDummyTextArea() {
   const textarea = document.createElement('textarea');
   textarea.style.position = "absolute";
   textarea.style.top = "0";
@@ -647,7 +647,7 @@ function createDummyTextArea() {
   window.document.body.appendChild(textarea);
 }
 
-function removeDummyTextArea() {
+export function removeDummyTextArea() {
   const textarea = document.getElementById('dummyText');
   if (textarea) {
     window.document.body.removeChild(textarea);
diff --git a/test/nbrowser/CopyWithHeaders.ts b/test/nbrowser/CopyWithHeaders.ts
new file mode 100644
index 00000000000..852de7d1d20
--- /dev/null
+++ b/test/nbrowser/CopyWithHeaders.ts
@@ -0,0 +1,59 @@
+/**
+ * Test for copying Grist data with headers.
+ */
+
+import {assert, driver, Key} from 'mocha-webdriver';
+import * as gu from 'test/nbrowser/gristUtils';
+import {setupTestSuite} from 'test/nbrowser/testUtils';
+import {createDummyTextArea, removeDummyTextArea} from 'test/nbrowser/CopyPaste';
+
+describe("CopyWithHeaders", function() {
+  this.timeout(90000);
+  const cleanup = setupTestSuite();
+  const clipboard = gu.getLockableClipboard();
+  afterEach(() => gu.checkForErrors());
+  gu.bigScreen();
+
+  after(async function() {
+    await driver.executeScript(removeDummyTextArea);
+  });
+
+  it('should copy headers', async function() {
+    const session = await gu.session().teamSite.login();
+    await session.tempDoc(cleanup, 'Hello.grist');
+    await driver.executeScript(createDummyTextArea);
+
+    await clipboard.lockAndPerform(async (cb) => {
+        // Select all
+        await gu.sendKeys(Key.chord(Key.CONTROL, 'a'));
+        await gu.rightClick(gu.getCell({rowNum: 1, col: 'A'}));
+        await driver.findContent('.grist-floating-menu li', 'Copy with headers').click();
+
+        await pasteAndCheck(cb, ["A", "B", "C", "D", "E"], 5);
+    });
+
+    await clipboard.lockAndPerform(async (cb) => {
+        // Select a single cell.
+        await gu.getCell({rowNum: 2, col: 'D'}).click();
+        await gu.rightClick(gu.getCell({rowNum: 2, col: 'D'}));
+        await driver.findContent('.grist-floating-menu li', 'Copy with headers').click();
+
+        await pasteAndCheck(cb, ["D"], 2);
+    });
+  });
+});
+
+async function pasteAndCheck(cb: gu.IClipboard, headers: string[], rows: number) {
+  // Paste into the dummy textarea.
+  await driver.find('#dummyText').click();
+  await gu.waitAppFocus(false);
+  await cb.paste();
+
+  const textarea = await driver.find('#dummyText');
+  const text = await textarea.getAttribute('value');
+  const lines = text.split('\n');
+  const regex = new RegExp(`^${headers.join('\\s+')}$`);
+  assert.match(lines[0], regex);
+  assert.equal(lines.length, rows);
+  await textarea.clear();
+}
diff --git a/test/nbrowser/DescriptionColumn.ts b/test/nbrowser/DescriptionColumn.ts
index cd14102e731..aa7dc57c270 100644
--- a/test/nbrowser/DescriptionColumn.ts
+++ b/test/nbrowser/DescriptionColumn.ts
@@ -9,11 +9,38 @@ describe('DescriptionColumn', function() {
   let session: gu.Session;
 
   before(async () => {
-    session = await gu.session().teamSite.login();
+    session = await gu.session().login();
+    await session.tempNewDoc(cleanup);
+  });
+
+  it('should allow to edit description on summary table', async () => {
+    await gu.toggleSidePanel('left', 'close');
+    // Add summary table.
+    await gu.addNewSection('Table', 'Table1', {summarize: ['A']});
+    await gu.sendActions([
+      ['AddRecord', 'Table1', null, {A: 1}],
+    ]);
+
+    // Set description on A column and count column.
+    await gu.openColumnPanel('A');
+    await getDescriptionInput().sendKeys('testA');
+    await gu.openColumnPanel('count');
+    await gu.waitForServer();
+    await gu.checkForErrors();
+    await getDescriptionInput().sendKeys('testCount');
+    await gu.openColumnPanel('A');
+    await gu.waitForServer();
+    await gu.checkForErrors();
+
+    await gu.reloadDoc();
+    await gu.openColumnPanel('A');
+    assert.equal(await getDescriptionInput().getAttribute('value'), 'testA');
+    await gu.openColumnPanel('count');
+    assert.equal(await getDescriptionInput().getAttribute('value'), 'testCount');
+    await gu.undo(4);
   });
 
   it('should switch between close and save', async () => {
-    await session.tempNewDoc(cleanup);
     // Add new column.
     await addColumn();
 
@@ -100,7 +127,6 @@ describe('DescriptionColumn', function() {
     assert.isFalse(await gu.getColumnHeader({col: 'D'}).isPresent());
   });
 
-
   it('shows links in the column description', async () => {
     const revert = await gu.begin();
 
diff --git a/test/nbrowser/DocTutorial.ts b/test/nbrowser/DocTutorial.ts
index 1c7d365548f..862d5f8768d 100644
--- a/test/nbrowser/DocTutorial.ts
+++ b/test/nbrowser/DocTutorial.ts
@@ -1,47 +1,34 @@
-import {DocCreationInfo} from 'app/common/DocListAPI';
 import {UserAPI} from 'app/common/UserAPI';
 import {assert, driver, Key} from 'mocha-webdriver';
 import * as gu from 'test/nbrowser/gristUtils';
-import {server, setupTestSuite} from 'test/nbrowser/testUtils';
-import {EnvironmentSnapshot} from 'test/server/testUtils';
+import {setupTestSuite} from 'test/nbrowser/testUtils';
 
 describe('DocTutorial', function () {
   this.timeout(60000);
 
   gu.bigScreen();
 
-  let doc: DocCreationInfo;
   let api: UserAPI;
   let ownerSession: gu.Session;
   let editorSession: gu.Session;
   let viewerSession: gu.Session;
-  let oldEnv: EnvironmentSnapshot;
 
-  const cleanup = setupTestSuite({samples: true, team: true});
+  setupTestSuite({samples: true, tutorial: true, team: true});
+
+  gu.withEnvironmentSnapshot({
+    'GRIST_UI_FEATURES': 'tutorials',
+    'GRIST_TEMPLATE_ORG': 'templates',
+    'GRIST_ONBOARDING_TUTORIAL_DOC_ID': 'grist-basics',
+  });
 
   before(async () => {
     ownerSession = await gu.session().customTeamSite('templates').user('support').login();
-    doc = await ownerSession.tempDoc(cleanup, 'DocTutorial.grist', {load: false});
-    oldEnv = new EnvironmentSnapshot();
-    process.env.GRIST_UI_FEATURES = 'tutorials';
-    process.env.GRIST_TEMPLATE_ORG = 'templates';
-    process.env.GRIST_ONBOARDING_TUTORIAL_DOC_ID = doc.id;
-    await server.restart();
-
     api = ownerSession.createHomeApi();
-    await api.updateDoc(doc.id, {type: 'tutorial'});
-    await api.updateDocPermissions(doc.id, {users: {
-      'anon@getgrist.com': 'viewers',
-      'everyone@getgrist.com': 'viewers',
+    await api.updateDocPermissions('grist-basics', {users: {
       [gu.translateUser('user1').email]: 'editors',
     }});
   });
 
-  after(async function () {
-    oldEnv.restore();
-    await server.restart();
-  });
-
   describe('when logged out', function () {
     before(async () => {
       viewerSession = await gu.session().anon.login();
@@ -49,16 +36,8 @@ describe('DocTutorial', function () {
 
     it('shows a tutorial card', async function() {
       await viewerSession.loadDocMenu('/');
-      assert.isTrue(await driver.find('.test-onboarding-tutorial-card').isDisplayed());
-      assert.equal(await driver.find('.test-onboarding-tutorial-percent-complete').getText(), '0%');
-    });
-
-    it('can dismiss tutorial card', async function() {
-      await driver.find('.test-onboarding-dismiss-cards').click();
-      assert.isFalse(await driver.find('.test-onboarding-tutorial-card').isPresent());
-      await driver.navigate().refresh();
-      await gu.waitForDocMenuToLoad();
-      assert.isFalse(await driver.find('.test-onboarding-tutorial-card').isPresent());
+      assert.isTrue(await driver.find('.test-intro-tutorial').isDisplayed());
+      assert.equal(await driver.find('.test-intro-tutorial-percent-complete').getText(), '0%');
     });
 
     it('shows a link to tutorial', async function() {
@@ -84,9 +63,9 @@ describe('DocTutorial', function () {
     afterEach(() => gu.checkForErrors());
 
     it('shows a tutorial card', async function() {
-      assert.isTrue(await driver.find('.test-onboarding-tutorial-card').isDisplayed());
+      assert.isTrue(await driver.find('.test-intro-tutorial').isDisplayed());
       await gu.waitToPass(async () =>
-        assert.equal(await driver.find('.test-onboarding-tutorial-percent-complete').getText(), '0%'),
+        assert.equal(await driver.find('.test-intro-tutorial-percent-complete').getText(), '0%'),
         2000
       );
     });
@@ -101,15 +80,14 @@ describe('DocTutorial', function () {
 
     it('shows a popup containing slides generated from the GristDocTutorial table', async function() {
       assert.isTrue(await driver.findWait('.test-doc-tutorial-popup', 2000).isDisplayed());
-      assert.equal(await driver.find('.test-floating-popup-header').getText(), 'DocTutorial');
+      assert.equal(await driver.find('.test-floating-popup-header').getText(), 'Grist Basics');
       assert.equal(
         await driver.findWait('.test-doc-tutorial-popup h1', 2000).getText(),
         'Intro'
       );
-      assert.equal(
-        await driver.find('.test-doc-tutorial-popup p').getText(),
-        'Welcome to the Grist Basics tutorial. We will cover the most important Grist '
-          + 'concepts and features. Let’s get started.'
+      assert.match(
+        await driver.find('.test-doc-tutorial-popup').getText(),
+        /Welcome to the Grist Basics tutorial/
       );
     });
 
@@ -268,7 +246,7 @@ describe('DocTutorial', function () {
 
     it('does not show the GristDocTutorial page or table to non-editors', async function() {
       viewerSession = await gu.session().customTeamSite('templates').user('user2').login();
-      await viewerSession.loadDoc(`/doc/${doc.id}`);
+      await viewerSession.loadDoc(`/doc/grist-basics`);
       assert.deepEqual(await gu.getPageNames(), ['Page 1', 'Page 2']);
       await driver.find('.test-tools-raw').click();
       await driver.findWait('.test-raw-data-list', 1000);
@@ -287,7 +265,7 @@ describe('DocTutorial', function () {
     it('only allows users access to their own forks', async function() {
       await driver.navigate().to(forkUrl);
       assert.match(await driver.findWait('.test-error-header', 2000).getText(), /Access denied/);
-      await viewerSession.loadDoc(`/doc/${doc.id}`);
+      await viewerSession.loadDoc(`/doc/grist-basics`);
       let otherForkUrl: string;
       await driver.wait(async () => {
         otherForkUrl = await driver.getCurrentUrl();
@@ -311,8 +289,8 @@ describe('DocTutorial', function () {
       );
       assert.equal(
         await driver.find('.test-doc-tutorial-popup h1 + p').getText(),
-        'On the left-side panel is a list of pages which are views of your data. Right'
-          + ' now, there are two pages, Page 1 and Page 2. You are looking at Page 1.'
+        'On the left-side panel is a list of pages, which are views of your data. ' +
+          'Right now, there are two pages: Page 1 and Page 2. You are looking at Page 1.'
       );
       assert.isTrue(await driver.find('.test-doc-tutorial-popup-next').isDisplayed());
       assert.isTrue(await driver.find('.test-doc-tutorial-popup-previous').isDisplayed());
@@ -322,10 +300,9 @@ describe('DocTutorial', function () {
         await driver.find('.test-doc-tutorial-popup h1').getText(),
         'Intro'
       );
-      assert.equal(
-        await driver.find('.test-doc-tutorial-popup p').getText(),
-        'Welcome to the Grist Basics tutorial. We will cover the most important Grist '
-          + 'concepts and features. Let’s get started.'
+      assert.match(
+        await driver.find('.test-doc-tutorial-popup').getText(),
+        /Welcome to the Grist Basics tutorial/
       );
       assert.isTrue(await driver.find('.test-doc-tutorial-popup-next').isDisplayed());
       assert.isFalse(await driver.find('.test-doc-tutorial-popup-previous').isDisplayed());
@@ -347,8 +324,7 @@ describe('DocTutorial', function () {
       );
       assert.equal(
         await driver.find('.test-doc-tutorial-popup p').getText(),
-        "You can add new columns to your table by clicking the ‘+’ icon"
-          + ' to the far right of your column headers.'
+        "Let's start with the basics of working with spreadsheet data — columns and rows."
       );
 
       const slide1 = await driver.find('.test-doc-tutorial-popup-slide-1');
@@ -363,10 +339,9 @@ describe('DocTutorial', function () {
         await driver.find('.test-doc-tutorial-popup h1').getText(),
         'Intro'
       );
-      assert.equal(
-        await driver.find('.test-doc-tutorial-popup p').getText(),
-        'Welcome to the Grist Basics tutorial. We will cover the most important Grist '
-          + 'concepts and features. Let’s get started.'
+      assert.match(
+        await driver.find('.test-doc-tutorial-popup').getText(),
+        /Welcome to the Grist Basics tutorial/
       );
     });
 
@@ -375,7 +350,7 @@ describe('DocTutorial', function () {
       assert.isTrue(await driver.find('.test-doc-tutorial-lightbox').isDisplayed());
       assert.equal(
         await driver.find('.test-doc-tutorial-lightbox-image').getAttribute('src'),
-        'https://www.getgrist.com/wp-content/uploads/2023/03/Row-1-Intro.png'
+        'https://www.getgrist.com/wp-content/uploads/2023/11/Row-1-Intro.png'
       );
       await driver.find('.test-doc-tutorial-lightbox-close').click();
       assert.isFalse(await driver.find('.test-doc-tutorial-lightbox').isPresent());
@@ -429,8 +404,7 @@ describe('DocTutorial', function () {
       );
       assert.equal(
         await driver.find('.test-doc-tutorial-popup p').getText(),
-        "You can add new columns to your table by clicking the ‘+’ icon"
-          + ' to the far right of your column headers.'
+        "Let's start with the basics of working with spreadsheet data — columns and rows."
       );
     });
 
@@ -439,7 +413,7 @@ describe('DocTutorial', function () {
       await gu.getCell(0, 1).click();
       await gu.sendKeys('Redacted', Key.ENTER);
       await gu.waitForServer();
-      await editorSession.loadDoc(`/doc/${doc.id}`);
+      await editorSession.loadDoc(`/doc/grist-basics`);
       let currentUrl: string;
       await driver.wait(async () => {
         currentUrl = await driver.getCurrentUrl();
@@ -454,7 +428,7 @@ describe('DocTutorial', function () {
       await gu.waitForServer();
       await gu.waitForDocMenuToLoad();
       await gu.waitToPass(async () =>
-        assert.equal(await driver.find('.test-onboarding-tutorial-percent-complete').getText(), '15%'),
+        assert.equal(await driver.find('.test-intro-tutorial-percent-complete').getText(), '15%'),
         2000
       );
       await driver.find('.test-dm-basic-tutorial').click();
@@ -463,7 +437,7 @@ describe('DocTutorial', function () {
 
     it('skips starting or resuming a tutorial if the open mode is set to default', async function() {
       ownerSession = await gu.session().customTeamSite('templates').user('support').login();
-      await ownerSession.loadDoc(`/doc/${doc.id}/m/default`);
+      await ownerSession.loadDoc(`/doc/grist-basics/m/default`);
       assert.deepEqual(await gu.getPageNames(), ['Page 1', 'Page 2', 'GristDocTutorial']);
       await driver.find('.test-tools-raw').click();
       await gu.waitForServer();
@@ -500,10 +474,9 @@ describe('DocTutorial', function () {
         await driver.findWait('.test-doc-tutorial-popup h1', 2000).getText(),
         'Intro'
       );
-      assert.equal(
-        await driver.find('.test-doc-tutorial-popup p').getText(),
-        'Welcome to the Grist Basics tutorial. We will cover the most important Grist '
-          + 'concepts and features. Let’s get started.'
+      assert.match(
+        await driver.find('.test-doc-tutorial-popup').getText(),
+        /Welcome to the Grist Basics tutorial/
       );
 
       // Check that edits were reset.
@@ -517,7 +490,7 @@ describe('DocTutorial', function () {
 
     it('allows owners to replace original', async function() {
       ownerSession = await gu.session().customTeamSite('templates').user('support').login();
-      await ownerSession.loadDoc(`/doc/${doc.id}`);
+      await ownerSession.loadDoc(`/doc/grist-basics`);
 
       // Make an edit to one of the tutorial slides.
       await gu.openPage('GristDocTutorial');
@@ -545,7 +518,7 @@ describe('DocTutorial', function () {
 
       // Switch to another user and restart the tutorial.
       viewerSession = await gu.session().customTeamSite('templates').user('user2').login();
-      await viewerSession.loadDoc(`/doc/${doc.id}`);
+      await viewerSession.loadDoc(`/doc/grist-basics`);
       await driver.findWait('.test-doc-tutorial-popup-restart', 2000).click();
       await driver.find('.test-modal-confirm').click();
       await gu.waitForServer();
@@ -561,18 +534,18 @@ describe('DocTutorial', function () {
     it('redirects to the last visited site when finished', async function() {
       const otherSiteSession = await gu.session().personalSite.user('user1').addLogin();
       await otherSiteSession.loadDocMenu('/');
-      await ownerSession.loadDoc(`/doc/${doc.id}`);
+      await ownerSession.loadDoc(`/doc/grist-basics`);
       await driver.findWait('.test-doc-tutorial-popup-slide-13', 2000).click();
       await driver.find('.test-doc-tutorial-popup-next').click();
       await gu.waitForDocMenuToLoad();
       assert.match(await driver.getCurrentUrl(), /o\/docs\/$/);
       await gu.waitToPass(async () =>
-        assert.equal(await driver.find('.test-onboarding-tutorial-percent-complete').getText(), '0%'),
+        assert.equal(await driver.find('.test-intro-tutorial-percent-complete').getText(), '0%'),
         2000
       );
       await ownerSession.loadDocMenu('/');
       await gu.waitToPass(async () =>
-        assert.equal(await driver.find('.test-onboarding-tutorial-percent-complete').getText(), '100%'),
+        assert.equal(await driver.find('.test-intro-tutorial-percent-complete').getText(), '100%'),
         2000
       );
     });
@@ -580,9 +553,9 @@ describe('DocTutorial', function () {
 
   describe('without tutorial flag set', function () {
     before(async () => {
-      await api.updateDoc(doc.id, {type: null});
+      await api.updateDoc('grist-basics', {type: null});
       ownerSession = await gu.session().customTeamSite('templates').user('support').login();
-      await ownerSession.loadDoc(`/doc/${doc.id}`);
+      await ownerSession.loadDoc(`/doc/grist-basics`);
     });
 
     afterEach(() => gu.checkForErrors());
@@ -592,10 +565,9 @@ describe('DocTutorial', function () {
         ['Page 1', 'Page 2', 'GristDocTutorial', 'Table1']);
       await gu.openPage('GristDocTutorial');
       assert.deepEqual(
-        await gu.getVisibleGridCells({cols: [1, 2], rowNums: [1]}),
+        await gu.getVisibleGridCells({cols: [1], rowNums: [1]}),
         [
           '# Intro\n\nWelcome to the Grist Basics tutorial V2.',
-          '',
         ]
       );
       await driver.find('.test-tools-raw').click();
diff --git a/test/nbrowser/GridViewBugs.ts b/test/nbrowser/GridViewBugs.ts
index 808ce307999..751857d401d 100644
--- a/test/nbrowser/GridViewBugs.ts
+++ b/test/nbrowser/GridViewBugs.ts
@@ -15,6 +15,38 @@ describe('GridViewBugs', function() {
     api = session.createHomeApi();
   });
 
+  it('should rename valid column when clicked away', async function() {
+    await gu.openColumnPanel('A');
+
+    // Rename column A to Dummy
+    await toggleDerived();
+    await colId().click();
+    await gu.clearInput();
+    await colId().sendKeys('$Dummy');
+
+    // Now click away, it used to rename the new column to Dummy
+    await gu.getCell('B', 1).click();
+    await gu.waitForServer();
+
+    // Now make sure that column A was renamed to $Dummy
+    await gu.getCell('A', 1).click();
+    assert.equal(await colId().value(), '$Dummy');
+
+    // And that column B is still named $B.
+    await gu.getCell('B', 1).click();
+    assert.equal(await colId().value(), '$B');
+    await gu.undo();
+
+    async function toggleDerived() {
+      await driver.find(".test-field-derive-id").click();
+      await gu.waitForServer();
+    }
+
+    function colId() {
+      return driver.find('.test-field-col-id');
+    }
+  });
+
   // This test is for a bug where hiding multiple columns at once would cause an error in the menu.
   // Selection wasn't updated and the column index was out of bounds.
   it('should hide multiple columns without an error', async function() {
diff --git a/test/nbrowser/HeaderColor.ts b/test/nbrowser/HeaderColor.ts
index 29ef6f322f6..d733c437130 100644
--- a/test/nbrowser/HeaderColor.ts
+++ b/test/nbrowser/HeaderColor.ts
@@ -5,22 +5,50 @@ import { setupTestSuite } from 'test/nbrowser/testUtils';
 const defaultHeaderBackgroundColor = '#f7f7f7';
 
 describe('HeaderColor', function () {
-  this.timeout(20000);
+  this.timeout('20s');
   const cleanup = setupTestSuite();
 
   before(async () => {
     // Create a new document
     const mainSession = await gu.session().login();
     await mainSession.tempNewDoc(cleanup, 'HeaderColor');
+  });
+
+  it('allows setting header colors in summary table', async function () {
+    const revert = await gu.begin();
+    await gu.toggleSidePanel('left', 'close');
+    // Add summary table.
+    await gu.addNewSection('Table', 'Table1', {summarize: ['A']});
+    await gu.sendActions([
+      ['AddRecord', 'Table1', null, {A: 1}],
+    ]);
+    await gu.toggleSidePanel('right', 'open');
+    const testStyle = async () => {
+      await gu.openHeaderColorPicker();
+      await gu.setFillColor('red');
+      await gu.setTextColor('blue');
+      await gu.applyStyle();
+      await gu.checkForErrors();
+      await gu.assertHeaderFillColor(await gu.getSelectedColumn(), 'red');
+      await gu.assertHeaderTextColor(await gu.getSelectedColumn(), 'blue');
+    };
+    await gu.openColumnPanel('A');
+    await testStyle();
+    await gu.openColumnPanel('count');
+    await testStyle();
+
+    await gu.waitForServer();
+    await revert();
+  });
+
+  it('should save by clicking away', async function () {
     // add records
     await gu.enterCell('a');
     await gu.enterCell('b');
     await gu.enterCell('c');
     await gu.toggleSidePanel('right', 'open');
     await driver.find('.test-right-tab-field').click();
-  });
 
-  it('should save by clicking away', async function () {
     await gu.getCell('A', 1).click();
     // open color picker
     await gu.openHeaderColorPicker();
diff --git a/test/nbrowser/HomeIntro.ts b/test/nbrowser/HomeIntro.ts
index 62f78bab6c9..14e4cabc57a 100644
--- a/test/nbrowser/HomeIntro.ts
+++ b/test/nbrowser/HomeIntro.ts
@@ -9,8 +9,12 @@ import {server, setupTestSuite} from 'test/nbrowser/testUtils';
 
 describe('HomeIntro', function() {
   this.timeout(40000);
-  setupTestSuite({samples: true});
-  gu.withEnvironmentSnapshot({'GRIST_TEMPLATE_ORG': 'templates'});
+  setupTestSuite({samples: true, tutorial: true});
+  gu.withEnvironmentSnapshot({
+    'GRIST_UI_FEATURES': 'templates,tutorials',
+    'GRIST_TEMPLATE_ORG': 'templates',
+    'GRIST_ONBOARDING_TUTORIAL_DOC_ID': 'grist-basics',
+  });
 
   describe("Anonymous on merged-org", function() {
     it('should show welcome for anonymous user', async function() {
@@ -22,25 +26,13 @@ describe('HomeIntro', function() {
 
       // Check message specific to anon
       assert.equal(await driver.find('.test-welcome-title').getText(), 'Welcome to Grist!');
-      assert.match(await driver.find('.test-welcome-text').getText(), /Sign up.*Visit our Help Center/);
-
-      // Check the sign-up link.
-      const signUp = await driver.findContent('.test-welcome-text a', 'Sign up');
-      assert.include(await signUp.getAttribute('href'), '/signin');
-
-      // Check that the link takes us to a Grist login page.
-      await signUp.click();
-      await gu.checkLoginPage();
-      await driver.navigate().back();
-      await gu.waitForDocMenuToLoad();
     });
 
-    it('should should intro screen for anon', () => testIntroScreen({team: false}));
+    it('should should intro screen for anon', () => testIntroScreen({anon: true, team: false}));
     it('should should set meta tags for URL previews', testMetaTags);
     it('should not show Other Sites section', testOtherSitesSection);
     it('should allow create/import from intro screen', testCreateImport.bind(null, false));
-    it('should allow collapsing examples and remember the state', testExamplesCollapsing);
-    it('should show examples workspace with the intro', testExamplesSection);
+    it('should link to examples page from the intro', testExamplesPage);
     it('should render selected Examples workspace specially', testSelectedExamplesPage);
   });
 
@@ -62,15 +54,12 @@ describe('HomeIntro', function() {
 
       // Check message specific to logged-in user
       assert.match(await driver.find('.test-welcome-title').getText(), new RegExp(`Welcome.* ${session.name}`));
-      assert.match(await driver.find('.test-welcome-text').getText(), /Visit our Help Center/);
-      assert.notMatch(await driver.find('.test-welcome-text').getText(), /sign up/i);
     });
 
     it('should not show Other Sites section', testOtherSitesSection);
-    it('should show intro screen for empty org', () => testIntroScreen({team: false}));
+    it('should show intro screen for empty org', () => testIntroScreen({anon: false, team: false}));
     it('should allow create/import from intro screen', testCreateImport.bind(null, true));
-    it('should allow collapsing examples and remember the state', testExamplesCollapsing);
-    it('should show examples workspace with the intro', testExamplesSection);
+    it('should link to examples page from the intro', testExamplesPage);
     it('should allow copying examples', testCopyingExamples.bind(null, undefined));
     it('should render selected Examples workspace specially', testSelectedExamplesPage);
     it('should show empty workspace info', testEmptyWorkspace.bind(null, {buttons: true}));
@@ -88,14 +77,12 @@ describe('HomeIntro', function() {
 
       // Check message specific to logged-in user and an empty team site.
       assert.match(await driver.find('.test-welcome-title').getText(), new RegExp(`Welcome.* ${session.orgName}`));
-      assert.match(await driver.find('.test-welcome-text').getText(), /Learn more/);
-      assert.notMatch(await driver.find('.test-welcome-text').getText(), /sign up/);
     });
 
     it('should not show Other Sites section', testOtherSitesSection);
-    it('should show intro screen for empty org', () => testIntroScreen({team: true}));
+    it('should show intro screen for empty org', () => testIntroScreen({anon: false, team: true}));
     it('should allow create/import from intro screen', testCreateImport.bind(null, true));
-    it('should show examples workspace with the intro', testExamplesSection);
+    it('should link to examples page from the intro', testExamplesPage);
     it('should allow copying examples', testCopyingExamples.bind(null, gu.session().teamSite.orgName));
     it('should render selected Examples workspace specially', testSelectedExamplesPage);
     it('should show empty workspace info', testEmptyWorkspace);
@@ -106,22 +93,40 @@ describe('HomeIntro', function() {
     assert.isFalse(await driver.find('.test-dm-other-sites-header').isPresent());
   }
 
-  async function testIntroScreen(options: {team: boolean}) {
+  async function testIntroScreen(options: {anon: boolean; team: boolean}) {
     // TODO There is no longer a thumbnail + video link on an empty site, but it's a good place to
     // check for the presence and functionality of the planned links that open an intro video.
 
-    // Check link to Help Center
-    assert.include(await driver.findContent('.test-welcome-text a', /Help Center/).getAttribute('href'),
+    assert.isTrue(await driver.find('.test-intro-cards').isDisplayed());
+    assert.isTrue(await driver.find('.test-intro-video-tour').isDisplayed());
+    assert.isTrue(await driver.find('.test-intro-create-doc').isDisplayed());
+    assert.isTrue(await driver.find('.test-intro-import-doc').isDisplayed());
+    assert.isTrue(await driver.find('.test-intro-templates').isDisplayed());
+    assert.include(await driver.find('.test-intro-webinars').getAttribute('href'),
+      'www.getgrist.com/webinars');
+    assert.include(await driver.find('.test-intro-help-center').getAttribute('href'),
       'support.getgrist.com');
 
     if (options.team) {
-      assert.equal(await driver.find('.test-intro-invite').getText(), 'Invite Team Members');
-      assert.equal(await driver.find('.test-topbar-manage-team').getText(), 'Manage Team');
+      assert.equal(await driver.find('.test-topbar-manage-team').getText(), 'Manage team');
     } else {
-      assert.equal(await driver.find('.test-intro-invite').isPresent(), false);
       assert.equal(await driver.find('.test-topbar-manage-team').isPresent(), false);
-      assert.equal(await driver.find('.test-intro-templates').getText(), 'Browse Templates');
-      assert.include(await driver.find('.test-intro-templates').getAttribute('href'), '/p/templates');
+    }
+
+    if (options.anon) {
+      assert.isFalse(await driver.find('.test-welcome-menu').isPresent());
+    } else {
+      await driver.find('.test-welcome-menu').click();
+      await driver.find('.test-welcome-menu-only-show-documents').click();
+      await gu.waitForServer();
+      assert.isFalse(await driver.find('.test-intro-cards').isPresent());
+      await driver.navigate().refresh();
+      await gu.waitForDocMenuToLoad();
+      assert.isFalse(await driver.find('.test-intro-cards').isPresent());
+      await driver.find('.test-welcome-menu').click();
+      await driver.find('.test-welcome-menu-only-show-documents').click();
+      await gu.waitForServer();
+      assert.isTrue(await driver.find('.test-intro-cards').isDisplayed());
     }
   }
 
@@ -176,49 +181,16 @@ describe('HomeIntro', function() {
     assert.isAbove(Number(await img.getAttribute('naturalWidth')), 0);
   });
 
-
-
-  async function testExamplesCollapsing() {
-    assert.equal(await driver.find('.test-dm-pinned-doc-name').isDisplayed(), true);
-
-    // Collapse the templates section, check it's collapsed
-    await driver.find('.test-dm-all-docs-templates-header').click();
-    assert.equal(await driver.find('.test-dm-pinned-doc-name').isPresent(), false);
-
-    // Reload and check it's still collapsed.
-    await driver.navigate().refresh();
-    await gu.waitForDocMenuToLoad();
-    assert.equal(await driver.find('.test-dm-pinned-doc-name').isPresent(), false);
-
-    // Expand back, and check.
-    await driver.find('.test-dm-all-docs-templates-header').click();
-    assert.equal(await driver.find('.test-dm-pinned-doc-name').isDisplayed(), true);
-
-    // Reload and check it's still expanded.
-    await driver.navigate().refresh();
+  async function testExamplesPage() {
+    // Make sure we can get to the templates page from the home page.
+    await driver.find('.test-intro-templates').click();
     await gu.waitForDocMenuToLoad();
-    assert.equal(await driver.find('.test-dm-pinned-doc-name').isDisplayed(), true);
-  }
-
-  async function testExamplesSection() {
-    // Check rendering and functionality of the examples and templates section
+    assert(gu.testCurrentUrl(/p\/templates/));
 
     // Check titles.
     assert.includeMembers(await driver.findAll('.test-dm-pinned-doc-name', (el) => el.getText()),
       ['Lightweight CRM']);
 
-    // Check the Discover More Templates button is shown.
-    const discoverMoreButton = await driver.find('.test-dm-all-docs-templates-discover-more');
-    assert(await discoverMoreButton.isPresent());
-    assert.include(await discoverMoreButton.getAttribute('href'), '/p/templates');
-
-    // Check that the button takes us to the templates page, then go back.
-    await discoverMoreButton.click();
-    await gu.waitForDocMenuToLoad();
-    assert(gu.testCurrentUrl(/p\/templates/));
-    await driver.navigate().back();
-    await gu.waitForDocMenuToLoad();
-
     // Check images.
     const docItem = await driver.findContent('.test-dm-pinned-doc', /Lightweight CRM/);
     assert.equal(await docItem.find('img').isPresent(), true);
@@ -240,8 +212,9 @@ describe('HomeIntro', function() {
   }
 
   async function testCopyingExamples(destination?: string) {
-    // Open the example to copy it. Note that we no longer support copying examples from doc menu.
-    // Make full copy of the example.
+    // Open the example and make a full copy of it.
+    await driver.find('.test-dm-templates-page').click();
+    await gu.waitForDocMenuToLoad();
     await driver.findContent('.test-dm-pinned-doc-name', /Lightweight CRM/).click();
     await gu.waitForDocToLoad();
     await driver.findWait('.test-tb-share-action', 500).click();
@@ -249,9 +222,11 @@ describe('HomeIntro', function() {
     await checkDocAndRestore(true, async () => {
       assert.match(await gu.getCell('Company', 1).getText(), /Sporer/);
       assert.match(await driver.find('.test-bc-doc').value(), /LCRM Copy/);
-    }, 2);
+    }, 3);
 
     // Make a template copy of the example.
+    await driver.find('.test-dm-templates-page').click();
+    await gu.waitForDocMenuToLoad();
     await driver.findContent('.test-dm-pinned-doc-name', /Lightweight CRM/).click();
     await gu.waitForDocToLoad();
     await driver.findWait('.test-tb-share-action', 500).click();
@@ -261,7 +236,7 @@ describe('HomeIntro', function() {
       // No data, because the file was copied as a template.
       assert.equal(await gu.getCell(0, 1).getText(), '');
       assert.match(await driver.find('.test-bc-doc').value(), /LCRM Template Copy/);
-    }, 2);
+    }, 3);
   }
 
   async function testSelectedExamplesPage() {
@@ -321,6 +296,7 @@ async function testEmptyWorkspace(options = { buttons: false }) {
   // Check that we don't see empty info.
   await driver.navigate().back();
   await gu.waitForDocMenuToLoad();
+  await gu.dismissBehavioralPrompts();
   assert.equal(await driver.find('.test-empty-workspace-info').isPresent(), false);
   // Remove created document, it also checks that document is visible.
   await deleteFirstDoc();
@@ -345,8 +321,6 @@ async function checkDocAndRestore(
   await gu.waitForDocMenuToLoad();
   // If not logged in, we create docs "unsaved" and don't see them in doc-menu.
   if (isLoggedIn) {
-    // Freshly-created users will see a tip for the Add New button; dismiss it.
-    await gu.dismissBehavioralPrompts();
     // Delete the first doc we find. We expect exactly one to exist.
     await deleteFirstDoc();
   }
diff --git a/test/nbrowser/HomeIntroWithoutPlaygound.ts b/test/nbrowser/HomeIntroWithoutPlaygound.ts
index aafc53532f4..42c9bd8ee11 100644
--- a/test/nbrowser/HomeIntroWithoutPlaygound.ts
+++ b/test/nbrowser/HomeIntroWithoutPlaygound.ts
@@ -3,50 +3,29 @@ import * as gu from 'test/nbrowser/gristUtils';
 import {setupTestSuite} from 'test/nbrowser/testUtils';
 
 describe('HomeIntroWithoutPlayground', function() {
-  this.timeout(40000);
+  this.timeout(20000);
   setupTestSuite({samples: true});
   gu.withEnvironmentSnapshot({'GRIST_ANON_PLAYGROUND': false});
 
   describe("Anonymous on merged-org", function() {
-    it('should show welcome page with signin and signup buttons and "add new" button disabled', async function () {
-      // Sign out
+    it('should show welcome page', async function () {
       const session = await gu.session().personalSite.anon.login();
-
-      // Open doc-menu
       await session.loadDocMenu('/');
-
       assert.equal(await driver.find('.test-welcome-title').getText(), 'Welcome to Grist!');
-      assert.match(
-        await driver.find('.test-welcome-text-no-playground').getText(),
-        /Visit our Help Center.*about Grist./
-      );
-
-      // Check the sign-up and sign-in buttons.
-      const getSignUp = async () => await driver.findContent('.test-intro-sign-up', 'Sign up');
-      const getSignIn = async () => await driver.findContent('.test-intro-sign-in', 'Sign in');
-      // Check that these buttons take us to a Grist login page.
-      for (const getButton of [getSignUp, getSignIn]) {
-        const button = await getButton();
-        await button.click();
-        await gu.checkLoginPage();
-        await driver.navigate().back();
-        await gu.waitForDocMenuToLoad();
-      }
     });
 
     it('should not allow creating new documents', async function () {
-      // Sign out
       const session = await gu.session().personalSite.anon.login();
-
-      // Open doc-menu
       await session.loadDocMenu('/');
 
-      // Check that add-new button is disabled
+      // Check that the Add New button is disabled.
       assert.equal(await driver.find('.test-dm-add-new').matches('[class*=-disabled]'), true);
-
-      // Check that add-new menu is not displayed
       await driver.find('.test-dm-add-new').doClick();
       assert.equal(await driver.find('.test-dm-new-doc').isPresent(), false);
+
+      // Check that the intro buttons are also disabled.
+      assert.equal(await driver.find('.test-intro-create-doc').getAttribute('disabled'), 'true');
+      assert.equal(await driver.find('.test-intro-import-doc').getAttribute('disabled'), 'true');
     });
   });
 });
diff --git a/test/nbrowser/Smoke.ts b/test/nbrowser/Smoke.ts
index 67257479f18..16995c0aa0a 100644
--- a/test/nbrowser/Smoke.ts
+++ b/test/nbrowser/Smoke.ts
@@ -14,7 +14,7 @@ async function openMainPage() {
   await driver.get(`${server.getHost()}`);
   while (true) {    // eslint-disable-line no-constant-condition
     try {
-      if (await driver.findContent('button', /Create Empty Document/).isPresent()) {
+      if (await driver.find('.test-intro-create-doc').isPresent()) {
         return;
       }
     } catch (e) {
@@ -31,7 +31,7 @@ describe("Smoke", function() {
   it('can create, edit, and reopen a document', async function() {
     this.timeout(20000);
     await openMainPage();
-    await driver.findContent('button', /Create Empty Document/).click();
+    await driver.find('.test-intro-create-doc').click();
     await gu.waitForDocToLoad(20000);
     await gu.dismissWelcomeTourIfNeeded();
     await gu.getCell('A', 1).click();
diff --git a/test/nbrowser/SupportGrist.ts b/test/nbrowser/SupportGrist.ts
index 3f62e1b471b..17a526b91ce 100644
--- a/test/nbrowser/SupportGrist.ts
+++ b/test/nbrowser/SupportGrist.ts
@@ -38,8 +38,7 @@ describe('SupportGrist', function() {
         await session.loadDocMenu('/');
       });
 
-      it('does not show a nudge on the doc menu', async function() {
-        await assertNudgeCardShown(false);
+      it('shows a button in the top bar', async function() {
         await assertSupportButtonShown(true, {isSponsorLink: true});
       });
 
@@ -56,34 +55,15 @@ describe('SupportGrist', function() {
         await session.loadDocMenu('/');
       });
 
-      it('shows a nudge on the doc menu', async function() {
-        // Check that the nudge is expanded by default.
-        await assertSupportButtonShown(false);
-        await assertNudgeCardShown(true);
-
-        // Reload the doc menu and check that it's still expanded.
-        await session.loadDocMenu('/');
-        await assertSupportButtonShown(false);
-        await assertNudgeCardShown(true);
-
-        // Close the nudge and check that it's now collapsed.
-        await driver.find('.test-support-nudge-close').click();
-        await assertSupportButtonShown(true, {isSponsorLink: false});
-        await assertNudgeCardShown(false);
-
-        // Reload again, and check that it's still collapsed.
-        await session.loadDocMenu('/');
+      it('shows a button in the top bar', async function() {
         await assertSupportButtonShown(true, {isSponsorLink: false});
-        await assertNudgeCardShown(false);
 
-        // Dismiss the contribute button and check that it's now gone, even after reloading.
+        // Dismiss the button and check that it's now gone, even after reloading.
         await driver.find('.test-support-grist-button').mouseMove();
         await driver.find('.test-support-grist-button-dismiss').click();
         await assertSupportButtonShown(false);
-        await assertNudgeCardShown(false);
         await session.loadDocMenu('/');
         await assertSupportButtonShown(false);
-        await assertNudgeCardShown(false);
       });
 
       it('shows a link to Admin Panel and Support Grist in the user menu', async function() {
@@ -92,35 +72,30 @@ describe('SupportGrist', function() {
         await assertMenuHasSupportGrist(true);
       });
 
-      it('supports opting in to telemetry from the nudge', async function() {
-        // Reset all dismissed popups, including the telemetry nudge.
+      it('supports opting in to telemetry', async function() {
+        // Reset all dismissed popups, which includes the telemetry button.
         await driver.executeScript('resetDismissedPopups();');
         await gu.waitForServer();
         await session.loadDocMenu('/');
 
         // Opt in to telemetry and reload the page.
+        await driver.find('.test-support-grist-button').click();
         await driver.find('.test-support-nudge-opt-in').click();
         await driver.findWait('.test-support-nudge-close-button', 1000).click();
         await assertSupportButtonShown(false);
-        await assertNudgeCardShown(false);
         await session.loadDocMenu('/');
 
-        // Check that the nudge is no longer shown and telemetry is set to "limited".
+        // Check that the button is no longer shown and telemetry is set to "limited".
         await assertSupportButtonShown(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.
+      it('does not show the button if telemetry is enabled', async function() {
         await driver.executeScript('resetDismissedPopups();');
         await gu.waitForServer();
 
-        // Reload the doc menu and check that the nudge still isn't shown.
+        // Reload the doc menu and check that We show the "Support Grist" button linking to sponsorship page.
         await session.loadDocMenu('/');
-        await assertNudgeCardShown(false);
-
-        // We still show the "Support Grist" button linking to sponsorship page.
         await assertSupportButtonShown(true, {isSponsorLink: true});
 
         // Disable telemetry from the Support Grist page.
@@ -133,10 +108,9 @@ describe('SupportGrist', function() {
           '.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.
+        // Reload the doc menu and check that the button is now shown.
         await gu.loadDocMenu('/');
-        await assertSupportButtonShown(false);
-        await assertNudgeCardShown(true);
+        await assertSupportButtonShown(true, {isSponsorLink: false});
       });
 
       it('shows sponsorship link when no telemetry nudge, and allows dismissing it', async function() {
@@ -156,16 +130,14 @@ describe('SupportGrist', function() {
 
         // We still show the "Support Grist" button linking to sponsorship page.
         await assertSupportButtonShown(true, {isSponsorLink: true});
-        await assertNudgeCardShown(false);
 
-        // we can dismiss it.
+        // We can dismiss it.
         await driver.find('.test-support-grist-button').mouseMove();
         await driver.find('.test-support-grist-button-dismiss').click();
         await assertSupportButtonShown(false);
 
         // And this will get remembered.
         await session.loadDocMenu('/');
-        await assertNudgeCardShown(false);
         await assertSupportButtonShown(false);
       });
     });
@@ -185,9 +157,8 @@ describe('SupportGrist', function() {
       oldEnv.restore();
     });
 
-    it('does not show a nudge on the doc menu', async function() {
+    it('does not show a button in the top bar', async function() {
       await assertSupportButtonShown(false);
-      await assertNudgeCardShown(false);
     });
 
     it('shows Admin Panel but not Support Grist in the user menu for admin', async function() {
@@ -219,9 +190,8 @@ describe('SupportGrist', function() {
       oldEnv.restore();
     });
 
-    it('does not show a nudge on the doc menu', async function() {
+    it('does not show a button in the top bar', async function() {
       await assertSupportButtonShown(false);
-      await assertNudgeCardShown(false);
     });
 
     it('shows Admin Panel but not Support Grist page in the user menu', async function() {
@@ -242,11 +212,6 @@ async function assertSupportButtonShown(isShown: boolean, opts?: {isSponsorLink:
   }
 }
 
-async function assertNudgeCardShown(isShown: boolean) {
-  const card = driver.find('.test-support-nudge');
-  assert.equal(await card.isPresent() && await card.isDisplayed(), isShown);
-}
-
 async function assertMenuHasAdminPanel(isShown: boolean) {
   const elem = driver.find('.test-usermenu-admin-panel');
   assert.equal(await elem.isPresent() && await elem.isDisplayed(), isShown);
diff --git a/test/nbrowser/TwoWayReference.ts b/test/nbrowser/TwoWayReference.ts
index e8be6e4f499..5b92489591e 100644
--- a/test/nbrowser/TwoWayReference.ts
+++ b/test/nbrowser/TwoWayReference.ts
@@ -7,12 +7,12 @@ describe('TwoWayReference', function() {
   this.timeout('3m');
   let session: Session;
   let docId: string;
+  let revert: () => Promise<void>;
   const cleanup = setupTestSuite();
   afterEach(() => gu.checkForErrors());
   before(async function() {
     session = await gu.session().login();
     docId = await session.tempNewDoc(cleanup);
-    await gu.toggleSidePanel('left', 'close');
     await petsSetup();
   });
 
@@ -34,12 +34,124 @@ describe('TwoWayReference', function() {
     await gu.addNewSection('Table', 'Pets');
     await gu.openColumnPanel('Owner');
     await gu.setRefShowColumn('Name');
-    await addReverseColumn('Pets', 'Owner');
+    await addReverseColumn();
   }
 
+  it('works after reload', async function() {
+    const revert = await gu.begin();
+    await gu.selectSectionByTitle('OWNERS');
+    assert.deepEqual(await gu.getVisibleGridCells('Pets', [1, 2]), ['', 'Rex']);
+    await session.createHomeApi().getDocAPI(docId).forceReload();
+    await driver.navigate().refresh();
+    await gu.waitForDocToLoad();
+    // Change Rex owner to Alice.
+    await gu.selectSectionByTitle('PETS');
+    await gu.getCell('Owner', 1).click();
+    await gu.sendKeys('Alice', Key.ENTER);
+    await gu.waitForServer();
+    await gu.selectSectionByTitle('OWNERS');
+    assert.deepEqual(await gu.getVisibleGridCells('Pets', [1, 2]), ['Rex', '']);
+    await revert();
+  });
+
+
+  it('creates proper names when labels are not standard', async function() {
+    const revert = await gu.begin();
+    await gu.toggleSidePanel('left', 'close');
+
+    // Remove the reverse column, then rename the table to contain illegal characters
+    // in label, and add ref columns to it.
+    await gu.selectSectionByTitle('PETS');
+    await gu.openColumnPanel('Owner');
+    await removeTwoWay();
+    await removeModal.wait();
+    await removeModal.confirm();
+    await gu.waitForServer();
+
+    // Now add another Ref:Owners column to Pets table.
+    await gu.sendActions([
+      ['AddVisibleColumn', 'Pets', 'Friend', {type: 'Ref:Owners'}],
+    ]);
+    await gu.selectColumn('Friend');
+    await gu.setRefShowColumn('Name');
+    await gu.getCell('Friend', 1).click();
+    await gu.enterCell('Bob', Key.ENTER);
+    await gu.waitForServer();
+
+    // Now rename the Pets table to start with a number and contain a space + person emoji.
+    const LABEL = '2 🧑 + 🐕';
+    await gu.renameTable('Pets', LABEL);
+
+    // Now create reverse column for Owner and Friend.
+    await gu.openColumnPanel('Owner');
+    await addReverseColumn();
+    await gu.openColumnPanel('Friend');
+    await addReverseColumn();
+
+    // Hide side panels.
+    await gu.toggleSidePanel('left', 'close');
+    await gu.toggleSidePanel('right', 'close');
+
+    // Make sure we see proper data.
+    await gu.assertGridData(LABEL, [
+      [0, "Name", "Owner", "Friend"],
+      [1, "Rex",  "Alice", "Bob"],
+    ]);
+
+    await gu.assertGridData("OWNERS", [
+      [0, "Name", LABEL, `${LABEL}-Friend`],
+      [1, "Alice", "Rex", ""],
+      [2, "Bob",   "", "Rex"],
+    ]);
+
+    await gu.selectSectionByTitle("OWNERS");
+    // Check that creator panel contains proper names.
+    await gu.openColumnPanel(LABEL);
+    assert.equal(await driver.find('.test-field-col-id').value(), '$c2_');
+
+    await revert();
+  });
+
+  it('properly reasings reflists', async function() {
+    const revert = await gu.begin();
+
+    // Add two more dogs and move all of them to Alice
+    await gu.sendActions([
+      ['AddRecord', 'Pets', null, {Name: 'Pluto', Owner: 1}],
+      ['AddRecord', 'Pets', null, {Name: 'Azor', Owner: 1}],
+      ['UpdateRecord', 'Pets', 1, {Owner: 1}],
+    ]);
+
+    // Now reasign Azor to Bob using Owners table.
+    await gu.selectSectionByTitle('OWNERS');
+    await gu.getCell('Pets', 2).click();
+    await gu.sendKeys(Key.ENTER, 'Azor', Key.ENTER, Key.ENTER);
+    await gu.waitForServer();
+
+    // Make sure we see it.
+    assert.deepEqual(await gu.getVisibleGridCells('Pets', [1, 2]), ['Rex\nPluto\nAzor', '']);
+
+    // We are now in a modal dialog.
+    assert.equal(
+      await driver.findWait('.test-modal-dialog label', 100).getText(),
+      'Reassign to Owners record "Bob".'
+    );
+
+    // Reassign it.
+    await driver.findWait('.test-modal-dialog input', 100).click();
+    await driver.findWait('.test-modal-dialog button', 100).click();
+    await gu.waitForServer();
+
+    // Make sure we see correct value.
+    assert.deepEqual(await gu.getVisibleGridCells('Pets', [1, 2]), ['Rex\nPluto', 'Azor']);
+
+    await revert();
+  });
+
   it('deletes tables with 2 way references', async function() {
     const revert = await gu.begin();
-    await gu.toggleSidePanel('left', 'open');
+
+    const beforeRemove = await gu.begin();
     await driver.find('.test-tools-raw').click();
     const removeTable = async (tableId: string) => {
       await driver.findWait(`.test-raw-data-table-menu-${tableId}`, 1000).click();
@@ -48,10 +160,11 @@ describe('TwoWayReference', function() {
       await gu.waitForServer();
     };
     await removeTable('Pets');
-    await revert();
+    await beforeRemove();
     await removeTable('Owners');
     await gu.checkForErrors();
     await revert();
+    await gu.toggleSidePanel('left', 'open');
     await gu.openPage('Table1');
   });
 
@@ -59,7 +172,7 @@ describe('TwoWayReference', function() {
     const revert = await gu.begin();
 
     await gu.selectSectionByTitle('Owners');
-    await gu.selectColumn('Pets');
+    await gu.openColumnPanel('Pets');
     await gu.setType('Reference', {apply: true});
     await gu.setType('Reference List', {apply: true});
 
@@ -79,6 +192,16 @@ describe('TwoWayReference', function() {
     await gu.toggleSidePanel('left', 'close');
     await gu.toggleSidePanel('right', 'close');
 
+    await gu.assertGridData('OWNERS', [
+      [0, "Name", "Pets"],
+      [1, "Alice", "Rex"],
+      [2, "Bob", ""],
+    ]);
+    await gu.assertGridData("PETS", [
+      [0, "Name", "Owner"],
+      [1, "Rex",  "Alice"],
+    ]);
+
     // Remove the reverse column.
     await gu.selectSectionByTitle('OWNERS');
     await gu.deleteColumn('Pets');
@@ -89,46 +212,74 @@ describe('TwoWayReference', function() {
       ['Name'],
       ['Name', 'Owner']
     ]);
-    assert.deepEqual(await gu.getVisibleGridCells('Owner', [1], 'PETS'), ['Bob']);
+    await gu.assertGridData("PETS", [
+      [0, "Name", "Owner"],
+      [1, "Rex",  "Alice"],
+    ]);
     await gu.undo();
 
     // Check data.
-    assert.deepEqual(await columns(), [
-      ['Name', 'Pets'],
-      ['Name', 'Owner']
+    await gu.assertGridData('OWNERS', [
+      [0, "Name", "Pets"],
+      [1, "Alice", "Rex"],
+      [2, "Bob", ""],
+    ]);
+    await gu.assertGridData("PETS", [
+      [0, "Name", "Owner"],
+      [1, "Rex",  "Alice"],
     ]);
-    assert.deepEqual(await gu.getVisibleGridCells('Pets', [1, 2], 'OWNERS'), ['', 'Rex']);
-    assert.deepEqual(await gu.getVisibleGridCells('Owner', [1], 'PETS'), ['Bob']);
 
     // Check that connection works.
 
     // Make sure we can change data.
     await gu.selectSectionByTitle('PETS');
     await gu.getCell('Owner', 1).click();
-    await gu.enterCell('Alice', Key.ENTER);
+    await gu.enterCell('Bob', Key.ENTER);
     await gu.waitForServer();
     await gu.checkForErrors();
 
     // Check data.
-    assert.deepEqual(await gu.getVisibleGridCells('Owner', [1], 'PETS'), ['Alice']);
-    assert.deepEqual(await gu.getVisibleGridCells('Pets', [1, 2], 'OWNERS'), ['Rex', '']);
+    await gu.assertGridData('OWNERS', [
+      [0, "Name", "Pets"],
+      [1, "Alice", ""],
+      [2, "Bob", "Rex"],
+    ]);
+    await gu.assertGridData("PETS", [
+      [0, "Name", "Owner"],
+      [1, "Rex",  "Bob"],
+    ]);
 
     // Now delete Owner column, and redo it
     await gu.selectSectionByTitle('Pets');
     await gu.deleteColumn('Owner');
     await gu.checkForErrors();
     await gu.undo();
+    await gu.redo();
+    await gu.undo();
     await gu.checkForErrors();
 
     // Check data.
-    assert.deepEqual(await gu.getVisibleGridCells('Owner', [1], 'PETS'), ['Alice']);
-    assert.deepEqual(await gu.getVisibleGridCells('Pets', [1, 2], 'OWNERS'), ['Rex', '']);
+    await gu.assertGridData('OWNERS', [
+      [0, "Name", "Pets"],
+      [1, "Alice", ""],
+      [2, "Bob", "Rex"],
+    ]);
+    await gu.assertGridData("PETS", [
+      [0, "Name", "Owner"],
+      [1, "Rex",  "Bob"],
+    ]);
     await revert();
   });
 
   it('breaks connection after removing reverseCol', async function() {
     const revert = await gu.begin();
 
+    // Move Rex to Bob.
+    await gu.selectSectionByTitle('PETS');
+    await gu.getCell('Owner', 1).click();
+    await gu.enterCell('Bob', Key.ENTER);
+    await gu.waitForServer();
+
     // Make sure Rex is owned by Bob, in both tables.
     await gu.assertGridData('OWNERS', [
       [0, "Name", "Pets"],
@@ -206,25 +357,7 @@ describe('TwoWayReference', function() {
     await revert();
   });
 
-  it('works after reload', async function() {
-    const revert = await gu.begin();
-
-    await gu.selectSectionByTitle('OWNERS');
-    assert.deepEqual(await gu.getVisibleGridCells('Pets', [1, 2]), ['', 'Rex']);
-    await session.createHomeApi().getDocAPI(docId).forceReload();
-    await driver.navigate().refresh();
-    await gu.waitForDocToLoad();
-    // Change Rex owner to Alice.
-    await gu.selectSectionByTitle('PETS');
-    await gu.getCell('Owner', 1).click();
-    await gu.sendKeys('Alice', Key.ENTER);
-    await gu.waitForServer();
-    await gu.selectSectionByTitle('OWNERS');
-    assert.deepEqual(await gu.getVisibleGridCells('Pets', [1, 2]), ['Rex', '']);
-    await revert();
-  });
-
-  async function projectSetup() {
+  it('common setup', async function() {
     await gu.sendActions([
       ['AddTable', 'Projects', []],
       ['AddTable', 'People', []],
@@ -239,37 +372,252 @@ describe('TwoWayReference', function() {
     await gu.selectSectionByTitle('Projects');
     await gu.openColumnPanel();
     await gu.toggleSidePanel('left', 'close');
-  }
+    revert = await gu.begin();
+  });
 
-  it('undo works for adding reverse column', async function() {
-    await projectSetup();
-    const revert = await gu.begin();
+  it('clicking show on creates a new column', async function() {
+    await gu.selectColumn('Owner');
+    await addReverseColumn();
+    assert.deepEqual(await columns(), [
+      ['Name', 'Owner'],
+      ['Name', 'Projects']
+    ]);
 
+    await gu.selectSectionByTitle('People');
+    await gu.openColumnPanel('Projects');
+    assert.equal(await configText(), 'Projects.Owner(Ref)');
+  });
+
+  it('can remove two way reference', async function() {
+    await gu.selectSectionByTitle('Projects');
+    await gu.openColumnPanel('Owner');
+    await removeTwoWay();
+    await removeModal.wait();
+    await removeModal.confirm();
+    await gu.waitForServer();
     assert.deepEqual(await columns(), [
       ['Name', 'Owner'],
       ['Name']
     ]);
-    await addReverseColumn('Projects', 'Owner');
+  });
+
+  it('right column looks ok', async function() {
+    await addReverseColumn();
+    await gu.waitForServer();
+
+    await gu.selectSectionByTitle('People');
+    await gu.openColumnPanel('Projects');
+
+    assert.equal(await gu.getType(), 'Reference List');
+    assert.equal(await gu.getRefTable(), 'Projects');
+  });
+
+  it('right column has same options', async function() {
+    await gu.openColumnPanel('Projects');
+    assert.equal(await gu.getType(), 'Reference List');
+    assert.equal(await configText(), 'Projects.Owner(Ref)');
+  });
+
+  it('reloading the page keeps the options', async function() {
+    await gu.reloadDoc();
+    await gu.selectSectionByTitle('Projects');
+    await gu.openColumnPanel('Owner');
+    assert.equal(await configText(), 'People.Projects(RefList)');
+
+    await gu.selectSectionByTitle('People');
+    await gu.openColumnPanel('Projects');
+    assert.equal(await configText(), 'Projects.Owner(Ref)');
+  });
+
+  it('relationship can be removed through the right column', async function() {
+    await removeTwoWay();
+    await removeModal.confirm();
+    await gu.waitForServer();
+    assert.deepEqual(await columns(), [
+      ['Name'],
+      ['Name', 'Projects']
+    ]);
+  });
+
+  it('undo works', async function() {
+    // First revert all changes.
+    await revert();
+    await gu.checkForErrors();
     assert.deepEqual(await columns(), [
       ['Name', 'Owner'],
+      ['Name']
+    ]);
+
+    // Now redo all changes.
+    await gu.redoAll();
+    await gu.checkForErrors();
+    assert.deepEqual(await columns(), [
+      ['Name'],
       ['Name', 'Projects']
     ]);
-    await gu.undo(1);
+
+    await revert();
+    await gu.checkForErrors();
     assert.deepEqual(await columns(), [
       ['Name', 'Owner'],
       ['Name']
     ]);
-    await gu.redo(1);
+
+    // And now check individual changes.
+    await gu.selectSectionByTitle('Projects');
+    await gu.openColumnPanel('Owner');
+    assert.isTrue(await canAddReverseColumn());
+
+    // Now add and do a single undo to make sure it is bundled.
+    await addReverseColumn();
     assert.deepEqual(await columns(), [
       ['Name', 'Owner'],
       ['Name', 'Projects']
     ]);
+    await gu.undo(1);
+    assert.deepEqual(await columns(), [
+      ['Name', 'Owner'],
+      ['Name']
+    ]);
+  });
+
+  it('can delete left column', async function() {
+    await gu.selectSectionByTitle('Projects');
+    await gu.openColumnPanel('Owner');
+    await addReverseColumn();
+    await gu.deleteColumn('Owner');
+    await gu.checkForErrors();
+    assert.deepEqual(await columns(), [
+      ['Name'],
+      ['Name', 'Projects']
+    ]);
+    await gu.selectSectionByTitle('People');
+    await gu.openColumnPanel('Projects');
+    assert.isTrue(await canAddReverseColumn());
+    await gu.deleteColumn('Projects');
+    await gu.checkForErrors();
     await revert();
+    assert.deepEqual(await columns(), [
+      ['Name', 'Owner'],
+      ['Name']
+    ]);
+  });
+
+  it('can delete right column', async function() {
+    await gu.selectSectionByTitle('Projects');
+    await gu.openColumnPanel('Owner');
+    await addReverseColumn();
+    await gu.selectSectionByTitle('People');
+    await gu.openColumnPanel('Projects');
+    await gu.deleteColumn('Projects');
+    await gu.checkForErrors();
+    assert.deepEqual(await columns(), [
+      ['Name', 'Owner'],
+      ['Name']
+    ]);
+    await gu.selectSectionByTitle('Projects');
+    await gu.openColumnPanel('Owner');
+    assert.isFalse(await isConfigured());
+  });
+
+  it('syncs columns', async function() {
+    await gu.selectSectionByTitle('Projects');
+    await gu.openColumnPanel('Owner');
+    await gu.setRefShowColumn('Name');
+    await addReverseColumn();
+
+    // Show better names.
+    await gu.selectSectionByTitle('People');
+    await gu.openColumnPanel('Projects');
+    await gu.setRefShowColumn('Name');
+
+    // Add two projects.
+    await gu.sendActions([
+      ['AddRecord', 'Projects', null, {Name: 'Apps'}],
+      ['AddRecord', 'Projects', null, {Name: 'Backend'}],
+    ]);
+    // Add two people.
+    await gu.sendActions([
+      ['AddRecord', 'People', null, {Name: 'Alice'}],
+      ['AddRecord', 'People', null, {Name: 'Bob'}],
+    ]);
+
+    // Now assign Bob to Backend and Alice to Apps.
+    await gu.selectSectionByTitle('Projects');
+    await gu.getCell('Owner', 1).click();
+    await gu.enterCell('Alice');
+    await gu.getCell('Owner', 2).click();
+    await gu.enterCell('Bob');
+
+    // And now make sure the reverse reference is correct.
+    await gu.selectSectionByTitle('People');
+    assert.deepEqual(await gu.getVisibleGridCells('Name', [1, 2]), ['Alice', 'Bob']);
+    assert.deepEqual(await gu.getVisibleGridCells('Projects', [1, 2]), ['Apps', 'Backend']);
   });
 
+  it('sync columns when edited from right', async function() {
+    await gu.getCell('Projects', 1).click();
+    // Remove the project from Alice.
+    await gu.sendKeys(Key.DELETE);
+    await gu.waitForServer();
+    assert.deepEqual(await gu.getVisibleGridCells('Projects', [1, 2], 'People'), ['', 'Backend']);
+    assert.deepEqual(await gu.getVisibleGridCells('Owner', [1, 2], 'Projects'), ['', 'Bob']);
+    // Single undo restores it.
+    await gu.undo(1);
+    assert.deepEqual(await gu.getVisibleGridCells('Projects', [1, 2], 'People'), ['Apps', 'Backend']);
+    assert.deepEqual(await gu.getVisibleGridCells('Owner', [1, 2], 'Projects'), ['Alice', 'Bob']);
+
+    await gu.redo(1);
+    assert.deepEqual(await gu.getVisibleGridCells('Projects', [1, 2], 'People'), ['', 'Backend']);
+    assert.deepEqual(await gu.getVisibleGridCells('Owner', [1, 2], 'Projects'), ['', 'Bob']);
+
+    await gu.undo(1);
+    assert.deepEqual(await gu.getVisibleGridCells('Projects', [1, 2], 'People'), ['Apps', 'Backend']);
+    assert.deepEqual(await gu.getVisibleGridCells('Owner', [1, 2], 'Projects'), ['Alice', 'Bob']);
+  });
+
+  it('honors relations from list to single', async function() {
+    // Now make Alice owner of Backend project. Apps project should now have no owner,
+    // and Bob shouldn't be owner of Backend.
+
+    const checkInitial = async () => {
+      assert.deepEqual(await gu.getVisibleGridCells('Owner', [1, 2], 'Projects'), ['Alice', 'Bob']);
+      assert.deepEqual(await gu.getVisibleGridCells('Projects', [1, 2], 'People'), ['Apps', 'Backend']);
+    };
+    await checkInitial();
+
+    await gu.selectSectionByTitle('People');
+    await gu.getCell('Projects', 1).click();
+    await gu.sendKeys('Backend');
+    await gu.sendKeys(Key.ENTER);
+    await gu.sendKeys(Key.ENTER);
+    await gu.waitForServer();
+
+    // We should see a modal dialog
+    await driver.findWait('.test-modal-dialog', 100);
+
+    // We should have an option there.
+    assert.equal(
+      await driver.findWait('.test-modal-dialog label', 100).getText(),
+      'Reassign to People record "Alice".'
+    );
+
+    // Reassign it.
+    await driver.findWait('.test-modal-dialog input', 100).click();
+    await driver.findWait('.test-modal-dialog button', 100).click();
+    await gu.waitForServer();
+
+    assert.deepEqual(await gu.getVisibleGridCells('Owner', [1, 2], 'Projects'), ['', 'Alice']);
+    assert.deepEqual(await gu.getVisibleGridCells('Projects', [1, 2], 'People'), ['Backend', '']);
+
+    // Single undo restores it.
+    await gu.undo(1);
+    await checkInitial();
+  });
+
+
   it('creates proper names when added multiple times', async function() {
     const revert = await gu.begin();
-    await addReverseColumn('Projects', 'Owner');
 
     // Add another reference to Projects from People.
     await gu.selectSectionByTitle('Projects');
@@ -278,22 +626,22 @@ describe('TwoWayReference', function() {
     await gu.setRefShowColumn('Name');
 
     // And now show it on People.
-    await addReverseColumn('Projects', 'Tester');
+    await addReverseColumn();
 
     // We should now see 3 columns on People.
     await gu.selectSectionByTitle('People');
-    assert.deepEqual(await gu.getColumnNames(), ['Name', 'Projects', 'Projects_Tester']);
+    assert.deepEqual(await gu.getColumnNames(), ['Name', 'Projects', 'Projects-Tester']);
 
     // Add yet another one.
     await gu.selectSectionByTitle('Projects');
     await gu.addColumn('PM', 'Reference');
     await gu.setRefTable('People');
     await gu.setRefShowColumn('Name');
-    await addReverseColumn('Projects', 'PM');
+    await addReverseColumn();
 
     // We should now see 4 columns on People.
     await gu.selectSectionByTitle('People');
-    assert.deepEqual(await gu.getColumnNames(), ['Name', 'Projects', 'Projects_Tester', 'Projects_PM']);
+    assert.deepEqual(await gu.getColumnNames(), ['Name', 'Projects', 'Projects-Tester', 'Projects-PM']);
 
     await revert();
   });
@@ -318,7 +666,7 @@ describe('TwoWayReference', function() {
       ['AddRecord', 'Tasks', null, {Name: 'Child', Parent: -1}],
     ]);
     await gu.openColumnPanel('Parent');
-    await addReverseColumn('Tasks', 'Parent');
+    await addReverseColumn();
 
     // We should now see 3 columns on Tasks.
     assert.deepEqual(await gu.getColumnNames(), ['Name', 'Parent', 'Tasks']);
@@ -362,11 +710,36 @@ describe('TwoWayReference', function() {
   });
 });
 
-async function addReverseColumn(tableId: string, colId: string) {
-  await gu.sendActions([
-    ['AddReverseColumn', tableId, colId],
-  ]);
-}
+const canAddReverseColumn = async () => {
+  return await driver.findWait('.test-add-reverse-columm', 100).isPresent();
+};
+
+const isConfigured = async () => {
+  if (!await driver.find('.test-reverse-column-label').isPresent()) {
+    return false;
+  }
+  return await driver.findWait('.test-reverse-column-label', 100).isDisplayed();
+};
+
+const addReverseColumn = () => driver.findWait('.test-add-reverse-columm', 100)
+                              .click().then(() => gu.waitForServer());
+
+const removeTwoWay = () => driver.findWait('.test-remove-reverse-column', 100).click()
+                                  .then(() => gu.waitForServer());
+
+const configText = async () => {
+  const text = await driver.findWait('.test-reverse-column-label', 100).getText();
+  return text.trim().split('\n').join('').replace('COLUMN', '.').replace("TARGET TABLE", "");
+};
+
+const removeModal = {
+  wait: async () => assert.isTrue(await driver.findWait('.test-modal-confirm', 100).isDisplayed()),
+  confirm: () => driver.findWait('.test-modal-confirm', 100).click().then(() => gu.waitForServer()),
+  cancel: () => driver.findWait('.test-modal-cancel', 100).click(),
+  checkUnlink: () => driver.findWait('.test-option-unlink', 100).click(),
+  checkRemove: () => driver.findWait('.test-option-remove', 100).click(),
+};
+
 
 /**
  * Returns an array of column headers for each table in the document.
diff --git a/test/nbrowser/gristUtils.ts b/test/nbrowser/gristUtils.ts
index 7cfa14a6d78..fadac5e4dae 100644
--- a/test/nbrowser/gristUtils.ts
+++ b/test/nbrowser/gristUtils.ts
@@ -563,6 +563,10 @@ export function getColumnHeader(colOrColOptions: string|IColHeader): WebElementP
     sectionElem.findContent('.column_name .kf_elabel_text', exactMatch(col)).findClosest('.column_name'));
 }
 
+export function getSelectedColumn() {
+  return driver.find('.active_section .column_name.selected');
+}
+
 export async function getColumnNames() {
   const section = await driver.findWait('.active_section', 4000);
   return (await section.findAll('.column_name', el => el.getText()))
@@ -2439,6 +2443,11 @@ export function setFillColor(color: string) {
   return setColor(driver.find('.test-fill-input'), color);
 }
 
+export async function applyStyle() {
+  await driver.find('.test-colors-save').click();
+  await waitForServer();
+}
+
 export function getStyleRuleAt(nr: number) {
   return driver.find(`.test-widget-style-conditional-rule-${nr}`);
 }
@@ -2482,14 +2491,17 @@ export function openHeaderColorPicker() {
   return driver.find('.test-header-color-select .test-color-select').click();
 }
 
-export async function assertHeaderTextColor(col: string, color: string) {
-  await assertTextColor(await getColumnHeader(col), color);
+export async function assertHeaderTextColor(col: string|WebElement, color: string) {
+  const element = typeof col === 'string' ? await getColumnHeader(col) : col;
+  await assertTextColor(element, color);
 }
 
-export async function assertHeaderFillColor(col: string, color: string) {
-  await assertFillColor(await getColumnHeader(col), color);
+export async function assertHeaderFillColor(col: string|WebElement, color: string) {
+  const element = typeof col === 'string' ? await getColumnHeader(col) : col;
+  await assertFillColor(element, color);
 }
 
+
 /**
  * Opens a cell color picker, either the default one or the one for a specific style rule.
  */
@@ -2655,7 +2667,7 @@ export async function addSupportUserIfPossible() {
 /**
  * Adds samples to the Examples & Templates page.
  */
-async function addSamples() {
+async function addSamples(includeTutorial: boolean) {
   await addSupportUserIfPossible();
   const homeApi = createHomeApi('support', 'docs');
 
@@ -2722,6 +2734,27 @@ async function addSamples() {
       'anon@getgrist.com': 'viewers',
     }});
   }
+
+  if (includeTutorial) {
+    await templatesApi.newWorkspace({name: 'Tutorials'}, 'current');
+    const tutorialDocId = (await importFixturesDoc('support', 'templates', 'Tutorials',
+      'Grist Basics.grist', {load: false, newName: 'Grist Basics.grist'})).id;
+    await templatesApi.updateDoc(
+      tutorialDocId,
+      {
+        type: 'tutorial',
+        options: {
+          description: 'Learn Grist fast with a hands-on tutorial that covers the basics.',
+          icon: 'https://grist-static.com/icons/grist-basics.png',
+        },
+        urlId: 'grist-basics',
+      },
+    );
+    await homeApi.updateDocPermissions(tutorialDocId, {users: {
+      'everyone@getgrist.com': 'viewers',
+      'anon@getgrist.com': 'viewers',
+    }});
+  }
 }
 
 /**
@@ -2737,9 +2770,9 @@ function removeTemplatesOrg() {
  * "Examples & Templates" page in before(), and remove added samples
  * in after().
  */
-export function addSamplesForSuite() {
+export function addSamplesForSuite(includeTutorial = false) {
   before(async function() {
-    await addSamples();
+    await addSamples(includeTutorial);
   });
 
   after(async function() {
diff --git a/test/nbrowser/testUtils.ts b/test/nbrowser/testUtils.ts
index 14cc494c357..ed7ce1af910 100644
--- a/test/nbrowser/testUtils.ts
+++ b/test/nbrowser/testUtils.ts
@@ -92,6 +92,7 @@ setOptionsModifyFunc(({chromeOpts, firefoxOpts}) => {
 
 interface TestSuiteOptions {
   samples?: boolean;
+  tutorial?: boolean;
   team?: boolean;
 
   // If set, clear user preferences for all test users at the end of the suite. It should be used
@@ -268,10 +269,11 @@ export function setupCleanup() {
  */
 export function setupRequirement(options: TestSuiteOptions) {
   const cleanup = setupCleanup();
-  if (options.samples) {
+  const {samples, tutorial} = options;
+  if (samples || tutorial) {
     if (process.env.TEST_ADD_SAMPLES || !server.isExternalServer()) {
       gu.shareSupportWorkspaceForSuite(); // TODO: Remove after the support workspace is removed from the backend.
-      gu.addSamplesForSuite();
+      gu.addSamplesForSuite(tutorial);
     }
   }
 
diff --git a/test/server/fixSiteProducts.ts b/test/server/fixSiteProducts.ts
deleted file mode 100644
index 353b4ac8e46..00000000000
--- a/test/server/fixSiteProducts.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import {Organization} from 'app/gen-server/entity/Organization';
-import {fixSiteProducts} from 'app/gen-server/lib/Housekeeper';
-import {TestServer} from 'test/gen-server/apiUtils';
-import * as testUtils from 'test/server/testUtils';
-import {assert} from 'chai';
-import sinon from "sinon";
-import {getDefaultProductNames} from 'app/gen-server/entity/Product';
-
-const email = 'chimpy@getgrist.com';
-const profile = {email, name: email};
-const org = 'single-org';
-
-describe('fixSiteProducts', function() {
-  this.timeout(6000);
-
-  let oldEnv: testUtils.EnvironmentSnapshot;
-  let server: TestServer;
-
-  before(async function() {
-    oldEnv = new testUtils.EnvironmentSnapshot();
-    // By default we will simulate 'core' deployment that has 'Free' team site as default product.
-    process.env.GRIST_TEST_SERVER_DEPLOYMENT_TYPE = 'core';
-    process.env.GRIST_DEFAULT_PRODUCT = 'Free';
-    server = new TestServer(this);
-    await server.start();
-  });
-
-  after(async function() {
-    oldEnv.restore();
-    await server.stop();
-  });
-
-  it('fix should be deleted after 2024-10-01', async function() {
-    const now = new Date();
-    const remove_date = new Date('2024-10-01');
-    assert.isTrue(now < remove_date, 'This test and a fix method should be deleted after 2024-10-01');
-  });
-
-  it('fixes sites that where created with a wrong product', async function() {
-    const db = server.dbManager;
-    const user = await db.getUserByLogin(email, {profile}) as any;
-    const getOrg = (id: number) => db.connection.manager.findOne(
-      Organization,
-      {where: {id}, relations: ['billingAccount', 'billingAccount.product']});
-
-    const productOrg = (id: number) => getOrg(id)?.then(org => org?.billingAccount?.product?.name);
-
-    const freeOrgId = db.unwrapQueryResult(await db.addOrg(user, {
-      name: org,
-      domain: org,
-    }, {
-      setUserAsOwner: false,
-      useNewPlan: true,
-      product: 'teamFree',
-    }));
-
-    const teamOrgId = db.unwrapQueryResult(await db.addOrg(user, {
-      name: 'fix-team-org',
-      domain: 'fix-team-org',
-    }, {
-      setUserAsOwner: false,
-      useNewPlan: true,
-      product: 'team',
-    }));
-
-    // Make sure it is created with teamFree product.
-    assert.equal(await productOrg(freeOrgId), 'teamFree');
-
-    // Run the fixer.
-    assert.isTrue(await fixSiteProducts({
-      db,
-      deploymentType: server.server.getDeploymentType(),
-    }));
-
-    // Make sure we fixed the product is on Free product.
-    assert.equal(await productOrg(freeOrgId), 'Free');
-
-    // Make sure the other org is still on team product.
-    assert.equal(await productOrg(teamOrgId), 'team');
-  });
-
-  it("doesn't run when on saas deployment", async function() {
-    process.env.GRIST_TEST_SERVER_DEPLOYMENT_TYPE = 'saas';
-
-    // Stub it in the server. Notice that we assume some knowledge about how the server is implemented - that it won't
-    // cache this value (nor any other component) and always read it when needed. Otherwise we would need to recreate
-    // the server each time.
-    const sandbox = sinon.createSandbox();
-    sandbox.stub(server.server, 'getDeploymentType').returns('saas');
-    assert.equal(server.server.getDeploymentType(), 'saas');
-
-    assert.isFalse(await fixSiteProducts({
-      db: server.dbManager,
-      deploymentType: server.server.getDeploymentType(),
-    }));
-
-    sandbox.restore();
-  });
-
-  it("doesn't run when default product is not set", async function() {
-    // Make sure we are in 'core'.
-    assert.equal(server.server.getDeploymentType(), 'core');
-
-    // But only when Free product is the default one.
-    process.env.GRIST_DEFAULT_PRODUCT = 'teamFree';
-    assert.equal(getDefaultProductNames().teamInitial, 'teamFree'); // sanity check that Grist sees it.
-
-    assert.isFalse(await fixSiteProducts({
-      db: server.dbManager,
-      deploymentType: server.server.getDeploymentType(),
-    }));
-
-    process.env.GRIST_DEFAULT_PRODUCT = 'team';
-    assert.equal(getDefaultProductNames().teamInitial, 'team');
-
-    assert.isFalse(await fixSiteProducts({
-      db: server.dbManager,
-      deploymentType: server.server.getDeploymentType(),
-    }));
-
-    delete process.env.GRIST_DEFAULT_PRODUCT;
-    assert.equal(getDefaultProductNames().teamInitial, 'stub');
-
-    const db = server.dbManager;
-    const user = await db.getUserByLogin(email, {profile});
-    const orgId = db.unwrapQueryResult(await db.addOrg(user, {
-      name: 'sanity-check-org',
-      domain: 'sanity-check-org',
-    }, {
-      setUserAsOwner: false,
-      useNewPlan: true,
-      product: 'teamFree',
-    }));
-
-    const getOrg = (id: number) => db.connection.manager.findOne(Organization,
-      {where: {id}, relations: ['billingAccount', 'billingAccount.product']});
-    const productOrg = (id: number) => getOrg(id)?.then(org => org?.billingAccount?.product?.name);
-    assert.equal(await productOrg(orgId), 'teamFree');
-
-    assert.isFalse(await fixSiteProducts({
-      db: server.dbManager,
-      deploymentType: server.server.getDeploymentType(),
-    }));
-    assert.equal(await productOrg(orgId), 'teamFree');
-  });
-});
diff --git a/test/server/lib/GristAuditLogger.ts b/test/server/lib/GristAuditLogger.ts
index bfa6f7c3d61..6cec048176b 100644
--- a/test/server/lib/GristAuditLogger.ts
+++ b/test/server/lib/GristAuditLogger.ts
@@ -52,10 +52,13 @@ describe('GristAuditLogger', function() {
         .post('/events', {
           event: {
             name: 'createDocument',
-            user: null,
+            user: {type: 'unknown'},
             details: {
               id: 'docId',
+              name: 'docName',
             },
+            context: {},
+            source: {},
           },
           timestamp,
         })
@@ -64,7 +67,7 @@ describe('GristAuditLogger', function() {
         auditLogger.logEventAsync(null, {
           event: {
             name: 'createDocument',
-            details: {id: 'docId'},
+            details: {id: 'docId', name: 'docName'},
           },
           timestamp,
         })
@@ -80,7 +83,7 @@ describe('GristAuditLogger', function() {
         auditLogger.logEventAsync(null, {
           event: {
             name: 'createDocument',
-            details: {id: 'docId'},
+            details: {id: 'docId', name: 'docName'},
           },
         }),
         'received a non-200 response from https://api.getgrist.com/events: 404 Not found'
@@ -98,7 +101,7 @@ describe('GristAuditLogger', function() {
         void auditLogger.logEvent(null, {
           event: {
             name: 'createDocument',
-            details: {id: 'docId'},
+            details: {id: 'docId', name: 'docName'},
           },
         });
       }
@@ -106,7 +109,7 @@ describe('GristAuditLogger', function() {
         auditLogger.logEventAsync(null, {
           event: {
             name: 'createDocument',
-            details: {id: 'docId'},
+            details: {id: 'docId', name: 'docName'},
           },
         }),
         'exceeded the maximum number of pending audit event calls (25)'
diff --git a/test/server/lib/GristJobs.ts b/test/server/lib/GristJobs.ts
new file mode 100644
index 00000000000..8285d065ccd
--- /dev/null
+++ b/test/server/lib/GristJobs.ts
@@ -0,0 +1,151 @@
+import { delay } from 'app/common/delay';
+import { GristBullMQJobs, GristJobs } from 'app/server/lib/GristJobs';
+import { assert } from 'chai';
+
+describe('GristJobs', function() {
+  this.timeout(20000);
+
+  // Clean up any jobs left over from previous round of tests,
+  // if external queues are in use (Redis).
+  beforeEach(async function() {
+    const jobs = new GristBullMQJobs();
+    const q = jobs.queue();
+    await q.stop({obliterate: true});
+  });
+
+  it('can run immediate jobs', async function() {
+    const jobs: GristJobs = new GristBullMQJobs();
+    const q = jobs.queue();
+    try {
+      let ct = 0;
+      let defaultCt = 0;
+      q.handleName('add', async (job) => {
+        ct += job.data.delta;
+      });
+      q.handleDefault(async (job) => {
+        defaultCt++;
+      });
+      await q.add('add', {delta: 2});
+      await waitToPass(async () => {
+        assert.equal(ct, 2);
+        assert.equal(defaultCt, 0);
+      });
+      await q.add('add', {delta: 3});
+      await waitToPass(async () => {
+        assert.equal(ct, 5);
+        assert.equal(defaultCt, 0);
+      });
+      await q.add('badd', {delta: 4});
+      await waitToPass(async () => {
+        assert.equal(ct, 5);
+        assert.equal(defaultCt, 1);
+      });
+    } finally {
+      await jobs.stop({obliterate: true});
+    }
+  });
+
+  // FIXME: unskip this and the following test once Jenkins failures are resolved.
+  it.skip('can run delayed jobs', async function() {
+    const jobs: GristJobs = new GristBullMQJobs();
+    const q = jobs.queue();
+    try {
+      let ct = 0;
+      let defaultCt = 0;
+      q.handleName('add', async (job) => {
+        ct += job.data.delta;
+      });
+      q.handleDefault(async () => {
+        defaultCt++;
+      });
+      await q.add('add', {delta: 2}, {delay: 500});
+      assert.equal(ct, 0);
+      assert.equal(defaultCt, 0);
+      // We need to wait long enough to see the effect.
+      await delay(100);
+      assert.equal(ct, 0);
+      assert.equal(defaultCt, 0);
+      await delay(900);
+      assert.equal(ct, 2);
+      assert.equal(defaultCt, 0);
+    } finally {
+      await jobs.stop({obliterate: true});
+    }
+  });
+
+  it.skip('can run repeated jobs', async function() {
+    const jobs: GristJobs = new GristBullMQJobs();
+    const q = jobs.queue();
+    try {
+      let ct = 0;
+      let defaultCt = 0;
+      q.handleName('add', async (job) => {
+        ct += job.data.delta;
+      });
+      q.handleDefault(async () => {
+        defaultCt++;
+      });
+      await q.add('add', {delta: 2}, {repeat: {every: 250}});
+      await q.add('badd', {delta: 2}, {repeat: {every: 100}});
+      assert.equal(ct, 0);
+      assert.equal(defaultCt, 0);
+      await delay(1000);
+      // allow for a lot of slop on CI
+      assert.isAtLeast(ct, 8 - 4);
+      assert.isAtMost(ct, 8 + 4);
+      assert.isAtLeast(defaultCt, 10 - 3);
+      assert.isAtMost(defaultCt, 10 + 3);
+    } finally {
+      await jobs.stop({obliterate: true});
+    }
+  });
+
+  it('can pick up jobs again', async function() {
+    // this test is only appropriate if we have an external queue.
+    if (!process.env.REDIS_URL) { this.skip(); }
+    const jobs1: GristJobs = new GristBullMQJobs();
+    const q = jobs1.queue();
+    try {
+      let ct = 0;
+      q.handleName('add', async (job) => {
+        ct += job.data.delta;
+      });
+      q.handleDefault(async () => {});
+      await q.add('add', {delta: 1}, {delay: 250});
+      await q.add('add', {delta: 1}, {delay: 1000});
+      await delay(500);
+      assert.equal(ct, 1);
+      await jobs1.stop();
+      const jobs2: GristJobs = new GristBullMQJobs();
+      const q2 = jobs2.queue();
+      try {
+        q2.handleName('add', async (job) => {
+          ct += job.data.delta * 2;
+        });
+        q2.handleDefault(async () => {});
+        await delay(1000);
+        assert.equal(ct, 3);
+      } finally {
+        await jobs2.stop({obliterate: true});
+      }
+    } finally {
+      await jobs1.stop({obliterate: true});
+    }
+  });
+});
+
+async function waitToPass(fn: () => Promise<void>,
+                          maxWaitMs: number = 2000) {
+  const start = Date.now();
+  while (Date.now() - start < maxWaitMs) {
+    try {
+      await fn();
+      return true;
+    } catch (e) {
+      // continue after a small delay.
+      await delay(10);
+    }
+  }
+  await fn();
+  return true;
+}
diff --git a/yarn.lock b/yarn.lock
index 69e799b0c72..4a9ea139e4b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -383,10 +383,10 @@
     safe-buffer "5.2.0"
     uid-safe "~2.1.5"
 
-"@gristlabs/grist-widget@^0.0.4":
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/@gristlabs/grist-widget/-/grist-widget-0.0.4.tgz#df50d988bcdf8fc26a876cf23b82e258bbdb0ccc"
-  integrity sha512-Q0k+GuudU2+0JkuvVkB9UZzqeUKJH8PsaO9ZfxKuqL9/ssIXUd080msB+PJLXB0TU9BkpzPSl7+kLqXTBSnA5g==
+"@gristlabs/grist-widget@^0.0.5":
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/@gristlabs/grist-widget/-/grist-widget-0.0.5.tgz#b56b91ad0ee12020fa83993bb11e70d41c11a77b"
+  integrity sha512-0JhCFLjcbNqKsDyipQSWJhj5VglzixHXuqfAvHB858vmbRyG9s5G2x1lCZj2MGD+PCrIXA/qwNmJx/Ei7b6e8Q==
 
 "@gristlabs/moment-guess@1.2.4-grist.1":
   version "1.2.4-grist.1"
@@ -435,6 +435,11 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@ioredis/commands@^1.1.1":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ioredis/commands/-/commands-1.2.0.tgz#6d61b3097470af1fdbbe622795b8921d42018e11"
+  integrity sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==
+
 "@jridgewell/gen-mapping@^0.1.0":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
@@ -535,6 +540,36 @@
     semver "^7.3.5"
     tar "^6.1.11"
 
+"@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz#9edec61b22c3082018a79f6d1c30289ddf3d9d11"
+  integrity sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==
+
+"@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz#33677a275204898ad8acbf62734fc4dc0b6a4855"
+  integrity sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz#19edf7cdc2e7063ee328403c1d895a86dd28f4bb"
+  integrity sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz#94fb0543ba2e28766c3fc439cabbe0440ae70159"
+  integrity sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==
+
+"@msgpackr-extract/msgpackr-extract-linux-x64@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz#4a0609ab5fe44d07c9c60a11e4484d3c38bbd6e3"
+  integrity sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==
+
+"@msgpackr-extract/msgpackr-extract-win32-x64@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz#0aa5502d547b57abfc4ac492de68e2006e417242"
+  integrity sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -2220,6 +2255,19 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
+bullmq@5.8.7:
+  version "5.8.7"
+  resolved "https://registry.yarnpkg.com/bullmq/-/bullmq-5.8.7.tgz#d5da6215377fe29494d74ad307f195f7408b9e2e"
+  integrity sha512-IdAgB9WvJHRAcZtamRLj6fbjMyuIogEa1cjOTWM1pkVoHUOpO34q6FzNMX1R8VOeUhkvkOkWcxI5ENgFLh+TVA==
+  dependencies:
+    cron-parser "^4.6.0"
+    ioredis "^5.4.1"
+    msgpackr "^1.10.1"
+    node-abort-controller "^3.1.1"
+    semver "^7.5.4"
+    tslib "^2.0.0"
+    uuid "^9.0.0"
+
 bytes@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
@@ -2559,6 +2607,11 @@ clone@^2.1.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
   integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
 
+cluster-key-slot@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"
+  integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==
+
 collect-js-deps@^0.1.1:
   version "0.1.1"
   resolved "https://registry.npmjs.org/collect-js-deps/-/collect-js-deps-0.1.1.tgz"
@@ -2848,6 +2901,13 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+cron-parser@^4.6.0:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-4.9.0.tgz#0340694af3e46a0894978c6f52a6dbb5c0f11ad5"
+  integrity sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==
+  dependencies:
+    luxon "^3.2.1"
+
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -3071,6 +3131,11 @@ denque@^1.5.0:
   resolved "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz"
   integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==
 
+denque@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
+  integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
+
 depd@2.0.0, depd@~2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
@@ -3109,6 +3174,11 @@ detect-libc@^2.0.0:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
   integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
 
+detect-libc@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700"
+  integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==
+
 detective@^4.0.0:
   version "4.7.1"
   resolved "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz"
@@ -4827,6 +4897,21 @@ interpret@^2.2.0:
   resolved "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
+ioredis@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.4.1.tgz#1c56b70b759f01465913887375ed809134296f40"
+  integrity sha512-2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA==
+  dependencies:
+    "@ioredis/commands" "^1.1.1"
+    cluster-key-slot "^1.1.0"
+    debug "^4.3.4"
+    denque "^2.1.0"
+    lodash.defaults "^4.2.0"
+    lodash.isarguments "^3.1.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+    standard-as-callback "^2.1.0"
+
 ip@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
@@ -5411,6 +5496,11 @@ lodash.includes@^4.3.0:
   resolved "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"
   integrity sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==
 
+lodash.isarguments@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==
+
 lodash.isboolean@^3.0.3:
   version "3.0.3"
   resolved "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"
@@ -5530,6 +5620,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+luxon@^3.2.1:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.4.4.tgz#cf20dc27dc532ba41a169c43fdcc0063601577af"
+  integrity sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==
+
 make-dir@^3.0.0, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -5948,6 +6043,27 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.3:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+msgpackr-extract@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz#e9d87023de39ce714872f9e9504e3c1996d61012"
+  integrity sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==
+  dependencies:
+    node-gyp-build-optional-packages "5.2.2"
+  optionalDependencies:
+    "@msgpackr-extract/msgpackr-extract-darwin-arm64" "3.0.3"
+    "@msgpackr-extract/msgpackr-extract-darwin-x64" "3.0.3"
+    "@msgpackr-extract/msgpackr-extract-linux-arm" "3.0.3"
+    "@msgpackr-extract/msgpackr-extract-linux-arm64" "3.0.3"
+    "@msgpackr-extract/msgpackr-extract-linux-x64" "3.0.3"
+    "@msgpackr-extract/msgpackr-extract-win32-x64" "3.0.3"
+
+msgpackr@^1.10.1:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.10.2.tgz#a73de4767f76659e8c69cf9c80fdfce83937a44a"
+  integrity sha512-L60rsPynBvNE+8BWipKKZ9jHcSGbtyJYIwjRq0VrIvQ08cRjntGXJYW/tmciZ2IHWIY8WEW32Qa2xbh5+SKBZA==
+  optionalDependencies:
+    msgpackr-extract "^3.0.2"
+
 multiparty@4.2.2:
   version "4.2.2"
   resolved "https://registry.npmjs.org/multiparty/-/multiparty-4.2.2.tgz"
@@ -6019,6 +6135,11 @@ node-abort-controller@3.0.1:
   resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.0.1.tgz#f91fa50b1dee3f909afabb7e261b1e1d6b0cb74e"
   integrity sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw==
 
+node-abort-controller@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
+  integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==
+
 node-addon-api@^3.0.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
@@ -6055,6 +6176,13 @@ node-forge@^0.10.0:
   resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
+node-gyp-build-optional-packages@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz#522f50c2d53134d7f3a76cd7255de4ab6c96a3a4"
+  integrity sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==
+  dependencies:
+    detect-libc "^2.0.1"
+
 node-gyp-build@^4.2.2:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055"
@@ -7522,6 +7650,11 @@ stackback@0.0.2:
   resolved "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
   integrity sha1-Gsig2Ug4SNFpXkGLbQMaPDzmjjs=
 
+standard-as-callback@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45"
+  integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
+
 statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"