diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 83%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 3a375bcbe9..9c0577106e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,10 +1,19 @@
+---
+name: Bug report
+about: Report a bug
+title: ''
+labels: type:bug
+assignees: ''
+
+---
+
 <!--
 
-Note: If you are using www.overleaf.com and have a problem, 
+Note: If you are using www.overleaf.com and have a problem,
       or if you would like to request a new feature please contact
       the support team at support@overleaf.com
-      
-      This form should only be used to report bugs in the 
+
+      This form should only be used to report bugs in the
       Community Edition release of Overleaf.
 
 -->
diff --git a/develop/docker-compose.yml b/develop/docker-compose.yml
index 750e11ac87..8388b7dafa 100644
--- a/develop/docker-compose.yml
+++ b/develop/docker-compose.yml
@@ -25,10 +25,10 @@ services:
     env_file:
       - dev.env
     environment:
-      - DOCKER_RUNNER=true
       - TEXLIVE_IMAGE=texlive-full # docker build texlive -t texlive-full
-      - COMPILES_HOST_DIR=${PWD}/compiles
-      - OUTPUT_HOST_DIR=${PWD}/output
+      - SANDBOXED_COMPILES=true
+      - SANDBOXED_COMPILES_HOST_DIR_COMPILES=${PWD}/compiles
+      - SANDBOXED_COMPILES_HOST_DIR_OUTPUT=${PWD}/output
     user: root
     volumes:
       - ${PWD}/compiles:/overleaf/services/clsi/compiles
@@ -123,14 +123,14 @@ services:
       dockerfile: services/real-time/Dockerfile
     env_file:
       - dev.env
-
+ 
   redis:
     image: redis:5
     ports:
       - "127.0.0.1:6379:6379" # for debugging
     volumes:
       - redis-data:/data
-
+ 
   web:
     build:
       context: ..
diff --git a/libraries/access-token-encryptor/buildscript.txt b/libraries/access-token-encryptor/buildscript.txt
index 74c3bbbd24..8ce12073ea 100644
--- a/libraries/access-token-encryptor/buildscript.txt
+++ b/libraries/access-token-encryptor/buildscript.txt
@@ -1,6 +1,6 @@
 access-token-encryptor
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/libraries/fetch-utils/buildscript.txt b/libraries/fetch-utils/buildscript.txt
index 91548ff7c6..35e8eed85b 100644
--- a/libraries/fetch-utils/buildscript.txt
+++ b/libraries/fetch-utils/buildscript.txt
@@ -1,6 +1,6 @@
 fetch-utils
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/libraries/logger/buildscript.txt b/libraries/logger/buildscript.txt
index 9008707b0e..a3d1cc0646 100644
--- a/libraries/logger/buildscript.txt
+++ b/libraries/logger/buildscript.txt
@@ -1,6 +1,6 @@
 logger
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/libraries/metrics/buildscript.txt b/libraries/metrics/buildscript.txt
index 2c2e5d7531..58ff195d95 100644
--- a/libraries/metrics/buildscript.txt
+++ b/libraries/metrics/buildscript.txt
@@ -1,6 +1,6 @@
 metrics
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/libraries/mongo-utils/buildscript.txt b/libraries/mongo-utils/buildscript.txt
index bda8d4f734..35ca540bfb 100644
--- a/libraries/mongo-utils/buildscript.txt
+++ b/libraries/mongo-utils/buildscript.txt
@@ -1,6 +1,6 @@
 mongo-utils
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/libraries/o-error/buildscript.txt b/libraries/o-error/buildscript.txt
index a4134b4b60..c61679157e 100644
--- a/libraries/o-error/buildscript.txt
+++ b/libraries/o-error/buildscript.txt
@@ -1,6 +1,6 @@
 o-error
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/libraries/object-persistor/buildscript.txt b/libraries/object-persistor/buildscript.txt
index 75d2e09382..d5113ce910 100644
--- a/libraries/object-persistor/buildscript.txt
+++ b/libraries/object-persistor/buildscript.txt
@@ -1,6 +1,6 @@
 object-persistor
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/libraries/overleaf-editor-core/buildscript.txt b/libraries/overleaf-editor-core/buildscript.txt
index 9b6508663b..25a221232a 100644
--- a/libraries/overleaf-editor-core/buildscript.txt
+++ b/libraries/overleaf-editor-core/buildscript.txt
@@ -1,6 +1,6 @@
 overleaf-editor-core
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/libraries/overleaf-editor-core/lib/file_data/clear_tracking_props.js b/libraries/overleaf-editor-core/lib/file_data/clear_tracking_props.js
index ba7f0bf00b..b3ddbab7d8 100644
--- a/libraries/overleaf-editor-core/lib/file_data/clear_tracking_props.js
+++ b/libraries/overleaf-editor-core/lib/file_data/clear_tracking_props.js
@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * @import { ClearTrackingPropsRawData } from '../types'
+ * @import { ClearTrackingPropsRawData, TrackingDirective } from '../types'
  */
 
 class ClearTrackingProps {
@@ -11,12 +11,27 @@ class ClearTrackingProps {
 
   /**
    * @param {any} other
-   * @returns {boolean}
+   * @returns {other is ClearTrackingProps}
    */
   equals(other) {
     return other instanceof ClearTrackingProps
   }
 
+  /**
+   * @param {TrackingDirective} other
+   * @returns {other is ClearTrackingProps}
+   */
+  canMergeWith(other) {
+    return other instanceof ClearTrackingProps
+  }
+
+  /**
+   * @param {TrackingDirective} other
+   */
+  mergeWith(other) {
+    return this
+  }
+
   /**
    * @returns {ClearTrackingPropsRawData}
    */
diff --git a/libraries/overleaf-editor-core/lib/file_data/lazy_string_file_data.js b/libraries/overleaf-editor-core/lib/file_data/lazy_string_file_data.js
index bc11b3e98d..abc720d10c 100644
--- a/libraries/overleaf-editor-core/lib/file_data/lazy_string_file_data.js
+++ b/libraries/overleaf-editor-core/lib/file_data/lazy_string_file_data.js
@@ -11,7 +11,7 @@ const EditOperation = require('../operation/edit_operation')
 const EditOperationBuilder = require('../operation/edit_operation_builder')
 
 /**
- *  @import { BlobStore, ReadonlyBlobStore, RangesBlob, RawFileData, RawLazyStringFileData } from '../types'
+ *  @import { BlobStore, ReadonlyBlobStore, RangesBlob, RawHashFileData, RawLazyStringFileData } from '../types'
  */
 
 class LazyStringFileData extends FileData {
@@ -159,11 +159,11 @@ class LazyStringFileData extends FileData {
 
   /** @inheritdoc
    * @param {BlobStore} blobStore
-   * @return {Promise<RawFileData>}
+   * @return {Promise<RawHashFileData>}
    */
   async store(blobStore) {
     if (this.operations.length === 0) {
-      /** @type RawFileData */
+      /** @type RawHashFileData */
       const raw = { hash: this.hash }
       if (this.rangesHash) {
         raw.rangesHash = this.rangesHash
@@ -171,9 +171,11 @@ class LazyStringFileData extends FileData {
       return raw
     }
     const eager = await this.toEager(blobStore)
+    const raw = await eager.store(blobStore)
+    this.hash = raw.hash
+    this.rangesHash = raw.rangesHash
     this.operations.length = 0
-    /** @type RawFileData */
-    return await eager.store(blobStore)
+    return raw
   }
 }
 
diff --git a/libraries/overleaf-editor-core/lib/file_data/string_file_data.js b/libraries/overleaf-editor-core/lib/file_data/string_file_data.js
index 48df633461..c78c1e0414 100644
--- a/libraries/overleaf-editor-core/lib/file_data/string_file_data.js
+++ b/libraries/overleaf-editor-core/lib/file_data/string_file_data.js
@@ -8,7 +8,7 @@ const CommentList = require('./comment_list')
 const TrackedChangeList = require('./tracked_change_list')
 
 /**
- * @import { StringFileRawData, RawFileData, BlobStore, CommentRawData } from "../types"
+ * @import { StringFileRawData, RawHashFileData, BlobStore, CommentRawData } from "../types"
  * @import { TrackedChangeRawData, RangesBlob } from "../types"
  * @import EditOperation from "../operation/edit_operation"
  */
@@ -139,7 +139,7 @@ class StringFileData extends FileData {
   /**
    * @inheritdoc
    * @param {BlobStore} blobStore
-   * @return {Promise<RawFileData>}
+   * @return {Promise<RawHashFileData>}
    */
   async store(blobStore) {
     const blob = await blobStore.putString(this.content)
diff --git a/libraries/overleaf-editor-core/lib/file_data/tracked_change.js b/libraries/overleaf-editor-core/lib/file_data/tracked_change.js
index d0e6517d0f..e789a427b0 100644
--- a/libraries/overleaf-editor-core/lib/file_data/tracked_change.js
+++ b/libraries/overleaf-editor-core/lib/file_data/tracked_change.js
@@ -84,6 +84,21 @@ class TrackedChange {
       )
     )
   }
+
+  /**
+   * Return an equivalent tracked change whose extent is limited to the given
+   * range
+   *
+   * @param {Range} range
+   * @returns {TrackedChange | null} - the result or null if the intersection is empty
+   */
+  intersectRange(range) {
+    const intersection = this.range.intersect(range)
+    if (intersection == null) {
+      return null
+    }
+    return new TrackedChange(intersection, this.tracking)
+  }
 }
 
 module.exports = TrackedChange
diff --git a/libraries/overleaf-editor-core/lib/file_data/tracked_change_list.js b/libraries/overleaf-editor-core/lib/file_data/tracked_change_list.js
index 263b37ab50..b302865c70 100644
--- a/libraries/overleaf-editor-core/lib/file_data/tracked_change_list.js
+++ b/libraries/overleaf-editor-core/lib/file_data/tracked_change_list.js
@@ -2,9 +2,11 @@
 const Range = require('../range')
 const TrackedChange = require('./tracked_change')
 const TrackingProps = require('../file_data/tracking_props')
+const { InsertOp, RemoveOp, RetainOp } = require('../operation/scan_op')
 
 /**
  * @import { TrackingDirective, TrackedChangeRawData } from "../types"
+ * @import TextOperation from "../operation/text_operation"
  */
 
 class TrackedChangeList {
@@ -58,6 +60,22 @@ class TrackedChangeList {
     return this._trackedChanges.filter(change => range.contains(change.range))
   }
 
+  /**
+   * Returns tracked changes that overlap with the given range
+   * @param {Range} range
+   * @returns {TrackedChange[]}
+   */
+  intersectRange(range) {
+    const changes = []
+    for (const change of this._trackedChanges) {
+      const intersection = change.intersectRange(range)
+      if (intersection != null) {
+        changes.push(intersection)
+      }
+    }
+    return changes
+  }
+
   /**
    * Returns the tracking props for a given range.
    * @param {Range} range
@@ -89,6 +107,8 @@ class TrackedChangeList {
 
   /**
    * Collapses consecutive (and compatible) ranges
+   *
+   * @private
    * @returns {void}
    */
   _mergeRanges() {
@@ -117,12 +137,28 @@ class TrackedChangeList {
   }
 
   /**
+   * Apply an insert operation
    *
    * @param {number} cursor
    * @param {string} insertedText
    * @param {{tracking?: TrackingProps}} opts
    */
   applyInsert(cursor, insertedText, opts = {}) {
+    this._applyInsert(cursor, insertedText, opts)
+    this._mergeRanges()
+  }
+
+  /**
+   * Apply an insert operation
+   *
+   * This method will not merge ranges at the end
+   *
+   * @private
+   * @param {number} cursor
+   * @param {string} insertedText
+   * @param {{tracking?: TrackingProps}} [opts]
+   */
+  _applyInsert(cursor, insertedText, opts = {}) {
     const newTrackedChanges = []
     for (const trackedChange of this._trackedChanges) {
       if (
@@ -171,15 +207,29 @@ class TrackedChangeList {
       newTrackedChanges.push(newTrackedChange)
     }
     this._trackedChanges = newTrackedChanges
-    this._mergeRanges()
   }
 
   /**
+   * Apply a delete operation to the list of tracked changes
    *
    * @param {number} cursor
    * @param {number} length
    */
   applyDelete(cursor, length) {
+    this._applyDelete(cursor, length)
+    this._mergeRanges()
+  }
+
+  /**
+   * Apply a delete operation to the list of tracked changes
+   *
+   * This method will not merge ranges at the end
+   *
+   * @private
+   * @param {number} cursor
+   * @param {number} length
+   */
+  _applyDelete(cursor, length) {
     const newTrackedChanges = []
     for (const trackedChange of this._trackedChanges) {
       const deletedRange = new Range(cursor, length)
@@ -205,15 +255,31 @@ class TrackedChangeList {
       }
     }
     this._trackedChanges = newTrackedChanges
+  }
+
+  /**
+   * Apply a retain operation to the list of tracked changes
+   *
+   * @param {number} cursor
+   * @param {number} length
+   * @param {{tracking?: TrackingDirective}} [opts]
+   */
+  applyRetain(cursor, length, opts = {}) {
+    this._applyRetain(cursor, length, opts)
     this._mergeRanges()
   }
 
   /**
+   * Apply a retain operation to the list of tracked changes
+   *
+   * This method will not merge ranges at the end
+   *
+   * @private
    * @param {number} cursor
    * @param {number} length
    * @param {{tracking?: TrackingDirective}} opts
    */
-  applyRetain(cursor, length, opts = {}) {
+  _applyRetain(cursor, length, opts = {}) {
     // If there's no tracking info, leave everything as-is
     if (!opts.tracking) {
       return
@@ -269,6 +335,31 @@ class TrackedChangeList {
       newTrackedChanges.push(newTrackedChange)
     }
     this._trackedChanges = newTrackedChanges
+  }
+
+  /**
+   * Apply a text operation to the list of tracked changes
+   *
+   * Ranges are merged only once at the end, for performance and to avoid
+   * problematic edge cases where intermediate ranges get incorrectly merged.
+   *
+   * @param {TextOperation} operation
+   */
+  applyTextOperation(operation) {
+    // this cursor tracks the destination document that gets modified as
+    // operations are applied to it.
+    let cursor = 0
+    for (const op of operation.ops) {
+      if (op instanceof InsertOp) {
+        this._applyInsert(cursor, op.insertion, { tracking: op.tracking })
+        cursor += op.insertion.length
+      } else if (op instanceof RemoveOp) {
+        this._applyDelete(cursor, op.length)
+      } else if (op instanceof RetainOp) {
+        this._applyRetain(cursor, op.length, { tracking: op.tracking })
+        cursor += op.length
+      }
+    }
     this._mergeRanges()
   }
 }
diff --git a/libraries/overleaf-editor-core/lib/file_data/tracking_props.js b/libraries/overleaf-editor-core/lib/file_data/tracking_props.js
index 75ec95c566..82d731a232 100644
--- a/libraries/overleaf-editor-core/lib/file_data/tracking_props.js
+++ b/libraries/overleaf-editor-core/lib/file_data/tracking_props.js
@@ -62,6 +62,35 @@ class TrackingProps {
       this.ts.getTime() === other.ts.getTime()
     )
   }
+
+  /**
+   * Are these tracking props compatible with the other tracking props for merging
+   * ranges?
+   *
+   * @param {TrackingDirective} other
+   * @returns {other is TrackingProps}
+   */
+  canMergeWith(other) {
+    if (!(other instanceof TrackingProps)) {
+      return false
+    }
+    return this.type === other.type && this.userId === other.userId
+  }
+
+  /**
+   * Merge two tracking props
+   *
+   * Assumes that `canMerge(other)` returns true
+   *
+   * @param {TrackingDirective} other
+   */
+  mergeWith(other) {
+    if (!this.canMergeWith(other)) {
+      throw new Error('Cannot merge with incompatible tracking props')
+    }
+    const ts = this.ts <= other.ts ? this.ts : other.ts
+    return new TrackingProps(this.type, this.userId, ts)
+  }
 }
 
 module.exports = TrackingProps
diff --git a/libraries/overleaf-editor-core/lib/operation/scan_op.js b/libraries/overleaf-editor-core/lib/operation/scan_op.js
index 4f179f24b4..fd322459cc 100644
--- a/libraries/overleaf-editor-core/lib/operation/scan_op.js
+++ b/libraries/overleaf-editor-core/lib/operation/scan_op.js
@@ -175,7 +175,7 @@ class InsertOp extends ScanOp {
       return false
     }
     if (this.tracking) {
-      if (!this.tracking.equals(other.tracking)) {
+      if (!other.tracking || !this.tracking.canMergeWith(other.tracking)) {
         return false
       }
     } else if (other.tracking) {
@@ -198,7 +198,10 @@ class InsertOp extends ScanOp {
       throw new Error('Cannot merge with incompatible operation')
     }
     this.insertion += other.insertion
-    // We already have the same tracking info and commentIds
+    if (this.tracking != null && other.tracking != null) {
+      this.tracking = this.tracking.mergeWith(other.tracking)
+    }
+    // We already have the same commentIds
   }
 
   /**
@@ -306,9 +309,13 @@ class RetainOp extends ScanOp {
       return false
     }
     if (this.tracking) {
-      return this.tracking.equals(other.tracking)
+      if (!other.tracking || !this.tracking.canMergeWith(other.tracking)) {
+        return false
+      }
+    } else if (other.tracking) {
+      return false
     }
-    return !other.tracking
+    return true
   }
 
   /**
@@ -319,6 +326,9 @@ class RetainOp extends ScanOp {
       throw new Error('Cannot merge with incompatible operation')
     }
     this.length += other.length
+    if (this.tracking != null && other.tracking != null) {
+      this.tracking = this.tracking.mergeWith(other.tracking)
+    }
   }
 
   /**
diff --git a/libraries/overleaf-editor-core/lib/operation/text_operation.js b/libraries/overleaf-editor-core/lib/operation/text_operation.js
index 148570fa42..61c7f124b4 100644
--- a/libraries/overleaf-editor-core/lib/operation/text_operation.js
+++ b/libraries/overleaf-editor-core/lib/operation/text_operation.js
@@ -314,25 +314,18 @@ class TextOperation extends EditOperation {
             str
           )
         }
-        file.trackedChanges.applyRetain(result.length, op.length, {
-          tracking: op.tracking,
-        })
         result += str.slice(inputCursor, inputCursor + op.length)
         inputCursor += op.length
       } else if (op instanceof InsertOp) {
         if (containsNonBmpChars(op.insertion)) {
           throw new InvalidInsertionError(str, op.toJSON())
         }
-        file.trackedChanges.applyInsert(result.length, op.insertion, {
-          tracking: op.tracking,
-        })
         file.comments.applyInsert(
           new Range(result.length, op.insertion.length),
           { commentIds: op.commentIds }
         )
         result += op.insertion
       } else if (op instanceof RemoveOp) {
-        file.trackedChanges.applyDelete(result.length, op.length)
         file.comments.applyDelete(new Range(result.length, op.length))
         inputCursor += op.length
       } else {
@@ -352,6 +345,8 @@ class TextOperation extends EditOperation {
       throw new TextOperation.TooLongError(operation, result.length)
     }
 
+    file.trackedChanges.applyTextOperation(this)
+
     file.content = result
   }
 
@@ -400,44 +395,36 @@ class TextOperation extends EditOperation {
     for (let i = 0, l = ops.length; i < l; i++) {
       const op = ops[i]
       if (op instanceof RetainOp) {
-        // Where we need to end up after the retains
-        const target = strIndex + op.length
-        // A previous retain could have overriden some tracking info. Now we
-        // need to restore it.
-        const previousRanges = previousState.trackedChanges.inRange(
-          new Range(strIndex, op.length)
-        )
-
-        let removeTrackingInfoIfNeeded
         if (op.tracking) {
-          removeTrackingInfoIfNeeded = new ClearTrackingProps()
-        }
+          // Where we need to end up after the retains
+          const target = strIndex + op.length
+          // A previous retain could have overriden some tracking info. Now we
+          // need to restore it.
+          const previousChanges = previousState.trackedChanges.intersectRange(
+            new Range(strIndex, op.length)
+          )
 
-        for (const trackedChange of previousRanges) {
-          if (strIndex < trackedChange.range.start) {
-            inverse.retain(trackedChange.range.start - strIndex, {
-              tracking: removeTrackingInfoIfNeeded,
+          for (const change of previousChanges) {
+            if (strIndex < change.range.start) {
+              inverse.retain(change.range.start - strIndex, {
+                tracking: new ClearTrackingProps(),
+              })
+              strIndex = change.range.start
+            }
+            inverse.retain(change.range.length, {
+              tracking: change.tracking,
             })
-            strIndex = trackedChange.range.start
+            strIndex += change.range.length
           }
-          if (trackedChange.range.end < strIndex + op.length) {
-            inverse.retain(trackedChange.range.length, {
-              tracking: trackedChange.tracking,
+          if (strIndex < target) {
+            inverse.retain(target - strIndex, {
+              tracking: new ClearTrackingProps(),
             })
-            strIndex = trackedChange.range.end
+            strIndex = target
           }
-          if (trackedChange.range.end !== strIndex) {
-            // No need to split the range at the end
-            const [left] = trackedChange.range.splitAt(strIndex)
-            inverse.retain(left.length, { tracking: trackedChange.tracking })
-            strIndex = left.end
-          }
-        }
-        if (strIndex < target) {
-          inverse.retain(target - strIndex, {
-            tracking: removeTrackingInfoIfNeeded,
-          })
-          strIndex = target
+        } else {
+          inverse.retain(op.length)
+          strIndex += op.length
         }
       } else if (op instanceof InsertOp) {
         inverse.remove(op.insertion.length)
diff --git a/libraries/overleaf-editor-core/lib/range.js b/libraries/overleaf-editor-core/lib/range.js
index bc47632f92..b3fb2bd78b 100644
--- a/libraries/overleaf-editor-core/lib/range.js
+++ b/libraries/overleaf-editor-core/lib/range.js
@@ -86,10 +86,32 @@ class Range {
   }
 
   /**
-   * @param {Range} range
+   * Does this range overlap another range?
+   *
+   * Overlapping means that the two ranges have at least one character in common
+   *
+   * @param {Range} other - the other range
    */
-  overlaps(range) {
-    return this.start < range.end && this.end > range.start
+  overlaps(other) {
+    return this.start < other.end && this.end > other.start
+  }
+
+  /**
+   * Does this range overlap the start of another range?
+   *
+   * @param {Range} other - the other range
+   */
+  overlapsStart(other) {
+    return this.start <= other.start && this.end > other.start
+  }
+
+  /**
+   * Does this range overlap the end of another range?
+   *
+   * @param {Range} other - the other range
+   */
+  overlapsEnd(other) {
+    return this.start < other.end && this.end >= other.end
   }
 
   /**
@@ -227,6 +249,26 @@ class Range {
     )
     return [rangeUpToCursor, rangeAfterCursor]
   }
+
+  /**
+   * Returns the intersection of this range with another range
+   *
+   * @param {Range} other - the other range
+   * @return {Range | null} the intersection or null if the intersection is empty
+   */
+  intersect(other) {
+    if (this.contains(other)) {
+      return other
+    } else if (other.contains(this)) {
+      return this
+    } else if (other.overlapsStart(this)) {
+      return new Range(this.pos, other.end - this.start)
+    } else if (other.overlapsEnd(this)) {
+      return new Range(other.pos, this.end - other.start)
+    } else {
+      return null
+    }
+  }
 }
 
 module.exports = Range
diff --git a/libraries/overleaf-editor-core/test/lazy_string_file_data.test.js b/libraries/overleaf-editor-core/test/lazy_string_file_data.test.js
index 4c9f4aa497..946e6cd5d1 100644
--- a/libraries/overleaf-editor-core/test/lazy_string_file_data.test.js
+++ b/libraries/overleaf-editor-core/test/lazy_string_file_data.test.js
@@ -193,4 +193,13 @@ describe('LazyStringFileData', function () {
     expect(fileData.getStringLength()).to.equal(longString.length)
     expect(fileData.getOperations()).to.have.length(1)
   })
+
+  it('truncates its operations after being stored', async function () {
+    const testHash = File.EMPTY_FILE_HASH
+    const fileData = new LazyStringFileData(testHash, undefined, 0)
+    fileData.edit(new TextOperation().insert('abc'))
+    const stored = await fileData.store(this.blobStore)
+    expect(fileData.hash).to.equal(stored.hash)
+    expect(fileData.operations).to.deep.equal([])
+  })
 })
diff --git a/libraries/overleaf-editor-core/test/range.test.js b/libraries/overleaf-editor-core/test/range.test.js
index daad8fd6ed..9a048d5c03 100644
--- a/libraries/overleaf-editor-core/test/range.test.js
+++ b/libraries/overleaf-editor-core/test/range.test.js
@@ -1,4 +1,3 @@
-// @ts-check
 'use strict'
 
 const { expect } = require('chai')
@@ -449,4 +448,44 @@ describe('Range', function () {
       expect(() => range.insertAt(16, 3)).to.throw()
     })
   })
+
+  describe('intersect', function () {
+    it('should handle partially overlapping ranges', function () {
+      const range1 = new Range(5, 10)
+      const range2 = new Range(3, 6)
+      const intersection1 = range1.intersect(range2)
+      expect(intersection1.pos).to.equal(5)
+      expect(intersection1.length).to.equal(4)
+      const intersection2 = range2.intersect(range1)
+      expect(intersection2.pos).to.equal(5)
+      expect(intersection2.length).to.equal(4)
+    })
+
+    it('should intersect with itself', function () {
+      const range = new Range(5, 10)
+      const intersection = range.intersect(range)
+      expect(intersection.pos).to.equal(5)
+      expect(intersection.length).to.equal(10)
+    })
+
+    it('should handle nested ranges', function () {
+      const range1 = new Range(5, 10)
+      const range2 = new Range(7, 2)
+      const intersection1 = range1.intersect(range2)
+      expect(intersection1.pos).to.equal(7)
+      expect(intersection1.length).to.equal(2)
+      const intersection2 = range2.intersect(range1)
+      expect(intersection2.pos).to.equal(7)
+      expect(intersection2.length).to.equal(2)
+    })
+
+    it('should handle disconnected ranges', function () {
+      const range1 = new Range(5, 10)
+      const range2 = new Range(20, 30)
+      const intersection1 = range1.intersect(range2)
+      expect(intersection1).to.be.null
+      const intersection2 = range2.intersect(range1)
+      expect(intersection2).to.be.null
+    })
+  })
 })
diff --git a/libraries/overleaf-editor-core/test/scan_op.test.js b/libraries/overleaf-editor-core/test/scan_op.test.js
index 80ab69114e..98f4834d48 100644
--- a/libraries/overleaf-editor-core/test/scan_op.test.js
+++ b/libraries/overleaf-editor-core/test/scan_op.test.js
@@ -107,7 +107,7 @@ describe('RetainOp', function () {
     expect(op1.equals(new RetainOp(3))).to.be.true
   })
 
-  it('cannot merge with another RetainOp if tracking info is different', function () {
+  it('cannot merge with another RetainOp if the tracking user is different', function () {
     const op1 = new RetainOp(
       4,
       new TrackingProps('insert', 'user1', new Date('2024-01-01T00:00:00.000Z'))
@@ -120,14 +120,14 @@ describe('RetainOp', function () {
     expect(() => op1.mergeWith(op2)).to.throw(Error)
   })
 
-  it('can merge with another RetainOp if tracking info is the same', function () {
+  it('can merge with another RetainOp if the tracking user is the same', function () {
     const op1 = new RetainOp(
       4,
       new TrackingProps('insert', 'user1', new Date('2024-01-01T00:00:00.000Z'))
     )
     const op2 = new RetainOp(
       4,
-      new TrackingProps('insert', 'user1', new Date('2024-01-01T00:00:00.000Z'))
+      new TrackingProps('insert', 'user1', new Date('2024-01-01T00:00:01.000Z'))
     )
     op1.mergeWith(op2)
     expect(
@@ -310,7 +310,7 @@ describe('InsertOp', function () {
     expect(() => op1.mergeWith(op2)).to.throw(Error)
   })
 
-  it('cannot merge with another InsertOp if tracking info is different', function () {
+  it('cannot merge with another InsertOp if tracking user is different', function () {
     const op1 = new InsertOp(
       'a',
       new TrackingProps('insert', 'user1', new Date('2024-01-01T00:00:00.000Z'))
@@ -323,7 +323,7 @@ describe('InsertOp', function () {
     expect(() => op1.mergeWith(op2)).to.throw(Error)
   })
 
-  it('can merge with another InsertOp if tracking and comment info is the same', function () {
+  it('can merge with another InsertOp if tracking user and comment info is the same', function () {
     const op1 = new InsertOp(
       'a',
       new TrackingProps(
@@ -338,7 +338,7 @@ describe('InsertOp', function () {
       new TrackingProps(
         'insert',
         'user1',
-        new Date('2024-01-01T00:00:00.000Z')
+        new Date('2024-01-01T00:00:01.000Z')
       ),
       ['1', '2']
     )
diff --git a/libraries/overleaf-editor-core/test/text_operation.test.js b/libraries/overleaf-editor-core/test/text_operation.test.js
index fa9bc62dc3..43b8c707a6 100644
--- a/libraries/overleaf-editor-core/test/text_operation.test.js
+++ b/libraries/overleaf-editor-core/test/text_operation.test.js
@@ -322,6 +322,47 @@ describe('TextOperation', function () {
         new TextOperation().retain(4).remove(4).retain(3)
       )
     })
+
+    it('undoing a tracked delete restores the tracked changes', function () {
+      expectInverseToLeadToInitialState(
+        new StringFileData(
+          'the quick brown fox jumps over the lazy dog',
+          undefined,
+          [
+            {
+              range: { pos: 5, length: 5 },
+              tracking: {
+                ts: '2023-01-01T00:00:00.000Z',
+                type: 'insert',
+                userId: 'user1',
+              },
+            },
+            {
+              range: { pos: 12, length: 3 },
+              tracking: {
+                ts: '2023-01-01T00:00:00.000Z',
+                type: 'delete',
+                userId: 'user1',
+              },
+            },
+            {
+              range: { pos: 18, length: 5 },
+              tracking: {
+                ts: '2023-01-01T00:00:00.000Z',
+                type: 'insert',
+                userId: 'user1',
+              },
+            },
+          ]
+        ),
+        new TextOperation()
+          .retain(7)
+          .retain(13, {
+            tracking: new TrackingProps('delete', 'user1', new Date()),
+          })
+          .retain(23)
+      )
+    })
   })
 
   describe('compose', function () {
diff --git a/libraries/promise-utils/buildscript.txt b/libraries/promise-utils/buildscript.txt
index 73dec381c1..32c9fc8793 100644
--- a/libraries/promise-utils/buildscript.txt
+++ b/libraries/promise-utils/buildscript.txt
@@ -1,6 +1,6 @@
 promise-utils
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/libraries/ranges-tracker/buildscript.txt b/libraries/ranges-tracker/buildscript.txt
index 6276182679..be28fc1d80 100644
--- a/libraries/ranges-tracker/buildscript.txt
+++ b/libraries/ranges-tracker/buildscript.txt
@@ -1,6 +1,6 @@
 ranges-tracker
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/libraries/redis-wrapper/buildscript.txt b/libraries/redis-wrapper/buildscript.txt
index 1e4489a655..395bc706ac 100644
--- a/libraries/redis-wrapper/buildscript.txt
+++ b/libraries/redis-wrapper/buildscript.txt
@@ -1,6 +1,6 @@
 redis-wrapper
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/libraries/settings/buildscript.txt b/libraries/settings/buildscript.txt
index 925234f561..d4daff96d5 100644
--- a/libraries/settings/buildscript.txt
+++ b/libraries/settings/buildscript.txt
@@ -1,6 +1,6 @@
 settings
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/libraries/stream-utils/buildscript.txt b/libraries/stream-utils/buildscript.txt
index a04310e77f..1da6bdade9 100644
--- a/libraries/stream-utils/buildscript.txt
+++ b/libraries/stream-utils/buildscript.txt
@@ -1,6 +1,6 @@
 stream-utils
 --dependencies=None
---docker-repos=gcr.io/overleaf-ops
+--docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
 --env-add=
 --env-pass-through=
 --esmock-loader=False
diff --git a/package-lock.json b/package-lock.json
index 73b722b1f5..2a3bb7696d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5943,15 +5943,16 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/@grpc/grpc-js": {
-      "version": "1.8.22",
-      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.22.tgz",
-      "integrity": "sha512-oAjDdN7fzbUi+4hZjKG96MR6KTEubAeMpQEb+77qy+3r0Ua5xTFuie6JOLr4ZZgl5g+W5/uRTS2M1V8mVAFPuA==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.13.4.tgz",
+      "integrity": "sha512-GsFaMXCkMqkKIvwCQjCrwH+GHbPKBjhwo/8ZuUkWHqbI73Kky9I+pQltrlT0+MWpedCoosda53lgjYfyEPgxBg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@grpc/proto-loader": "^0.7.0",
-        "@types/node": ">=12.12.47"
+        "@grpc/proto-loader": "^0.7.13",
+        "@js-sdsl/ordered-map": "^4.4.2"
       },
       "engines": {
-        "node": "^8.13.0 || >=10.10.0"
+        "node": ">=12.10.0"
       }
     },
     "node_modules/@grpc/proto-loader": {
@@ -6989,6 +6990,18 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/@noble/hashes": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
+      "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
+      "license": "MIT",
+      "engines": {
+        "node": "^14.21.3 || >=16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@node-oauth/formats": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@node-oauth/formats/-/formats-1.0.0.tgz",
@@ -8643,6 +8656,15 @@
       "resolved": "services/web",
       "link": true
     },
+    "node_modules/@paralleldrive/cuid2": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz",
+      "integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==",
+      "license": "MIT",
+      "dependencies": {
+        "@noble/hashes": "^1.1.5"
+      }
+    },
     "node_modules/@phosphor-icons/react": {
       "version": "2.1.7",
       "resolved": "https://registry.npmjs.org/@phosphor-icons/react/-/react-2.1.7.tgz",
@@ -11575,29 +11597,6 @@
         "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
       }
     },
-    "node_modules/@stripe/react-stripe-js": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@stripe/react-stripe-js/-/react-stripe-js-3.5.0.tgz",
-      "integrity": "sha512-oo5J2SNbuAUjE9XmQv/SOD7vgZCa1Y9OcZyRAfvQPkyrDrru35sg5c64ANdHEmOWUibism3+25rKdARSw3HOfA==",
-      "license": "MIT",
-      "dependencies": {
-        "prop-types": "^15.7.2"
-      },
-      "peerDependencies": {
-        "@stripe/stripe-js": ">=1.44.1 <7.0.0",
-        "react": ">=16.8.0 <20.0.0",
-        "react-dom": ">=16.8.0 <20.0.0"
-      }
-    },
-    "node_modules/@stripe/stripe-js": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-5.10.0.tgz",
-      "integrity": "sha512-PTigkxMdMUP6B5ISS7jMqJAKhgrhZwjprDqR1eATtFfh0OpKVNp110xiH+goeVdrJ29/4LeZJR4FaHHWstsu0A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.16"
-      }
-    },
     "node_modules/@swc/helpers": {
       "version": "0.5.17",
       "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.17.tgz",
@@ -15252,13 +15251,13 @@
       }
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
-      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "is-array-buffer": "^3.0.4"
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15374,19 +15373,18 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
       "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.2.1",
-        "get-intrinsic": "^1.2.3",
-        "is-array-buffer": "^3.0.4",
-        "is-shared-array-buffer": "^1.0.2"
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15480,6 +15478,15 @@
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
       "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="
     },
+    "node_modules/async-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/async-lock": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.4.1.tgz",
@@ -16049,24 +16056,32 @@
       "optional": true
     },
     "node_modules/bare-fs": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.0.1.tgz",
-      "integrity": "sha512-ilQs4fm/l9eMfWY2dY0WCIUplSUp7U0CT1vrqMg1MUdeZl4fypu5UP0XcDBK5WBQPJAKP1b7XEodISmekH/CEg==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.5.tgz",
+      "integrity": "sha512-1zccWBMypln0jEE05LzZt+V/8y8AQsQQqxtklqaIyg5nu6OAYFhZxPXinJTSG+kU5qyNmeLgcn9AW7eHiCHVLA==",
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "bare-events": "^2.0.0",
+        "bare-events": "^2.5.4",
         "bare-path": "^3.0.0",
-        "bare-stream": "^2.0.0"
+        "bare-stream": "^2.6.4"
       },
       "engines": {
-        "bare": ">=1.7.0"
+        "bare": ">=1.16.0"
+      },
+      "peerDependencies": {
+        "bare-buffer": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-buffer": {
+          "optional": true
+        }
       }
     },
     "node_modules/bare-os": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.0.tgz",
-      "integrity": "sha512-BUrFS5TqSBdA0LwHop4OjPJwisqxGy6JsWVqV6qaFoe965qqtaKfDzHY5T2YA1gUL0ZeeQeA+4BBc1FJTcHiPw==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz",
+      "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==",
       "license": "Apache-2.0",
       "optional": true,
       "engines": {
@@ -16948,15 +16963,44 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -17445,7 +17489,8 @@
     "node_modules/chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "license": "ISC"
     },
     "node_modules/chrome-trace-event": {
       "version": "1.0.3",
@@ -17803,12 +17848,10 @@
       "license": "MIT"
     },
     "node_modules/commander": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-      "engines": {
-        "node": ">= 6"
-      }
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+      "license": "MIT"
     },
     "node_modules/common-path-prefix": {
       "version": "3.0.0",
@@ -17923,46 +17966,20 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+      "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
       "engines": [
-        "node >= 0.8"
+        "node >= 6.0"
       ],
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
+        "readable-stream": "^3.0.2",
         "typedarray": "^0.0.6"
       }
     },
-    "node_modules/concat-stream/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-    },
-    "node_modules/concat-stream/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/concat-stream/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/confbox": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
@@ -18408,6 +18425,20 @@
         "node": ">=10"
       }
     },
+    "node_modules/cpu-features": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz",
+      "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "buildcheck": "~0.0.6",
+        "nan": "^2.19.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/crc-32": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
@@ -19453,14 +19484,14 @@
       }
     },
     "node_modules/data-view-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
-      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "is-data-view": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -19470,29 +19501,29 @@
       }
     },
     "node_modules/data-view-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
-      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "is-data-view": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/inspect-js"
       }
     },
     "node_modules/data-view-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
         "is-data-view": "^1.0.1"
       },
@@ -19903,7 +19934,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
       "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
-      "dev": true,
       "dependencies": {
         "asap": "^2.0.0",
         "wrappy": "1"
@@ -19975,6 +20005,88 @@
         "node": ">=6"
       }
     },
+    "node_modules/docker-modem": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.6.tgz",
+      "integrity": "sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "readable-stream": "^3.5.0",
+        "split-ca": "^1.0.1",
+        "ssh2": "^1.15.0"
+      },
+      "engines": {
+        "node": ">= 8.0"
+      }
+    },
+    "node_modules/dockerode": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.7.tgz",
+      "integrity": "sha512-R+rgrSRTRdU5mH14PZTCPZtW/zw3HDWNTS/1ZAQpL/5Upe/ye5K9WQkIysu4wBoiMwKynsz0a8qWuGsHgEvSAA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@balena/dockerignore": "^1.0.2",
+        "@grpc/grpc-js": "^1.11.1",
+        "@grpc/proto-loader": "^0.7.13",
+        "docker-modem": "^5.0.6",
+        "protobufjs": "^7.3.2",
+        "tar-fs": "~2.1.2",
+        "uuid": "^10.0.0"
+      },
+      "engines": {
+        "node": ">= 8.0"
+      }
+    },
+    "node_modules/dockerode/node_modules/protobufjs": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.3.tgz",
+      "integrity": "sha512-sildjKwVqOI2kmFDiXQ6aEB0fjYTafpEvIBs8tOR8qI4spuL9OPROLVu2qZqi/xgCfsHIwVqlaF8JBjWFHnKbw==",
+      "hasInstallScript": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/dockerode/node_modules/tar-fs": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
+      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
+      "license": "MIT",
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/dockerode/node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -20202,6 +20314,20 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/duplexify": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz",
@@ -20533,57 +20659,65 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
-      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "version": "1.24.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
       "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "arraybuffer.prototype.slice": "^1.0.3",
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "data-view-buffer": "^1.0.1",
-        "data-view-byte-length": "^1.0.1",
-        "data-view-byte-offset": "^1.0.0",
-        "es-define-property": "^1.0.0",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-set-tostringtag": "^2.0.3",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.4",
-        "get-symbol-description": "^1.0.2",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
+        "es-object-atoms": "^1.1.1",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
         "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
-        "has-symbols": "^1.0.3",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
         "hasown": "^2.0.2",
-        "internal-slot": "^1.0.7",
-        "is-array-buffer": "^3.0.4",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.1",
+        "is-data-view": "^1.0.2",
         "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.3",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.13",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
+        "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.1",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.4",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.5",
-        "regexp.prototype.flags": "^1.5.2",
-        "safe-array-concat": "^1.1.2",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.9",
-        "string.prototype.trimend": "^1.0.8",
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.4",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.2",
-        "typed-array-byte-length": "^1.0.1",
-        "typed-array-byte-offset": "^1.0.2",
-        "typed-array-length": "^1.0.6",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.15"
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.19"
       },
       "engines": {
         "node": ">= 0.4"
@@ -20593,12 +20727,10 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -20639,9 +20771,9 @@
       "license": "MIT"
     },
     "node_modules/es-object-atoms": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
-      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0"
@@ -20651,14 +20783,15 @@
       }
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
-      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.4",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
         "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.1"
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -20674,13 +20807,14 @@
       }
     },
     "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -22835,8 +22969,7 @@
     "node_modules/fast-safe-stringify": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
-      "dev": true
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
     },
     "node_modules/fast-text-encoding": {
       "version": "1.0.3",
@@ -23331,11 +23464,18 @@
       }
     },
     "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.3"
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/for-in": {
@@ -23497,6 +23637,7 @@
       "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz",
       "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==",
       "deprecated": "Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau",
+      "license": "MIT",
       "funding": {
         "url": "https://ko-fi.com/tunnckoCore/commissions"
       }
@@ -23672,14 +23813,17 @@
       }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -23791,15 +23935,21 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -23827,6 +23977,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -23843,14 +24006,14 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
-      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4"
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -24070,11 +24233,13 @@
       }
     },
     "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -24621,11 +24786,12 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -24645,6 +24811,7 @@
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz",
       "integrity": "sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==",
+      "license": "MIT",
       "dependencies": {
         "lodash": "^4.17.15"
       }
@@ -24865,10 +25032,13 @@
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
       "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -24877,9 +25047,10 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -25837,14 +26008,14 @@
       }
     },
     "node_modules/internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -26022,13 +26193,14 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -26043,12 +26215,35 @@
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
       "dev": true
     },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+    "node_modules/is-async-function": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
+      "license": "MIT",
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+      "license": "MIT",
+      "dependencies": {
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -26067,12 +26262,13 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -26137,11 +26333,13 @@
       }
     },
     "node_modules/is-data-view": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
-      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
       "license": "MIT",
       "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
         "is-typed-array": "^1.1.13"
       },
       "engines": {
@@ -26152,11 +26350,13 @@
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -26221,6 +26421,21 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -26318,10 +26533,13 @@
       }
     },
     "node_modules/is-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
-      "dev": true,
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -26383,11 +26601,13 @@
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -26446,12 +26666,15 @@
       "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
     },
     "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -26461,10 +26684,13 @@
       }
     },
     "node_modules/is-set": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
-      "dev": true,
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -26477,12 +26703,12 @@
       "license": "MIT"
     },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7"
+        "call-bound": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -26503,11 +26729,13 @@
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -26517,11 +26745,14 @@
       }
     },
     "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -26531,12 +26762,12 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
-      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
       "license": "MIT",
       "dependencies": {
-        "which-typed-array": "^1.1.14"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -26577,33 +26808,43 @@
       "integrity": "sha512-X/kiF3Xndj6WI7l/yLyzR7V1IbQd6L4S4cewSL0fRciemPmHbaXIKR2qtf+zseH+lbMG0vFp4HvCUe7amGZVhw=="
     },
     "node_modules/is-weakmap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
-      "dev": true,
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-weakset": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
-      "dev": true,
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -27324,6 +27565,7 @@
       "version": "3.0.15",
       "resolved": "https://registry.npmjs.org/json-refs/-/json-refs-3.0.15.tgz",
       "integrity": "sha512-0vOQd9eLNBL18EGl5yYaO44GhixmImes2wiYn9Z3sag3QnehWrYWlB9AFtMxCL2Bj3fyxgDYkxGFEU/chlYssw==",
+      "license": "MIT",
       "dependencies": {
         "commander": "~4.1.1",
         "graphlib": "^2.1.8",
@@ -27345,14 +27587,25 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
     },
+    "node_modules/json-refs/node_modules/commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/json-refs/node_modules/js-yaml": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -27365,6 +27618,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -28130,12 +28384,14 @@
     "node_modules/lodash._arraypool": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.4.1.tgz",
-      "integrity": "sha1-6I7suS4ruEyQZWEv2VigcZzUf5Q="
+      "integrity": "sha512-tC2aLC7bbkDXKNrjDu9OLiVx9pFIvjinID2eD9PzNdAQGZScWUd/h8faqOw5d6oLsOvFRCRbz1ASoB+deyMVUw==",
+      "license": "MIT"
     },
     "node_modules/lodash._basebind": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz",
-      "integrity": "sha1-6UC5690nwyfgqNqxtVkWxTQelXU=",
+      "integrity": "sha512-VGHm6DH+1UiuafQdE/DNMqxOcSyhRu0xO9+jPDq7xITRn5YOorGrHVQmavMVXCYmTm80YRTZZCn/jTW7MokwLg==",
+      "license": "MIT",
       "dependencies": {
         "lodash._basecreate": "~2.4.1",
         "lodash._setbinddata": "~2.4.1",
@@ -28146,7 +28402,8 @@
     "node_modules/lodash._baseclone": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-2.4.1.tgz",
-      "integrity": "sha1-MPgj5X4X43NdODvWK2Czh1Q7QYY=",
+      "integrity": "sha512-+zJVXs0VxC/Au+/7foiKzw8UaWvfSfPh20XhqK/6HFQiUeclL5fz05zY7G9yDAFItAKKZwB4cgpzGvxiwuG1wQ==",
+      "license": "MIT",
       "dependencies": {
         "lodash._getarray": "~2.4.1",
         "lodash._releasearray": "~2.4.1",
@@ -28161,7 +28418,8 @@
     "node_modules/lodash._basecreate": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
-      "integrity": "sha1-+Ob1tXip405UEXm1a47uv0oofgg=",
+      "integrity": "sha512-8JJ3FnMPm54t3BwPLk8q8mPyQKQXm/rt9df+awr4NGtyJrtcCXM3Of1I86S6jVy1b4yAyFBb8wbKPEauuqzRmQ==",
+      "license": "MIT",
       "dependencies": {
         "lodash._isnative": "~2.4.1",
         "lodash.isobject": "~2.4.1",
@@ -28171,7 +28429,8 @@
     "node_modules/lodash._basecreatecallback": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz",
-      "integrity": "sha1-fQsmdknLKeehOdAQO3wR+uhOSFE=",
+      "integrity": "sha512-SLczhg860fGW7AKlYcuOFstDtJuQhaANlJ4Y/jrOoRxhmVtK41vbJDH3OefVRSRkSCQo4HI82QVkAVsoGa5gSw==",
+      "license": "MIT",
       "dependencies": {
         "lodash._setbinddata": "~2.4.1",
         "lodash.bind": "~2.4.1",
@@ -28182,7 +28441,8 @@
     "node_modules/lodash._basecreatewrapper": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz",
-      "integrity": "sha1-TTHy595+E0+/KAN2K4FQsyUZZm8=",
+      "integrity": "sha512-x2ja1fa/qmzbizuXgVM4QAP9svtMbdxjG8Anl9bCeDAwLOVQ1vLrA0hLb/NkpbGi9evjtkl0aWLTEoOlUdBPQA==",
+      "license": "MIT",
       "dependencies": {
         "lodash._basecreate": "~2.4.1",
         "lodash._setbinddata": "~2.4.1",
@@ -28193,7 +28453,8 @@
     "node_modules/lodash._createwrapper": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz",
-      "integrity": "sha1-UdaVeXPaTtVW43KQ2MGhjFPeFgc=",
+      "integrity": "sha512-5TCfLt1haQpsa7bgLYRKNNE4yqhO4ZxIayN1btQmazMchO6Q8JYFRMqbJ3W+uNmMm4R0Jw7KGkZX5YfDDnywuw==",
+      "license": "MIT",
       "dependencies": {
         "lodash._basebind": "~2.4.1",
         "lodash._basecreatewrapper": "~2.4.1",
@@ -28204,7 +28465,8 @@
     "node_modules/lodash._getarray": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.4.1.tgz",
-      "integrity": "sha1-+vH3+BD6mFolHCGHQESBCUg55e4=",
+      "integrity": "sha512-iIrScwY3atGvLVbQL/+CNUznaPwBJg78S/JO4cTUFXRkRsZgEBhscB27cVoT4tsIOUyFu/5M/0umfHNGJ6wYwg==",
+      "license": "MIT",
       "dependencies": {
         "lodash._arraypool": "~2.4.1"
       }
@@ -28212,22 +28474,26 @@
     "node_modules/lodash._isnative": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw="
+      "integrity": "sha512-BOlKGKNHhCHswGOWtmVb5zBygyxN7EmTuzVOSQI6QSoGhG+kvv71gICFS1TBpnqvT1n53txK8CDK3u5D2/GZxQ==",
+      "license": "MIT"
     },
     "node_modules/lodash._maxpoolsize": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._maxpoolsize/-/lodash._maxpoolsize-2.4.1.tgz",
-      "integrity": "sha1-nUgvRjuOZq++WcLBTtsRcGAXIzQ="
+      "integrity": "sha512-xKDem1BxoIfcCtaJHotjtyfdIvZO9qrF+mv3G1+ngQmaI3MJt3Qm46i9HLk/CbzABbavUrr1/EomQT8KxtsrYA==",
+      "license": "MIT"
     },
     "node_modules/lodash._objecttypes": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE="
+      "integrity": "sha512-XpqGh1e7hhkOzftBfWE7zt+Yn9mVHFkDhicVttvKLsoCMLVVL+xTQjfjB4X4vtznauxv0QZ5ZAeqjvat0dh62Q==",
+      "license": "MIT"
     },
     "node_modules/lodash._releasearray": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.4.1.tgz",
-      "integrity": "sha1-phOWMNdtFTawfdyAliiJsIL2pkE=",
+      "integrity": "sha512-wwCwWX8PK/mYR5VZjcU5JFl6py/qrfLGMxzpKOfSqgA1PaZ6Z625CZLCxH1KsqyxSkOFmNm+mEYjeDpXlM4hrg==",
+      "license": "MIT",
       "dependencies": {
         "lodash._arraypool": "~2.4.1",
         "lodash._maxpoolsize": "~2.4.1"
@@ -28236,7 +28502,8 @@
     "node_modules/lodash._setbinddata": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz",
-      "integrity": "sha1-98IAzRuS7yNrOZ7s9zxkjReqlNI=",
+      "integrity": "sha512-Vx0XKzpg2DFbQw4wrp1xSWd2sfl3W/BG6bucSRZmftS1AzbWRemCmBQDxyQTNhlLNec428PXkuuja+VNBZgu2A==",
+      "license": "MIT",
       "dependencies": {
         "lodash._isnative": "~2.4.1",
         "lodash.noop": "~2.4.1"
@@ -28245,7 +28512,8 @@
     "node_modules/lodash._shimkeys": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-      "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
+      "integrity": "sha512-lBrglYxLD/6KAJ8IEa5Lg+YHgNAL7FyKqXg4XOUI+Du/vtniLs1ZqS+yHNKPkK54waAgkdUnDOYaWf+rv4B+AA==",
+      "license": "MIT",
       "dependencies": {
         "lodash._objecttypes": "~2.4.1"
       }
@@ -28253,12 +28521,14 @@
     "node_modules/lodash._slice": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz",
-      "integrity": "sha1-dFz0GlNZexj2iImFREBe+isG2Q8="
+      "integrity": "sha512-+odPJa4PE2UgYnQgJgkLs0UD03QU78R2ivhrFnG9GdtYOZdE6ObxOj7KiUEUlqOOgatFT+ZqSypFjDSduTigKg==",
+      "license": "MIT"
     },
     "node_modules/lodash.assign": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-2.4.1.tgz",
-      "integrity": "sha1-hMOVlt1xGBqXsGUpE6fJZ15Jsao=",
+      "integrity": "sha512-AqQ4AJz5buSx9ELXWt5dONwJyVPd4NTADMKhoVYWCugjoVf172/LpvVhwmSJn4g8/Dc0S8hxTe8rt5Dob3X9KQ==",
+      "license": "MIT",
       "dependencies": {
         "lodash._basecreatecallback": "~2.4.1",
         "lodash._objecttypes": "~2.4.1",
@@ -28268,7 +28538,8 @@
     "node_modules/lodash.bind": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz",
-      "integrity": "sha1-XRn6AFyMTSNvr0dCx7eh/Kvikmc=",
+      "integrity": "sha512-hn2VWYZ+N9aYncRad4jORvlGgpFrn+axnPIWRvFxjk6CWcZH5b5alI8EymYsHITI23Z9wrW/+ORq+azrVFpOfw==",
+      "license": "MIT",
       "dependencies": {
         "lodash._createwrapper": "~2.4.1",
         "lodash._slice": "~2.4.1"
@@ -28282,7 +28553,8 @@
     "node_modules/lodash.clonedeep": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-2.4.1.tgz",
-      "integrity": "sha1-8pIDtAsS/uCkXTYxZIJZvrq8eGg=",
+      "integrity": "sha512-zj5vReFLkR+lJOBKP1wyteZ13zut/KSmXtdCBgxcy/m4UTitcBxpeVZT7gwk8BQrztPI5dIgO4bhBppXV4rpTQ==",
+      "license": "MIT",
       "dependencies": {
         "lodash._baseclone": "~2.4.1",
         "lodash._basecreatecallback": "~2.4.1"
@@ -28312,7 +28584,8 @@
     "node_modules/lodash.foreach": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-2.4.1.tgz",
-      "integrity": "sha1-/j/Do0yGyUyrb5UiVgKCdB4BYwk=",
+      "integrity": "sha512-AvOobAkE7qBtIiHU5QHQIfveWH5Usr9pIcFIzBv7u4S6bvb3FWpFrh9ltqBY7UeL5lw6e8d+SggiUXQVyh+FpA==",
+      "license": "MIT",
       "dependencies": {
         "lodash._basecreatecallback": "~2.4.1",
         "lodash.forown": "~2.4.1"
@@ -28321,7 +28594,8 @@
     "node_modules/lodash.forown": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-2.4.1.tgz",
-      "integrity": "sha1-eLQer+FAX6lmRZ6kGT/VAtCEUks=",
+      "integrity": "sha512-VC+CKm/zSs5t3i/MHv71HZoQphuqOvez1xhjWBwHU5zAbsCYrqwHr+MyQyMk14HzA3hSRNA5lCqDMSw5G2Qscg==",
+      "license": "MIT",
       "dependencies": {
         "lodash._basecreatecallback": "~2.4.1",
         "lodash._objecttypes": "~2.4.1",
@@ -28342,7 +28616,8 @@
     "node_modules/lodash.identity": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz",
-      "integrity": "sha1-ZpTP+mX++TH3wxzobHRZfPVg9PE="
+      "integrity": "sha512-VRYX+8XipeLjorag5bz3YBBRJ+5kj8hVBzfnaHgXPZAVTYowBdY5l0M5ZnOmlAMCOXBFabQtm7f5VqjMKEji0w==",
+      "license": "MIT"
     },
     "node_modules/lodash.includes": {
       "version": "4.3.0",
@@ -28357,7 +28632,8 @@
     "node_modules/lodash.isarray": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-2.4.1.tgz",
-      "integrity": "sha1-tSoybB9i9tfac6MdVAHfbvRPD6E=",
+      "integrity": "sha512-yRDd0z+APziDqbk0MqR6Qfwj/Qn3jLxFJbI9U8MuvdTnqIXdZ5YXyGLnwuzCpZmjr26F1GNOjKLMMZ10i/wy6A==",
+      "license": "MIT",
       "dependencies": {
         "lodash._isnative": "~2.4.1"
       }
@@ -28370,12 +28646,15 @@
     "node_modules/lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
+      "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.",
+      "license": "MIT"
     },
     "node_modules/lodash.isfunction": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz",
-      "integrity": "sha1-LP1XXHPkmKtX4xm3f6Aq3vE6lNE="
+      "integrity": "sha512-6XcAB3izeQxPOQQNAJbbdjXbvWEt2Pn9ezPrjr4CwoLwmqsLVbsiEXD19cmmt4mbzOCOCdHzOQiUivUOJLra7w==",
+      "license": "MIT"
     },
     "node_modules/lodash.isinteger": {
       "version": "4.0.4",
@@ -28390,7 +28669,8 @@
     "node_modules/lodash.isobject": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-      "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
+      "integrity": "sha512-sTebg2a1PoicYEZXD5PBdQcTlIJ6hUslrlWr7iV0O7n+i4596s2NQ9I5CaZ5FbXSfya/9WQsrYLANUJv9paYVA==",
+      "license": "MIT",
       "dependencies": {
         "lodash._objecttypes": "~2.4.1"
       }
@@ -28408,7 +28688,8 @@
     "node_modules/lodash.keys": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-      "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
+      "integrity": "sha512-ZpJhwvUXHSNL5wYd1RM6CUa2ZuqorG9ngoJ9Ix5Cce+uX7I5O/E06FCJdhSZ33b5dVyeQDnIlWH7B2s5uByZ7g==",
+      "license": "MIT",
       "dependencies": {
         "lodash._isnative": "~2.4.1",
         "lodash._shimkeys": "~2.4.1",
@@ -28429,7 +28710,8 @@
     "node_modules/lodash.noop": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz",
-      "integrity": "sha1-T7VPgWZS5a4Q6PcvcXo4jHMmU4o="
+      "integrity": "sha512-uNcV98/blRhInPUGQEnj9ekXXfG+q+rfoNSFZgl/eBfog9yBDW9gfUv2AHX/rAF7zZRlzWhbslGhbGQFZlCkZA==",
+      "license": "MIT"
     },
     "node_modules/lodash.once": {
       "version": "4.1.1",
@@ -28445,7 +28727,8 @@
     "node_modules/lodash.support": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz",
-      "integrity": "sha1-Mg4LZwMWc8KNeiu12eAzGkUkBRU=",
+      "integrity": "sha512-6SwqWwGFHhTXEiqB/yQgu8FYd//tm786d49y7kizHVCJH7zdzs191UQn3ES3tkkDbUddNRfkCRYqJFHtbLnbCw==",
+      "license": "MIT",
       "dependencies": {
         "lodash._isnative": "~2.4.1"
       }
@@ -28835,6 +29118,15 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/mathjax": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/mathjax/-/mathjax-3.2.2.tgz",
@@ -29448,7 +29740,6 @@
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
       "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "dev": true,
       "bin": {
         "mime": "cli.js"
       },
@@ -29457,9 +29748,10 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -29475,11 +29767,12 @@
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.34",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
-      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
       "dependencies": {
-        "mime-db": "1.51.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -29716,7 +30009,8 @@
     "node_modules/mkdirp-classic": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "license": "MIT"
     },
     "node_modules/mlly": {
       "version": "1.7.4",
@@ -30181,18 +30475,18 @@
       }
     },
     "node_modules/multer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.0.tgz",
-      "integrity": "sha512-bS8rPZurbAuHGAnApbM9d4h1wSoYqrOqkE+6a64KLMK9yWU7gJXBDDVklKQ3TPi9DRb85cRs6yXaC0+cjxRtRg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.1.tgz",
+      "integrity": "sha512-Ug8bXeTIUlxurg8xLTEskKShvcKDZALo1THEX5E41pYCD2sCVub5/kIRIGqWNoqV6szyLyQKV6mD4QUrWE5GCQ==",
       "license": "MIT",
       "dependencies": {
         "append-field": "^1.0.0",
-        "busboy": "^1.0.0",
-        "concat-stream": "^1.5.2",
-        "mkdirp": "^0.5.4",
+        "busboy": "^1.6.0",
+        "concat-stream": "^2.0.0",
+        "mkdirp": "^0.5.6",
         "object-assign": "^4.1.1",
-        "type-is": "^1.6.4",
-        "xtend": "^4.0.0"
+        "type-is": "^1.6.18",
+        "xtend": "^4.0.2"
       },
       "engines": {
         "node": ">= 10.16.0"
@@ -30322,7 +30616,8 @@
     "node_modules/native-promise-only": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz",
-      "integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE="
+      "integrity": "sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg==",
+      "license": "MIT"
     },
     "node_modules/native-request": {
       "version": "1.1.0",
@@ -30876,9 +31171,13 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -30920,14 +31219,16 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -31178,6 +31479,23 @@
       "resolved": "libraries/overleaf-editor-core",
       "link": true
     },
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/p-event": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
@@ -31737,12 +32055,80 @@
       }
     },
     "node_modules/path-loader": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/path-loader/-/path-loader-1.0.10.tgz",
-      "integrity": "sha512-CMP0v6S6z8PHeJ6NFVyVJm6WyJjIwFvyz2b0n2/4bKdS/0uZa/9sKUlYZzubrn3zuDRU0zIuEDX9DZYQ2ZI8TA==",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/path-loader/-/path-loader-1.0.12.tgz",
+      "integrity": "sha512-n7oDG8B+k/p818uweWrOixY9/Dsr89o2TkCm6tOTex3fpdo2+BFDgR+KpB37mGKBRsBAlR8CIJMFN0OEy/7hIQ==",
+      "license": "MIT",
       "dependencies": {
         "native-promise-only": "^0.8.1",
-        "superagent": "^3.8.3"
+        "superagent": "^7.1.6"
+      }
+    },
+    "node_modules/path-loader/node_modules/debug": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/path-loader/node_modules/formidable": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.5.tgz",
+      "integrity": "sha512-Oz5Hwvwak/DCaXVVUtPn4oLMLLy1CdclLKO1LFgU7XzDpVMUU5UjlSLpGMocyQNNk8F6IJW9M/YdooSn2MRI+Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@paralleldrive/cuid2": "^2.2.2",
+        "dezalgo": "^1.0.4",
+        "once": "^1.4.0",
+        "qs": "^6.11.0"
+      },
+      "funding": {
+        "url": "https://ko-fi.com/tunnckoCore/commissions"
+      }
+    },
+    "node_modules/path-loader/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/path-loader/node_modules/superagent": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-7.1.6.tgz",
+      "integrity": "sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g==",
+      "deprecated": "Please upgrade to v9.0.0+ as we have fixed a public vulnerability with formidable dependency. Note that v9.0.0+ requires Node.js v14.18.0+. See https://github.com/ladjs/superagent/pull/1800 for insight. This project is supported and maintained by the team at Forward Email @ https://forwardemail.net",
+      "license": "MIT",
+      "dependencies": {
+        "component-emitter": "^1.3.0",
+        "cookiejar": "^2.1.3",
+        "debug": "^4.3.4",
+        "fast-safe-stringify": "^2.1.1",
+        "form-data": "^4.0.0",
+        "formidable": "^2.0.1",
+        "methods": "^1.1.2",
+        "mime": "2.6.0",
+        "qs": "^6.10.3",
+        "readable-stream": "^3.6.0",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": ">=6.4.0 <13 || >=14"
       }
     },
     "node_modules/path-parse": {
@@ -35079,6 +35465,28 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.1",
+        "which-builtin-type": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -35143,15 +35551,17 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
         "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -35666,14 +36076,15 @@
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
-      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
       "engines": {
@@ -35694,6 +36105,22 @@
       "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
       "optional": true
     },
+    "node_modules/safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
@@ -35704,14 +36131,14 @@
       }
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
-      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
-        "is-regex": "^1.1.4"
+        "is-regex": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -36429,13 +36856,29 @@
       }
     },
     "node_modules/set-function-name": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
-      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "license": "MIT",
       "dependencies": {
-        "define-data-property": "^1.0.1",
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
         "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
+      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -36546,14 +36989,69 @@
       "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="
     },
     "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -37132,7 +37630,8 @@
     "node_modules/spark-md5": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.2.tgz",
-      "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw=="
+      "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==",
+      "license": "(WTFPL OR MIT)"
     },
     "node_modules/sparse-bitfield": {
       "version": "3.0.3",
@@ -37221,7 +37720,8 @@
     "node_modules/split-ca": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz",
-      "integrity": "sha1-bIOv82kvphJW4M0ZfgXp3hV2kaY="
+      "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==",
+      "license": "ISC"
     },
     "node_modules/split-string": {
       "version": "3.1.0",
@@ -37256,6 +37756,23 @@
         "es5-ext": "^0.10.53"
       }
     },
+    "node_modules/ssh2": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz",
+      "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "asn1": "^0.2.6",
+        "bcrypt-pbkdf": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=10.16.0"
+      },
+      "optionalDependencies": {
+        "cpu-features": "~0.0.10",
+        "nan": "^2.20.0"
+      }
+    },
     "node_modules/sshpk": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
@@ -37370,12 +37887,13 @@
       "license": "MIT"
     },
     "node_modules/stop-iteration-iterator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
-      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
-      "dev": true,
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "license": "MIT",
       "dependencies": {
-        "internal-slot": "^1.0.4"
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -37548,15 +38066,18 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
-      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.0",
-        "es-object-atoms": "^1.0.0"
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -37566,15 +38087,19 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
-      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
         "define-properties": "^1.2.1",
         "es-object-atoms": "^1.0.0"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -38063,7 +38588,8 @@
       "version": "3.8.3",
       "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz",
       "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==",
-      "deprecated": "Please upgrade to v7.0.2+ of superagent.  We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing.  See the releases tab for more information at <https://github.com/visionmedia/superagent/releases>. Thanks to @shadowgate15, @spence-s, and @niftylettuce. Superagent is sponsored by Forward Email at <https://forwardemail.net>.",
+      "deprecated": "Please upgrade to v9.0.0+ as we have fixed a public vulnerability with formidable dependency. Note that v9.0.0+ requires Node.js v14.18.0+. See https://github.com/ladjs/superagent/pull/1800 for insight. This project is supported and maintained by the team at Forward Email @ https://forwardemail.net",
+      "license": "MIT",
       "dependencies": {
         "component-emitter": "^1.2.0",
         "cookiejar": "^2.1.0",
@@ -38084,32 +38610,58 @@
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/superagent/node_modules/form-data": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.3.tgz",
+      "integrity": "sha512-XHIrMD0NpDrNM/Ckf7XJiBbLl57KEhT3+i3yY+eWm+cqYZJQTZrKo8Y8AWKnuV5GT4scfuUGt9LzNoIx3dU1nQ==",
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "mime-types": "^2.1.35",
+        "safe-buffer": "^5.2.1"
       },
       "engines": {
         "node": ">= 0.12"
       }
     },
+    "node_modules/superagent/node_modules/form-data/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/superagent/node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "license": "MIT"
     },
     "node_modules/superagent/node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -38118,9 +38670,10 @@
       }
     },
     "node_modules/superagent/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -38135,6 +38688,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -38375,7 +38929,8 @@
     "node_modules/swagger-converter": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/swagger-converter/-/swagger-converter-0.1.7.tgz",
-      "integrity": "sha1-oJdRnG8e5N1n4wjZtT3cnCslf5c=",
+      "integrity": "sha512-O2hZbWqq8x6j0uZ4qWj5dw45WPoAxKsJLJZqOgTqRtPNi8IqA+rDkDV/48S8qanS3KGv1QcVoPNLivMbyHHdAQ==",
+      "license": "MIT",
       "dependencies": {
         "lodash.clonedeep": "^2.4.1"
       }
@@ -38426,12 +38981,6 @@
         "lodash": "^4.17.14"
       }
     },
-    "node_modules/swagger-tools/node_modules/commander": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-      "license": "MIT"
-    },
     "node_modules/swagger-tools/node_modules/debug": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
@@ -38530,9 +39079,9 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.8.tgz",
-      "integrity": "sha512-ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg==",
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.9.tgz",
+      "integrity": "sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA==",
       "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0",
@@ -39356,14 +39905,14 @@
       }
     },
     "node_modules/traverse": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.9.tgz",
-      "integrity": "sha512-7bBrcF+/LQzSgFmT0X5YclVqQxtv7TDJ1f8Wj7ibBu/U6BMLeOpUxuZjV7rMc44UtKxlnMFigdhFAIszSX1DMg==",
+      "version": "0.6.11",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.11.tgz",
+      "integrity": "sha512-vxXDZg8/+p3gblxB6BhhG5yWVn1kGRlaL8O78UDXc3wRnPizB5g83dcvWV1jpDMIPnjZjOFuxlMmE82XJ4407w==",
       "license": "MIT",
       "dependencies": {
-        "gopd": "^1.0.1",
-        "typedarray.prototype.slice": "^1.0.3",
-        "which-typed-array": "^1.1.15"
+        "gopd": "^1.2.0",
+        "typedarray.prototype.slice": "^1.0.5",
+        "which-typed-array": "^1.1.18"
       },
       "engines": {
         "node": ">= 0.4"
@@ -39520,30 +40069,30 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.13"
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
-      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -39553,17 +40102,18 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
-      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -39573,17 +40123,17 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
-      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
         "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0"
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -39598,17 +40148,19 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "node_modules/typedarray.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-8WbVAQAUlENo1q3c3zZYuy5k9VzBQvp8AX9WOtbvyWlLM1v5JaSRmjubLjzHF4JFtptjH/5c/i95yaElvcjC0A==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz",
+      "integrity": "sha512-q7QNVDGTdl702bVFiI5eY4l/HkgCM6at9KhcFbgUAzezHFbOVy4+0O/lCjsABEQwbZPravVfBIiBVGo89yzHFg==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.0",
+        "es-abstract": "^1.23.9",
         "es-errors": "^1.3.0",
-        "typed-array-buffer": "^1.0.2",
-        "typed-array-byte-offset": "^1.0.2"
+        "get-proto": "^1.0.1",
+        "math-intrinsics": "^1.1.0",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -39696,14 +40248,18 @@
       }
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -41388,30 +41944,64 @@
       }
     },
     "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
+      "license": "MIT",
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.2.1",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/which-collection": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
-      "dev": true,
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "license": "MIT",
       "dependencies": {
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-weakmap": "^2.0.1",
-        "is-weakset": "^2.0.1"
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -41424,15 +42014,17 @@
       "dev": true
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
-      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
+      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "for-each": "^0.3.5",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
         "has-tostringtag": "^1.0.2"
       },
       "engines": {
@@ -41949,6 +42541,7 @@
       "version": "3.25.1",
       "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.25.1.tgz",
       "integrity": "sha512-7tDlwhrBG+oYFdXNOjILSurpfQyuVgkRe3hB2q8TEssamDHB7BbLWYkYO98nTn0FibfdFroFKDjndbgufAgS/Q==",
+      "license": "MIT",
       "dependencies": {
         "core-js": "^2.5.7",
         "lodash.get": "^4.0.0",
@@ -41962,23 +42555,19 @@
         "commander": "^2.7.1"
       }
     },
-    "node_modules/z-schema/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "optional": true
-    },
     "node_modules/z-schema/node_modules/core-js": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
       "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
-      "hasInstallScript": true
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "hasInstallScript": true,
+      "license": "MIT"
     },
     "node_modules/z-schema/node_modules/validator": {
       "version": "10.11.0",
       "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
       "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
@@ -42102,13 +42691,13 @@
         "async": "^3.2.5",
         "body-parser": "^1.20.3",
         "bunyan": "^1.8.15",
-        "dockerode": "^4.0.5",
+        "dockerode": "^4.0.7",
         "express": "^4.21.2",
         "lodash": "^4.17.21",
         "p-limit": "^3.1.0",
         "request": "^2.88.2",
         "send": "^0.19.0",
-        "tar-fs": "^3.0.4",
+        "tar-fs": "^3.0.9",
         "workerpool": "^6.1.5"
       },
       "devDependencies": {
@@ -42175,33 +42764,6 @@
         "node": ">= 0.6"
       }
     },
-    "services/clsi/node_modules/@grpc/grpc-js": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.13.2.tgz",
-      "integrity": "sha512-nnR5nmL6lxF8YBqb6gWvEgLdLh/Fn+kvAdX5hUOnt48sNSb0riz/93ASd2E5gvanPA41X6Yp25bIfGRp1SMb2g==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@grpc/proto-loader": "^0.7.13",
-        "@js-sdsl/ordered-map": "^4.4.2"
-      },
-      "engines": {
-        "node": ">=12.10.0"
-      }
-    },
-    "services/clsi/node_modules/cpu-features": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz",
-      "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==",
-      "hasInstallScript": true,
-      "optional": true,
-      "dependencies": {
-        "buildcheck": "~0.0.6",
-        "nan": "^2.19.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
     "services/clsi/node_modules/diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
@@ -42211,75 +42773,6 @@
         "node": ">=0.3.1"
       }
     },
-    "services/clsi/node_modules/docker-modem": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.6.tgz",
-      "integrity": "sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "readable-stream": "^3.5.0",
-        "split-ca": "^1.0.1",
-        "ssh2": "^1.15.0"
-      },
-      "engines": {
-        "node": ">= 8.0"
-      }
-    },
-    "services/clsi/node_modules/dockerode": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.5.tgz",
-      "integrity": "sha512-ZPmKSr1k1571Mrh7oIBS/j0AqAccoecY2yH420ni5j1KyNMgnoTh4Nu4FWunh0HZIJmRSmSysJjBIpa/zyWUEA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@balena/dockerignore": "^1.0.2",
-        "@grpc/grpc-js": "^1.11.1",
-        "@grpc/proto-loader": "^0.7.13",
-        "docker-modem": "^5.0.6",
-        "protobufjs": "^7.3.2",
-        "tar-fs": "~2.1.2",
-        "uuid": "^10.0.0"
-      },
-      "engines": {
-        "node": ">= 8.0"
-      }
-    },
-    "services/clsi/node_modules/dockerode/node_modules/tar-fs": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz",
-      "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==",
-      "license": "MIT",
-      "dependencies": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
-      }
-    },
-    "services/clsi/node_modules/protobufjs": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
-      "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
-      "hasInstallScript": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.2",
-        "@protobufjs/base64": "^1.1.2",
-        "@protobufjs/codegen": "^2.0.4",
-        "@protobufjs/eventemitter": "^1.1.0",
-        "@protobufjs/fetch": "^1.1.0",
-        "@protobufjs/float": "^1.0.2",
-        "@protobufjs/inquire": "^1.1.0",
-        "@protobufjs/path": "^1.1.2",
-        "@protobufjs/pool": "^1.1.0",
-        "@protobufjs/utf8": "^1.1.0",
-        "@types/node": ">=13.7.0",
-        "long": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
     "services/clsi/node_modules/sinon": {
       "version": "9.0.3",
       "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.0.3.tgz",
@@ -42299,23 +42792,6 @@
         "url": "https://opencollective.com/sinon"
       }
     },
-    "services/clsi/node_modules/ssh2": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz",
-      "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "asn1": "^0.2.6",
-        "bcrypt-pbkdf": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=10.16.0"
-      },
-      "optionalDependencies": {
-        "cpu-features": "~0.0.10",
-        "nan": "^2.20.0"
-      }
-    },
     "services/clsi/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -42328,19 +42804,6 @@
         "node": ">=8"
       }
     },
-    "services/clsi/node_modules/uuid": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
-      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "services/contacts": {
       "name": "@overleaf/contacts",
       "dependencies": {
@@ -42408,6 +42871,7 @@
     "services/docstore": {
       "name": "@overleaf/docstore",
       "dependencies": {
+        "@overleaf/fetch-utils": "*",
         "@overleaf/logger": "*",
         "@overleaf/metrics": "*",
         "@overleaf/o-error": "*",
@@ -42718,6 +43182,7 @@
       "license": "Proprietary",
       "dependencies": {
         "@google-cloud/secret-manager": "^5.6.0",
+        "@overleaf/fetch-utils": "*",
         "@overleaf/logger": "*",
         "@overleaf/metrics": "*",
         "@overleaf/mongo-utils": "*",
@@ -42747,6 +43212,7 @@
         "mongodb": "6.12.0",
         "overleaf-editor-core": "*",
         "p-limit": "^6.2.0",
+        "p-queue": "^8.1.0",
         "pg": "^8.7.1",
         "pg-query-stream": "^4.2.4",
         "swagger-tools": "^0.10.4",
@@ -44228,6 +44694,7 @@
         "@overleaf/promise-utils": "*",
         "@overleaf/redis-wrapper": "*",
         "@overleaf/settings": "*",
+        "@overleaf/stream-utils": "*",
         "async": "^3.2.5",
         "aws-sdk": "^2.650.0",
         "body-parser": "^1.20.3",
@@ -44687,8 +45154,7 @@
         "@overleaf/settings": "*",
         "@phosphor-icons/react": "^2.1.7",
         "@slack/webhook": "^7.0.2",
-        "@stripe/react-stripe-js": "^3.1.1",
-        "@stripe/stripe-js": "^5.6.0",
+        "@stripe/stripe-js": "^7.3.0",
         "@xmldom/xmldom": "^0.7.13",
         "accepts": "^1.3.7",
         "ajv": "^8.12.0",
@@ -44740,7 +45206,7 @@
         "moment": "^2.29.4",
         "mongodb-legacy": "6.1.3",
         "mongoose": "8.9.5",
-        "multer": "overleaf/multer#199c5ff05bd375c508f4074498237baead7f5148",
+        "multer": "overleaf/multer#4dbceda355efc3fc8ac3cf5c66c3778c8a6fdb23",
         "nocache": "^2.1.0",
         "node-fetch": "^2.7.0",
         "nodemailer": "^6.7.0",
@@ -45175,6 +45641,15 @@
         "lodash": "^4.17.15"
       }
     },
+    "services/web/node_modules/@stripe/stripe-js": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-7.3.0.tgz",
+      "integrity": "sha512-xnCyFIEI5SQnQrKkCxVj7nS5fWTZap+zuIGzmmxLMdlmgahFJaihK4zogqE8YyKKTLtrp/EldkEijSgtXsRVDg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.16"
+      }
+    },
     "services/web/node_modules/@transloadit/prettier-bytes": {
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/@transloadit/prettier-bytes/-/prettier-bytes-0.0.9.tgz",
@@ -46022,18 +46497,18 @@
       }
     },
     "services/web/node_modules/multer": {
-      "version": "2.0.0",
-      "resolved": "git+ssh://git@github.com/overleaf/multer.git#199c5ff05bd375c508f4074498237baead7f5148",
-      "integrity": "sha512-S5MlIoOgrDr+a2jLS8z7jQlbzvZ0m30U2tRwdyLrxhnnMUQZYEzkVysEv10Dw41RTpM5bQQDs563Vzl1LLhxhQ==",
+      "version": "2.0.1",
+      "resolved": "git+ssh://git@github.com/overleaf/multer.git#4dbceda355efc3fc8ac3cf5c66c3778c8a6fdb23",
+      "integrity": "sha512-kkvPK48OQibR5vIoTQBbZp1uWVCvT9MrW3Y0mqdhFYJP/HVJujb4eSCEU0yj+hyf0Y+H/BKCmPdM4fJnzqAO4w==",
       "license": "MIT",
       "dependencies": {
         "append-field": "^1.0.0",
-        "busboy": "^1.0.0",
-        "concat-stream": "^1.5.2",
-        "mkdirp": "^0.5.4",
+        "busboy": "^1.6.0",
+        "concat-stream": "^2.0.0",
+        "mkdirp": "^0.5.6",
         "object-assign": "^4.1.1",
-        "type-is": "^1.6.4",
-        "xtend": "^4.0.0"
+        "type-is": "^1.6.18",
+        "xtend": "^4.0.2"
       },
       "engines": {
         "node": ">= 10.16.0"
diff --git a/package.json b/package.json
index 64fbd258ed..a51bbcd743 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     },
     "swagger-tools": {
       "body-parser": "1.20.3",
-      "multer": "2.0.0",
+      "multer": "2.0.1",
       "path-to-regexp": "3.3.0",
       "qs": "6.13.0"
     }
diff --git a/server-ce/hotfix/5.5.1/Dockerfile b/server-ce/hotfix/5.5.1/Dockerfile
new file mode 100644
index 0000000000..9572d29740
--- /dev/null
+++ b/server-ce/hotfix/5.5.1/Dockerfile
@@ -0,0 +1,28 @@
+FROM sharelatex/sharelatex:5.5.0
+
+
+# fix tls configuration in redis for history-v1
+COPY pr_25168.patch .
+RUN patch -p1 < pr_25168.patch && rm pr_25168.patch
+
+# improve logging in history system
+COPY pr_26086.patch .
+RUN patch -p1 < pr_26086.patch && rm pr_26086.patch
+
+# fix create-user.mjs script
+COPY pr_26152.patch .
+RUN patch -p1 < pr_26152.patch && rm pr_26152.patch
+
+# check mongo featureCompatibilityVersion
+COPY pr_26091.patch .
+RUN patch -p1 < pr_26091.patch && rm pr_26091.patch
+
+# update multer and tar-fs
+RUN sed -i 's/"multer": "2.0.0"/"multer": "2.0.1"/g' package.json
+RUN sed -i 's/"dockerode": "^4.0.5"/"dockerode": "^4.0.7"/g' services/clsi/package.json
+RUN sed -i 's/"tar-fs": "^3.0.4"/"tar-fs": "^3.0.9"/g' services/clsi/package.json
+RUN sed -i 's/199c5ff05bd375c508f4074498237baead7f5148/4dbceda355efc3fc8ac3cf5c66c3778c8a6fdb23/g' services/web/package.json
+COPY package-lock.json.diff .
+RUN patch package-lock.json < package-lock.json.diff
+RUN npm install --omit=dev
+RUN npm install  @paralleldrive/cuid2@2.2.2 -w services/history-v1
diff --git a/server-ce/hotfix/5.5.1/package-lock.json.diff b/server-ce/hotfix/5.5.1/package-lock.json.diff
new file mode 100644
index 0000000000..ecbf851bc8
--- /dev/null
+++ b/server-ce/hotfix/5.5.1/package-lock.json.diff
@@ -0,0 +1,2202 @@
+4954,4956c4954,4957
+<       "version": "1.8.22",
+<       "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.22.tgz",
+<       "integrity": "sha512-oAjDdN7fzbUi+4hZjKG96MR6KTEubAeMpQEb+77qy+3r0Ua5xTFuie6JOLr4ZZgl5g+W5/uRTS2M1V8mVAFPuA==",
+---
+>       "version": "1.13.4",
+>       "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.13.4.tgz",
+>       "integrity": "sha512-GsFaMXCkMqkKIvwCQjCrwH+GHbPKBjhwo/8ZuUkWHqbI73Kky9I+pQltrlT0+MWpedCoosda53lgjYfyEPgxBg==",
+>       "license": "Apache-2.0",
+4958,4959c4959,4960
+<         "@grpc/proto-loader": "^0.7.0",
+<         "@types/node": ">=12.12.47"
+---
+>         "@grpc/proto-loader": "^0.7.13",
+>         "@js-sdsl/ordered-map": "^4.4.2"
+4962c4963
+<         "node": "^8.13.0 || >=10.10.0"
+---
+>         "node": ">=12.10.0"
+5915a5917,5928
+>     "node_modules/@noble/hashes": {
+>       "version": "1.8.0",
+>       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
+>       "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
+>       "license": "MIT",
+>       "engines": {
+>         "node": "^14.21.3 || >=16"
+>       },
+>       "funding": {
+>         "url": "https://paulmillr.com/funding/"
+>       }
+>     },
+7528a7542,7550
+>     "node_modules/@paralleldrive/cuid2": {
+>       "version": "2.2.2",
+>       "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz",
+>       "integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "@noble/hashes": "^1.1.5"
+>       }
+>     },
+13479,13481c13501,13503
+<       "version": "1.0.1",
+<       "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+<       "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+---
+>       "version": "1.0.2",
+>       "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+>       "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
+13484,13485c13506,13507
+<         "call-bind": "^1.0.5",
+<         "is-array-buffer": "^3.0.4"
+---
+>         "call-bound": "^1.0.3",
+>         "is-array-buffer": "^3.0.5"
+13601,13603c13623,13625
+<       "version": "1.0.3",
+<       "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+<       "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+---
+>       "version": "1.0.4",
+>       "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+>       "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
+13607c13629
+<         "call-bind": "^1.0.5",
+---
+>         "call-bind": "^1.0.8",
+13609,13613c13631,13634
+<         "es-abstract": "^1.22.3",
+<         "es-errors": "^1.2.1",
+<         "get-intrinsic": "^1.2.3",
+<         "is-array-buffer": "^3.0.4",
+<         "is-shared-array-buffer": "^1.0.2"
+---
+>         "es-abstract": "^1.23.5",
+>         "es-errors": "^1.3.0",
+>         "get-intrinsic": "^1.2.6",
+>         "is-array-buffer": "^3.0.4"
+13706a13728,13736
+>     "node_modules/async-function": {
+>       "version": "1.0.0",
+>       "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+>       "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+>       "license": "MIT",
+>       "engines": {
+>         "node": ">= 0.4"
+>       }
+>     },
+14255,14257c14285,14287
+<       "version": "4.0.1",
+<       "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.0.1.tgz",
+<       "integrity": "sha512-ilQs4fm/l9eMfWY2dY0WCIUplSUp7U0CT1vrqMg1MUdeZl4fypu5UP0XcDBK5WBQPJAKP1b7XEodISmekH/CEg==",
+---
+>       "version": "4.1.5",
+>       "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.5.tgz",
+>       "integrity": "sha512-1zccWBMypln0jEE05LzZt+V/8y8AQsQQqxtklqaIyg5nu6OAYFhZxPXinJTSG+kU5qyNmeLgcn9AW7eHiCHVLA==",
+14261c14291
+<         "bare-events": "^2.0.0",
+---
+>         "bare-events": "^2.5.4",
+14263c14293
+<         "bare-stream": "^2.0.0"
+---
+>         "bare-stream": "^2.6.4"
+14266c14296,14304
+<         "bare": ">=1.7.0"
+---
+>         "bare": ">=1.16.0"
+>       },
+>       "peerDependencies": {
+>         "bare-buffer": "*"
+>       },
+>       "peerDependenciesMeta": {
+>         "bare-buffer": {
+>           "optional": true
+>         }
+14270,14272c14308,14310
+<       "version": "3.6.0",
+<       "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.0.tgz",
+<       "integrity": "sha512-BUrFS5TqSBdA0LwHop4OjPJwisqxGy6JsWVqV6qaFoe965qqtaKfDzHY5T2YA1gUL0ZeeQeA+4BBc1FJTcHiPw==",
+---
+>       "version": "3.6.1",
+>       "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz",
+>       "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==",
+15110,15112c15148,15151
+<       "version": "1.0.7",
+<       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+<       "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+---
+>       "version": "1.0.8",
+>       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+>       "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+>       "license": "MIT",
+15113a15153
+>         "call-bind-apply-helpers": "^1.0.0",
+15115,15116d15154
+<         "es-errors": "^1.3.0",
+<         "function-bind": "^1.1.2",
+15118c15156,15185
+<         "set-function-length": "^1.2.1"
+---
+>         "set-function-length": "^1.2.2"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+>       "funding": {
+>         "url": "https://github.com/sponsors/ljharb"
+>       }
+>     },
+>     "node_modules/call-bind-apply-helpers": {
+>       "version": "1.0.2",
+>       "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+>       "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "es-errors": "^1.3.0",
+>         "function-bind": "^1.1.2"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       }
+>     },
+>     "node_modules/call-bound": {
+>       "version": "1.0.4",
+>       "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+>       "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "call-bind-apply-helpers": "^1.0.2",
+>         "get-intrinsic": "^1.3.0"
+15423c15490,15491
+<       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+---
+>       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+>       "license": "ISC"
+15751,15756c15819,15822
+<       "version": "4.1.1",
+<       "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+<       "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+<       "engines": {
+<         "node": ">= 6"
+<       }
+---
+>       "version": "2.11.0",
+>       "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+>       "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+>       "license": "MIT"
+15871,15873c15937,15939
+<       "version": "1.6.2",
+<       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+<       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+---
+>       "version": "2.0.0",
+>       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+>       "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
+15875c15941
+<         "node >= 0.8"
+---
+>         "node >= 6.0"
+15876a15943
+>       "license": "MIT",
+15880c15947
+<         "readable-stream": "^2.2.2",
+---
+>         "readable-stream": "^3.0.2",
+15884,15910d15950
+<     "node_modules/concat-stream/node_modules/isarray": {
+<       "version": "1.0.0",
+<       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+<       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+<     },
+<     "node_modules/concat-stream/node_modules/readable-stream": {
+<       "version": "2.3.8",
+<       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+<       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+<       "dependencies": {
+<         "core-util-is": "~1.0.0",
+<         "inherits": "~2.0.3",
+<         "isarray": "~1.0.0",
+<         "process-nextick-args": "~2.0.0",
+<         "safe-buffer": "~5.1.1",
+<         "string_decoder": "~1.1.1",
+<         "util-deprecate": "~1.0.1"
+<       }
+<     },
+<     "node_modules/concat-stream/node_modules/string_decoder": {
+<       "version": "1.1.1",
+<       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+<       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+<       "dependencies": {
+<         "safe-buffer": "~5.1.0"
+<       }
+<     },
+16125c16165,16166
+<       "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw=="
+---
+>       "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
+>       "license": "MIT"
+16337a16379,16392
+>     "node_modules/cpu-features": {
+>       "version": "0.0.10",
+>       "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz",
+>       "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==",
+>       "hasInstallScript": true,
+>       "optional": true,
+>       "dependencies": {
+>         "buildcheck": "~0.0.6",
+>         "nan": "^2.19.0"
+>       },
+>       "engines": {
+>         "node": ">=10.0.0"
+>       }
+>     },
+17268,17270c17323,17325
+<       "version": "1.0.1",
+<       "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+<       "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+---
+>       "version": "1.0.2",
+>       "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+>       "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
+17273c17328
+<         "call-bind": "^1.0.6",
+---
+>         "call-bound": "^1.0.3",
+17275c17330
+<         "is-data-view": "^1.0.1"
+---
+>         "is-data-view": "^1.0.2"
+17285,17287c17340,17342
+<       "version": "1.0.1",
+<       "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+<       "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+---
+>       "version": "1.0.2",
+>       "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+>       "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
+17290c17345
+<         "call-bind": "^1.0.7",
+---
+>         "call-bound": "^1.0.3",
+17292c17347
+<         "is-data-view": "^1.0.1"
+---
+>         "is-data-view": "^1.0.2"
+17298c17353
+<         "url": "https://github.com/sponsors/ljharb"
+---
+>         "url": "https://github.com/sponsors/inspect-js"
+17302,17304c17357,17359
+<       "version": "1.0.0",
+<       "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+<       "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+---
+>       "version": "1.0.1",
+>       "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+>       "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
+17307c17362
+<         "call-bind": "^1.0.6",
+---
+>         "call-bound": "^1.0.2",
+17666a17722,17731
+>     "node_modules/dezalgo": {
+>       "version": "1.0.4",
+>       "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+>       "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+>       "license": "ISC",
+>       "dependencies": {
+>         "asap": "^2.0.0",
+>         "wrappy": "1"
+>       }
+>     },
+17725a17791,17872
+>     "node_modules/docker-modem": {
+>       "version": "5.0.6",
+>       "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.6.tgz",
+>       "integrity": "sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==",
+>       "license": "Apache-2.0",
+>       "dependencies": {
+>         "debug": "^4.1.1",
+>         "readable-stream": "^3.5.0",
+>         "split-ca": "^1.0.1",
+>         "ssh2": "^1.15.0"
+>       },
+>       "engines": {
+>         "node": ">= 8.0"
+>       }
+>     },
+>     "node_modules/dockerode": {
+>       "version": "4.0.7",
+>       "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.7.tgz",
+>       "integrity": "sha512-R+rgrSRTRdU5mH14PZTCPZtW/zw3HDWNTS/1ZAQpL/5Upe/ye5K9WQkIysu4wBoiMwKynsz0a8qWuGsHgEvSAA==",
+>       "license": "Apache-2.0",
+>       "dependencies": {
+>         "@balena/dockerignore": "^1.0.2",
+>         "@grpc/grpc-js": "^1.11.1",
+>         "@grpc/proto-loader": "^0.7.13",
+>         "docker-modem": "^5.0.6",
+>         "protobufjs": "^7.3.2",
+>         "tar-fs": "~2.1.2",
+>         "uuid": "^10.0.0"
+>       },
+>       "engines": {
+>         "node": ">= 8.0"
+>       }
+>     },
+>     "node_modules/dockerode/node_modules/protobufjs": {
+>       "version": "7.5.3",
+>       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.3.tgz",
+>       "integrity": "sha512-sildjKwVqOI2kmFDiXQ6aEB0fjYTafpEvIBs8tOR8qI4spuL9OPROLVu2qZqi/xgCfsHIwVqlaF8JBjWFHnKbw==",
+>       "hasInstallScript": true,
+>       "license": "BSD-3-Clause",
+>       "dependencies": {
+>         "@protobufjs/aspromise": "^1.1.2",
+>         "@protobufjs/base64": "^1.1.2",
+>         "@protobufjs/codegen": "^2.0.4",
+>         "@protobufjs/eventemitter": "^1.1.0",
+>         "@protobufjs/fetch": "^1.1.0",
+>         "@protobufjs/float": "^1.0.2",
+>         "@protobufjs/inquire": "^1.1.0",
+>         "@protobufjs/path": "^1.1.2",
+>         "@protobufjs/pool": "^1.1.0",
+>         "@protobufjs/utf8": "^1.1.0",
+>         "@types/node": ">=13.7.0",
+>         "long": "^5.0.0"
+>       },
+>       "engines": {
+>         "node": ">=12.0.0"
+>       }
+>     },
+>     "node_modules/dockerode/node_modules/tar-fs": {
+>       "version": "2.1.3",
+>       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
+>       "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "chownr": "^1.1.1",
+>         "mkdirp-classic": "^0.5.2",
+>         "pump": "^3.0.0",
+>         "tar-stream": "^2.1.4"
+>       }
+>     },
+>     "node_modules/dockerode/node_modules/uuid": {
+>       "version": "10.0.0",
+>       "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+>       "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+>       "funding": [
+>         "https://github.com/sponsors/broofa",
+>         "https://github.com/sponsors/ctavan"
+>       ],
+>       "license": "MIT",
+>       "bin": {
+>         "uuid": "dist/bin/uuid"
+>       }
+>     },
+17926a18074,18087
+>     "node_modules/dunder-proto": {
+>       "version": "1.0.1",
+>       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+>       "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "call-bind-apply-helpers": "^1.0.1",
+>         "es-errors": "^1.3.0",
+>         "gopd": "^1.2.0"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       }
+>     },
+18212,18214c18373,18375
+<       "version": "1.23.3",
+<       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+<       "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+---
+>       "version": "1.24.0",
+>       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+>       "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
+18217,18218c18378,18379
+<         "array-buffer-byte-length": "^1.0.1",
+<         "arraybuffer.prototype.slice": "^1.0.3",
+---
+>         "array-buffer-byte-length": "^1.0.2",
+>         "arraybuffer.prototype.slice": "^1.0.4",
+18220,18224c18381,18386
+<         "call-bind": "^1.0.7",
+<         "data-view-buffer": "^1.0.1",
+<         "data-view-byte-length": "^1.0.1",
+<         "data-view-byte-offset": "^1.0.0",
+<         "es-define-property": "^1.0.0",
+---
+>         "call-bind": "^1.0.8",
+>         "call-bound": "^1.0.4",
+>         "data-view-buffer": "^1.0.2",
+>         "data-view-byte-length": "^1.0.2",
+>         "data-view-byte-offset": "^1.0.1",
+>         "es-define-property": "^1.0.1",
+18226,18233c18388,18396
+<         "es-object-atoms": "^1.0.0",
+<         "es-set-tostringtag": "^2.0.3",
+<         "es-to-primitive": "^1.2.1",
+<         "function.prototype.name": "^1.1.6",
+<         "get-intrinsic": "^1.2.4",
+<         "get-symbol-description": "^1.0.2",
+<         "globalthis": "^1.0.3",
+<         "gopd": "^1.0.1",
+---
+>         "es-object-atoms": "^1.1.1",
+>         "es-set-tostringtag": "^2.1.0",
+>         "es-to-primitive": "^1.3.0",
+>         "function.prototype.name": "^1.1.8",
+>         "get-intrinsic": "^1.3.0",
+>         "get-proto": "^1.0.1",
+>         "get-symbol-description": "^1.1.0",
+>         "globalthis": "^1.0.4",
+>         "gopd": "^1.2.0",
+18235,18236c18398,18399
+<         "has-proto": "^1.0.3",
+<         "has-symbols": "^1.0.3",
+---
+>         "has-proto": "^1.2.0",
+>         "has-symbols": "^1.1.0",
+18238,18239c18401,18402
+<         "internal-slot": "^1.0.7",
+<         "is-array-buffer": "^3.0.4",
+---
+>         "internal-slot": "^1.1.0",
+>         "is-array-buffer": "^3.0.5",
+18241c18404
+<         "is-data-view": "^1.0.1",
+---
+>         "is-data-view": "^1.0.2",
+18243,18248c18406,18413
+<         "is-regex": "^1.1.4",
+<         "is-shared-array-buffer": "^1.0.3",
+<         "is-string": "^1.0.7",
+<         "is-typed-array": "^1.1.13",
+<         "is-weakref": "^1.0.2",
+<         "object-inspect": "^1.13.1",
+---
+>         "is-regex": "^1.2.1",
+>         "is-set": "^2.0.3",
+>         "is-shared-array-buffer": "^1.0.4",
+>         "is-string": "^1.1.1",
+>         "is-typed-array": "^1.1.15",
+>         "is-weakref": "^1.1.1",
+>         "math-intrinsics": "^1.1.0",
+>         "object-inspect": "^1.13.4",
+18250,18255c18415,18424
+<         "object.assign": "^4.1.5",
+<         "regexp.prototype.flags": "^1.5.2",
+<         "safe-array-concat": "^1.1.2",
+<         "safe-regex-test": "^1.0.3",
+<         "string.prototype.trim": "^1.2.9",
+<         "string.prototype.trimend": "^1.0.8",
+---
+>         "object.assign": "^4.1.7",
+>         "own-keys": "^1.0.1",
+>         "regexp.prototype.flags": "^1.5.4",
+>         "safe-array-concat": "^1.1.3",
+>         "safe-push-apply": "^1.0.0",
+>         "safe-regex-test": "^1.1.0",
+>         "set-proto": "^1.0.0",
+>         "stop-iteration-iterator": "^1.1.0",
+>         "string.prototype.trim": "^1.2.10",
+>         "string.prototype.trimend": "^1.0.9",
+18257,18262c18426,18431
+<         "typed-array-buffer": "^1.0.2",
+<         "typed-array-byte-length": "^1.0.1",
+<         "typed-array-byte-offset": "^1.0.2",
+<         "typed-array-length": "^1.0.6",
+<         "unbox-primitive": "^1.0.2",
+<         "which-typed-array": "^1.1.15"
+---
+>         "typed-array-buffer": "^1.0.3",
+>         "typed-array-byte-length": "^1.0.3",
+>         "typed-array-byte-offset": "^1.0.4",
+>         "typed-array-length": "^1.0.7",
+>         "unbox-primitive": "^1.1.0",
+>         "which-typed-array": "^1.1.19"
+18272,18277c18441,18444
+<       "version": "1.0.0",
+<       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+<       "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+<       "dependencies": {
+<         "get-intrinsic": "^1.2.4"
+<       },
+---
+>       "version": "1.0.1",
+>       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+>       "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+>       "license": "MIT",
+18318,18320c18485,18487
+<       "version": "1.0.0",
+<       "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+<       "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+---
+>       "version": "1.1.1",
+>       "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+>       "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+18330,18332c18497,18499
+<       "version": "2.0.3",
+<       "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+<       "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+---
+>       "version": "2.1.0",
+>       "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+>       "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+18335c18502,18503
+<         "get-intrinsic": "^1.2.4",
+---
+>         "es-errors": "^1.3.0",
+>         "get-intrinsic": "^1.2.6",
+18337c18505
+<         "hasown": "^2.0.1"
+---
+>         "hasown": "^2.0.2"
+18353,18355c18521,18524
+<       "version": "1.2.1",
+<       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+<       "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+---
+>       "version": "1.3.0",
+>       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+>       "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
+>       "license": "MIT",
+18357,18359c18526,18528
+<         "is-callable": "^1.1.4",
+<         "is-date-object": "^1.0.1",
+<         "is-symbol": "^1.0.2"
+---
+>         "is-callable": "^1.2.7",
+>         "is-date-object": "^1.0.5",
+>         "is-symbol": "^1.0.4"
+20463a20633,20638
+>     "node_modules/fast-safe-stringify": {
+>       "version": "2.1.1",
+>       "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+>       "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+>       "license": "MIT"
+>     },
+20933,20935c21108,21111
+<       "version": "0.3.3",
+<       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+<       "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+---
+>       "version": "0.3.5",
+>       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+>       "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
+>       "license": "MIT",
+20937c21113,21119
+<         "is-callable": "^1.1.3"
+---
+>         "is-callable": "^1.2.7"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+>       "funding": {
+>         "url": "https://github.com/sponsors/ljharb"
+21100a21283
+>       "license": "MIT",
+21272,21274c21455,21458
+<       "version": "1.1.6",
+<       "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+<       "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+---
+>       "version": "1.1.8",
+>       "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+>       "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
+>       "license": "MIT",
+21276,21279c21460,21465
+<         "call-bind": "^1.0.2",
+<         "define-properties": "^1.2.0",
+<         "es-abstract": "^1.22.1",
+<         "functions-have-names": "^1.2.3"
+---
+>         "call-bind": "^1.0.8",
+>         "call-bound": "^1.0.3",
+>         "define-properties": "^1.2.1",
+>         "functions-have-names": "^1.2.3",
+>         "hasown": "^2.0.2",
+>         "is-callable": "^1.2.7"
+21385,21387c21571,21574
+<       "version": "1.2.4",
+<       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+<       "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+---
+>       "version": "1.3.0",
+>       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+>       "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+>       "license": "MIT",
+21388a21576,21577
+>         "call-bind-apply-helpers": "^1.0.2",
+>         "es-define-property": "^1.0.1",
+21389a21579
+>         "es-object-atoms": "^1.1.1",
+21391,21393c21581,21585
+<         "has-proto": "^1.0.1",
+<         "has-symbols": "^1.0.3",
+<         "hasown": "^2.0.0"
+---
+>         "get-proto": "^1.0.1",
+>         "gopd": "^1.2.0",
+>         "has-symbols": "^1.1.0",
+>         "hasown": "^2.0.2",
+>         "math-intrinsics": "^1.1.0"
+21420a21613,21625
+>     "node_modules/get-proto": {
+>       "version": "1.0.1",
+>       "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+>       "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "dunder-proto": "^1.0.1",
+>         "es-object-atoms": "^1.0.0"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       }
+>     },
+21437,21439c21642,21644
+<       "version": "1.0.2",
+<       "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+<       "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+---
+>       "version": "1.1.0",
+>       "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+>       "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
+21442c21647
+<         "call-bind": "^1.0.5",
+---
+>         "call-bound": "^1.0.3",
+21444c21649
+<         "get-intrinsic": "^1.2.4"
+---
+>         "get-intrinsic": "^1.2.6"
+21664,21666c21869,21872
+<       "version": "1.0.3",
+<       "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+<       "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+---
+>       "version": "1.0.4",
+>       "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+>       "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+>       "license": "MIT",
+21668c21874,21875
+<         "define-properties": "^1.1.3"
+---
+>         "define-properties": "^1.2.1",
+>         "gopd": "^1.0.1"
+22055,22059c22262,22267
+<       "version": "1.0.1",
+<       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+<       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+<       "dependencies": {
+<         "get-intrinsic": "^1.1.3"
+---
+>       "version": "1.2.0",
+>       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+>       "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+>       "license": "MIT",
+>       "engines": {
+>         "node": ">= 0.4"
+22079a22288
+>       "license": "MIT",
+22300,22302c22509,22511
+<       "version": "1.0.3",
+<       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+<       "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+---
+>       "version": "1.2.0",
+>       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+>       "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+22303a22513,22515
+>       "dependencies": {
+>         "dunder-proto": "^1.0.0"
+>       },
+22312,22314c22524,22527
+<       "version": "1.0.3",
+<       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+<       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+---
+>       "version": "1.1.0",
+>       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+>       "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+>       "license": "MIT",
+23257,23259c23470,23472
+<       "version": "1.0.7",
+<       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+<       "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+---
+>       "version": "1.1.0",
+>       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+>       "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
+23263,23264c23476,23477
+<         "hasown": "^2.0.0",
+<         "side-channel": "^1.0.4"
+---
+>         "hasown": "^2.0.2",
+>         "side-channel": "^1.1.0"
+23402,23404c23615,23617
+<       "version": "3.0.4",
+<       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+<       "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+---
+>       "version": "3.0.5",
+>       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+>       "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
+23407,23408c23620,23622
+<         "call-bind": "^1.0.2",
+<         "get-intrinsic": "^1.2.1"
+---
+>         "call-bind": "^1.0.8",
+>         "call-bound": "^1.0.3",
+>         "get-intrinsic": "^1.2.6"
+23422a23637,23655
+>     "node_modules/is-async-function": {
+>       "version": "2.1.1",
+>       "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+>       "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "async-function": "^1.0.0",
+>         "call-bound": "^1.0.3",
+>         "get-proto": "^1.0.1",
+>         "has-tostringtag": "^1.0.2",
+>         "safe-regex-test": "^1.1.0"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+>       "funding": {
+>         "url": "https://github.com/sponsors/ljharb"
+>       }
+>     },
+23424,23426c23657,23660
+<       "version": "1.0.4",
+<       "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+<       "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+---
+>       "version": "1.1.0",
+>       "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+>       "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+>       "license": "MIT",
+23428c23662,23665
+<         "has-bigints": "^1.0.1"
+---
+>         "has-bigints": "^1.0.2"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+23447,23449c23684,23687
+<       "version": "1.1.2",
+<       "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+<       "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+---
+>       "version": "1.2.2",
+>       "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+>       "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
+>       "license": "MIT",
+23451,23452c23689,23690
+<         "call-bind": "^1.0.2",
+<         "has-tostringtag": "^1.0.0"
+---
+>         "call-bound": "^1.0.3",
+>         "has-tostringtag": "^1.0.2"
+23517,23519c23755,23757
+<       "version": "1.0.1",
+<       "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+<       "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+---
+>       "version": "1.0.2",
+>       "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+>       "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
+23521a23760,23761
+>         "call-bound": "^1.0.2",
+>         "get-intrinsic": "^1.2.6",
+23532,23534c23772,23775
+<       "version": "1.0.5",
+<       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+<       "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+---
+>       "version": "1.1.0",
+>       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+>       "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
+>       "license": "MIT",
+23536c23777,23778
+<         "has-tostringtag": "^1.0.0"
+---
+>         "call-bound": "^1.0.2",
+>         "has-tostringtag": "^1.0.2"
+23601a23844,23858
+>     "node_modules/is-finalizationregistry": {
+>       "version": "1.1.1",
+>       "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+>       "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "call-bound": "^1.0.3"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+>       "funding": {
+>         "url": "https://github.com/sponsors/ljharb"
+>       }
+>     },
+23688,23691c23945,23951
+<       "version": "2.0.2",
+<       "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+<       "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+<       "dev": true,
+---
+>       "version": "2.0.3",
+>       "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+>       "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+>       "license": "MIT",
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+23753,23755c24013,24016
+<       "version": "1.0.7",
+<       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+<       "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+---
+>       "version": "1.1.1",
+>       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+>       "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
+>       "license": "MIT",
+23757c24018,24019
+<         "has-tostringtag": "^1.0.0"
+---
+>         "call-bound": "^1.0.3",
+>         "has-tostringtag": "^1.0.2"
+23817,23819c24079,24082
+<       "version": "1.1.4",
+<       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+<       "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+---
+>       "version": "1.2.1",
+>       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+>       "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+>       "license": "MIT",
+23821,23822c24084,24087
+<         "call-bind": "^1.0.2",
+<         "has-tostringtag": "^1.0.0"
+---
+>         "call-bound": "^1.0.2",
+>         "gopd": "^1.2.0",
+>         "has-tostringtag": "^1.0.2",
+>         "hasown": "^2.0.2"
+23832,23835c24097,24103
+<       "version": "2.0.2",
+<       "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+<       "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+<       "dev": true,
+---
+>       "version": "2.0.3",
+>       "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+>       "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+>       "license": "MIT",
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+23848,23850c24116,24118
+<       "version": "1.0.3",
+<       "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+<       "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+---
+>       "version": "1.0.4",
+>       "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+>       "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
+23853c24121
+<         "call-bind": "^1.0.7"
+---
+>         "call-bound": "^1.0.3"
+23874,23876c24142,24145
+<       "version": "1.0.7",
+<       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+<       "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+---
+>       "version": "1.1.1",
+>       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+>       "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
+>       "license": "MIT",
+23878c24147,24148
+<         "has-tostringtag": "^1.0.0"
+---
+>         "call-bound": "^1.0.3",
+>         "has-tostringtag": "^1.0.2"
+23888,23890c24158,24161
+<       "version": "1.0.4",
+<       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+<       "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+---
+>       "version": "1.1.1",
+>       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+>       "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
+>       "license": "MIT",
+23892c24163,24165
+<         "has-symbols": "^1.0.2"
+---
+>         "call-bound": "^1.0.2",
+>         "has-symbols": "^1.1.0",
+>         "safe-regex-test": "^1.1.0"
+23902,23904c24175,24177
+<       "version": "1.1.13",
+<       "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+<       "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+---
+>       "version": "1.1.15",
+>       "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+>       "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
+23907c24180
+<         "which-typed-array": "^1.1.14"
+---
+>         "which-typed-array": "^1.1.16"
+23943,23946c24216,24222
+<       "version": "2.0.1",
+<       "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+<       "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+<       "dev": true,
+---
+>       "version": "2.0.2",
+>       "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+>       "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+>       "license": "MIT",
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+23952,23954c24228,24231
+<       "version": "1.0.2",
+<       "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+<       "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+---
+>       "version": "1.1.1",
+>       "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+>       "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+>       "license": "MIT",
+23956c24233,24236
+<         "call-bind": "^1.0.2"
+---
+>         "call-bound": "^1.0.3"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+23963,23966c24243,24246
+<       "version": "2.0.2",
+<       "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+<       "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+<       "dev": true,
+---
+>       "version": "2.0.4",
+>       "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+>       "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+>       "license": "MIT",
+23968,23969c24248,24252
+<         "call-bind": "^1.0.2",
+<         "get-intrinsic": "^1.1.1"
+---
+>         "call-bound": "^1.0.3",
+>         "get-intrinsic": "^1.2.6"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+24543a24827
+>       "license": "MIT",
+24564a24849
+>       "license": "MIT",
+24568a24854,24862
+>     "node_modules/json-refs/node_modules/commander": {
+>       "version": "4.1.1",
+>       "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+>       "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+>       "license": "MIT",
+>       "engines": {
+>         "node": ">= 6"
+>       }
+>     },
+24572a24867
+>       "license": "MIT",
+24584a24880
+>       "license": "MIT",
+25175,25187d25470
+<     "node_modules/less/node_modules/mime": {
+<       "version": "1.6.0",
+<       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+<       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+<       "dev": true,
+<       "optional": true,
+<       "bin": {
+<         "mime": "cli.js"
+<       },
+<       "engines": {
+<         "node": ">=4"
+<       }
+<     },
+25335c25618,25619
+<       "integrity": "sha1-6I7suS4ruEyQZWEv2VigcZzUf5Q="
+---
+>       "integrity": "sha512-tC2aLC7bbkDXKNrjDu9OLiVx9pFIvjinID2eD9PzNdAQGZScWUd/h8faqOw5d6oLsOvFRCRbz1ASoB+deyMVUw==",
+>       "license": "MIT"
+25340c25624,25625
+<       "integrity": "sha1-6UC5690nwyfgqNqxtVkWxTQelXU=",
+---
+>       "integrity": "sha512-VGHm6DH+1UiuafQdE/DNMqxOcSyhRu0xO9+jPDq7xITRn5YOorGrHVQmavMVXCYmTm80YRTZZCn/jTW7MokwLg==",
+>       "license": "MIT",
+25351c25636,25637
+<       "integrity": "sha1-MPgj5X4X43NdODvWK2Czh1Q7QYY=",
+---
+>       "integrity": "sha512-+zJVXs0VxC/Au+/7foiKzw8UaWvfSfPh20XhqK/6HFQiUeclL5fz05zY7G9yDAFItAKKZwB4cgpzGvxiwuG1wQ==",
+>       "license": "MIT",
+25366c25652,25653
+<       "integrity": "sha1-+Ob1tXip405UEXm1a47uv0oofgg=",
+---
+>       "integrity": "sha512-8JJ3FnMPm54t3BwPLk8q8mPyQKQXm/rt9df+awr4NGtyJrtcCXM3Of1I86S6jVy1b4yAyFBb8wbKPEauuqzRmQ==",
+>       "license": "MIT",
+25376c25663,25664
+<       "integrity": "sha1-fQsmdknLKeehOdAQO3wR+uhOSFE=",
+---
+>       "integrity": "sha512-SLczhg860fGW7AKlYcuOFstDtJuQhaANlJ4Y/jrOoRxhmVtK41vbJDH3OefVRSRkSCQo4HI82QVkAVsoGa5gSw==",
+>       "license": "MIT",
+25387c25675,25676
+<       "integrity": "sha1-TTHy595+E0+/KAN2K4FQsyUZZm8=",
+---
+>       "integrity": "sha512-x2ja1fa/qmzbizuXgVM4QAP9svtMbdxjG8Anl9bCeDAwLOVQ1vLrA0hLb/NkpbGi9evjtkl0aWLTEoOlUdBPQA==",
+>       "license": "MIT",
+25398c25687,25688
+<       "integrity": "sha1-UdaVeXPaTtVW43KQ2MGhjFPeFgc=",
+---
+>       "integrity": "sha512-5TCfLt1haQpsa7bgLYRKNNE4yqhO4ZxIayN1btQmazMchO6Q8JYFRMqbJ3W+uNmMm4R0Jw7KGkZX5YfDDnywuw==",
+>       "license": "MIT",
+25409c25699,25700
+<       "integrity": "sha1-+vH3+BD6mFolHCGHQESBCUg55e4=",
+---
+>       "integrity": "sha512-iIrScwY3atGvLVbQL/+CNUznaPwBJg78S/JO4cTUFXRkRsZgEBhscB27cVoT4tsIOUyFu/5M/0umfHNGJ6wYwg==",
+>       "license": "MIT",
+25417c25708,25709
+<       "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw="
+---
+>       "integrity": "sha512-BOlKGKNHhCHswGOWtmVb5zBygyxN7EmTuzVOSQI6QSoGhG+kvv71gICFS1TBpnqvT1n53txK8CDK3u5D2/GZxQ==",
+>       "license": "MIT"
+25422c25714,25715
+<       "integrity": "sha1-nUgvRjuOZq++WcLBTtsRcGAXIzQ="
+---
+>       "integrity": "sha512-xKDem1BxoIfcCtaJHotjtyfdIvZO9qrF+mv3G1+ngQmaI3MJt3Qm46i9HLk/CbzABbavUrr1/EomQT8KxtsrYA==",
+>       "license": "MIT"
+25427c25720,25721
+<       "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE="
+---
+>       "integrity": "sha512-XpqGh1e7hhkOzftBfWE7zt+Yn9mVHFkDhicVttvKLsoCMLVVL+xTQjfjB4X4vtznauxv0QZ5ZAeqjvat0dh62Q==",
+>       "license": "MIT"
+25432c25726,25727
+<       "integrity": "sha1-phOWMNdtFTawfdyAliiJsIL2pkE=",
+---
+>       "integrity": "sha512-wwCwWX8PK/mYR5VZjcU5JFl6py/qrfLGMxzpKOfSqgA1PaZ6Z625CZLCxH1KsqyxSkOFmNm+mEYjeDpXlM4hrg==",
+>       "license": "MIT",
+25441c25736,25737
+<       "integrity": "sha1-98IAzRuS7yNrOZ7s9zxkjReqlNI=",
+---
+>       "integrity": "sha512-Vx0XKzpg2DFbQw4wrp1xSWd2sfl3W/BG6bucSRZmftS1AzbWRemCmBQDxyQTNhlLNec428PXkuuja+VNBZgu2A==",
+>       "license": "MIT",
+25450c25746,25747
+<       "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
+---
+>       "integrity": "sha512-lBrglYxLD/6KAJ8IEa5Lg+YHgNAL7FyKqXg4XOUI+Du/vtniLs1ZqS+yHNKPkK54waAgkdUnDOYaWf+rv4B+AA==",
+>       "license": "MIT",
+25458c25755,25756
+<       "integrity": "sha1-dFz0GlNZexj2iImFREBe+isG2Q8="
+---
+>       "integrity": "sha512-+odPJa4PE2UgYnQgJgkLs0UD03QU78R2ivhrFnG9GdtYOZdE6ObxOj7KiUEUlqOOgatFT+ZqSypFjDSduTigKg==",
+>       "license": "MIT"
+25463c25761,25762
+<       "integrity": "sha1-hMOVlt1xGBqXsGUpE6fJZ15Jsao=",
+---
+>       "integrity": "sha512-AqQ4AJz5buSx9ELXWt5dONwJyVPd4NTADMKhoVYWCugjoVf172/LpvVhwmSJn4g8/Dc0S8hxTe8rt5Dob3X9KQ==",
+>       "license": "MIT",
+25473c25772,25773
+<       "integrity": "sha1-XRn6AFyMTSNvr0dCx7eh/Kvikmc=",
+---
+>       "integrity": "sha512-hn2VWYZ+N9aYncRad4jORvlGgpFrn+axnPIWRvFxjk6CWcZH5b5alI8EymYsHITI23Z9wrW/+ORq+azrVFpOfw==",
+>       "license": "MIT",
+25487c25787,25788
+<       "integrity": "sha1-8pIDtAsS/uCkXTYxZIJZvrq8eGg=",
+---
+>       "integrity": "sha512-zj5vReFLkR+lJOBKP1wyteZ13zut/KSmXtdCBgxcy/m4UTitcBxpeVZT7gwk8BQrztPI5dIgO4bhBppXV4rpTQ==",
+>       "license": "MIT",
+25517c25818,25819
+<       "integrity": "sha1-/j/Do0yGyUyrb5UiVgKCdB4BYwk=",
+---
+>       "integrity": "sha512-AvOobAkE7qBtIiHU5QHQIfveWH5Usr9pIcFIzBv7u4S6bvb3FWpFrh9ltqBY7UeL5lw6e8d+SggiUXQVyh+FpA==",
+>       "license": "MIT",
+25526c25828,25829
+<       "integrity": "sha1-eLQer+FAX6lmRZ6kGT/VAtCEUks=",
+---
+>       "integrity": "sha512-VC+CKm/zSs5t3i/MHv71HZoQphuqOvez1xhjWBwHU5zAbsCYrqwHr+MyQyMk14HzA3hSRNA5lCqDMSw5G2Qscg==",
+>       "license": "MIT",
+25547c25850,25851
+<       "integrity": "sha1-ZpTP+mX++TH3wxzobHRZfPVg9PE="
+---
+>       "integrity": "sha512-VRYX+8XipeLjorag5bz3YBBRJ+5kj8hVBzfnaHgXPZAVTYowBdY5l0M5ZnOmlAMCOXBFabQtm7f5VqjMKEji0w==",
+>       "license": "MIT"
+25562c25866,25867
+<       "integrity": "sha1-tSoybB9i9tfac6MdVAHfbvRPD6E=",
+---
+>       "integrity": "sha512-yRDd0z+APziDqbk0MqR6Qfwj/Qn3jLxFJbI9U8MuvdTnqIXdZ5YXyGLnwuzCpZmjr26F1GNOjKLMMZ10i/wy6A==",
+>       "license": "MIT",
+25575c25880,25882
+<       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
+---
+>       "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
+>       "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.",
+>       "license": "MIT"
+25580c25887,25888
+<       "integrity": "sha1-LP1XXHPkmKtX4xm3f6Aq3vE6lNE="
+---
+>       "integrity": "sha512-6XcAB3izeQxPOQQNAJbbdjXbvWEt2Pn9ezPrjr4CwoLwmqsLVbsiEXD19cmmt4mbzOCOCdHzOQiUivUOJLra7w==",
+>       "license": "MIT"
+25595c25903,25904
+<       "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
+---
+>       "integrity": "sha512-sTebg2a1PoicYEZXD5PBdQcTlIJ6hUslrlWr7iV0O7n+i4596s2NQ9I5CaZ5FbXSfya/9WQsrYLANUJv9paYVA==",
+>       "license": "MIT",
+25613c25922,25923
+<       "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
+---
+>       "integrity": "sha512-ZpJhwvUXHSNL5wYd1RM6CUa2ZuqorG9ngoJ9Ix5Cce+uX7I5O/E06FCJdhSZ33b5dVyeQDnIlWH7B2s5uByZ7g==",
+>       "license": "MIT",
+25634c25944,25945
+<       "integrity": "sha1-T7VPgWZS5a4Q6PcvcXo4jHMmU4o="
+---
+>       "integrity": "sha512-uNcV98/blRhInPUGQEnj9ekXXfG+q+rfoNSFZgl/eBfog9yBDW9gfUv2AHX/rAF7zZRlzWhbslGhbGQFZlCkZA==",
+>       "license": "MIT"
+25650c25961,25962
+<       "integrity": "sha1-Mg4LZwMWc8KNeiu12eAzGkUkBRU=",
+---
+>       "integrity": "sha512-6SwqWwGFHhTXEiqB/yQgu8FYd//tm786d49y7kizHVCJH7zdzs191UQn3ES3tkkDbUddNRfkCRYqJFHtbLnbCw==",
+>       "license": "MIT",
+25997a26310,26318
+>     "node_modules/math-intrinsics": {
+>       "version": "1.1.0",
+>       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+>       "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+>       "license": "MIT",
+>       "engines": {
+>         "node": ">= 0.4"
+>       }
+>     },
+26577a26899,26910
+>     "node_modules/mime": {
+>       "version": "1.6.0",
+>       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+>       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+>       "license": "MIT",
+>       "bin": {
+>         "mime": "cli.js"
+>       },
+>       "engines": {
+>         "node": ">=4"
+>       }
+>     },
+26579,26581c26912,26915
+<       "version": "1.51.0",
+<       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+<       "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+---
+>       "version": "1.52.0",
+>       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+>       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+>       "license": "MIT",
+26597,26599c26931,26934
+<       "version": "2.1.34",
+<       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+<       "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+---
+>       "version": "2.1.35",
+>       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+>       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+>       "license": "MIT",
+26601c26936
+<         "mime-db": "1.51.0"
+---
+>         "mime-db": "1.52.0"
+26792c27127,27128
+<       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+---
+>       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+>       "license": "MIT"
+27248,27250c27584,27586
+<       "version": "2.0.0",
+<       "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.0.tgz",
+<       "integrity": "sha512-bS8rPZurbAuHGAnApbM9d4h1wSoYqrOqkE+6a64KLMK9yWU7gJXBDDVklKQ3TPi9DRb85cRs6yXaC0+cjxRtRg==",
+---
+>       "version": "2.0.1",
+>       "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.1.tgz",
+>       "integrity": "sha512-Ug8bXeTIUlxurg8xLTEskKShvcKDZALo1THEX5E41pYCD2sCVub5/kIRIGqWNoqV6szyLyQKV6mD4QUrWE5GCQ==",
+27254,27256c27590,27592
+<         "busboy": "^1.0.0",
+<         "concat-stream": "^1.5.2",
+<         "mkdirp": "^0.5.4",
+---
+>         "busboy": "^1.6.0",
+>         "concat-stream": "^2.0.0",
+>         "mkdirp": "^0.5.6",
+27258,27259c27594,27595
+<         "type-is": "^1.6.4",
+<         "xtend": "^4.0.0"
+---
+>         "type-is": "^1.6.18",
+>         "xtend": "^4.0.2"
+27384c27720,27721
+<       "integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE="
+---
+>       "integrity": "sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg==",
+>       "license": "MIT"
+27842,27844c28179,28185
+<       "version": "1.13.1",
+<       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+<       "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+---
+>       "version": "1.13.4",
+>       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+>       "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+>       "license": "MIT",
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+27886,27888c28227,28229
+<       "version": "4.1.5",
+<       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+<       "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+---
+>       "version": "4.1.7",
+>       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+>       "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
+27891c28232,28233
+<         "call-bind": "^1.0.5",
+---
+>         "call-bind": "^1.0.8",
+>         "call-bound": "^1.0.3",
+27893c28235,28236
+<         "has-symbols": "^1.0.3",
+---
+>         "es-object-atoms": "^1.0.0",
+>         "has-symbols": "^1.1.0",
+28129a28473,28489
+>     "node_modules/own-keys": {
+>       "version": "1.0.1",
+>       "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+>       "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "get-intrinsic": "^1.2.6",
+>         "object-keys": "^1.1.1",
+>         "safe-push-apply": "^1.0.0"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+>       "funding": {
+>         "url": "https://github.com/sponsors/ljharb"
+>       }
+>     },
+28684,28686c29044,29047
+<       "version": "1.0.10",
+<       "resolved": "https://registry.npmjs.org/path-loader/-/path-loader-1.0.10.tgz",
+<       "integrity": "sha512-CMP0v6S6z8PHeJ6NFVyVJm6WyJjIwFvyz2b0n2/4bKdS/0uZa/9sKUlYZzubrn3zuDRU0zIuEDX9DZYQ2ZI8TA==",
+---
+>       "version": "1.0.12",
+>       "resolved": "https://registry.npmjs.org/path-loader/-/path-loader-1.0.12.tgz",
+>       "integrity": "sha512-n7oDG8B+k/p818uweWrOixY9/Dsr89o2TkCm6tOTex3fpdo2+BFDgR+KpB37mGKBRsBAlR8CIJMFN0OEy/7hIQ==",
+>       "license": "MIT",
+28689c29050,29129
+<         "superagent": "^3.8.3"
+---
+>         "superagent": "^7.1.6"
+>       }
+>     },
+>     "node_modules/path-loader/node_modules/debug": {
+>       "version": "4.4.1",
+>       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+>       "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "ms": "^2.1.3"
+>       },
+>       "engines": {
+>         "node": ">=6.0"
+>       },
+>       "peerDependenciesMeta": {
+>         "supports-color": {
+>           "optional": true
+>         }
+>       }
+>     },
+>     "node_modules/path-loader/node_modules/formidable": {
+>       "version": "2.1.5",
+>       "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.5.tgz",
+>       "integrity": "sha512-Oz5Hwvwak/DCaXVVUtPn4oLMLLy1CdclLKO1LFgU7XzDpVMUU5UjlSLpGMocyQNNk8F6IJW9M/YdooSn2MRI+Q==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "@paralleldrive/cuid2": "^2.2.2",
+>         "dezalgo": "^1.0.4",
+>         "once": "^1.4.0",
+>         "qs": "^6.11.0"
+>       },
+>       "funding": {
+>         "url": "https://ko-fi.com/tunnckoCore/commissions"
+>       }
+>     },
+>     "node_modules/path-loader/node_modules/mime": {
+>       "version": "2.6.0",
+>       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+>       "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+>       "license": "MIT",
+>       "bin": {
+>         "mime": "cli.js"
+>       },
+>       "engines": {
+>         "node": ">=4.0.0"
+>       }
+>     },
+>     "node_modules/path-loader/node_modules/semver": {
+>       "version": "7.7.2",
+>       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+>       "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+>       "license": "ISC",
+>       "bin": {
+>         "semver": "bin/semver.js"
+>       },
+>       "engines": {
+>         "node": ">=10"
+>       }
+>     },
+>     "node_modules/path-loader/node_modules/superagent": {
+>       "version": "7.1.6",
+>       "resolved": "https://registry.npmjs.org/superagent/-/superagent-7.1.6.tgz",
+>       "integrity": "sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g==",
+>       "deprecated": "Please upgrade to v9.0.0+ as we have fixed a public vulnerability with formidable dependency. Note that v9.0.0+ requires Node.js v14.18.0+. See https://github.com/ladjs/superagent/pull/1800 for insight. This project is supported and maintained by the team at Forward Email @ https://forwardemail.net",
+>       "license": "MIT",
+>       "dependencies": {
+>         "component-emitter": "^1.3.0",
+>         "cookiejar": "^2.1.3",
+>         "debug": "^4.3.4",
+>         "fast-safe-stringify": "^2.1.1",
+>         "form-data": "^4.0.0",
+>         "formidable": "^2.0.1",
+>         "methods": "^1.1.2",
+>         "mime": "2.6.0",
+>         "qs": "^6.10.3",
+>         "readable-stream": "^3.6.0",
+>         "semver": "^7.3.7"
+>       },
+>       "engines": {
+>         "node": ">=6.4.0 <13 || >=14"
+31146a31587,31608
+>     "node_modules/reflect.getprototypeof": {
+>       "version": "1.0.10",
+>       "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+>       "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "call-bind": "^1.0.8",
+>         "define-properties": "^1.2.1",
+>         "es-abstract": "^1.23.9",
+>         "es-errors": "^1.3.0",
+>         "es-object-atoms": "^1.0.0",
+>         "get-intrinsic": "^1.2.7",
+>         "get-proto": "^1.0.1",
+>         "which-builtin-type": "^1.2.1"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+>       "funding": {
+>         "url": "https://github.com/sponsors/ljharb"
+>       }
+>     },
+31211,31213c31673,31675
+<       "version": "1.5.2",
+<       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+<       "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+---
+>       "version": "1.5.4",
+>       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+>       "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
+31216c31678
+<         "call-bind": "^1.0.6",
+---
+>         "call-bind": "^1.0.8",
+31219c31681,31683
+<         "set-function-name": "^2.0.1"
+---
+>         "get-proto": "^1.0.1",
+>         "gopd": "^1.2.0",
+>         "set-function-name": "^2.0.2"
+31679,31681c32143,32145
+<       "version": "1.1.2",
+<       "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+<       "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+---
+>       "version": "1.1.3",
+>       "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+>       "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
+31684,31686c32148,32151
+<         "call-bind": "^1.0.7",
+<         "get-intrinsic": "^1.2.4",
+<         "has-symbols": "^1.0.3",
+---
+>         "call-bind": "^1.0.8",
+>         "call-bound": "^1.0.2",
+>         "get-intrinsic": "^1.2.6",
+>         "has-symbols": "^1.1.0",
+31706a32172,32187
+>     "node_modules/safe-push-apply": {
+>       "version": "1.0.0",
+>       "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+>       "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "es-errors": "^1.3.0",
+>         "isarray": "^2.0.5"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+>       "funding": {
+>         "url": "https://github.com/sponsors/ljharb"
+>       }
+>     },
+31717,31719c32198,32200
+<       "version": "1.0.3",
+<       "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+<       "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+---
+>       "version": "1.1.0",
+>       "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+>       "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+31722c32203
+<         "call-bind": "^1.0.6",
+---
+>         "call-bound": "^1.0.2",
+31724c32205
+<         "is-regex": "^1.1.4"
+---
+>         "is-regex": "^1.2.1"
+32123,32133d32603
+<     "node_modules/send/node_modules/mime": {
+<       "version": "1.6.0",
+<       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+<       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+<       "bin": {
+<         "mime": "cli.js"
+<       },
+<       "engines": {
+<         "node": ">=4"
+<       }
+<     },
+32288,32290c32758,32761
+<       "version": "2.0.1",
+<       "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+<       "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+---
+>       "version": "2.0.2",
+>       "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+>       "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+>       "license": "MIT",
+32292c32763,32764
+<         "define-data-property": "^1.0.1",
+---
+>         "define-data-property": "^1.1.4",
+>         "es-errors": "^1.3.0",
+32294c32766,32780
+<         "has-property-descriptors": "^1.0.0"
+---
+>         "has-property-descriptors": "^1.0.2"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       }
+>     },
+>     "node_modules/set-proto": {
+>       "version": "1.0.0",
+>       "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
+>       "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "dunder-proto": "^1.0.1",
+>         "es-errors": "^1.3.0",
+>         "es-object-atoms": "^1.0.0"
+32391,32393c32877,32880
+<       "version": "1.0.6",
+<       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+<       "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+---
+>       "version": "1.1.0",
+>       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+>       "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+>       "license": "MIT",
+32395d32881
+<         "call-bind": "^1.0.7",
+32397,32398c32883,32939
+<         "get-intrinsic": "^1.2.4",
+<         "object-inspect": "^1.13.1"
+---
+>         "object-inspect": "^1.13.3",
+>         "side-channel-list": "^1.0.0",
+>         "side-channel-map": "^1.0.1",
+>         "side-channel-weakmap": "^1.0.2"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+>       "funding": {
+>         "url": "https://github.com/sponsors/ljharb"
+>       }
+>     },
+>     "node_modules/side-channel-list": {
+>       "version": "1.0.0",
+>       "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+>       "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "es-errors": "^1.3.0",
+>         "object-inspect": "^1.13.3"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+>       "funding": {
+>         "url": "https://github.com/sponsors/ljharb"
+>       }
+>     },
+>     "node_modules/side-channel-map": {
+>       "version": "1.0.1",
+>       "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+>       "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "call-bound": "^1.0.2",
+>         "es-errors": "^1.3.0",
+>         "get-intrinsic": "^1.2.5",
+>         "object-inspect": "^1.13.3"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+>       "funding": {
+>         "url": "https://github.com/sponsors/ljharb"
+>       }
+>     },
+>     "node_modules/side-channel-weakmap": {
+>       "version": "1.0.2",
+>       "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+>       "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "call-bound": "^1.0.2",
+>         "es-errors": "^1.3.0",
+>         "get-intrinsic": "^1.2.5",
+>         "object-inspect": "^1.13.3",
+>         "side-channel-map": "^1.0.1"
+32871c33412,33413
+<       "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw=="
+---
+>       "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==",
+>       "license": "(WTFPL OR MIT)"
+32960c33502,33503
+<       "integrity": "sha1-bIOv82kvphJW4M0ZfgXp3hV2kaY="
+---
+>       "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==",
+>       "license": "ISC"
+32994a33538,33554
+>     "node_modules/ssh2": {
+>       "version": "1.16.0",
+>       "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz",
+>       "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==",
+>       "hasInstallScript": true,
+>       "dependencies": {
+>         "asn1": "^0.2.6",
+>         "bcrypt-pbkdf": "^1.0.2"
+>       },
+>       "engines": {
+>         "node": ">=10.16.0"
+>       },
+>       "optionalDependencies": {
+>         "cpu-features": "~0.0.10",
+>         "nan": "^2.20.0"
+>       }
+>     },
+33095,33098c33655,33658
+<       "version": "1.0.0",
+<       "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+<       "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+<       "dev": true,
+---
+>       "version": "1.1.0",
+>       "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+>       "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+>       "license": "MIT",
+33100c33660,33661
+<         "internal-slot": "^1.0.4"
+---
+>         "es-errors": "^1.3.0",
+>         "internal-slot": "^1.1.0"
+33265,33267c33826,33828
+<       "version": "1.2.9",
+<       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+<       "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+---
+>       "version": "1.2.10",
+>       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+>       "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
+33270c33831,33833
+<         "call-bind": "^1.0.7",
+---
+>         "call-bind": "^1.0.8",
+>         "call-bound": "^1.0.2",
+>         "define-data-property": "^1.1.4",
+33272,33273c33835,33837
+<         "es-abstract": "^1.23.0",
+<         "es-object-atoms": "^1.0.0"
+---
+>         "es-abstract": "^1.23.5",
+>         "es-object-atoms": "^1.0.0",
+>         "has-property-descriptors": "^1.0.2"
+33283,33285c33847,33849
+<       "version": "1.0.8",
+<       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+<       "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+---
+>       "version": "1.0.9",
+>       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+>       "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
+33288c33852,33853
+<         "call-bind": "^1.0.7",
+---
+>         "call-bind": "^1.0.8",
+>         "call-bound": "^1.0.2",
+33291a33857,33859
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+33781c34349,34350
+<       "deprecated": "Please upgrade to v7.0.2+ of superagent.  We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing.  See the releases tab for more information at <https://github.com/visionmedia/superagent/releases>. Thanks to @shadowgate15, @spence-s, and @niftylettuce. Superagent is sponsored by Forward Email at <https://forwardemail.net>.",
+---
+>       "deprecated": "Please upgrade to v9.0.0+ as we have fixed a public vulnerability with formidable dependency. Note that v9.0.0+ requires Node.js v14.18.0+. See https://github.com/ladjs/superagent/pull/1800 for insight. This project is supported and maintained by the team at Forward Email @ https://forwardemail.net",
+>       "license": "MIT",
+33801a34371
+>       "license": "MIT",
+33807,33809c34377,34380
+<       "version": "2.5.1",
+<       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+<       "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+---
+>       "version": "2.5.3",
+>       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.3.tgz",
+>       "integrity": "sha512-XHIrMD0NpDrNM/Ckf7XJiBbLl57KEhT3+i3yY+eWm+cqYZJQTZrKo8Y8AWKnuV5GT4scfuUGt9LzNoIx3dU1nQ==",
+>       "license": "MIT",
+33812,33813c34383,34386
+<         "combined-stream": "^1.0.6",
+<         "mime-types": "^2.1.12"
+---
+>         "combined-stream": "^1.0.8",
+>         "es-set-tostringtag": "^2.1.0",
+>         "mime-types": "^2.1.35",
+>         "safe-buffer": "^5.2.1"
+33818a34392,34411
+>     "node_modules/superagent/node_modules/form-data/node_modules/safe-buffer": {
+>       "version": "5.2.1",
+>       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+>       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+>       "funding": [
+>         {
+>           "type": "github",
+>           "url": "https://github.com/sponsors/feross"
+>         },
+>         {
+>           "type": "patreon",
+>           "url": "https://www.patreon.com/feross"
+>         },
+>         {
+>           "type": "consulting",
+>           "url": "https://feross.org/support"
+>         }
+>       ],
+>       "license": "MIT"
+>     },
+33822,33833c34415,34416
+<       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+<     },
+<     "node_modules/superagent/node_modules/mime": {
+<       "version": "1.6.0",
+<       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+<       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+<       "bin": {
+<         "mime": "cli.js"
+<       },
+<       "engines": {
+<         "node": ">=4"
+<       }
+---
+>       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+>       "license": "MIT"
+33836,33838c34419,34422
+<       "version": "2.3.7",
+<       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+<       "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+---
+>       "version": "2.3.8",
+>       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+>       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+>       "license": "MIT",
+33852a34437
+>       "license": "MIT",
+34099c34684,34685
+<       "integrity": "sha1-oJdRnG8e5N1n4wjZtT3cnCslf5c=",
+---
+>       "integrity": "sha512-O2hZbWqq8x6j0uZ4qWj5dw45WPoAxKsJLJZqOgTqRtPNi8IqA+rDkDV/48S8qanS3KGv1QcVoPNLivMbyHHdAQ==",
+>       "license": "MIT",
+34150,34155d34735
+<     "node_modules/swagger-tools/node_modules/commander": {
+<       "version": "2.11.0",
+<       "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+<       "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+<       "license": "MIT"
+<     },
+34257,34259c34837,34839
+<       "version": "3.0.8",
+<       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.8.tgz",
+<       "integrity": "sha512-ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg==",
+---
+>       "version": "3.0.9",
+>       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.9.tgz",
+>       "integrity": "sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA==",
+34943,34945c35523,35525
+<       "version": "0.6.9",
+<       "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.9.tgz",
+<       "integrity": "sha512-7bBrcF+/LQzSgFmT0X5YclVqQxtv7TDJ1f8Wj7ibBu/U6BMLeOpUxuZjV7rMc44UtKxlnMFigdhFAIszSX1DMg==",
+---
+>       "version": "0.6.11",
+>       "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.11.tgz",
+>       "integrity": "sha512-vxXDZg8/+p3gblxB6BhhG5yWVn1kGRlaL8O78UDXc3wRnPizB5g83dcvWV1jpDMIPnjZjOFuxlMmE82XJ4407w==",
+34948,34950c35528,35530
+<         "gopd": "^1.0.1",
+<         "typedarray.prototype.slice": "^1.0.3",
+<         "which-typed-array": "^1.1.15"
+---
+>         "gopd": "^1.2.0",
+>         "typedarray.prototype.slice": "^1.0.5",
+>         "which-typed-array": "^1.1.18"
+35110,35112c35690,35692
+<       "version": "1.0.2",
+<       "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+<       "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+---
+>       "version": "1.0.3",
+>       "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+>       "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
+35115c35695
+<         "call-bind": "^1.0.7",
+---
+>         "call-bound": "^1.0.3",
+35117c35697
+<         "is-typed-array": "^1.1.13"
+---
+>         "is-typed-array": "^1.1.14"
+35124,35126c35704,35706
+<       "version": "1.0.1",
+<       "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+<       "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+---
+>       "version": "1.0.3",
+>       "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+>       "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
+35129c35709
+<         "call-bind": "^1.0.7",
+---
+>         "call-bind": "^1.0.8",
+35131,35133c35711,35713
+<         "gopd": "^1.0.1",
+<         "has-proto": "^1.0.3",
+<         "is-typed-array": "^1.1.13"
+---
+>         "gopd": "^1.2.0",
+>         "has-proto": "^1.2.0",
+>         "is-typed-array": "^1.1.14"
+35143,35145c35723,35725
+<       "version": "1.0.2",
+<       "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+<       "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+---
+>       "version": "1.0.4",
+>       "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+>       "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
+35149c35729
+<         "call-bind": "^1.0.7",
+---
+>         "call-bind": "^1.0.8",
+35151,35153c35731,35734
+<         "gopd": "^1.0.1",
+<         "has-proto": "^1.0.3",
+<         "is-typed-array": "^1.1.13"
+---
+>         "gopd": "^1.2.0",
+>         "has-proto": "^1.2.0",
+>         "is-typed-array": "^1.1.15",
+>         "reflect.getprototypeof": "^1.0.9"
+35163,35165c35744,35746
+<       "version": "1.0.6",
+<       "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+<       "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+---
+>       "version": "1.0.7",
+>       "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+>       "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+35171d35751
+<         "has-proto": "^1.0.3",
+35173c35753,35754
+<         "possible-typed-array-names": "^1.0.0"
+---
+>         "possible-typed-array-names": "^1.0.0",
+>         "reflect.getprototypeof": "^1.0.6"
+35188,35190c35769,35771
+<       "version": "1.0.3",
+<       "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.3.tgz",
+<       "integrity": "sha512-8WbVAQAUlENo1q3c3zZYuy5k9VzBQvp8AX9WOtbvyWlLM1v5JaSRmjubLjzHF4JFtptjH/5c/i95yaElvcjC0A==",
+---
+>       "version": "1.0.5",
+>       "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz",
+>       "integrity": "sha512-q7QNVDGTdl702bVFiI5eY4l/HkgCM6at9KhcFbgUAzezHFbOVy4+0O/lCjsABEQwbZPravVfBIiBVGo89yzHFg==",
+35193c35774
+<         "call-bind": "^1.0.7",
+---
+>         "call-bind": "^1.0.8",
+35195c35776
+<         "es-abstract": "^1.23.0",
+---
+>         "es-abstract": "^1.23.9",
+35197,35198c35778,35781
+<         "typed-array-buffer": "^1.0.2",
+<         "typed-array-byte-offset": "^1.0.2"
+---
+>         "get-proto": "^1.0.1",
+>         "math-intrinsics": "^1.1.0",
+>         "typed-array-buffer": "^1.0.3",
+>         "typed-array-byte-offset": "^1.0.4"
+35274,35276c35857,35860
+<       "version": "1.0.2",
+<       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+<       "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+---
+>       "version": "1.1.0",
+>       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+>       "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
+>       "license": "MIT",
+35278c35862
+<         "call-bind": "^1.0.2",
+---
+>         "call-bound": "^1.0.3",
+35280,35281c35864,35868
+<         "has-symbols": "^1.0.3",
+<         "which-boxed-primitive": "^1.0.2"
+---
+>         "has-symbols": "^1.1.0",
+>         "which-boxed-primitive": "^1.1.1"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+35709a36297,36305
+>     "node_modules/validator": {
+>       "version": "10.11.0",
+>       "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
+>       "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==",
+>       "license": "MIT",
+>       "engines": {
+>         "node": ">= 0.10"
+>       }
+>     },
+36697,36699c37293,37296
+<       "version": "1.0.2",
+<       "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+<       "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+---
+>       "version": "1.1.1",
+>       "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+>       "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
+>       "license": "MIT",
+36701,36705c37298,37332
+<         "is-bigint": "^1.0.1",
+<         "is-boolean-object": "^1.1.0",
+<         "is-number-object": "^1.0.4",
+<         "is-string": "^1.0.5",
+<         "is-symbol": "^1.0.3"
+---
+>         "is-bigint": "^1.1.0",
+>         "is-boolean-object": "^1.2.1",
+>         "is-number-object": "^1.1.1",
+>         "is-string": "^1.1.1",
+>         "is-symbol": "^1.1.1"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+>       },
+>       "funding": {
+>         "url": "https://github.com/sponsors/ljharb"
+>       }
+>     },
+>     "node_modules/which-builtin-type": {
+>       "version": "1.2.1",
+>       "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+>       "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+>       "license": "MIT",
+>       "dependencies": {
+>         "call-bound": "^1.0.2",
+>         "function.prototype.name": "^1.1.6",
+>         "has-tostringtag": "^1.0.2",
+>         "is-async-function": "^2.0.0",
+>         "is-date-object": "^1.1.0",
+>         "is-finalizationregistry": "^1.1.0",
+>         "is-generator-function": "^1.0.10",
+>         "is-regex": "^1.2.1",
+>         "is-weakref": "^1.0.2",
+>         "isarray": "^2.0.5",
+>         "which-boxed-primitive": "^1.1.0",
+>         "which-collection": "^1.0.2",
+>         "which-typed-array": "^1.1.16"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+36712,36715c37339,37342
+<       "version": "1.0.1",
+<       "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+<       "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+<       "dev": true,
+---
+>       "version": "1.0.2",
+>       "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+>       "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+>       "license": "MIT",
+36717,36720c37344,37350
+<         "is-map": "^2.0.1",
+<         "is-set": "^2.0.1",
+<         "is-weakmap": "^2.0.1",
+<         "is-weakset": "^2.0.1"
+---
+>         "is-map": "^2.0.3",
+>         "is-set": "^2.0.3",
+>         "is-weakmap": "^2.0.2",
+>         "is-weakset": "^2.0.3"
+>       },
+>       "engines": {
+>         "node": ">= 0.4"
+36733,36735c37363,37365
+<       "version": "1.1.15",
+<       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+<       "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+---
+>       "version": "1.1.19",
+>       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
+>       "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
+36739,36741c37369,37373
+<         "call-bind": "^1.0.7",
+<         "for-each": "^0.3.3",
+<         "gopd": "^1.0.1",
+---
+>         "call-bind": "^1.0.8",
+>         "call-bound": "^1.0.4",
+>         "for-each": "^0.3.5",
+>         "get-proto": "^1.0.1",
+>         "gopd": "^1.2.0",
+37217a37850
+>       "license": "MIT",
+37231,37236d37863
+<     "node_modules/z-schema/node_modules/commander": {
+<       "version": "2.20.3",
+<       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+<       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+<       "optional": true
+<     },
+37241,37250c37868,37870
+<       "deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
+<       "hasInstallScript": true
+<     },
+<     "node_modules/z-schema/node_modules/validator": {
+<       "version": "10.11.0",
+<       "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
+<       "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==",
+<       "engines": {
+<         "node": ">= 0.10"
+<       }
+---
+>       "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+>       "hasInstallScript": true,
+>       "license": "MIT"
+37358c37978
+<         "dockerode": "^4.0.5",
+---
+>         "dockerode": "^4.0.7",
+37364c37984
+<         "tar-fs": "^3.0.4",
+---
+>         "tar-fs": "^3.0.9",
+37425,37451d38044
+<     "services/clsi/node_modules/@grpc/grpc-js": {
+<       "version": "1.13.2",
+<       "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.13.2.tgz",
+<       "integrity": "sha512-nnR5nmL6lxF8YBqb6gWvEgLdLh/Fn+kvAdX5hUOnt48sNSb0riz/93ASd2E5gvanPA41X6Yp25bIfGRp1SMb2g==",
+<       "license": "Apache-2.0",
+<       "dependencies": {
+<         "@grpc/proto-loader": "^0.7.13",
+<         "@js-sdsl/ordered-map": "^4.4.2"
+<       },
+<       "engines": {
+<         "node": ">=12.10.0"
+<       }
+<     },
+<     "services/clsi/node_modules/cpu-features": {
+<       "version": "0.0.10",
+<       "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz",
+<       "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==",
+<       "hasInstallScript": true,
+<       "optional": true,
+<       "dependencies": {
+<         "buildcheck": "~0.0.6",
+<         "nan": "^2.19.0"
+<       },
+<       "engines": {
+<         "node": ">=10.0.0"
+<       }
+<     },
+37461,37529d38053
+<     "services/clsi/node_modules/docker-modem": {
+<       "version": "5.0.6",
+<       "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.6.tgz",
+<       "integrity": "sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==",
+<       "license": "Apache-2.0",
+<       "dependencies": {
+<         "debug": "^4.1.1",
+<         "readable-stream": "^3.5.0",
+<         "split-ca": "^1.0.1",
+<         "ssh2": "^1.15.0"
+<       },
+<       "engines": {
+<         "node": ">= 8.0"
+<       }
+<     },
+<     "services/clsi/node_modules/dockerode": {
+<       "version": "4.0.5",
+<       "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.5.tgz",
+<       "integrity": "sha512-ZPmKSr1k1571Mrh7oIBS/j0AqAccoecY2yH420ni5j1KyNMgnoTh4Nu4FWunh0HZIJmRSmSysJjBIpa/zyWUEA==",
+<       "license": "Apache-2.0",
+<       "dependencies": {
+<         "@balena/dockerignore": "^1.0.2",
+<         "@grpc/grpc-js": "^1.11.1",
+<         "@grpc/proto-loader": "^0.7.13",
+<         "docker-modem": "^5.0.6",
+<         "protobufjs": "^7.3.2",
+<         "tar-fs": "~2.1.2",
+<         "uuid": "^10.0.0"
+<       },
+<       "engines": {
+<         "node": ">= 8.0"
+<       }
+<     },
+<     "services/clsi/node_modules/dockerode/node_modules/tar-fs": {
+<       "version": "2.1.2",
+<       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz",
+<       "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==",
+<       "license": "MIT",
+<       "dependencies": {
+<         "chownr": "^1.1.1",
+<         "mkdirp-classic": "^0.5.2",
+<         "pump": "^3.0.0",
+<         "tar-stream": "^2.1.4"
+<       }
+<     },
+<     "services/clsi/node_modules/protobufjs": {
+<       "version": "7.4.0",
+<       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
+<       "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
+<       "hasInstallScript": true,
+<       "license": "BSD-3-Clause",
+<       "dependencies": {
+<         "@protobufjs/aspromise": "^1.1.2",
+<         "@protobufjs/base64": "^1.1.2",
+<         "@protobufjs/codegen": "^2.0.4",
+<         "@protobufjs/eventemitter": "^1.1.0",
+<         "@protobufjs/fetch": "^1.1.0",
+<         "@protobufjs/float": "^1.0.2",
+<         "@protobufjs/inquire": "^1.1.0",
+<         "@protobufjs/path": "^1.1.2",
+<         "@protobufjs/pool": "^1.1.0",
+<         "@protobufjs/utf8": "^1.1.0",
+<         "@types/node": ">=13.7.0",
+<         "long": "^5.0.0"
+<       },
+<       "engines": {
+<         "node": ">=12.0.0"
+<       }
+<     },
+37549,37565d38072
+<     "services/clsi/node_modules/ssh2": {
+<       "version": "1.16.0",
+<       "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz",
+<       "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==",
+<       "hasInstallScript": true,
+<       "dependencies": {
+<         "asn1": "^0.2.6",
+<         "bcrypt-pbkdf": "^1.0.2"
+<       },
+<       "engines": {
+<         "node": ">=10.16.0"
+<       },
+<       "optionalDependencies": {
+<         "cpu-features": "~0.0.10",
+<         "nan": "^2.20.0"
+<       }
+<     },
+37578,37590d38084
+<     "services/clsi/node_modules/uuid": {
+<       "version": "10.0.0",
+<       "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+<       "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+<       "funding": [
+<         "https://github.com/sponsors/broofa",
+<         "https://github.com/sponsors/ctavan"
+<       ],
+<       "license": "MIT",
+<       "bin": {
+<         "uuid": "dist/bin/uuid"
+<       }
+<     },
+38683c39177
+<         "multer": "overleaf/multer#199c5ff05bd375c508f4074498237baead7f5148",
+---
+>         "multer": "github:overleaf/multer#4dbceda355efc3fc8ac3cf5c66c3778c8a6fdb23",
+39602,39604c40096,40098
+<       "version": "2.0.0",
+<       "resolved": "git+ssh://git@github.com/overleaf/multer.git#199c5ff05bd375c508f4074498237baead7f5148",
+<       "integrity": "sha512-S5MlIoOgrDr+a2jLS8z7jQlbzvZ0m30U2tRwdyLrxhnnMUQZYEzkVysEv10Dw41RTpM5bQQDs563Vzl1LLhxhQ==",
+---
+>       "version": "2.0.1",
+>       "resolved": "git+ssh://git@github.com/overleaf/multer.git#4dbceda355efc3fc8ac3cf5c66c3778c8a6fdb23",
+>       "integrity": "sha512-kkvPK48OQibR5vIoTQBbZp1uWVCvT9MrW3Y0mqdhFYJP/HVJujb4eSCEU0yj+hyf0Y+H/BKCmPdM4fJnzqAO4w==",
+39608,39610c40102,40104
+<         "busboy": "^1.0.0",
+<         "concat-stream": "^1.5.2",
+<         "mkdirp": "^0.5.4",
+---
+>         "busboy": "^1.6.0",
+>         "concat-stream": "^2.0.0",
+>         "mkdirp": "^0.5.6",
+39612,39613c40106,40107
+<         "type-is": "^1.6.4",
+<         "xtend": "^4.0.0"
+---
+>         "type-is": "^1.6.18",
+>         "xtend": "^4.0.2"
diff --git a/server-ce/hotfix/5.5.1/pr_25168.patch b/server-ce/hotfix/5.5.1/pr_25168.patch
new file mode 100644
index 0000000000..5d496d1f67
--- /dev/null
+++ b/server-ce/hotfix/5.5.1/pr_25168.patch
@@ -0,0 +1,19 @@
+--- a/services/history-v1/config/custom-environment-variables.json
++++ b/services/history-v1/config/custom-environment-variables.json
+@@ -50,12 +50,14 @@
+     "history": {
+       "host": "OVERLEAF_REDIS_HOST",
+       "password": "OVERLEAF_REDIS_PASS",
+-      "port": "OVERLEAF_REDIS_PORT"
++      "port": "OVERLEAF_REDIS_PORT",
++      "tls": "OVERLEAF_REDIS_TLS"
+     },
+     "lock": {
+       "host": "OVERLEAF_REDIS_HOST",
+       "password": "OVERLEAF_REDIS_PASS",
+-      "port": "OVERLEAF_REDIS_PORT"
++      "port": "OVERLEAF_REDIS_PORT",
++      "tls": "OVERLEAF_REDIS_TLS"
+     }
+   }
+ }
diff --git a/server-ce/hotfix/5.5.1/pr_26086.patch b/server-ce/hotfix/5.5.1/pr_26086.patch
new file mode 100644
index 0000000000..fec417b3a5
--- /dev/null
+++ b/server-ce/hotfix/5.5.1/pr_26086.patch
@@ -0,0 +1,200 @@
+--- a/services/history-v1/api/controllers/project_import.js
++++ b/services/history-v1/api/controllers/project_import.js
+@@ -35,6 +35,7 @@ async function importSnapshot(req, res) {
+   try {
+     snapshot = Snapshot.fromRaw(rawSnapshot)
+   } catch (err) {
++    logger.warn({ err, projectId }, 'failed to import snapshot')
+     return render.unprocessableEntity(res)
+   }
+
+@@ -43,6 +44,7 @@ async function importSnapshot(req, res) {
+     historyId = await chunkStore.initializeProject(projectId, snapshot)
+   } catch (err) {
+     if (err instanceof chunkStore.AlreadyInitialized) {
++      logger.warn({ err, projectId }, 'already initialized')
+       return render.conflict(res)
+     } else {
+       throw err
+--- a/services/history-v1/api/controllers/projects.js
++++ b/services/history-v1/api/controllers/projects.js
+@@ -34,6 +34,7 @@ async function initializeProject(req, res, next) {
+     res.status(HTTPStatus.OK).json({ projectId })
+   } catch (err) {
+     if (err instanceof chunkStore.AlreadyInitialized) {
++      logger.warn({ err, projectId }, 'failed to initialize')
+       render.conflict(res)
+     } else {
+       throw err
+@@ -242,11 +243,15 @@ async function createProjectBlob(req, res, next) {
+     const sizeLimit = new StreamSizeLimit(maxUploadSize)
+     await pipeline(req, sizeLimit, fs.createWriteStream(tmpPath))
+     if (sizeLimit.sizeLimitExceeded) {
++      logger.warn(
++        { projectId, expectedHash, maxUploadSize },
++        'blob exceeds size threshold'
++      )
+       return render.requestEntityTooLarge(res)
+     }
+     const hash = await blobHash.fromFile(tmpPath)
+     if (hash !== expectedHash) {
+-      logger.debug({ hash, expectedHash }, 'Hash mismatch')
++      logger.warn({ projectId, hash, expectedHash }, 'Hash mismatch')
+       return render.conflict(res, 'File hash mismatch')
+     }
+
+@@ -343,6 +348,10 @@ async function copyProjectBlob(req, res, next) {
+     targetBlobStore.getBlob(blobHash),
+   ])
+   if (!sourceBlob) {
++    logger.warn(
++      { sourceProjectId, targetProjectId, blobHash },
++      'missing source blob when copying across projects'
++    )
+     return render.notFound(res)
+   }
+   // Exit early if the blob exists in the target project.
+--- a/services/history-v1/app.js
++++ b/services/history-v1/app.js
+@@ -100,11 +100,13 @@ function setupErrorHandling() {
+       })
+     }
+     if (err.code === 'ENUM_MISMATCH') {
++      logger.warn({ err, projectId }, err.message)
+       return res.status(HTTPStatus.UNPROCESSABLE_ENTITY).json({
+         message: 'invalid enum value: ' + err.paramName,
+       })
+     }
+     if (err.code === 'REQUIRED') {
++      logger.warn({ err, projectId }, err.message)
+       return res.status(HTTPStatus.UNPROCESSABLE_ENTITY).json({
+         message: err.message,
+       })
+--- a/services/project-history/app/js/HistoryStoreManager.js
++++ b/services/project-history/app/js/HistoryStoreManager.js
+@@ -35,7 +35,10 @@ class StringStream extends stream.Readable {
+ _mocks.getMostRecentChunk = (projectId, historyId, callback) => {
+   const path = `projects/${historyId}/latest/history`
+   logger.debug({ projectId, historyId }, 'getting chunk from history service')
+-  _requestChunk({ path, json: true }, callback)
++  _requestChunk({ path, json: true }, (err, chunk) => {
++    if (err) return callback(OError.tag(err))
++    callback(null, chunk)
++  })
+ }
+
+ /**
+@@ -54,7 +57,10 @@ export function getChunkAtVersion(projectId, historyId, version, callback) {
+     { projectId, historyId, version },
+     'getting chunk from history service for version'
+   )
+-  _requestChunk({ path, json: true }, callback)
++  _requestChunk({ path, json: true }, (err, chunk) => {
++    if (err) return callback(OError.tag(err))
++    callback(null, chunk)
++  })
+ }
+
+ export function getMostRecentVersion(projectId, historyId, callback) {
+@@ -68,8 +74,10 @@ export function getMostRecentVersion(projectId, historyId, callback) {
+       _.sortBy(chunk.chunk.history.changes || [], x => x.timestamp)
+     )
+     // find the latest project and doc versions in the chunk
+-    _getLatestProjectVersion(projectId, chunk, (err1, projectVersion) =>
++    _getLatestProjectVersion(projectId, chunk, (err1, projectVersion) => {
++      if (err1) err1 = OError.tag(err1)
+       _getLatestV2DocVersions(projectId, chunk, (err2, v2DocVersions) => {
++        if (err2) err2 = OError.tag(err2)
+         // return the project and doc versions
+         const projectStructureAndDocVersions = {
+           project: projectVersion,
+@@ -83,7 +91,7 @@ export function getMostRecentVersion(projectId, historyId, callback) {
+           chunk
+         )
+       })
+-    )
++    })
+   })
+ }
+
+@@ -211,7 +219,10 @@ export function getProjectBlob(historyId, blobHash, callback) {
+   logger.debug({ historyId, blobHash }, 'getting blob from history service')
+   _requestHistoryService(
+     { path: `projects/${historyId}/blobs/${blobHash}` },
+-    callback
++    (err, blob) => {
++      if (err) return callback(OError.tag(err))
++      callback(null, blob)
++    }
+   )
+ }
+
+@@ -277,7 +288,10 @@ function createBlobFromString(historyId, data, fileId, callback) {
+     (fsPath, cb) => {
+       _createBlob(historyId, fsPath, cb)
+     },
+-    callback
++    (err, hash) => {
++      if (err) return callback(OError.tag(err))
++      callback(null, hash)
++    }
+   )
+ }
+
+@@ -330,7 +344,7 @@ export function createBlobForUpdate(projectId, historyId, update, callback) {
+     try {
+       ranges = HistoryBlobTranslator.createRangeBlobDataFromUpdate(update)
+     } catch (error) {
+-      return callback(error)
++      return callback(OError.tag(error))
+     }
+     createBlobFromString(
+       historyId,
+@@ -338,7 +352,7 @@ export function createBlobForUpdate(projectId, historyId, update, callback) {
+       `project-${projectId}-doc-${update.doc}`,
+       (err, fileHash) => {
+         if (err) {
+-          return callback(err)
++          return callback(OError.tag(err))
+         }
+         if (ranges) {
+           createBlobFromString(
+@@ -347,7 +361,7 @@ export function createBlobForUpdate(projectId, historyId, update, callback) {
+             `project-${projectId}-doc-${update.doc}-ranges`,
+             (err, rangesHash) => {
+               if (err) {
+-                return callback(err)
++                return callback(OError.tag(err))
+               }
+               logger.debug(
+                 { fileHash, rangesHash },
+@@ -415,7 +429,7 @@ export function createBlobForUpdate(projectId, historyId, update, callback) {
+             },
+             (err, fileHash) => {
+               if (err) {
+-                return callback(err)
++                return callback(OError.tag(err))
+               }
+               if (update.hash && update.hash !== fileHash) {
+                 logger.warn(
+@@ -447,7 +461,7 @@ export function createBlobForUpdate(projectId, historyId, update, callback) {
+               },
+               (err, fileHash) => {
+                 if (err) {
+-                  return callback(err)
++                  return callback(OError.tag(err))
+                 }
+                 logger.debug({ fileHash }, 'created empty blob for file')
+                 callback(null, { file: fileHash })
+@@ -520,7 +534,10 @@ export function initializeProject(historyId, callback) {
+ export function deleteProject(projectId, callback) {
+   _requestHistoryService(
+     { method: 'DELETE', path: `projects/${projectId}` },
+-    callback
++    err => {
++      if (err) return callback(OError.tag(err))
++      callback(null)
++    }
+   )
+ }
+
diff --git a/server-ce/hotfix/5.5.1/pr_26091.patch b/server-ce/hotfix/5.5.1/pr_26091.patch
new file mode 100644
index 0000000000..c88618b8d0
--- /dev/null
+++ b/server-ce/hotfix/5.5.1/pr_26091.patch
@@ -0,0 +1,60 @@
+--- a/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
++++ b/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
+@@ -7,6 +7,7 @@ import {
+ const { ObjectId } = mongodb
+
+ const MIN_MONGO_VERSION = [6, 0]
++const MIN_MONGO_FEATURE_COMPATIBILITY_VERSION = [6, 0]
+
+ async function main() {
+   let mongoClient
+@@ -18,6 +19,7 @@ async function main() {
+   }
+
+   await checkMongoVersion(mongoClient)
++  await checkFeatureCompatibilityVersion(mongoClient)
+
+   try {
+     await testTransactions(mongoClient)
+@@ -53,6 +55,41 @@ async function checkMongoVersion(mongoClient) {
+   }
+ }
+
++async function checkFeatureCompatibilityVersion(mongoClient) {
++  const {
++    featureCompatibilityVersion: { version },
++  } = await mongoClient
++    .db()
++    .admin()
++    .command({ getParameter: 1, featureCompatibilityVersion: 1 })
++  const [major, minor] = version.split('.').map(v => parseInt(v))
++  const [minMajor, minMinor] = MIN_MONGO_FEATURE_COMPATIBILITY_VERSION
++
++  if (major < minMajor || (major === minMajor && minor < minMinor)) {
++    const minVersion = MIN_MONGO_FEATURE_COMPATIBILITY_VERSION.join('.')
++    console.error(`
++The MongoDB server has featureCompatibilityVersion=${version}, but Overleaf requires at least version ${minVersion}.
++
++Open a mongo shell:
++- Overleaf Toolkit deployments: $ bin/mongo
++- Legacy docker-compose.yml deployments: $ docker exec -it mongo mongosh localhost/sharelatex
++
++In the mongo shell:
++> db.adminCommand( { setFeatureCompatibilityVersion: "${minMajor}.${minMinor}" } )
++
++Verify the new value:
++> db.adminCommand( { getParameter: 1, featureCompatibilityVersion: 1 } )
++ ...
++ {
++    featureCompatibilityVersion: { version: ${minMajor}.${minMinor}' },
++...
++
++Aborting.
++`)
++    process.exit(1)
++  }
++}
++
+ main()
+   .then(() => {
+     console.error('Mongodb is up.')
diff --git a/server-ce/hotfix/5.5.1/pr_26152.patch b/server-ce/hotfix/5.5.1/pr_26152.patch
new file mode 100644
index 0000000000..9dc5d50e28
--- /dev/null
+++ b/server-ce/hotfix/5.5.1/pr_26152.patch
@@ -0,0 +1,16 @@
+--- a/services/web/modules/server-ce-scripts/scripts/create-user.mjs
++++ b/services/web/modules/server-ce-scripts/scripts/create-user.mjs
+@@ -48,3 +48,13 @@ Please visit the following URL to set a password for ${email} and log in:
+     )
+   })
+ }
++
++if (filename === process.argv[1]) {
++  try {
++    await main()
++    process.exit(0)
++  } catch (error) {
++    console.error({ error })
++    process.exit(1)
++  }
++}
diff --git a/server-ce/test/Makefile b/server-ce/test/Makefile
index 18f4446902..6c56b7e8fe 100644
--- a/server-ce/test/Makefile
+++ b/server-ce/test/Makefile
@@ -6,8 +6,8 @@ all: test-e2e
 # Notable the container labels com.docker.compose.project.working_dir and com.docker.compose.project.config_files need to match when creating containers from the docker host (how you started things) and from host-admin (how tests reconfigure the instance).
 export PWD = $(shell pwd)
 
-export TEX_LIVE_DOCKER_IMAGE ?= gcr.io/overleaf-ops/texlive-full:2023.1
-export ALL_TEX_LIVE_DOCKER_IMAGES ?= gcr.io/overleaf-ops/texlive-full:2023.1,gcr.io/overleaf-ops/texlive-full:2022.1
+export TEX_LIVE_DOCKER_IMAGE ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2023.1
+export ALL_TEX_LIVE_DOCKER_IMAGES ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2023.1,us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2022.1
 export IMAGE_TAG_PRO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/pro:latest
 export CYPRESS_SHARD ?=
 export COMPOSE_PROJECT_NAME ?= test
@@ -20,6 +20,7 @@ test-e2e-native:
 		npm run cypress:open
 
 test-e2e:
+	docker compose build host-admin
 	docker compose up --no-log-prefix --exit-code-from=e2e e2e
 
 test-e2e-open:
@@ -45,7 +46,7 @@ prefetch_custom_compose_pull:
 prefetch_custom: prefetch_custom_texlive
 prefetch_custom_texlive:
 	echo "$$ALL_TEX_LIVE_DOCKER_IMAGES" | tr ',' '\n' | xargs -I% \
-	sh -exc 'tag=%; re_tag=quay.io/sharelatex/$${tag#*/*/}; docker pull $$tag; docker tag $$tag $$re_tag'
+	sh -exc 'tag=%; re_tag=quay.io/sharelatex/$${tag#*/*/*/}; docker pull $$tag; docker tag $$tag $$re_tag'
 
 prefetch_custom: prefetch_old
 prefetch_old:
diff --git a/server-ce/test/admin.spec.ts b/server-ce/test/admin.spec.ts
index 9031e21b68..50a89fb855 100644
--- a/server-ce/test/admin.spec.ts
+++ b/server-ce/test/admin.spec.ts
@@ -179,6 +179,21 @@ describe('admin panel', function () {
         cy.get('nav').findByText('Manage Users').click()
       })
 
+      it('displays expected tabs', () => {
+        const tabs = ['Users', 'License Usage']
+        cy.get('[role="tab"]').each((el, index) => {
+          cy.wrap(el).findByText(tabs[index]).click()
+        })
+        cy.get('[role="tab"]').should('have.length', tabs.length)
+      })
+
+      it('license usage tab', () => {
+        cy.get('a').contains('License Usage').click()
+        cy.findByText(
+          'An active user is one who has opened a project in this Server Pro instance in the last 12 months.'
+        )
+      })
+
       describe('create users', () => {
         beforeEach(() => {
           cy.get('a').contains('New User').click()
diff --git a/server-ce/test/docker-compose.yml b/server-ce/test/docker-compose.yml
index 43f494a084..f4255e241b 100644
--- a/server-ce/test/docker-compose.yml
+++ b/server-ce/test/docker-compose.yml
@@ -131,7 +131,7 @@ services:
 
   saml:
     restart: always
-    image: gcr.io/overleaf-ops/saml-test
+    image: us-east1-docker.pkg.dev/overleaf-ops/ol-docker/saml-test
     environment:
       SAML_TEST_SP_ENTITY_ID: 'sharelatex-test-saml'
       SAML_BASE_URL_PATH: 'http://saml/simplesaml/'
diff --git a/services/chat/docker-compose.ci.yml b/services/chat/docker-compose.ci.yml
index 8fd86c1fbb..24b57ab084 100644
--- a/services/chat/docker-compose.ci.yml
+++ b/services/chat/docker-compose.ci.yml
@@ -24,10 +24,13 @@ services:
       MOCHA_GREP: ${MOCHA_GREP}
       NODE_ENV: test
       NODE_OPTIONS: "--unhandled-rejections=strict"
+    volumes:
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     depends_on:
       mongo:
         condition: service_started
     user: node
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run test:acceptance
 
 
diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml
index 89a48339bd..43a30e8cc7 100644
--- a/services/chat/docker-compose.yml
+++ b/services/chat/docker-compose.yml
@@ -26,6 +26,7 @@ services:
       - .:/overleaf/services/chat
       - ../../node_modules:/overleaf/node_modules
       - ../../libraries:/overleaf/libraries
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     working_dir: /overleaf/services/chat
     environment:
       ELASTIC_SEARCH_DSN: es:9200
@@ -39,6 +40,7 @@ services:
     depends_on:
       mongo:
         condition: service_started
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run --silent test:acceptance
 
   mongo:
diff --git a/services/clsi/README.md b/services/clsi/README.md
index 16e40b8990..f1cf927d3d 100644
--- a/services/clsi/README.md
+++ b/services/clsi/README.md
@@ -19,18 +19,18 @@ The CLSI can be configured through the following environment variables:
 * `ALLOWED_IMAGES` - Space separated list of allowed Docker TeX Live images
 * `CATCH_ERRORS` - Set to `true` to log uncaught exceptions
 * `COMPILE_GROUP_DOCKER_CONFIGS` - JSON string of Docker configs for compile groups
-* `COMPILES_HOST_DIR` - Working directory for LaTeX compiles
-* `OUTPUT_HOST_DIR` - Output directory for LaTeX compiles
+* `SANDBOXED_COMPILES` - Set to true to use sibling containers
+* `SANDBOXED_COMPILES_HOST_DIR_COMPILES` - Working directory for LaTeX compiles
+* `SANDBOXED_COMPILES_HOST_DIR_OUTPUT` - Output directory for LaTeX compiles
 * `COMPILE_SIZE_LIMIT` - Sets the body-parser [limit](https://github.com/expressjs/body-parser#limit)
-* `DOCKER_RUNNER` - Set to true to use sibling containers
 * `DOCKER_RUNTIME` -
 * `FILESTORE_DOMAIN_OVERRIDE` - The url for the filestore service e.g.`http://$FILESTORE_HOST:3009`
 * `FILESTORE_PARALLEL_FILE_DOWNLOADS` - Number of parallel file downloads
 * `LISTEN_ADDRESS` - The address for the RESTful service to listen on. Set to `0.0.0.0` to listen on all network interfaces
 * `PROCESS_LIFE_SPAN_LIMIT_MS` - Process life span limit in milliseconds
 * `SMOKE_TEST` - Whether to run smoke tests
-* `TEXLIVE_IMAGE` - The TeX Live Docker image to use for sibling containers, e.g. `gcr.io/overleaf-ops/texlive-full:2017.1`
-* `TEX_LIVE_IMAGE_NAME_OVERRIDE` - The name of the registry for the Docker image e.g. `gcr.io/overleaf-ops`
+* `TEXLIVE_IMAGE` - The TeX Live Docker image to use for sibling containers, e.g. `us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2017.1`
+* `TEX_LIVE_IMAGE_NAME_OVERRIDE` - The name of the registry for the Docker image e.g. `us-east1-docker.pkg.dev/overleaf-ops/ol-docker`
 * `TEXLIVE_IMAGE_USER` - When using sibling containers, the user to run as in the TeX Live image. Defaults to `tex`
 * `TEXLIVE_OPENOUT_ANY` - Sets the `openout_any` environment variable for TeX Live (see the `\openout` primitive [documentation](http://tug.org/texinfohtml/web2c.html#tex-invocation))
 
@@ -63,10 +63,10 @@ Then start the Docker container:
 docker run --rm \
   -p 127.0.0.1:3013:3013 \
   -e LISTEN_ADDRESS=0.0.0.0 \
-  -e DOCKER_RUNNER=true \
+  -e SANDBOXED_COMPILES=true \
   -e TEXLIVE_IMAGE=texlive/texlive \
   -e TEXLIVE_IMAGE_USER=root \
-  -e COMPILES_HOST_DIR="$PWD/compiles" \
+  -e SANDBOXED_COMPILES_HOST_DIR_COMPILES="$PWD/compiles" \
   -v "$PWD/compiles:/overleaf/services/clsi/compiles" \
   -v "$PWD/cache:/overleaf/services/clsi/cache" \
   -v /var/run/docker.sock:/var/run/docker.sock \
diff --git a/services/clsi/buildscript.txt b/services/clsi/buildscript.txt
index 709ade18c3..58975135d0 100644
--- a/services/clsi/buildscript.txt
+++ b/services/clsi/buildscript.txt
@@ -2,7 +2,7 @@ clsi
 --data-dirs=cache,compiles,output
 --dependencies=
 --docker-repos=us-east1-docker.pkg.dev/overleaf-ops/ol-docker
---env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true",ALLOWED_IMAGES=quay.io/sharelatex/texlive-full:2017.1,TEXLIVE_IMAGE=quay.io/sharelatex/texlive-full:2017.1,TEX_LIVE_IMAGE_NAME_OVERRIDE=us-east1-docker.pkg.dev/overleaf-ops/ol-docker,TEXLIVE_IMAGE_USER="tex",DOCKER_RUNNER="true",COMPILES_HOST_DIR=$PWD/compiles,OUTPUT_HOST_DIR=$PWD/output
+--env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true",ALLOWED_IMAGES=quay.io/sharelatex/texlive-full:2017.1,TEXLIVE_IMAGE=quay.io/sharelatex/texlive-full:2017.1,TEX_LIVE_IMAGE_NAME_OVERRIDE=us-east1-docker.pkg.dev/overleaf-ops/ol-docker,TEXLIVE_IMAGE_USER="tex",SANDBOXED_COMPILES="true",SANDBOXED_COMPILES_HOST_DIR_COMPILES=$PWD/compiles,SANDBOXED_COMPILES_HOST_DIR_OUTPUT=$PWD/output
 --env-pass-through=
 --esmock-loader=False
 --node-version=22.15.1
diff --git a/services/clsi/docker-compose.ci.yml b/services/clsi/docker-compose.ci.yml
index b6643008f7..77a45615b7 100644
--- a/services/clsi/docker-compose.ci.yml
+++ b/services/clsi/docker-compose.ci.yml
@@ -29,9 +29,9 @@ services:
       TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1
       TEX_LIVE_IMAGE_NAME_OVERRIDE: us-east1-docker.pkg.dev/overleaf-ops/ol-docker
       TEXLIVE_IMAGE_USER: "tex"
-      DOCKER_RUNNER: "true"
-      COMPILES_HOST_DIR: $PWD/compiles
-      OUTPUT_HOST_DIR: $PWD/output
+      SANDBOXED_COMPILES: "true"
+      SANDBOXED_COMPILES_HOST_DIR_COMPILES: $PWD/compiles
+      SANDBOXED_COMPILES_HOST_DIR_OUTPUT: $PWD/output
     volumes:
       - ./compiles:/overleaf/services/clsi/compiles
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/services/clsi/docker-compose.yml b/services/clsi/docker-compose.yml
index e0f29ab09d..b8112a8e17 100644
--- a/services/clsi/docker-compose.yml
+++ b/services/clsi/docker-compose.yml
@@ -47,8 +47,8 @@ services:
       TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1
       TEX_LIVE_IMAGE_NAME_OVERRIDE: us-east1-docker.pkg.dev/overleaf-ops/ol-docker
       TEXLIVE_IMAGE_USER: "tex"
-      DOCKER_RUNNER: "true"
-      COMPILES_HOST_DIR: $PWD/compiles
-      OUTPUT_HOST_DIR: $PWD/output
+      SANDBOXED_COMPILES: "true"
+      SANDBOXED_COMPILES_HOST_DIR_COMPILES: $PWD/compiles
+      SANDBOXED_COMPILES_HOST_DIR_OUTPUT: $PWD/output
     command: npm run --silent test:acceptance
 
diff --git a/services/clsi/package.json b/services/clsi/package.json
index 86566e0f59..b07430391a 100644
--- a/services/clsi/package.json
+++ b/services/clsi/package.json
@@ -27,13 +27,13 @@
     "async": "^3.2.5",
     "body-parser": "^1.20.3",
     "bunyan": "^1.8.15",
-    "dockerode": "^4.0.5",
+    "dockerode": "^4.0.7",
     "express": "^4.21.2",
     "lodash": "^4.17.21",
     "p-limit": "^3.1.0",
     "request": "^2.88.2",
     "send": "^0.19.0",
-    "tar-fs": "^3.0.4",
+    "tar-fs": "^3.0.9",
     "workerpool": "^6.1.5"
   },
   "devDependencies": {
diff --git a/services/contacts/docker-compose.ci.yml b/services/contacts/docker-compose.ci.yml
index 8fd86c1fbb..24b57ab084 100644
--- a/services/contacts/docker-compose.ci.yml
+++ b/services/contacts/docker-compose.ci.yml
@@ -24,10 +24,13 @@ services:
       MOCHA_GREP: ${MOCHA_GREP}
       NODE_ENV: test
       NODE_OPTIONS: "--unhandled-rejections=strict"
+    volumes:
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     depends_on:
       mongo:
         condition: service_started
     user: node
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run test:acceptance
 
 
diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml
index 65e1a578cd..305232b55d 100644
--- a/services/contacts/docker-compose.yml
+++ b/services/contacts/docker-compose.yml
@@ -26,6 +26,7 @@ services:
       - .:/overleaf/services/contacts
       - ../../node_modules:/overleaf/node_modules
       - ../../libraries:/overleaf/libraries
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     working_dir: /overleaf/services/contacts
     environment:
       ELASTIC_SEARCH_DSN: es:9200
@@ -39,6 +40,7 @@ services:
     depends_on:
       mongo:
         condition: service_started
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run --silent test:acceptance
 
   mongo:
diff --git a/services/contacts/package.json b/services/contacts/package.json
index f81f947d6a..db707e55c9 100644
--- a/services/contacts/package.json
+++ b/services/contacts/package.json
@@ -6,9 +6,9 @@
   "main": "app.js",
   "scripts": {
     "start": "node app.js",
-    "test:acceptance:_run": "LOG_LEVEL=fatal mocha --loader=esmock --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
+    "test:acceptance:_run": "mocha --loader=esmock --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
     "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP",
-    "test:unit:_run": "LOG_LEVEL=fatal mocha --loader=esmock --recursive --reporter spec $@ test/unit/js",
+    "test:unit:_run": "mocha --loader=esmock --recursive --reporter spec $@ test/unit/js",
     "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "nodemon": "node --watch app.js",
     "lint": "eslint --max-warnings 0 --format unix .",
diff --git a/services/docstore/app.js b/services/docstore/app.js
index 76659e8411..ef755c4bb1 100644
--- a/services/docstore/app.js
+++ b/services/docstore/app.js
@@ -50,6 +50,14 @@ app.param('doc_id', function (req, res, next, docId) {
 app.get('/project/:project_id/doc-deleted', HttpController.getAllDeletedDocs)
 app.get('/project/:project_id/doc', HttpController.getAllDocs)
 app.get('/project/:project_id/ranges', HttpController.getAllRanges)
+app.get(
+  '/project/:project_id/comment-thread-ids',
+  HttpController.getCommentThreadIds
+)
+app.get(
+  '/project/:project_id/tracked-changes-user-ids',
+  HttpController.getTrackedChangesUserIds
+)
 app.get('/project/:project_id/has-ranges', HttpController.projectHasRanges)
 app.get('/project/:project_id/doc/:doc_id', HttpController.getDoc)
 app.get('/project/:project_id/doc/:doc_id/deleted', HttpController.isDocDeleted)
diff --git a/services/docstore/app/js/DocArchiveManager.js b/services/docstore/app/js/DocArchiveManager.js
index 4390afe18f..d03ee161a8 100644
--- a/services/docstore/app/js/DocArchiveManager.js
+++ b/services/docstore/app/js/DocArchiveManager.js
@@ -1,5 +1,4 @@
-const { callbackify } = require('node:util')
-const MongoManager = require('./MongoManager').promises
+const MongoManager = require('./MongoManager')
 const Errors = require('./Errors')
 const logger = require('@overleaf/logger')
 const Settings = require('@overleaf/settings')
@@ -8,29 +7,12 @@ const { ReadableString } = require('@overleaf/stream-utils')
 const RangeManager = require('./RangeManager')
 const PersistorManager = require('./PersistorManager')
 const pMap = require('p-map')
-const { streamToBuffer } = require('./StreamToBuffer').promises
+const { streamToBuffer } = require('./StreamToBuffer')
 const { BSON } = require('mongodb-legacy')
 
 const PARALLEL_JOBS = Settings.parallelArchiveJobs
 const UN_ARCHIVE_BATCH_SIZE = Settings.unArchiveBatchSize
 
-module.exports = {
-  archiveAllDocs: callbackify(archiveAllDocs),
-  archiveDoc: callbackify(archiveDoc),
-  unArchiveAllDocs: callbackify(unArchiveAllDocs),
-  unarchiveDoc: callbackify(unarchiveDoc),
-  destroyProject: callbackify(destroyProject),
-  getDoc: callbackify(getDoc),
-  promises: {
-    archiveAllDocs,
-    archiveDoc,
-    unArchiveAllDocs,
-    unarchiveDoc,
-    destroyProject,
-    getDoc,
-  },
-}
-
 async function archiveAllDocs(projectId) {
   if (!_isArchivingEnabled()) {
     return
@@ -62,6 +44,8 @@ async function archiveDoc(projectId, docId) {
     throw new Error('doc has no lines')
   }
 
+  RangeManager.fixCommentIds(doc)
+
   // warn about any oversized docs already in mongo
   const linesSize = BSON.calculateObjectSize(doc.lines || {})
   const rangesSize = BSON.calculateObjectSize(doc.ranges || {})
@@ -225,3 +209,12 @@ function _isArchivingEnabled() {
 
   return true
 }
+
+module.exports = {
+  archiveAllDocs,
+  archiveDoc,
+  unArchiveAllDocs,
+  unarchiveDoc,
+  destroyProject,
+  getDoc,
+}
diff --git a/services/docstore/app/js/DocManager.js b/services/docstore/app/js/DocManager.js
index a9ed99425c..c9e8dadc2c 100644
--- a/services/docstore/app/js/DocManager.js
+++ b/services/docstore/app/js/DocManager.js
@@ -5,7 +5,6 @@ const _ = require('lodash')
 const DocArchive = require('./DocArchiveManager')
 const RangeManager = require('./RangeManager')
 const Settings = require('@overleaf/settings')
-const { callbackifyAll } = require('@overleaf/promise-utils')
 const { setTimeout } = require('node:timers/promises')
 
 /**
@@ -29,7 +28,7 @@ const DocManager = {
       throw new Error('must include inS3 when getting doc')
     }
 
-    const doc = await MongoManager.promises.findDoc(projectId, docId, filter)
+    const doc = await MongoManager.findDoc(projectId, docId, filter)
 
     if (doc == null) {
       throw new Errors.NotFoundError(
@@ -38,15 +37,19 @@ const DocManager = {
     }
 
     if (doc.inS3) {
-      await DocArchive.promises.unarchiveDoc(projectId, docId)
+      await DocArchive.unarchiveDoc(projectId, docId)
       return await DocManager._getDoc(projectId, docId, filter)
     }
 
+    if (filter.ranges) {
+      RangeManager.fixCommentIds(doc)
+    }
+
     return doc
   },
 
   async isDocDeleted(projectId, docId) {
-    const doc = await MongoManager.promises.findDoc(projectId, docId, {
+    const doc = await MongoManager.findDoc(projectId, docId, {
       deleted: true,
     })
 
@@ -74,7 +77,7 @@ const DocManager = {
 
   // returns the doc without any version information
   async _peekRawDoc(projectId, docId) {
-    const doc = await MongoManager.promises.findDoc(projectId, docId, {
+    const doc = await MongoManager.findDoc(projectId, docId, {
       lines: true,
       rev: true,
       deleted: true,
@@ -91,7 +94,7 @@ const DocManager = {
 
     if (doc.inS3) {
       // skip the unarchiving to mongo when getting a doc
-      const archivedDoc = await DocArchive.promises.getDoc(projectId, docId)
+      const archivedDoc = await DocArchive.getDoc(projectId, docId)
       Object.assign(doc, archivedDoc)
     }
 
@@ -102,7 +105,7 @@ const DocManager = {
   // without unarchiving it (avoids unnecessary writes to mongo)
   async peekDoc(projectId, docId) {
     const doc = await DocManager._peekRawDoc(projectId, docId)
-    await MongoManager.promises.checkRevUnchanged(doc)
+    await MongoManager.checkRevUnchanged(doc)
     return doc
   },
 
@@ -111,16 +114,18 @@ const DocManager = {
       lines: true,
       inS3: true,
     })
-    return doc
+    if (!doc) throw new Errors.NotFoundError()
+    if (!Array.isArray(doc.lines)) throw new Errors.DocWithoutLinesError()
+    return doc.lines.join('\n')
   },
 
   async getAllDeletedDocs(projectId, filter) {
-    return await MongoManager.promises.getProjectsDeletedDocs(projectId, filter)
+    return await MongoManager.getProjectsDeletedDocs(projectId, filter)
   },
 
   async getAllNonDeletedDocs(projectId, filter) {
-    await DocArchive.promises.unArchiveAllDocs(projectId)
-    const docs = await MongoManager.promises.getProjectsDocs(
+    await DocArchive.unArchiveAllDocs(projectId)
+    const docs = await MongoManager.getProjectsDocs(
       projectId,
       { include_deleted: false },
       filter
@@ -128,15 +133,46 @@ const DocManager = {
     if (docs == null) {
       throw new Errors.NotFoundError(`No docs for project ${projectId}`)
     }
+    if (filter.ranges) {
+      for (const doc of docs) {
+        RangeManager.fixCommentIds(doc)
+      }
+    }
     return docs
   },
 
+  async getCommentThreadIds(projectId) {
+    const docs = await DocManager.getAllNonDeletedDocs(projectId, {
+      _id: true,
+      ranges: true,
+    })
+    const byDoc = new Map()
+    for (const doc of docs) {
+      const ids = new Set()
+      for (const comment of doc.ranges?.comments || []) {
+        ids.add(comment.op.t)
+      }
+      if (ids.size > 0) byDoc.set(doc._id.toString(), Array.from(ids))
+    }
+    return Object.fromEntries(byDoc.entries())
+  },
+
+  async getTrackedChangesUserIds(projectId) {
+    const docs = await DocManager.getAllNonDeletedDocs(projectId, {
+      ranges: true,
+    })
+    const userIds = new Set()
+    for (const doc of docs) {
+      for (const change of doc.ranges?.changes || []) {
+        if (change.metadata.user_id === 'anonymous-user') continue
+        userIds.add(change.metadata.user_id)
+      }
+    }
+    return Array.from(userIds)
+  },
+
   async projectHasRanges(projectId) {
-    const docs = await MongoManager.promises.getProjectsDocs(
-      projectId,
-      {},
-      { _id: 1 }
-    )
+    const docs = await MongoManager.getProjectsDocs(projectId, {}, { _id: 1 })
     const docIds = docs.map(doc => doc._id)
     for (const docId of docIds) {
       const doc = await DocManager.peekDoc(projectId, docId)
@@ -247,7 +283,7 @@ const DocManager = {
       }
 
       modified = true
-      await MongoManager.promises.upsertIntoDocCollection(
+      await MongoManager.upsertIntoDocCollection(
         projectId,
         docId,
         doc?.rev,
@@ -262,11 +298,7 @@ const DocManager = {
 
   async patchDoc(projectId, docId, meta) {
     const projection = { _id: 1, deleted: true }
-    const doc = await MongoManager.promises.findDoc(
-      projectId,
-      docId,
-      projection
-    )
+    const doc = await MongoManager.findDoc(projectId, docId, projection)
     if (!doc) {
       throw new Errors.NotFoundError(
         `No such project/doc to delete: ${projectId}/${docId}`
@@ -275,7 +307,7 @@ const DocManager = {
 
     if (meta.deleted && Settings.docstore.archiveOnSoftDelete) {
       // The user will not read this doc anytime soon. Flush it out of mongo.
-      DocArchive.promises.archiveDoc(projectId, docId).catch(err => {
+      DocArchive.archiveDoc(projectId, docId).catch(err => {
         logger.warn(
           { projectId, docId, err },
           'archiving a single doc in the background failed'
@@ -283,15 +315,8 @@ const DocManager = {
       })
     }
 
-    await MongoManager.promises.patchDoc(projectId, docId, meta)
+    await MongoManager.patchDoc(projectId, docId, meta)
   },
 }
 
-module.exports = {
-  ...callbackifyAll(DocManager, {
-    multiResult: {
-      updateDoc: ['modified', 'rev'],
-    },
-  }),
-  promises: DocManager,
-}
+module.exports = DocManager
diff --git a/services/docstore/app/js/Errors.js b/services/docstore/app/js/Errors.js
index bbdbe75c08..7b150cc0db 100644
--- a/services/docstore/app/js/Errors.js
+++ b/services/docstore/app/js/Errors.js
@@ -10,10 +10,13 @@ class DocRevValueError extends OError {}
 
 class DocVersionDecrementedError extends OError {}
 
+class DocWithoutLinesError extends OError {}
+
 module.exports = {
   Md5MismatchError,
   DocModifiedError,
   DocRevValueError,
   DocVersionDecrementedError,
+  DocWithoutLinesError,
   ...Errors,
 }
diff --git a/services/docstore/app/js/HealthChecker.js b/services/docstore/app/js/HealthChecker.js
index 34cd5c973c..a5b7ad7e9a 100644
--- a/services/docstore/app/js/HealthChecker.js
+++ b/services/docstore/app/js/HealthChecker.js
@@ -1,67 +1,35 @@
-// TODO: This file was created by bulk-decaffeinate.
-// Fix any style issues and re-enable lint.
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
 const { db, ObjectId } = require('./mongodb')
-const request = require('request')
-const async = require('async')
 const _ = require('lodash')
 const crypto = require('node:crypto')
 const settings = require('@overleaf/settings')
 const { port } = settings.internal.docstore
 const logger = require('@overleaf/logger')
+const { fetchNothing, fetchJson } = require('@overleaf/fetch-utils')
 
-module.exports = {
-  check(callback) {
-    const docId = new ObjectId()
-    const projectId = new ObjectId(settings.docstore.healthCheck.project_id)
-    const url = `http://127.0.0.1:${port}/project/${projectId}/doc/${docId}`
-    const lines = [
-      'smoke test - delete me',
-      `${crypto.randomBytes(32).toString('hex')}`,
-    ]
-    const getOpts = () => ({
-      url,
-      timeout: 3000,
+async function check() {
+  const docId = new ObjectId()
+  const projectId = new ObjectId(settings.docstore.healthCheck.project_id)
+  const url = `http://127.0.0.1:${port}/project/${projectId}/doc/${docId}`
+  const lines = [
+    'smoke test - delete me',
+    `${crypto.randomBytes(32).toString('hex')}`,
+  ]
+  logger.debug({ lines, url, docId, projectId }, 'running health check')
+  let body
+  try {
+    await fetchNothing(url, {
+      method: 'POST',
+      json: { lines, version: 42, ranges: {} },
+      signal: AbortSignal.timeout(3_000),
     })
-    logger.debug({ lines, url, docId, projectId }, 'running health check')
-    const jobs = [
-      function (cb) {
-        const opts = getOpts()
-        opts.json = { lines, version: 42, ranges: {} }
-        return request.post(opts, cb)
-      },
-      function (cb) {
-        const opts = getOpts()
-        opts.json = true
-        return request.get(opts, function (err, res, body) {
-          if (err != null) {
-            logger.err({ err }, 'docstore returned a error in health check get')
-            return cb(err)
-          } else if (res == null) {
-            return cb(new Error('no response from docstore with get check'))
-          } else if ((res != null ? res.statusCode : undefined) !== 200) {
-            return cb(new Error(`status code not 200, its ${res.statusCode}`))
-          } else if (
-            _.isEqual(body != null ? body.lines : undefined, lines) &&
-            (body != null ? body._id : undefined) === docId.toString()
-          ) {
-            return cb()
-          } else {
-            return cb(
-              new Error(
-                `health check lines not equal ${body.lines} != ${lines}`
-              )
-            )
-          }
-        })
-      },
-      cb => db.docs.deleteOne({ _id: docId, project_id: projectId }, cb),
-    ]
-    return async.series(jobs, callback)
-  },
+    body = await fetchJson(url, { signal: AbortSignal.timeout(3_000) })
+  } finally {
+    await db.docs.deleteOne({ _id: docId, project_id: projectId })
+  }
+  if (!_.isEqual(body?.lines, lines)) {
+    throw new Error(`health check lines not equal ${body.lines} != ${lines}`)
+  }
+}
+module.exports = {
+  check,
 }
diff --git a/services/docstore/app/js/HttpController.js b/services/docstore/app/js/HttpController.js
index 1c4e137033..50c4302aeb 100644
--- a/services/docstore/app/js/HttpController.js
+++ b/services/docstore/app/js/HttpController.js
@@ -4,143 +4,104 @@ const DocArchive = require('./DocArchiveManager')
 const HealthChecker = require('./HealthChecker')
 const Errors = require('./Errors')
 const Settings = require('@overleaf/settings')
+const { expressify } = require('@overleaf/promise-utils')
 
-function getDoc(req, res, next) {
+async function getDoc(req, res) {
   const { doc_id: docId, project_id: projectId } = req.params
   const includeDeleted = req.query.include_deleted === 'true'
   logger.debug({ projectId, docId }, 'getting doc')
-  DocManager.getFullDoc(projectId, docId, function (error, doc) {
-    if (error) {
-      return next(error)
-    }
-    logger.debug({ docId, projectId }, 'got doc')
-    if (doc == null) {
-      res.sendStatus(404)
-    } else if (doc.deleted && !includeDeleted) {
-      res.sendStatus(404)
-    } else {
-      res.json(_buildDocView(doc))
-    }
-  })
+  const doc = await DocManager.getFullDoc(projectId, docId)
+  logger.debug({ docId, projectId }, 'got doc')
+  if (doc.deleted && !includeDeleted) {
+    res.sendStatus(404)
+  } else {
+    res.json(_buildDocView(doc))
+  }
 }
 
-function peekDoc(req, res, next) {
+async function peekDoc(req, res) {
   const { doc_id: docId, project_id: projectId } = req.params
   logger.debug({ projectId, docId }, 'peeking doc')
-  DocManager.peekDoc(projectId, docId, function (error, doc) {
-    if (error) {
-      return next(error)
-    }
-    if (doc == null) {
-      res.sendStatus(404)
-    } else {
-      res.setHeader('x-doc-status', doc.inS3 ? 'archived' : 'active')
-      res.json(_buildDocView(doc))
-    }
-  })
+  const doc = await DocManager.peekDoc(projectId, docId)
+  res.setHeader('x-doc-status', doc.inS3 ? 'archived' : 'active')
+  res.json(_buildDocView(doc))
 }
 
-function isDocDeleted(req, res, next) {
+async function isDocDeleted(req, res) {
   const { doc_id: docId, project_id: projectId } = req.params
-  DocManager.isDocDeleted(projectId, docId, function (error, deleted) {
-    if (error) {
-      return next(error)
-    }
-    res.json({ deleted })
-  })
+  const deleted = await DocManager.isDocDeleted(projectId, docId)
+  res.json({ deleted })
 }
 
-function getRawDoc(req, res, next) {
+async function getRawDoc(req, res) {
   const { doc_id: docId, project_id: projectId } = req.params
   logger.debug({ projectId, docId }, 'getting raw doc')
-  DocManager.getDocLines(projectId, docId, function (error, doc) {
-    if (error) {
-      return next(error)
-    }
-    if (doc == null) {
-      res.sendStatus(404)
-    } else {
-      res.setHeader('content-type', 'text/plain')
-      res.send(_buildRawDocView(doc))
-    }
-  })
+  const content = await DocManager.getDocLines(projectId, docId)
+  res.setHeader('content-type', 'text/plain')
+  res.send(content)
 }
 
-function getAllDocs(req, res, next) {
+async function getAllDocs(req, res) {
   const { project_id: projectId } = req.params
   logger.debug({ projectId }, 'getting all docs')
-  DocManager.getAllNonDeletedDocs(
-    projectId,
-    { lines: true, rev: true },
-    function (error, docs) {
-      if (docs == null) {
-        docs = []
-      }
-      if (error) {
-        return next(error)
-      }
-      const docViews = _buildDocsArrayView(projectId, docs)
-      for (const docView of docViews) {
-        if (!docView.lines) {
-          logger.warn({ projectId, docId: docView._id }, 'missing doc lines')
-          docView.lines = []
-        }
-      }
-      res.json(docViews)
+  const docs = await DocManager.getAllNonDeletedDocs(projectId, {
+    lines: true,
+    rev: true,
+  })
+  const docViews = _buildDocsArrayView(projectId, docs)
+  for (const docView of docViews) {
+    if (!docView.lines) {
+      logger.warn({ projectId, docId: docView._id }, 'missing doc lines')
+      docView.lines = []
     }
-  )
+  }
+  res.json(docViews)
 }
 
-function getAllDeletedDocs(req, res, next) {
+async function getAllDeletedDocs(req, res) {
   const { project_id: projectId } = req.params
   logger.debug({ projectId }, 'getting all deleted docs')
-  DocManager.getAllDeletedDocs(
-    projectId,
-    { name: true, deletedAt: true },
-    function (error, docs) {
-      if (error) {
-        return next(error)
-      }
-      res.json(
-        docs.map(doc => ({
-          _id: doc._id.toString(),
-          name: doc.name,
-          deletedAt: doc.deletedAt,
-        }))
-      )
-    }
+  const docs = await DocManager.getAllDeletedDocs(projectId, {
+    name: true,
+    deletedAt: true,
+  })
+  res.json(
+    docs.map(doc => ({
+      _id: doc._id.toString(),
+      name: doc.name,
+      deletedAt: doc.deletedAt,
+    }))
   )
 }
 
-function getAllRanges(req, res, next) {
+async function getAllRanges(req, res) {
   const { project_id: projectId } = req.params
   logger.debug({ projectId }, 'getting all ranges')
-  DocManager.getAllNonDeletedDocs(
-    projectId,
-    { ranges: true },
-    function (error, docs) {
-      if (docs == null) {
-        docs = []
-      }
-      if (error) {
-        return next(error)
-      }
-      res.json(_buildDocsArrayView(projectId, docs))
-    }
-  )
-}
-
-function projectHasRanges(req, res, next) {
-  const { project_id: projectId } = req.params
-  DocManager.projectHasRanges(projectId, (err, projectHasRanges) => {
-    if (err) {
-      return next(err)
-    }
-    res.json({ projectHasRanges })
+  const docs = await DocManager.getAllNonDeletedDocs(projectId, {
+    ranges: true,
   })
+  res.json(_buildDocsArrayView(projectId, docs))
 }
 
-function updateDoc(req, res, next) {
+async function getCommentThreadIds(req, res) {
+  const { project_id: projectId } = req.params
+  const threadIds = await DocManager.getCommentThreadIds(projectId)
+  res.json(threadIds)
+}
+
+async function getTrackedChangesUserIds(req, res) {
+  const { project_id: projectId } = req.params
+  const userIds = await DocManager.getTrackedChangesUserIds(projectId)
+  res.json(userIds)
+}
+
+async function projectHasRanges(req, res) {
+  const { project_id: projectId } = req.params
+  const projectHasRanges = await DocManager.projectHasRanges(projectId)
+  res.json({ projectHasRanges })
+}
+
+async function updateDoc(req, res) {
   const { doc_id: docId, project_id: projectId } = req.params
   const lines = req.body?.lines
   const version = req.body?.version
@@ -172,25 +133,20 @@ function updateDoc(req, res, next) {
   }
 
   logger.debug({ projectId, docId }, 'got http request to update doc')
-  DocManager.updateDoc(
+  const { modified, rev } = await DocManager.updateDoc(
     projectId,
     docId,
     lines,
     version,
-    ranges,
-    function (error, modified, rev) {
-      if (error) {
-        return next(error)
-      }
-      res.json({
-        modified,
-        rev,
-      })
-    }
+    ranges
   )
+  res.json({
+    modified,
+    rev,
+  })
 }
 
-function patchDoc(req, res, next) {
+async function patchDoc(req, res) {
   const { doc_id: docId, project_id: projectId } = req.params
   logger.debug({ projectId, docId }, 'patching doc')
 
@@ -203,12 +159,8 @@ function patchDoc(req, res, next) {
       logger.fatal({ field }, 'joi validation for pathDoc is broken')
     }
   })
-  DocManager.patchDoc(projectId, docId, meta, function (error) {
-    if (error) {
-      return next(error)
-    }
-    res.sendStatus(204)
-  })
+  await DocManager.patchDoc(projectId, docId, meta)
+  res.sendStatus(204)
 }
 
 function _buildDocView(doc) {
@@ -221,10 +173,6 @@ function _buildDocView(doc) {
   return docView
 }
 
-function _buildRawDocView(doc) {
-  return (doc?.lines ?? []).join('\n')
-}
-
 function _buildDocsArrayView(projectId, docs) {
   const docViews = []
   for (const doc of docs) {
@@ -241,79 +189,69 @@ function _buildDocsArrayView(projectId, docs) {
   return docViews
 }
 
-function archiveAllDocs(req, res, next) {
+async function archiveAllDocs(req, res) {
   const { project_id: projectId } = req.params
   logger.debug({ projectId }, 'archiving all docs')
-  DocArchive.archiveAllDocs(projectId, function (error) {
-    if (error) {
-      return next(error)
-    }
-    res.sendStatus(204)
-  })
+  await DocArchive.archiveAllDocs(projectId)
+  res.sendStatus(204)
 }
 
-function archiveDoc(req, res, next) {
+async function archiveDoc(req, res) {
   const { doc_id: docId, project_id: projectId } = req.params
   logger.debug({ projectId, docId }, 'archiving a doc')
-  DocArchive.archiveDoc(projectId, docId, function (error) {
-    if (error) {
-      return next(error)
-    }
-    res.sendStatus(204)
-  })
+  await DocArchive.archiveDoc(projectId, docId)
+  res.sendStatus(204)
 }
 
-function unArchiveAllDocs(req, res, next) {
+async function unArchiveAllDocs(req, res) {
   const { project_id: projectId } = req.params
   logger.debug({ projectId }, 'unarchiving all docs')
-  DocArchive.unArchiveAllDocs(projectId, function (err) {
-    if (err) {
-      if (err instanceof Errors.DocRevValueError) {
-        logger.warn({ err }, 'Failed to unarchive doc')
-        return res.sendStatus(409)
-      }
-      return next(err)
+  try {
+    await DocArchive.unArchiveAllDocs(projectId)
+  } catch (err) {
+    if (err instanceof Errors.DocRevValueError) {
+      logger.warn({ err }, 'Failed to unarchive doc')
+      return res.sendStatus(409)
     }
-    res.sendStatus(200)
-  })
+    throw err
+  }
+  res.sendStatus(200)
 }
 
-function destroyProject(req, res, next) {
+async function destroyProject(req, res) {
   const { project_id: projectId } = req.params
   logger.debug({ projectId }, 'destroying all docs')
-  DocArchive.destroyProject(projectId, function (error) {
-    if (error) {
-      return next(error)
-    }
-    res.sendStatus(204)
-  })
+  await DocArchive.destroyProject(projectId)
+  res.sendStatus(204)
 }
 
-function healthCheck(req, res) {
-  HealthChecker.check(function (err) {
-    if (err) {
-      logger.err({ err }, 'error performing health check')
-      res.sendStatus(500)
-    } else {
-      res.sendStatus(200)
-    }
-  })
+async function healthCheck(req, res) {
+  try {
+    await HealthChecker.check()
+  } catch (err) {
+    logger.err({ err }, 'error performing health check')
+    res.sendStatus(500)
+    return
+  }
+  res.sendStatus(200)
 }
 
 module.exports = {
-  getDoc,
-  peekDoc,
-  isDocDeleted,
-  getRawDoc,
-  getAllDocs,
-  getAllDeletedDocs,
-  getAllRanges,
-  projectHasRanges,
-  updateDoc,
-  patchDoc,
-  archiveAllDocs,
-  archiveDoc,
-  unArchiveAllDocs,
-  destroyProject,
-  healthCheck,
+  getDoc: expressify(getDoc),
+  peekDoc: expressify(peekDoc),
+  isDocDeleted: expressify(isDocDeleted),
+  getRawDoc: expressify(getRawDoc),
+  getAllDocs: expressify(getAllDocs),
+  getAllDeletedDocs: expressify(getAllDeletedDocs),
+  getAllRanges: expressify(getAllRanges),
+  getTrackedChangesUserIds: expressify(getTrackedChangesUserIds),
+  getCommentThreadIds: expressify(getCommentThreadIds),
+  projectHasRanges: expressify(projectHasRanges),
+  updateDoc: expressify(updateDoc),
+  patchDoc: expressify(patchDoc),
+  archiveAllDocs: expressify(archiveAllDocs),
+  archiveDoc: expressify(archiveDoc),
+  unArchiveAllDocs: expressify(unArchiveAllDocs),
+  destroyProject: expressify(destroyProject),
+  healthCheck: expressify(healthCheck),
 }
diff --git a/services/docstore/app/js/MongoManager.js b/services/docstore/app/js/MongoManager.js
index ad1a2d2b40..ef101f91c0 100644
--- a/services/docstore/app/js/MongoManager.js
+++ b/services/docstore/app/js/MongoManager.js
@@ -1,7 +1,6 @@
 const { db, ObjectId } = require('./mongodb')
 const Settings = require('@overleaf/settings')
 const Errors = require('./Errors')
-const { callbackify } = require('node:util')
 
 const ARCHIVING_LOCK_DURATION_MS = Settings.archivingLockDurationMs
 
@@ -241,34 +240,17 @@ async function destroyProject(projectId) {
 }
 
 module.exports = {
-  findDoc: callbackify(findDoc),
-  getProjectsDeletedDocs: callbackify(getProjectsDeletedDocs),
-  getProjectsDocs: callbackify(getProjectsDocs),
-  getArchivedProjectDocs: callbackify(getArchivedProjectDocs),
-  getNonArchivedProjectDocIds: callbackify(getNonArchivedProjectDocIds),
-  getNonDeletedArchivedProjectDocs: callbackify(
-    getNonDeletedArchivedProjectDocs
-  ),
-  upsertIntoDocCollection: callbackify(upsertIntoDocCollection),
-  restoreArchivedDoc: callbackify(restoreArchivedDoc),
-  patchDoc: callbackify(patchDoc),
-  getDocForArchiving: callbackify(getDocForArchiving),
-  markDocAsArchived: callbackify(markDocAsArchived),
-  checkRevUnchanged: callbackify(checkRevUnchanged),
-  destroyProject: callbackify(destroyProject),
-  promises: {
-    findDoc,
-    getProjectsDeletedDocs,
-    getProjectsDocs,
-    getArchivedProjectDocs,
-    getNonArchivedProjectDocIds,
-    getNonDeletedArchivedProjectDocs,
-    upsertIntoDocCollection,
-    restoreArchivedDoc,
-    patchDoc,
-    getDocForArchiving,
-    markDocAsArchived,
-    checkRevUnchanged,
-    destroyProject,
-  },
+  findDoc,
+  getProjectsDeletedDocs,
+  getProjectsDocs,
+  getArchivedProjectDocs,
+  getNonArchivedProjectDocIds,
+  getNonDeletedArchivedProjectDocs,
+  upsertIntoDocCollection,
+  restoreArchivedDoc,
+  patchDoc,
+  getDocForArchiving,
+  markDocAsArchived,
+  checkRevUnchanged,
+  destroyProject,
 }
diff --git a/services/docstore/app/js/RangeManager.js b/services/docstore/app/js/RangeManager.js
index f36f68fe35..2fbadf9468 100644
--- a/services/docstore/app/js/RangeManager.js
+++ b/services/docstore/app/js/RangeManager.js
@@ -49,15 +49,25 @@ module.exports = RangeManager = {
       updateMetadata(change.metadata)
     }
     for (const comment of Array.from(ranges.comments || [])) {
-      comment.id = RangeManager._safeObjectId(comment.id)
-      if ((comment.op != null ? comment.op.t : undefined) != null) {
-        comment.op.t = RangeManager._safeObjectId(comment.op.t)
-      }
+      // Two bugs resulted in mismatched ids, prefer the thread id from the op: https://github.com/overleaf/internal/issues/23272
+      comment.id = RangeManager._safeObjectId(comment.op?.t || comment.id)
+      if (comment.op) comment.op.t = comment.id
+
+      // resolved property is added to comments when they are obtained from history, but this state doesn't belong in mongo docs collection
+      // more info: https://github.com/overleaf/internal/issues/24371#issuecomment-2913095174
+      delete comment.op?.resolved
       updateMetadata(comment.metadata)
     }
     return ranges
   },
 
+  fixCommentIds(doc) {
+    for (const comment of doc?.ranges?.comments || []) {
+      // Two bugs resulted in mismatched ids, prefer the thread id from the op: https://github.com/overleaf/internal/issues/23272
+      if (comment.op?.t) comment.id = comment.op.t
+    }
+  },
+
   _safeObjectId(data) {
     try {
       return new ObjectId(data)
diff --git a/services/docstore/app/js/StreamToBuffer.js b/services/docstore/app/js/StreamToBuffer.js
index 7de146cd11..09215a7367 100644
--- a/services/docstore/app/js/StreamToBuffer.js
+++ b/services/docstore/app/js/StreamToBuffer.js
@@ -2,13 +2,9 @@ const { LoggerStream, WritableBuffer } = require('@overleaf/stream-utils')
 const Settings = require('@overleaf/settings')
 const logger = require('@overleaf/logger/logging-manager')
 const { pipeline } = require('node:stream/promises')
-const { callbackify } = require('node:util')
 
 module.exports = {
-  streamToBuffer: callbackify(streamToBuffer),
-  promises: {
-    streamToBuffer,
-  },
+  streamToBuffer,
 }
 
 async function streamToBuffer(projectId, docId, stream) {
diff --git a/services/docstore/docker-compose.ci.yml b/services/docstore/docker-compose.ci.yml
index ff222f6514..40decc4aea 100644
--- a/services/docstore/docker-compose.ci.yml
+++ b/services/docstore/docker-compose.ci.yml
@@ -27,12 +27,15 @@ services:
       MOCHA_GREP: ${MOCHA_GREP}
       NODE_ENV: test
       NODE_OPTIONS: "--unhandled-rejections=strict"
+    volumes:
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     depends_on:
       mongo:
         condition: service_started
       gcs:
         condition: service_healthy
     user: node
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run test:acceptance
 
 
diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml
index 4a4fa2f10c..a58b862b9a 100644
--- a/services/docstore/docker-compose.yml
+++ b/services/docstore/docker-compose.yml
@@ -26,6 +26,7 @@ services:
       - .:/overleaf/services/docstore
       - ../../node_modules:/overleaf/node_modules
       - ../../libraries:/overleaf/libraries
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     working_dir: /overleaf/services/docstore
     environment:
       ELASTIC_SEARCH_DSN: es:9200
@@ -44,6 +45,7 @@ services:
         condition: service_started
       gcs:
         condition: service_healthy
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run --silent test:acceptance
 
   mongo:
diff --git a/services/docstore/package.json b/services/docstore/package.json
index e505f731d3..bf5857fd49 100644
--- a/services/docstore/package.json
+++ b/services/docstore/package.json
@@ -17,6 +17,7 @@
     "types:check": "tsc --noEmit"
   },
   "dependencies": {
+    "@overleaf/fetch-utils": "*",
     "@overleaf/logger": "*",
     "@overleaf/metrics": "*",
     "@overleaf/o-error": "*",
diff --git a/services/docstore/test/acceptance/js/ArchiveDocsTests.js b/services/docstore/test/acceptance/js/ArchiveDocsTests.js
index d9228103b6..7e254c7e84 100644
--- a/services/docstore/test/acceptance/js/ArchiveDocsTests.js
+++ b/services/docstore/test/acceptance/js/ArchiveDocsTests.js
@@ -1001,6 +1001,15 @@ describe('Archiving', function () {
         },
         version: 2,
       }
+      this.fixedRanges = {
+        ...this.doc.ranges,
+        comments: [
+          {
+            ...this.doc.ranges.comments[0],
+            id: this.doc.ranges.comments[0].op.t,
+          },
+        ],
+      }
       return DocstoreClient.createDoc(
         this.project_id,
         this.doc._id,
@@ -1048,7 +1057,7 @@ describe('Archiving', function () {
             throw error
           }
           s3Doc.lines.should.deep.equal(this.doc.lines)
-          const ranges = JSON.parse(JSON.stringify(this.doc.ranges)) // ObjectId -> String
+          const ranges = JSON.parse(JSON.stringify(this.fixedRanges)) // ObjectId -> String
           s3Doc.ranges.should.deep.equal(ranges)
           return done()
         }
@@ -1075,7 +1084,7 @@ describe('Archiving', function () {
             throw error
           }
           doc.lines.should.deep.equal(this.doc.lines)
-          doc.ranges.should.deep.equal(this.doc.ranges)
+          doc.ranges.should.deep.equal(this.fixedRanges)
           expect(doc.inS3).not.to.exist
           return done()
         })
diff --git a/services/docstore/test/acceptance/js/GettingAllDocsTests.js b/services/docstore/test/acceptance/js/GettingAllDocsTests.js
index 8fe5e7d91b..57851b2c3b 100644
--- a/services/docstore/test/acceptance/js/GettingAllDocsTests.js
+++ b/services/docstore/test/acceptance/js/GettingAllDocsTests.js
@@ -20,30 +20,73 @@ const DocstoreClient = require('./helpers/DocstoreClient')
 describe('Getting all docs', function () {
   beforeEach(function (done) {
     this.project_id = new ObjectId()
+    this.threadId1 = new ObjectId().toString()
+    this.threadId2 = new ObjectId().toString()
     this.docs = [
       {
         _id: new ObjectId(),
         lines: ['one', 'two', 'three'],
-        ranges: { mock: 'one' },
+        ranges: {
+          comments: [
+            { id: new ObjectId().toString(), op: { t: this.threadId1 } },
+          ],
+          changes: [
+            {
+              id: new ObjectId().toString(),
+              metadata: { user_id: 'user-id-1' },
+            },
+          ],
+        },
         rev: 2,
       },
       {
         _id: new ObjectId(),
         lines: ['aaa', 'bbb', 'ccc'],
-        ranges: { mock: 'two' },
+        ranges: {
+          changes: [
+            {
+              id: new ObjectId().toString(),
+              metadata: { user_id: 'user-id-2' },
+            },
+          ],
+        },
         rev: 4,
       },
       {
         _id: new ObjectId(),
         lines: ['111', '222', '333'],
-        ranges: { mock: 'three' },
+        ranges: {
+          comments: [
+            { id: new ObjectId().toString(), op: { t: this.threadId2 } },
+          ],
+          changes: [
+            {
+              id: new ObjectId().toString(),
+              metadata: { user_id: 'anonymous-user' },
+            },
+          ],
+        },
         rev: 6,
       },
     ]
+    this.fixedRanges = this.docs.map(doc => {
+      if (!doc.ranges?.comments?.length) return doc.ranges
+      return {
+        ...doc.ranges,
+        comments: [
+          { ...doc.ranges.comments[0], id: doc.ranges.comments[0].op.t },
+        ],
+      }
+    })
     this.deleted_doc = {
       _id: new ObjectId(),
       lines: ['deleted'],
-      ranges: { mock: 'four' },
+      ranges: {
+        comments: [{ id: new ObjectId().toString(), op: { t: 'thread-id-3' } }],
+        changes: [
+          { id: new ObjectId().toString(), metadata: { user_id: 'user-id-3' } },
+        ],
+      },
       rev: 8,
     }
     const version = 42
@@ -96,7 +139,7 @@ describe('Getting all docs', function () {
     })
   })
 
-  return it('getAllRanges should return all the (non-deleted) doc ranges', function (done) {
+  it('getAllRanges should return all the (non-deleted) doc ranges', function (done) {
     return DocstoreClient.getAllRanges(this.project_id, (error, res, docs) => {
       if (error != null) {
         throw error
@@ -104,9 +147,38 @@ describe('Getting all docs', function () {
       docs.length.should.equal(this.docs.length)
       for (let i = 0; i < docs.length; i++) {
         const doc = docs[i]
-        doc.ranges.should.deep.equal(this.docs[i].ranges)
+        doc.ranges.should.deep.equal(this.fixedRanges[i])
       }
       return done()
     })
   })
+
+  it('getTrackedChangesUserIds should return all the user ids from (non-deleted) ranges', function (done) {
+    DocstoreClient.getTrackedChangesUserIds(
+      this.project_id,
+      (error, res, userIds) => {
+        if (error != null) {
+          throw error
+        }
+        userIds.should.deep.equal(['user-id-1', 'user-id-2'])
+        done()
+      }
+    )
+  })
+
+  it('getCommentThreadIds should return all the thread ids from (non-deleted) ranges', function (done) {
+    DocstoreClient.getCommentThreadIds(
+      this.project_id,
+      (error, res, threadIds) => {
+        if (error != null) {
+          throw error
+        }
+        threadIds.should.deep.equal({
+          [this.docs[0]._id.toString()]: [this.threadId1],
+          [this.docs[2]._id.toString()]: [this.threadId2],
+        })
+        done()
+      }
+    )
+  })
 })
diff --git a/services/docstore/test/acceptance/js/GettingDocsTests.js b/services/docstore/test/acceptance/js/GettingDocsTests.js
index 121b3c1e24..1cfc53c5c6 100644
--- a/services/docstore/test/acceptance/js/GettingDocsTests.js
+++ b/services/docstore/test/acceptance/js/GettingDocsTests.js
@@ -28,10 +28,26 @@ describe('Getting a doc', function () {
           op: { i: 'foo', p: 3 },
           meta: {
             user_id: new ObjectId().toString(),
-            ts: new Date().toString(),
+            ts: new Date().toJSON(),
           },
         },
       ],
+      comments: [
+        {
+          id: new ObjectId().toString(),
+          op: { c: 'comment', p: 1, t: new ObjectId().toString() },
+          metadata: {
+            user_id: new ObjectId().toString(),
+            ts: new Date().toJSON(),
+          },
+        },
+      ],
+    }
+    this.fixedRanges = {
+      ...this.ranges,
+      comments: [
+        { ...this.ranges.comments[0], id: this.ranges.comments[0].op.t },
+      ],
     }
     return DocstoreApp.ensureRunning(() => {
       return DocstoreClient.createDoc(
@@ -60,7 +76,7 @@ describe('Getting a doc', function () {
           if (error) return done(error)
           doc.lines.should.deep.equal(this.lines)
           doc.version.should.equal(this.version)
-          doc.ranges.should.deep.equal(this.ranges)
+          doc.ranges.should.deep.equal(this.fixedRanges)
           return done()
         }
       )
@@ -114,7 +130,7 @@ describe('Getting a doc', function () {
           if (error) return done(error)
           doc.lines.should.deep.equal(this.lines)
           doc.version.should.equal(this.version)
-          doc.ranges.should.deep.equal(this.ranges)
+          doc.ranges.should.deep.equal(this.fixedRanges)
           doc.deleted.should.equal(true)
           return done()
         }
diff --git a/services/docstore/test/acceptance/js/HealthCheckerTest.js b/services/docstore/test/acceptance/js/HealthCheckerTest.js
new file mode 100644
index 0000000000..b25a45312b
--- /dev/null
+++ b/services/docstore/test/acceptance/js/HealthCheckerTest.js
@@ -0,0 +1,28 @@
+const { db } = require('../../../app/js/mongodb')
+const DocstoreApp = require('./helpers/DocstoreApp')
+const DocstoreClient = require('./helpers/DocstoreClient')
+const { expect } = require('chai')
+
+describe('HealthChecker', function () {
+  beforeEach('start', function (done) {
+    DocstoreApp.ensureRunning(done)
+  })
+  beforeEach('clear docs collection', async function () {
+    await db.docs.deleteMany({})
+  })
+  let res
+  beforeEach('run health check', function (done) {
+    DocstoreClient.healthCheck((err, _res) => {
+      res = _res
+      done(err)
+    })
+  })
+
+  it('should return 200', function () {
+    res.statusCode.should.equal(200)
+  })
+
+  it('should not leave any cruft behind', async function () {
+    expect(await db.docs.find({}).toArray()).to.deep.equal([])
+  })
+})
diff --git a/services/docstore/test/acceptance/js/helpers/DocstoreClient.js b/services/docstore/test/acceptance/js/helpers/DocstoreClient.js
index 790ec8f237..cb8bce2579 100644
--- a/services/docstore/test/acceptance/js/helpers/DocstoreClient.js
+++ b/services/docstore/test/acceptance/js/helpers/DocstoreClient.js
@@ -100,6 +100,26 @@ module.exports = DocstoreClient = {
     )
   },
 
+  getCommentThreadIds(projectId, callback) {
+    request.get(
+      {
+        url: `http://127.0.0.1:${settings.internal.docstore.port}/project/${projectId}/comment-thread-ids`,
+        json: true,
+      },
+      callback
+    )
+  },
+
+  getTrackedChangesUserIds(projectId, callback) {
+    request.get(
+      {
+        url: `http://127.0.0.1:${settings.internal.docstore.port}/project/${projectId}/tracked-changes-user-ids`,
+        json: true,
+      },
+      callback
+    )
+  },
+
   updateDoc(projectId, docId, lines, version, ranges, callback) {
     return request.post(
       {
@@ -181,6 +201,13 @@ module.exports = DocstoreClient = {
     )
   },
 
+  healthCheck(callback) {
+    request.get(
+      `http://127.0.0.1:${settings.internal.docstore.port}/health_check`,
+      callback
+    )
+  },
+
   getS3Doc(projectId, docId, callback) {
     getStringFromPersistor(
       Persistor,
diff --git a/services/docstore/test/unit/js/DocArchiveManagerTests.js b/services/docstore/test/unit/js/DocArchiveManagerTests.js
index a57f9806c8..2ec1cb2016 100644
--- a/services/docstore/test/unit/js/DocArchiveManagerTests.js
+++ b/services/docstore/test/unit/js/DocArchiveManagerTests.js
@@ -4,7 +4,7 @@ const modulePath = '../../../app/js/DocArchiveManager.js'
 const SandboxedModule = require('sandboxed-module')
 const { ObjectId } = require('mongodb-legacy')
 const Errors = require('../../../app/js/Errors')
-const StreamToBuffer = require('../../../app/js/StreamToBuffer').promises
+const StreamToBuffer = require('../../../app/js/StreamToBuffer')
 
 describe('DocArchiveManager', function () {
   let DocArchiveManager,
@@ -31,6 +31,7 @@ describe('DocArchiveManager', function () {
 
     RangeManager = {
       jsonRangesToMongo: sinon.stub().returns({ mongo: 'ranges' }),
+      fixCommentIds: sinon.stub(),
     }
     Settings = {
       docstore: {
@@ -142,37 +143,33 @@ describe('DocArchiveManager', function () {
     }
 
     MongoManager = {
-      promises: {
-        markDocAsArchived: sinon.stub().resolves(),
-        restoreArchivedDoc: sinon.stub().resolves(),
-        upsertIntoDocCollection: sinon.stub().resolves(),
-        getProjectsDocs: sinon.stub().resolves(mongoDocs),
-        getNonDeletedArchivedProjectDocs: getArchivedProjectDocs,
-        getNonArchivedProjectDocIds,
-        getArchivedProjectDocs,
-        findDoc: sinon.stub().callsFake(fakeGetDoc),
-        getDocForArchiving: sinon.stub().callsFake(fakeGetDoc),
-        destroyProject: sinon.stub().resolves(),
-      },
+      markDocAsArchived: sinon.stub().resolves(),
+      restoreArchivedDoc: sinon.stub().resolves(),
+      upsertIntoDocCollection: sinon.stub().resolves(),
+      getProjectsDocs: sinon.stub().resolves(mongoDocs),
+      getNonDeletedArchivedProjectDocs: getArchivedProjectDocs,
+      getNonArchivedProjectDocIds,
+      getArchivedProjectDocs,
+      findDoc: sinon.stub().callsFake(fakeGetDoc),
+      getDocForArchiving: sinon.stub().callsFake(fakeGetDoc),
+      destroyProject: sinon.stub().resolves(),
     }
 
     // Wrap streamToBuffer so that we can pass in something that it expects (in
     // this case, a Promise) rather than a stubbed stream object
     streamToBuffer = {
-      promises: {
-        streamToBuffer: async () => {
-          const inputStream = new Promise(resolve => {
-            stream.on('data', data => resolve(data))
-          })
+      streamToBuffer: async () => {
+        const inputStream = new Promise(resolve => {
+          stream.on('data', data => resolve(data))
+        })
 
-          const value = await StreamToBuffer.streamToBuffer(
-            'testProjectId',
-            'testDocId',
-            inputStream
-          )
+        const value = await StreamToBuffer.streamToBuffer(
+          'testProjectId',
+          'testDocId',
+          inputStream
+        )
 
-          return value
-        },
+        return value
       },
     }
 
@@ -192,9 +189,13 @@ describe('DocArchiveManager', function () {
 
   describe('archiveDoc', function () {
     it('should resolve when passed a valid document', async function () {
-      await expect(
-        DocArchiveManager.promises.archiveDoc(projectId, mongoDocs[0]._id)
-      ).to.eventually.be.fulfilled
+      await expect(DocArchiveManager.archiveDoc(projectId, mongoDocs[0]._id)).to
+        .eventually.be.fulfilled
+    })
+
+    it('should fix comment ids', async function () {
+      await DocArchiveManager.archiveDoc(projectId, mongoDocs[1]._id)
+      expect(RangeManager.fixCommentIds).to.have.been.called
     })
 
     it('should throw an error if the doc has no lines', async function () {
@@ -202,26 +203,26 @@ describe('DocArchiveManager', function () {
       doc.lines = null
 
       await expect(
-        DocArchiveManager.promises.archiveDoc(projectId, doc._id)
+        DocArchiveManager.archiveDoc(projectId, doc._id)
       ).to.eventually.be.rejectedWith('doc has no lines')
     })
 
     it('should add the schema version', async function () {
-      await DocArchiveManager.promises.archiveDoc(projectId, mongoDocs[1]._id)
+      await DocArchiveManager.archiveDoc(projectId, mongoDocs[1]._id)
       expect(StreamUtils.ReadableString).to.have.been.calledWith(
         sinon.match(/"schema_v":1/)
       )
     })
 
     it('should calculate the hex md5 sum of the content', async function () {
-      await DocArchiveManager.promises.archiveDoc(projectId, mongoDocs[0]._id)
+      await DocArchiveManager.archiveDoc(projectId, mongoDocs[0]._id)
       expect(Crypto.createHash).to.have.been.calledWith('md5')
       expect(HashUpdate).to.have.been.calledWith(archivedDocJson)
       expect(HashDigest).to.have.been.calledWith('hex')
     })
 
     it('should pass the md5 hash to the object persistor for verification', async function () {
-      await DocArchiveManager.promises.archiveDoc(projectId, mongoDocs[0]._id)
+      await DocArchiveManager.archiveDoc(projectId, mongoDocs[0]._id)
 
       expect(PersistorManager.sendStream).to.have.been.calledWith(
         sinon.match.any,
@@ -232,7 +233,7 @@ describe('DocArchiveManager', function () {
     })
 
     it('should pass the correct bucket and key to the persistor', async function () {
-      await DocArchiveManager.promises.archiveDoc(projectId, mongoDocs[0]._id)
+      await DocArchiveManager.archiveDoc(projectId, mongoDocs[0]._id)
 
       expect(PersistorManager.sendStream).to.have.been.calledWith(
         Settings.docstore.bucket,
@@ -241,7 +242,7 @@ describe('DocArchiveManager', function () {
     })
 
     it('should create a stream from the encoded json and send it', async function () {
-      await DocArchiveManager.promises.archiveDoc(projectId, mongoDocs[0]._id)
+      await DocArchiveManager.archiveDoc(projectId, mongoDocs[0]._id)
       expect(StreamUtils.ReadableString).to.have.been.calledWith(
         archivedDocJson
       )
@@ -253,8 +254,8 @@ describe('DocArchiveManager', function () {
     })
 
     it('should mark the doc as archived', async function () {
-      await DocArchiveManager.promises.archiveDoc(projectId, mongoDocs[0]._id)
-      expect(MongoManager.promises.markDocAsArchived).to.have.been.calledWith(
+      await DocArchiveManager.archiveDoc(projectId, mongoDocs[0]._id)
+      expect(MongoManager.markDocAsArchived).to.have.been.calledWith(
         projectId,
         mongoDocs[0]._id,
         mongoDocs[0].rev
@@ -267,8 +268,8 @@ describe('DocArchiveManager', function () {
       })
 
       it('should bail out early', async function () {
-        await DocArchiveManager.promises.archiveDoc(projectId, mongoDocs[0]._id)
-        expect(MongoManager.promises.getDocForArchiving).to.not.have.been.called
+        await DocArchiveManager.archiveDoc(projectId, mongoDocs[0]._id)
+        expect(MongoManager.getDocForArchiving).to.not.have.been.called
       })
     })
 
@@ -285,7 +286,7 @@ describe('DocArchiveManager', function () {
 
       it('should return an error', async function () {
         await expect(
-          DocArchiveManager.promises.archiveDoc(projectId, mongoDocs[0]._id)
+          DocArchiveManager.archiveDoc(projectId, mongoDocs[0]._id)
         ).to.eventually.be.rejectedWith('null bytes detected')
       })
     })
@@ -296,21 +297,19 @@ describe('DocArchiveManager', function () {
 
     describe('when the doc is in S3', function () {
       beforeEach(function () {
-        MongoManager.promises.findDoc = sinon
-          .stub()
-          .resolves({ inS3: true, rev })
+        MongoManager.findDoc = sinon.stub().resolves({ inS3: true, rev })
         docId = mongoDocs[0]._id
         lines = ['doc', 'lines']
         rev = 123
       })
 
       it('should resolve when passed a valid document', async function () {
-        await expect(DocArchiveManager.promises.unarchiveDoc(projectId, docId))
-          .to.eventually.be.fulfilled
+        await expect(DocArchiveManager.unarchiveDoc(projectId, docId)).to
+          .eventually.be.fulfilled
       })
 
       it('should test md5 validity with the raw buffer', async function () {
-        await DocArchiveManager.promises.unarchiveDoc(projectId, docId)
+        await DocArchiveManager.unarchiveDoc(projectId, docId)
         expect(HashUpdate).to.have.been.calledWith(
           sinon.match.instanceOf(Buffer)
         )
@@ -319,15 +318,17 @@ describe('DocArchiveManager', function () {
       it('should throw an error if the md5 does not match', async function () {
         PersistorManager.getObjectMd5Hash.resolves('badf00d')
         await expect(
-          DocArchiveManager.promises.unarchiveDoc(projectId, docId)
+          DocArchiveManager.unarchiveDoc(projectId, docId)
         ).to.eventually.be.rejected.and.be.instanceof(Errors.Md5MismatchError)
       })
 
       it('should restore the doc in Mongo', async function () {
-        await DocArchiveManager.promises.unarchiveDoc(projectId, docId)
-        expect(
-          MongoManager.promises.restoreArchivedDoc
-        ).to.have.been.calledWith(projectId, docId, archivedDoc)
+        await DocArchiveManager.unarchiveDoc(projectId, docId)
+        expect(MongoManager.restoreArchivedDoc).to.have.been.calledWith(
+          projectId,
+          docId,
+          archivedDoc
+        )
       })
 
       describe('when archiving is not configured', function () {
@@ -337,15 +338,15 @@ describe('DocArchiveManager', function () {
 
         it('should error out on archived doc', async function () {
           await expect(
-            DocArchiveManager.promises.unarchiveDoc(projectId, docId)
+            DocArchiveManager.unarchiveDoc(projectId, docId)
           ).to.eventually.be.rejected.and.match(
             /found archived doc, but archiving backend is not configured/
           )
         })
 
         it('should return early on non-archived doc', async function () {
-          MongoManager.promises.findDoc = sinon.stub().resolves({ rev })
-          await DocArchiveManager.promises.unarchiveDoc(projectId, docId)
+          MongoManager.findDoc = sinon.stub().resolves({ rev })
+          await DocArchiveManager.unarchiveDoc(projectId, docId)
           expect(PersistorManager.getObjectMd5Hash).to.not.have.been.called
         })
       })
@@ -363,10 +364,12 @@ describe('DocArchiveManager', function () {
           })
 
           it('should return the docs lines', async function () {
-            await DocArchiveManager.promises.unarchiveDoc(projectId, docId)
-            expect(
-              MongoManager.promises.restoreArchivedDoc
-            ).to.have.been.calledWith(projectId, docId, { lines, rev })
+            await DocArchiveManager.unarchiveDoc(projectId, docId)
+            expect(MongoManager.restoreArchivedDoc).to.have.been.calledWith(
+              projectId,
+              docId,
+              { lines, rev }
+            )
           })
         })
 
@@ -385,14 +388,16 @@ describe('DocArchiveManager', function () {
           })
 
           it('should return the doc lines and ranges', async function () {
-            await DocArchiveManager.promises.unarchiveDoc(projectId, docId)
-            expect(
-              MongoManager.promises.restoreArchivedDoc
-            ).to.have.been.calledWith(projectId, docId, {
-              lines,
-              ranges: { mongo: 'ranges' },
-              rev: 456,
-            })
+            await DocArchiveManager.unarchiveDoc(projectId, docId)
+            expect(MongoManager.restoreArchivedDoc).to.have.been.calledWith(
+              projectId,
+              docId,
+              {
+                lines,
+                ranges: { mongo: 'ranges' },
+                rev: 456,
+              }
+            )
           })
         })
 
@@ -406,10 +411,12 @@ describe('DocArchiveManager', function () {
           })
 
           it('should return only the doc lines', async function () {
-            await DocArchiveManager.promises.unarchiveDoc(projectId, docId)
-            expect(
-              MongoManager.promises.restoreArchivedDoc
-            ).to.have.been.calledWith(projectId, docId, { lines, rev: 456 })
+            await DocArchiveManager.unarchiveDoc(projectId, docId)
+            expect(MongoManager.restoreArchivedDoc).to.have.been.calledWith(
+              projectId,
+              docId,
+              { lines, rev: 456 }
+            )
           })
         })
 
@@ -423,10 +430,12 @@ describe('DocArchiveManager', function () {
           })
 
           it('should use the rev obtained from Mongo', async function () {
-            await DocArchiveManager.promises.unarchiveDoc(projectId, docId)
-            expect(
-              MongoManager.promises.restoreArchivedDoc
-            ).to.have.been.calledWith(projectId, docId, { lines, rev })
+            await DocArchiveManager.unarchiveDoc(projectId, docId)
+            expect(MongoManager.restoreArchivedDoc).to.have.been.calledWith(
+              projectId,
+              docId,
+              { lines, rev }
+            )
           })
         })
 
@@ -441,7 +450,7 @@ describe('DocArchiveManager', function () {
 
           it('should throw an error', async function () {
             await expect(
-              DocArchiveManager.promises.unarchiveDoc(projectId, docId)
+              DocArchiveManager.unarchiveDoc(projectId, docId)
             ).to.eventually.be.rejectedWith(
               "I don't understand the doc format in s3"
             )
@@ -451,8 +460,8 @@ describe('DocArchiveManager', function () {
     })
 
     it('should not do anything if the file is already unarchived', async function () {
-      MongoManager.promises.findDoc.resolves({ inS3: false })
-      await DocArchiveManager.promises.unarchiveDoc(projectId, docId)
+      MongoManager.findDoc.resolves({ inS3: false })
+      await DocArchiveManager.unarchiveDoc(projectId, docId)
       expect(PersistorManager.getObjectStream).not.to.have.been.called
     })
 
@@ -461,7 +470,7 @@ describe('DocArchiveManager', function () {
         .stub()
         .rejects(new Errors.NotFoundError())
       await expect(
-        DocArchiveManager.promises.unarchiveDoc(projectId, docId)
+        DocArchiveManager.unarchiveDoc(projectId, docId)
       ).to.eventually.be.rejected.and.be.instanceof(Errors.NotFoundError)
     })
   })
@@ -469,13 +478,11 @@ describe('DocArchiveManager', function () {
   describe('destroyProject', function () {
     describe('when archiving is enabled', function () {
       beforeEach(async function () {
-        await DocArchiveManager.promises.destroyProject(projectId)
+        await DocArchiveManager.destroyProject(projectId)
       })
 
       it('should delete the project in Mongo', function () {
-        expect(MongoManager.promises.destroyProject).to.have.been.calledWith(
-          projectId
-        )
+        expect(MongoManager.destroyProject).to.have.been.calledWith(projectId)
       })
 
       it('should delete the project in the persistor', function () {
@@ -489,13 +496,11 @@ describe('DocArchiveManager', function () {
     describe('when archiving is disabled', function () {
       beforeEach(async function () {
         Settings.docstore.backend = ''
-        await DocArchiveManager.promises.destroyProject(projectId)
+        await DocArchiveManager.destroyProject(projectId)
       })
 
       it('should delete the project in Mongo', function () {
-        expect(MongoManager.promises.destroyProject).to.have.been.calledWith(
-          projectId
-        )
+        expect(MongoManager.destroyProject).to.have.been.calledWith(projectId)
       })
 
       it('should not delete the project in the persistor', function () {
@@ -506,33 +511,35 @@ describe('DocArchiveManager', function () {
 
   describe('archiveAllDocs', function () {
     it('should resolve with valid arguments', async function () {
-      await expect(DocArchiveManager.promises.archiveAllDocs(projectId)).to
-        .eventually.be.fulfilled
+      await expect(DocArchiveManager.archiveAllDocs(projectId)).to.eventually.be
+        .fulfilled
     })
 
     it('should archive all project docs which are not in s3', async function () {
-      await DocArchiveManager.promises.archiveAllDocs(projectId)
+      await DocArchiveManager.archiveAllDocs(projectId)
       // not inS3
-      expect(MongoManager.promises.markDocAsArchived).to.have.been.calledWith(
+      expect(MongoManager.markDocAsArchived).to.have.been.calledWith(
         projectId,
         mongoDocs[0]._id
       )
-      expect(MongoManager.promises.markDocAsArchived).to.have.been.calledWith(
+      expect(MongoManager.markDocAsArchived).to.have.been.calledWith(
         projectId,
         mongoDocs[1]._id
       )
-      expect(MongoManager.promises.markDocAsArchived).to.have.been.calledWith(
+      expect(MongoManager.markDocAsArchived).to.have.been.calledWith(
         projectId,
         mongoDocs[4]._id
       )
 
       // inS3
-      expect(
-        MongoManager.promises.markDocAsArchived
-      ).not.to.have.been.calledWith(projectId, mongoDocs[2]._id)
-      expect(
-        MongoManager.promises.markDocAsArchived
-      ).not.to.have.been.calledWith(projectId, mongoDocs[3]._id)
+      expect(MongoManager.markDocAsArchived).not.to.have.been.calledWith(
+        projectId,
+        mongoDocs[2]._id
+      )
+      expect(MongoManager.markDocAsArchived).not.to.have.been.calledWith(
+        projectId,
+        mongoDocs[3]._id
+      )
     })
 
     describe('when archiving is not configured', function () {
@@ -541,21 +548,20 @@ describe('DocArchiveManager', function () {
       })
 
       it('should bail out early', async function () {
-        await DocArchiveManager.promises.archiveDoc(projectId, mongoDocs[0]._id)
-        expect(MongoManager.promises.getNonArchivedProjectDocIds).to.not.have
-          .been.called
+        await DocArchiveManager.archiveDoc(projectId, mongoDocs[0]._id)
+        expect(MongoManager.getNonArchivedProjectDocIds).to.not.have.been.called
       })
     })
   })
 
   describe('unArchiveAllDocs', function () {
     it('should resolve with valid arguments', async function () {
-      await expect(DocArchiveManager.promises.unArchiveAllDocs(projectId)).to
-        .eventually.be.fulfilled
+      await expect(DocArchiveManager.unArchiveAllDocs(projectId)).to.eventually
+        .be.fulfilled
     })
 
     it('should unarchive all inS3 docs', async function () {
-      await DocArchiveManager.promises.unArchiveAllDocs(projectId)
+      await DocArchiveManager.unArchiveAllDocs(projectId)
 
       for (const doc of archivedDocs) {
         expect(PersistorManager.getObjectStream).to.have.been.calledWith(
@@ -571,9 +577,9 @@ describe('DocArchiveManager', function () {
       })
 
       it('should bail out early', async function () {
-        await DocArchiveManager.promises.archiveDoc(projectId, mongoDocs[0]._id)
-        expect(MongoManager.promises.getNonDeletedArchivedProjectDocs).to.not
-          .have.been.called
+        await DocArchiveManager.archiveDoc(projectId, mongoDocs[0]._id)
+        expect(MongoManager.getNonDeletedArchivedProjectDocs).to.not.have.been
+          .called
       })
     })
   })
diff --git a/services/docstore/test/unit/js/DocManagerTests.js b/services/docstore/test/unit/js/DocManagerTests.js
index 8405520e6e..67a2f26547 100644
--- a/services/docstore/test/unit/js/DocManagerTests.js
+++ b/services/docstore/test/unit/js/DocManagerTests.js
@@ -17,25 +17,22 @@ describe('DocManager', function () {
     this.version = 42
 
     this.MongoManager = {
-      promises: {
-        findDoc: sinon.stub(),
-        getProjectsDocs: sinon.stub(),
-        patchDoc: sinon.stub().resolves(),
-        upsertIntoDocCollection: sinon.stub().resolves(),
-      },
+      findDoc: sinon.stub(),
+      getProjectsDocs: sinon.stub(),
+      patchDoc: sinon.stub().resolves(),
+      upsertIntoDocCollection: sinon.stub().resolves(),
     }
     this.DocArchiveManager = {
-      promises: {
-        unarchiveDoc: sinon.stub(),
-        unArchiveAllDocs: sinon.stub(),
-        archiveDoc: sinon.stub().resolves(),
-      },
+      unarchiveDoc: sinon.stub(),
+      unArchiveAllDocs: sinon.stub(),
+      archiveDoc: sinon.stub().resolves(),
     }
     this.RangeManager = {
       jsonRangesToMongo(r) {
         return r
       },
       shouldUpdateRanges: sinon.stub().returns(false),
+      fixCommentIds: sinon.stub(),
     }
     this.settings = { docstore: {} }
 
@@ -52,7 +49,7 @@ describe('DocManager', function () {
 
   describe('getFullDoc', function () {
     beforeEach(function () {
-      this.DocManager.promises._getDoc = sinon.stub()
+      this.DocManager._getDoc = sinon.stub()
       this.doc = {
         _id: this.doc_id,
         lines: ['2134'],
@@ -60,13 +57,10 @@ describe('DocManager', function () {
     })
 
     it('should call get doc with a quick filter', async function () {
-      this.DocManager.promises._getDoc.resolves(this.doc)
-      const doc = await this.DocManager.promises.getFullDoc(
-        this.project_id,
-        this.doc_id
-      )
+      this.DocManager._getDoc.resolves(this.doc)
+      const doc = await this.DocManager.getFullDoc(this.project_id, this.doc_id)
       doc.should.equal(this.doc)
-      this.DocManager.promises._getDoc
+      this.DocManager._getDoc
         .calledWith(this.project_id, this.doc_id, {
           lines: true,
           rev: true,
@@ -79,27 +73,27 @@ describe('DocManager', function () {
     })
 
     it('should return error when get doc errors', async function () {
-      this.DocManager.promises._getDoc.rejects(this.stubbedError)
+      this.DocManager._getDoc.rejects(this.stubbedError)
       await expect(
-        this.DocManager.promises.getFullDoc(this.project_id, this.doc_id)
+        this.DocManager.getFullDoc(this.project_id, this.doc_id)
       ).to.be.rejectedWith(this.stubbedError)
     })
   })
 
   describe('getRawDoc', function () {
     beforeEach(function () {
-      this.DocManager.promises._getDoc = sinon.stub()
+      this.DocManager._getDoc = sinon.stub()
       this.doc = { lines: ['2134'] }
     })
 
     it('should call get doc with a quick filter', async function () {
-      this.DocManager.promises._getDoc.resolves(this.doc)
-      const doc = await this.DocManager.promises.getDocLines(
+      this.DocManager._getDoc.resolves(this.doc)
+      const content = await this.DocManager.getDocLines(
         this.project_id,
         this.doc_id
       )
-      doc.should.equal(this.doc)
-      this.DocManager.promises._getDoc
+      content.should.equal(this.doc.lines.join('\n'))
+      this.DocManager._getDoc
         .calledWith(this.project_id, this.doc_id, {
           lines: true,
           inS3: true,
@@ -108,11 +102,46 @@ describe('DocManager', function () {
     })
 
     it('should return error when get doc errors', async function () {
-      this.DocManager.promises._getDoc.rejects(this.stubbedError)
+      this.DocManager._getDoc.rejects(this.stubbedError)
       await expect(
-        this.DocManager.promises.getDocLines(this.project_id, this.doc_id)
+        this.DocManager.getDocLines(this.project_id, this.doc_id)
       ).to.be.rejectedWith(this.stubbedError)
     })
+
+    it('should return error when get doc does not exist', async function () {
+      this.DocManager._getDoc.resolves(null)
+      await expect(
+        this.DocManager.getDocLines(this.project_id, this.doc_id)
+      ).to.be.rejectedWith(Errors.NotFoundError)
+    })
+
+    it('should return error when get doc has no lines', async function () {
+      this.DocManager._getDoc.resolves({})
+      await expect(
+        this.DocManager.getDocLines(this.project_id, this.doc_id)
+      ).to.be.rejectedWith(Errors.DocWithoutLinesError)
+    })
+  })
+
+  describe('_getDoc', function () {
+    it('should return error when get doc does not exist', async function () {
+      this.MongoManager.findDoc.resolves(null)
+      await expect(
+        this.DocManager._getDoc(this.project_id, this.doc_id, { inS3: true })
+      ).to.be.rejectedWith(Errors.NotFoundError)
+    })
+
+    it('should fix comment ids', async function () {
+      this.MongoManager.findDoc.resolves({
+        _id: this.doc_id,
+        ranges: {},
+      })
+      await this.DocManager._getDoc(this.project_id, this.doc_id, {
+        inS3: true,
+        ranges: true,
+      })
+      expect(this.RangeManager.fixCommentIds).to.have.been.called
+    })
   })
 
   describe('getDoc', function () {
@@ -128,26 +157,25 @@ describe('DocManager', function () {
 
     describe('when using a filter', function () {
       beforeEach(function () {
-        this.MongoManager.promises.findDoc.resolves(this.doc)
+        this.MongoManager.findDoc.resolves(this.doc)
       })
 
       it('should error if inS3 is not set to true', async function () {
         await expect(
-          this.DocManager.promises._getDoc(this.project_id, this.doc_id, {
+          this.DocManager._getDoc(this.project_id, this.doc_id, {
             inS3: false,
           })
         ).to.be.rejected
       })
 
       it('should always get inS3 even when no filter is passed', async function () {
-        await expect(
-          this.DocManager.promises._getDoc(this.project_id, this.doc_id)
-        ).to.be.rejected
-        this.MongoManager.promises.findDoc.called.should.equal(false)
+        await expect(this.DocManager._getDoc(this.project_id, this.doc_id)).to
+          .be.rejected
+        this.MongoManager.findDoc.called.should.equal(false)
       })
 
       it('should not error if inS3 is set to true', async function () {
-        await this.DocManager.promises._getDoc(this.project_id, this.doc_id, {
+        await this.DocManager._getDoc(this.project_id, this.doc_id, {
           inS3: true,
         })
       })
@@ -155,8 +183,8 @@ describe('DocManager', function () {
 
     describe('when the doc is in the doc collection', function () {
       beforeEach(async function () {
-        this.MongoManager.promises.findDoc.resolves(this.doc)
-        this.result = await this.DocManager.promises._getDoc(
+        this.MongoManager.findDoc.resolves(this.doc)
+        this.result = await this.DocManager._getDoc(
           this.project_id,
           this.doc_id,
           { version: true, inS3: true }
@@ -164,7 +192,7 @@ describe('DocManager', function () {
       })
 
       it('should get the doc from the doc collection', function () {
-        this.MongoManager.promises.findDoc
+        this.MongoManager.findDoc
           .calledWith(this.project_id, this.doc_id)
           .should.equal(true)
       })
@@ -177,9 +205,9 @@ describe('DocManager', function () {
 
     describe('when MongoManager.findDoc errors', function () {
       it('should return the error', async function () {
-        this.MongoManager.promises.findDoc.rejects(this.stubbedError)
+        this.MongoManager.findDoc.rejects(this.stubbedError)
         await expect(
-          this.DocManager.promises._getDoc(this.project_id, this.doc_id, {
+          this.DocManager._getDoc(this.project_id, this.doc_id, {
             version: true,
             inS3: true,
           })
@@ -202,15 +230,15 @@ describe('DocManager', function () {
           version: 2,
           inS3: false,
         }
-        this.MongoManager.promises.findDoc.resolves(this.doc)
-        this.DocArchiveManager.promises.unarchiveDoc.callsFake(
+        this.MongoManager.findDoc.resolves(this.doc)
+        this.DocArchiveManager.unarchiveDoc.callsFake(
           async (projectId, docId) => {
-            this.MongoManager.promises.findDoc.resolves({
+            this.MongoManager.findDoc.resolves({
               ...this.unarchivedDoc,
             })
           }
         )
-        this.result = await this.DocManager.promises._getDoc(
+        this.result = await this.DocManager._getDoc(
           this.project_id,
           this.doc_id,
           {
@@ -221,13 +249,13 @@ describe('DocManager', function () {
       })
 
       it('should call the DocArchive to unarchive the doc', function () {
-        this.DocArchiveManager.promises.unarchiveDoc
+        this.DocArchiveManager.unarchiveDoc
           .calledWith(this.project_id, this.doc_id)
           .should.equal(true)
       })
 
       it('should look up the doc twice', function () {
-        this.MongoManager.promises.findDoc.calledTwice.should.equal(true)
+        this.MongoManager.findDoc.calledTwice.should.equal(true)
       })
 
       it('should return the doc', function () {
@@ -239,9 +267,9 @@ describe('DocManager', function () {
 
     describe('when the doc does not exist in the docs collection', function () {
       it('should return a NotFoundError', async function () {
-        this.MongoManager.promises.findDoc.resolves(null)
+        this.MongoManager.findDoc.resolves(null)
         await expect(
-          this.DocManager.promises._getDoc(this.project_id, this.doc_id, {
+          this.DocManager._getDoc(this.project_id, this.doc_id, {
             version: true,
             inS3: true,
           })
@@ -262,23 +290,27 @@ describe('DocManager', function () {
             lines: ['mock-lines'],
           },
         ]
-        this.MongoManager.promises.getProjectsDocs.resolves(this.docs)
-        this.DocArchiveManager.promises.unArchiveAllDocs.resolves(this.docs)
-        this.filter = { lines: true }
-        this.result = await this.DocManager.promises.getAllNonDeletedDocs(
+        this.MongoManager.getProjectsDocs.resolves(this.docs)
+        this.DocArchiveManager.unArchiveAllDocs.resolves(this.docs)
+        this.filter = { lines: true, ranges: true }
+        this.result = await this.DocManager.getAllNonDeletedDocs(
           this.project_id,
           this.filter
         )
       })
 
       it('should get the project from the database', function () {
-        this.MongoManager.promises.getProjectsDocs.should.have.been.calledWith(
+        this.MongoManager.getProjectsDocs.should.have.been.calledWith(
           this.project_id,
           { include_deleted: false },
           this.filter
         )
       })
 
+      it('should fix comment ids', async function () {
+        expect(this.RangeManager.fixCommentIds).to.have.been.called
+      })
+
       it('should return the docs', function () {
         expect(this.result).to.deep.equal(this.docs)
       })
@@ -286,13 +318,10 @@ describe('DocManager', function () {
 
     describe('when there are no docs for the project', function () {
       it('should return a NotFoundError', async function () {
-        this.MongoManager.promises.getProjectsDocs.resolves(null)
-        this.DocArchiveManager.promises.unArchiveAllDocs.resolves(null)
+        this.MongoManager.getProjectsDocs.resolves(null)
+        this.DocArchiveManager.unArchiveAllDocs.resolves(null)
         await expect(
-          this.DocManager.promises.getAllNonDeletedDocs(
-            this.project_id,
-            this.filter
-          )
+          this.DocManager.getAllNonDeletedDocs(this.project_id, this.filter)
         ).to.be.rejectedWith(`No docs for project ${this.project_id}`)
       })
     })
@@ -303,7 +332,7 @@ describe('DocManager', function () {
       beforeEach(function () {
         this.lines = ['mock', 'doc', 'lines']
         this.rev = 77
-        this.MongoManager.promises.findDoc.resolves({
+        this.MongoManager.findDoc.resolves({
           _id: new ObjectId(this.doc_id),
         })
         this.meta = {}
@@ -311,7 +340,7 @@ describe('DocManager', function () {
 
       describe('standard path', function () {
         beforeEach(async function () {
-          await this.DocManager.promises.patchDoc(
+          await this.DocManager.patchDoc(
             this.project_id,
             this.doc_id,
             this.meta
@@ -319,14 +348,14 @@ describe('DocManager', function () {
         })
 
         it('should get the doc', function () {
-          expect(this.MongoManager.promises.findDoc).to.have.been.calledWith(
+          expect(this.MongoManager.findDoc).to.have.been.calledWith(
             this.project_id,
             this.doc_id
           )
         })
 
         it('should persist the meta', function () {
-          expect(this.MongoManager.promises.patchDoc).to.have.been.calledWith(
+          expect(this.MongoManager.patchDoc).to.have.been.calledWith(
             this.project_id,
             this.doc_id,
             this.meta
@@ -339,7 +368,7 @@ describe('DocManager', function () {
           this.settings.docstore.archiveOnSoftDelete = false
           this.meta.deleted = true
 
-          await this.DocManager.promises.patchDoc(
+          await this.DocManager.patchDoc(
             this.project_id,
             this.doc_id,
             this.meta
@@ -347,8 +376,7 @@ describe('DocManager', function () {
         })
 
         it('should not flush the doc out of mongo', function () {
-          expect(this.DocArchiveManager.promises.archiveDoc).to.not.have.been
-            .called
+          expect(this.DocArchiveManager.archiveDoc).to.not.have.been.called
         })
       })
 
@@ -356,7 +384,7 @@ describe('DocManager', function () {
         beforeEach(async function () {
           this.settings.docstore.archiveOnSoftDelete = false
           this.meta.deleted = false
-          await this.DocManager.promises.patchDoc(
+          await this.DocManager.patchDoc(
             this.project_id,
             this.doc_id,
             this.meta
@@ -364,8 +392,7 @@ describe('DocManager', function () {
         })
 
         it('should not flush the doc out of mongo', function () {
-          expect(this.DocArchiveManager.promises.archiveDoc).to.not.have.been
-            .called
+          expect(this.DocArchiveManager.archiveDoc).to.not.have.been.called
         })
       })
 
@@ -377,7 +404,7 @@ describe('DocManager', function () {
 
         describe('when the background flush succeeds', function () {
           beforeEach(async function () {
-            await this.DocManager.promises.patchDoc(
+            await this.DocManager.patchDoc(
               this.project_id,
               this.doc_id,
               this.meta
@@ -389,17 +416,18 @@ describe('DocManager', function () {
           })
 
           it('should flush the doc out of mongo', function () {
-            expect(
-              this.DocArchiveManager.promises.archiveDoc
-            ).to.have.been.calledWith(this.project_id, this.doc_id)
+            expect(this.DocArchiveManager.archiveDoc).to.have.been.calledWith(
+              this.project_id,
+              this.doc_id
+            )
           })
         })
 
         describe('when the background flush fails', function () {
           beforeEach(async function () {
             this.err = new Error('foo')
-            this.DocArchiveManager.promises.archiveDoc.rejects(this.err)
-            await this.DocManager.promises.patchDoc(
+            this.DocArchiveManager.archiveDoc.rejects(this.err)
+            await this.DocManager.patchDoc(
               this.project_id,
               this.doc_id,
               this.meta
@@ -422,9 +450,9 @@ describe('DocManager', function () {
 
     describe('when the doc does not exist', function () {
       it('should return a NotFoundError', async function () {
-        this.MongoManager.promises.findDoc.resolves(null)
+        this.MongoManager.findDoc.resolves(null)
         await expect(
-          this.DocManager.promises.patchDoc(this.project_id, this.doc_id, {})
+          this.DocManager.patchDoc(this.project_id, this.doc_id, {})
         ).to.be.rejectedWith(
           `No such project/doc to delete: ${this.project_id}/${this.doc_id}`
         )
@@ -470,13 +498,13 @@ describe('DocManager', function () {
         ranges: this.originalRanges,
       }
 
-      this.DocManager.promises._getDoc = sinon.stub()
+      this.DocManager._getDoc = sinon.stub()
     })
 
     describe('when only the doc lines have changed', function () {
       beforeEach(async function () {
-        this.DocManager.promises._getDoc = sinon.stub().resolves(this.doc)
-        this.result = await this.DocManager.promises.updateDoc(
+        this.DocManager._getDoc = sinon.stub().resolves(this.doc)
+        this.result = await this.DocManager.updateDoc(
           this.project_id,
           this.doc_id,
           this.newDocLines,
@@ -486,7 +514,7 @@ describe('DocManager', function () {
       })
 
       it('should get the existing doc', function () {
-        this.DocManager.promises._getDoc
+        this.DocManager._getDoc
           .calledWith(this.project_id, this.doc_id, {
             version: true,
             rev: true,
@@ -498,7 +526,7 @@ describe('DocManager', function () {
       })
 
       it('should upsert the document to the doc collection', function () {
-        this.MongoManager.promises.upsertIntoDocCollection
+        this.MongoManager.upsertIntoDocCollection
           .calledWith(this.project_id, this.doc_id, this.rev, {
             lines: this.newDocLines,
           })
@@ -512,9 +540,9 @@ describe('DocManager', function () {
 
     describe('when the doc ranges have changed', function () {
       beforeEach(async function () {
-        this.DocManager.promises._getDoc = sinon.stub().resolves(this.doc)
+        this.DocManager._getDoc = sinon.stub().resolves(this.doc)
         this.RangeManager.shouldUpdateRanges.returns(true)
-        this.result = await this.DocManager.promises.updateDoc(
+        this.result = await this.DocManager.updateDoc(
           this.project_id,
           this.doc_id,
           this.oldDocLines,
@@ -524,7 +552,7 @@ describe('DocManager', function () {
       })
 
       it('should upsert the ranges', function () {
-        this.MongoManager.promises.upsertIntoDocCollection
+        this.MongoManager.upsertIntoDocCollection
           .calledWith(this.project_id, this.doc_id, this.rev, {
             ranges: this.newRanges,
           })
@@ -538,8 +566,8 @@ describe('DocManager', function () {
 
     describe('when only the version has changed', function () {
       beforeEach(async function () {
-        this.DocManager.promises._getDoc = sinon.stub().resolves(this.doc)
-        this.result = await this.DocManager.promises.updateDoc(
+        this.DocManager._getDoc = sinon.stub().resolves(this.doc)
+        this.result = await this.DocManager.updateDoc(
           this.project_id,
           this.doc_id,
           this.oldDocLines,
@@ -549,7 +577,7 @@ describe('DocManager', function () {
       })
 
       it('should update the version', function () {
-        this.MongoManager.promises.upsertIntoDocCollection.should.have.been.calledWith(
+        this.MongoManager.upsertIntoDocCollection.should.have.been.calledWith(
           this.project_id,
           this.doc_id,
           this.rev,
@@ -564,8 +592,8 @@ describe('DocManager', function () {
 
     describe('when the doc has not changed at all', function () {
       beforeEach(async function () {
-        this.DocManager.promises._getDoc = sinon.stub().resolves(this.doc)
-        this.result = await this.DocManager.promises.updateDoc(
+        this.DocManager._getDoc = sinon.stub().resolves(this.doc)
+        this.result = await this.DocManager.updateDoc(
           this.project_id,
           this.doc_id,
           this.oldDocLines,
@@ -575,9 +603,7 @@ describe('DocManager', function () {
       })
 
       it('should not update the ranges or lines or version', function () {
-        this.MongoManager.promises.upsertIntoDocCollection.called.should.equal(
-          false
-        )
+        this.MongoManager.upsertIntoDocCollection.called.should.equal(false)
       })
 
       it('should return the old rev and modified == false', function () {
@@ -588,7 +614,7 @@ describe('DocManager', function () {
     describe('when the version is null', function () {
       it('should return an error', async function () {
         await expect(
-          this.DocManager.promises.updateDoc(
+          this.DocManager.updateDoc(
             this.project_id,
             this.doc_id,
             this.newDocLines,
@@ -602,7 +628,7 @@ describe('DocManager', function () {
     describe('when the lines are null', function () {
       it('should return an error', async function () {
         await expect(
-          this.DocManager.promises.updateDoc(
+          this.DocManager.updateDoc(
             this.project_id,
             this.doc_id,
             null,
@@ -616,7 +642,7 @@ describe('DocManager', function () {
     describe('when the ranges are null', function () {
       it('should return an error', async function () {
         await expect(
-          this.DocManager.promises.updateDoc(
+          this.DocManager.updateDoc(
             this.project_id,
             this.doc_id,
             this.newDocLines,
@@ -630,9 +656,9 @@ describe('DocManager', function () {
     describe('when there is a generic error getting the doc', function () {
       beforeEach(async function () {
         this.error = new Error('doc could not be found')
-        this.DocManager.promises._getDoc = sinon.stub().rejects(this.error)
+        this.DocManager._getDoc = sinon.stub().rejects(this.error)
         await expect(
-          this.DocManager.promises.updateDoc(
+          this.DocManager.updateDoc(
             this.project_id,
             this.doc_id,
             this.newDocLines,
@@ -643,16 +669,15 @@ describe('DocManager', function () {
       })
 
       it('should not upsert the document to the doc collection', function () {
-        this.MongoManager.promises.upsertIntoDocCollection.should.not.have.been
-          .called
+        this.MongoManager.upsertIntoDocCollection.should.not.have.been.called
       })
     })
 
     describe('when the version was decremented', function () {
       it('should return an error', async function () {
-        this.DocManager.promises._getDoc = sinon.stub().resolves(this.doc)
+        this.DocManager._getDoc = sinon.stub().resolves(this.doc)
         await expect(
-          this.DocManager.promises.updateDoc(
+          this.DocManager.updateDoc(
             this.project_id,
             this.doc_id,
             this.newDocLines,
@@ -665,8 +690,8 @@ describe('DocManager', function () {
 
     describe('when the doc lines have not changed', function () {
       beforeEach(async function () {
-        this.DocManager.promises._getDoc = sinon.stub().resolves(this.doc)
-        this.result = await this.DocManager.promises.updateDoc(
+        this.DocManager._getDoc = sinon.stub().resolves(this.doc)
+        this.result = await this.DocManager.updateDoc(
           this.project_id,
           this.doc_id,
           this.oldDocLines.slice(),
@@ -676,9 +701,7 @@ describe('DocManager', function () {
       })
 
       it('should not update the doc', function () {
-        this.MongoManager.promises.upsertIntoDocCollection.called.should.equal(
-          false
-        )
+        this.MongoManager.upsertIntoDocCollection.called.should.equal(false)
       })
 
       it('should return the existing rev', function () {
@@ -688,8 +711,8 @@ describe('DocManager', function () {
 
     describe('when the doc does not exist', function () {
       beforeEach(async function () {
-        this.DocManager.promises._getDoc = sinon.stub().resolves(null)
-        this.result = await this.DocManager.promises.updateDoc(
+        this.DocManager._getDoc = sinon.stub().resolves(null)
+        this.result = await this.DocManager.updateDoc(
           this.project_id,
           this.doc_id,
           this.newDocLines,
@@ -699,7 +722,7 @@ describe('DocManager', function () {
       })
 
       it('should upsert the document to the doc collection', function () {
-        this.MongoManager.promises.upsertIntoDocCollection.should.have.been.calledWith(
+        this.MongoManager.upsertIntoDocCollection.should.have.been.calledWith(
           this.project_id,
           this.doc_id,
           undefined,
@@ -718,12 +741,12 @@ describe('DocManager', function () {
 
     describe('when another update is racing', function () {
       beforeEach(async function () {
-        this.DocManager.promises._getDoc = sinon.stub().resolves(this.doc)
-        this.MongoManager.promises.upsertIntoDocCollection
+        this.DocManager._getDoc = sinon.stub().resolves(this.doc)
+        this.MongoManager.upsertIntoDocCollection
           .onFirstCall()
           .rejects(new Errors.DocRevValueError())
         this.RangeManager.shouldUpdateRanges.returns(true)
-        this.result = await this.DocManager.promises.updateDoc(
+        this.result = await this.DocManager.updateDoc(
           this.project_id,
           this.doc_id,
           this.newDocLines,
@@ -733,7 +756,7 @@ describe('DocManager', function () {
       })
 
       it('should upsert the doc twice', function () {
-        this.MongoManager.promises.upsertIntoDocCollection.should.have.been.calledWith(
+        this.MongoManager.upsertIntoDocCollection.should.have.been.calledWith(
           this.project_id,
           this.doc_id,
           this.rev,
@@ -743,8 +766,7 @@ describe('DocManager', function () {
             version: this.version + 1,
           }
         )
-        this.MongoManager.promises.upsertIntoDocCollection.should.have.been
-          .calledTwice
+        this.MongoManager.upsertIntoDocCollection.should.have.been.calledTwice
       })
 
       it('should return the new rev', function () {
diff --git a/services/docstore/test/unit/js/HttpControllerTests.js b/services/docstore/test/unit/js/HttpControllerTests.js
index bf78696890..ab491ec150 100644
--- a/services/docstore/test/unit/js/HttpControllerTests.js
+++ b/services/docstore/test/unit/js/HttpControllerTests.js
@@ -14,7 +14,7 @@ describe('HttpController', function () {
       max_doc_length: 2 * 1024 * 1024,
     }
     this.DocArchiveManager = {
-      unArchiveAllDocs: sinon.stub().yields(),
+      unArchiveAllDocs: sinon.stub().returns(),
     }
     this.DocManager = {}
     this.HttpController = SandboxedModule.require(modulePath, {
@@ -54,15 +54,13 @@ describe('HttpController', function () {
 
   describe('getDoc', function () {
     describe('without deleted docs', function () {
-      beforeEach(function () {
+      beforeEach(async function () {
         this.req.params = {
           project_id: this.projectId,
           doc_id: this.docId,
         }
-        this.DocManager.getFullDoc = sinon
-          .stub()
-          .callsArgWith(2, null, this.doc)
-        this.HttpController.getDoc(this.req, this.res, this.next)
+        this.DocManager.getFullDoc = sinon.stub().resolves(this.doc)
+        await this.HttpController.getDoc(this.req, this.res, this.next)
       })
 
       it('should get the document with the version (including deleted)', function () {
@@ -89,26 +87,24 @@ describe('HttpController', function () {
           project_id: this.projectId,
           doc_id: this.docId,
         }
-        this.DocManager.getFullDoc = sinon
-          .stub()
-          .callsArgWith(2, null, this.deletedDoc)
+        this.DocManager.getFullDoc = sinon.stub().resolves(this.deletedDoc)
       })
 
-      it('should get the doc from the doc manager', function () {
-        this.HttpController.getDoc(this.req, this.res, this.next)
+      it('should get the doc from the doc manager', async function () {
+        await this.HttpController.getDoc(this.req, this.res, this.next)
         this.DocManager.getFullDoc
           .calledWith(this.projectId, this.docId)
           .should.equal(true)
       })
 
-      it('should return 404 if the query string delete is not set ', function () {
-        this.HttpController.getDoc(this.req, this.res, this.next)
+      it('should return 404 if the query string delete is not set ', async function () {
+        await this.HttpController.getDoc(this.req, this.res, this.next)
         this.res.sendStatus.calledWith(404).should.equal(true)
       })
 
-      it('should return the doc as JSON if include_deleted is set to true', function () {
+      it('should return the doc as JSON if include_deleted is set to true', async function () {
         this.req.query.include_deleted = 'true'
-        this.HttpController.getDoc(this.req, this.res, this.next)
+        await this.HttpController.getDoc(this.req, this.res, this.next)
         this.res.json
           .calledWith({
             _id: this.docId,
@@ -123,13 +119,15 @@ describe('HttpController', function () {
   })
 
   describe('getRawDoc', function () {
-    beforeEach(function () {
+    beforeEach(async function () {
       this.req.params = {
         project_id: this.projectId,
         doc_id: this.docId,
       }
-      this.DocManager.getDocLines = sinon.stub().callsArgWith(2, null, this.doc)
-      this.HttpController.getRawDoc(this.req, this.res, this.next)
+      this.DocManager.getDocLines = sinon
+        .stub()
+        .resolves(this.doc.lines.join('\n'))
+      await this.HttpController.getRawDoc(this.req, this.res, this.next)
     })
 
     it('should get the document without the version', function () {
@@ -154,7 +152,7 @@ describe('HttpController', function () {
 
   describe('getAllDocs', function () {
     describe('normally', function () {
-      beforeEach(function () {
+      beforeEach(async function () {
         this.req.params = { project_id: this.projectId }
         this.docs = [
           {
@@ -168,10 +166,8 @@ describe('HttpController', function () {
             rev: 4,
           },
         ]
-        this.DocManager.getAllNonDeletedDocs = sinon
-          .stub()
-          .callsArgWith(2, null, this.docs)
-        this.HttpController.getAllDocs(this.req, this.res, this.next)
+        this.DocManager.getAllNonDeletedDocs = sinon.stub().resolves(this.docs)
+        await this.HttpController.getAllDocs(this.req, this.res, this.next)
       })
 
       it('should get all the (non-deleted) docs', function () {
@@ -199,7 +195,7 @@ describe('HttpController', function () {
     })
 
     describe('with null lines', function () {
-      beforeEach(function () {
+      beforeEach(async function () {
         this.req.params = { project_id: this.projectId }
         this.docs = [
           {
@@ -213,10 +209,8 @@ describe('HttpController', function () {
             rev: 4,
           },
         ]
-        this.DocManager.getAllNonDeletedDocs = sinon
-          .stub()
-          .callsArgWith(2, null, this.docs)
-        this.HttpController.getAllDocs(this.req, this.res, this.next)
+        this.DocManager.getAllNonDeletedDocs = sinon.stub().resolves(this.docs)
+        await this.HttpController.getAllDocs(this.req, this.res, this.next)
       })
 
       it('should return the doc with fallback lines', function () {
@@ -238,7 +232,7 @@ describe('HttpController', function () {
     })
 
     describe('with a null doc', function () {
-      beforeEach(function () {
+      beforeEach(async function () {
         this.req.params = { project_id: this.projectId }
         this.docs = [
           {
@@ -253,10 +247,8 @@ describe('HttpController', function () {
             rev: 4,
           },
         ]
-        this.DocManager.getAllNonDeletedDocs = sinon
-          .stub()
-          .callsArgWith(2, null, this.docs)
-        this.HttpController.getAllDocs(this.req, this.res, this.next)
+        this.DocManager.getAllNonDeletedDocs = sinon.stub().resolves(this.docs)
+        await this.HttpController.getAllDocs(this.req, this.res, this.next)
       })
 
       it('should return the non null docs as JSON', function () {
@@ -292,7 +284,7 @@ describe('HttpController', function () {
 
   describe('getAllRanges', function () {
     describe('normally', function () {
-      beforeEach(function () {
+      beforeEach(async function () {
         this.req.params = { project_id: this.projectId }
         this.docs = [
           {
@@ -304,10 +296,8 @@ describe('HttpController', function () {
             ranges: { mock_ranges: 'two' },
           },
         ]
-        this.DocManager.getAllNonDeletedDocs = sinon
-          .stub()
-          .callsArgWith(2, null, this.docs)
-        this.HttpController.getAllRanges(this.req, this.res, this.next)
+        this.DocManager.getAllNonDeletedDocs = sinon.stub().resolves(this.docs)
+        await this.HttpController.getAllRanges(this.req, this.res, this.next)
       })
 
       it('should get all the (non-deleted) doc ranges', function () {
@@ -342,16 +332,17 @@ describe('HttpController', function () {
     })
 
     describe('when the doc lines exist and were updated', function () {
-      beforeEach(function () {
+      beforeEach(async function () {
         this.req.body = {
           lines: (this.lines = ['hello', 'world']),
           version: (this.version = 42),
           ranges: (this.ranges = { changes: 'mock' }),
         }
+        this.rev = 5
         this.DocManager.updateDoc = sinon
           .stub()
-          .yields(null, true, (this.rev = 5))
-        this.HttpController.updateDoc(this.req, this.res, this.next)
+          .resolves({ modified: true, rev: this.rev })
+        await this.HttpController.updateDoc(this.req, this.res, this.next)
       })
 
       it('should update the document', function () {
@@ -374,16 +365,17 @@ describe('HttpController', function () {
     })
 
     describe('when the doc lines exist and were not updated', function () {
-      beforeEach(function () {
+      beforeEach(async function () {
         this.req.body = {
           lines: (this.lines = ['hello', 'world']),
           version: (this.version = 42),
           ranges: {},
         }
+        this.rev = 5
         this.DocManager.updateDoc = sinon
           .stub()
-          .yields(null, false, (this.rev = 5))
-        this.HttpController.updateDoc(this.req, this.res, this.next)
+          .resolves({ modified: false, rev: this.rev })
+        await this.HttpController.updateDoc(this.req, this.res, this.next)
       })
 
       it('should return a modified status', function () {
@@ -394,10 +386,12 @@ describe('HttpController', function () {
     })
 
     describe('when the doc lines are not provided', function () {
-      beforeEach(function () {
+      beforeEach(async function () {
         this.req.body = { version: 42, ranges: {} }
-        this.DocManager.updateDoc = sinon.stub().yields(null, false)
-        this.HttpController.updateDoc(this.req, this.res, this.next)
+        this.DocManager.updateDoc = sinon
+          .stub()
+          .resolves({ modified: false, rev: 0 })
+        await this.HttpController.updateDoc(this.req, this.res, this.next)
       })
 
       it('should not update the document', function () {
@@ -410,10 +404,12 @@ describe('HttpController', function () {
     })
 
     describe('when the doc version are not provided', function () {
-      beforeEach(function () {
+      beforeEach(async function () {
         this.req.body = { version: 42, lines: ['hello world'] }
-        this.DocManager.updateDoc = sinon.stub().yields(null, false)
-        this.HttpController.updateDoc(this.req, this.res, this.next)
+        this.DocManager.updateDoc = sinon
+          .stub()
+          .resolves({ modified: false, rev: 0 })
+        await this.HttpController.updateDoc(this.req, this.res, this.next)
       })
 
       it('should not update the document', function () {
@@ -426,10 +422,12 @@ describe('HttpController', function () {
     })
 
     describe('when the doc ranges is not provided', function () {
-      beforeEach(function () {
+      beforeEach(async function () {
         this.req.body = { lines: ['foo'], version: 42 }
-        this.DocManager.updateDoc = sinon.stub().yields(null, false)
-        this.HttpController.updateDoc(this.req, this.res, this.next)
+        this.DocManager.updateDoc = sinon
+          .stub()
+          .resolves({ modified: false, rev: 0 })
+        await this.HttpController.updateDoc(this.req, this.res, this.next)
       })
 
       it('should not update the document', function () {
@@ -442,13 +440,20 @@ describe('HttpController', function () {
     })
 
     describe('when the doc body is too large', function () {
-      beforeEach(function () {
+      beforeEach(async function () {
         this.req.body = {
           lines: (this.lines = Array(2049).fill('a'.repeat(1024))),
           version: (this.version = 42),
           ranges: (this.ranges = { changes: 'mock' }),
         }
-        this.HttpController.updateDoc(this.req, this.res, this.next)
+        this.DocManager.updateDoc = sinon
+          .stub()
+          .resolves({ modified: false, rev: 0 })
+        await this.HttpController.updateDoc(this.req, this.res, this.next)
+      })
+
+      it('should not update the document', function () {
+        this.DocManager.updateDoc.called.should.equal(false)
       })
 
       it('should return a 413 (too large) response', function () {
@@ -462,14 +467,14 @@ describe('HttpController', function () {
   })
 
   describe('patchDoc', function () {
-    beforeEach(function () {
+    beforeEach(async function () {
       this.req.params = {
         project_id: this.projectId,
         doc_id: this.docId,
       }
       this.req.body = { name: 'foo.tex' }
-      this.DocManager.patchDoc = sinon.stub().yields(null)
-      this.HttpController.patchDoc(this.req, this.res, this.next)
+      this.DocManager.patchDoc = sinon.stub().resolves()
+      await this.HttpController.patchDoc(this.req, this.res, this.next)
     })
 
     it('should delete the document', function () {
@@ -484,11 +489,11 @@ describe('HttpController', function () {
     })
 
     describe('with an invalid payload', function () {
-      beforeEach(function () {
+      beforeEach(async function () {
         this.req.body = { cannot: 'happen' }
 
-        this.DocManager.patchDoc = sinon.stub().yields(null)
-        this.HttpController.patchDoc(this.req, this.res, this.next)
+        this.DocManager.patchDoc = sinon.stub().resolves()
+        await this.HttpController.patchDoc(this.req, this.res, this.next)
       })
 
       it('should log a message', function () {
@@ -509,10 +514,10 @@ describe('HttpController', function () {
   })
 
   describe('archiveAllDocs', function () {
-    beforeEach(function () {
+    beforeEach(async function () {
       this.req.params = { project_id: this.projectId }
-      this.DocArchiveManager.archiveAllDocs = sinon.stub().callsArg(1)
-      this.HttpController.archiveAllDocs(this.req, this.res, this.next)
+      this.DocArchiveManager.archiveAllDocs = sinon.stub().resolves()
+      await this.HttpController.archiveAllDocs(this.req, this.res, this.next)
     })
 
     it('should archive the project', function () {
@@ -532,9 +537,12 @@ describe('HttpController', function () {
     })
 
     describe('on success', function () {
-      beforeEach(function (done) {
-        this.res.sendStatus.callsFake(() => done())
-        this.HttpController.unArchiveAllDocs(this.req, this.res, this.next)
+      beforeEach(async function () {
+        await this.HttpController.unArchiveAllDocs(
+          this.req,
+          this.res,
+          this.next
+        )
       })
 
       it('returns a 200', function () {
@@ -543,12 +551,15 @@ describe('HttpController', function () {
     })
 
     describe("when the archived rev doesn't match", function () {
-      beforeEach(function (done) {
-        this.res.sendStatus.callsFake(() => done())
-        this.DocArchiveManager.unArchiveAllDocs.yields(
+      beforeEach(async function () {
+        this.DocArchiveManager.unArchiveAllDocs.rejects(
           new Errors.DocRevValueError('bad rev')
         )
-        this.HttpController.unArchiveAllDocs(this.req, this.res, this.next)
+        await this.HttpController.unArchiveAllDocs(
+          this.req,
+          this.res,
+          this.next
+        )
       })
 
       it('returns a 409', function () {
@@ -558,10 +569,10 @@ describe('HttpController', function () {
   })
 
   describe('destroyProject', function () {
-    beforeEach(function () {
+    beforeEach(async function () {
       this.req.params = { project_id: this.projectId }
-      this.DocArchiveManager.destroyProject = sinon.stub().callsArg(1)
-      this.HttpController.destroyProject(this.req, this.res, this.next)
+      this.DocArchiveManager.destroyProject = sinon.stub().resolves()
+      await this.HttpController.destroyProject(this.req, this.res, this.next)
     })
 
     it('should destroy the docs', function () {
diff --git a/services/docstore/test/unit/js/MongoManagerTests.js b/services/docstore/test/unit/js/MongoManagerTests.js
index 4f8467db76..b96b661df4 100644
--- a/services/docstore/test/unit/js/MongoManagerTests.js
+++ b/services/docstore/test/unit/js/MongoManagerTests.js
@@ -41,7 +41,7 @@ describe('MongoManager', function () {
       this.doc = { name: 'mock-doc' }
       this.db.docs.findOne = sinon.stub().resolves(this.doc)
       this.filter = { lines: true }
-      this.result = await this.MongoManager.promises.findDoc(
+      this.result = await this.MongoManager.findDoc(
         this.projectId,
         this.docId,
         this.filter
@@ -70,11 +70,7 @@ describe('MongoManager', function () {
   describe('patchDoc', function () {
     beforeEach(async function () {
       this.meta = { name: 'foo.tex' }
-      await this.MongoManager.promises.patchDoc(
-        this.projectId,
-        this.docId,
-        this.meta
-      )
+      await this.MongoManager.patchDoc(this.projectId, this.docId, this.meta)
     })
 
     it('should pass the parameter along', function () {
@@ -104,7 +100,7 @@ describe('MongoManager', function () {
 
     describe('with included_deleted = false', function () {
       beforeEach(async function () {
-        this.result = await this.MongoManager.promises.getProjectsDocs(
+        this.result = await this.MongoManager.getProjectsDocs(
           this.projectId,
           { include_deleted: false },
           this.filter
@@ -132,7 +128,7 @@ describe('MongoManager', function () {
 
     describe('with included_deleted = true', function () {
       beforeEach(async function () {
-        this.result = await this.MongoManager.promises.getProjectsDocs(
+        this.result = await this.MongoManager.getProjectsDocs(
           this.projectId,
           { include_deleted: true },
           this.filter
@@ -167,7 +163,7 @@ describe('MongoManager', function () {
       this.db.docs.find = sinon.stub().returns({
         toArray: sinon.stub().resolves([this.doc1, this.doc2, this.doc3]),
       })
-      this.result = await this.MongoManager.promises.getProjectsDeletedDocs(
+      this.result = await this.MongoManager.getProjectsDeletedDocs(
         this.projectId,
         this.filter
       )
@@ -203,7 +199,7 @@ describe('MongoManager', function () {
     })
 
     it('should upsert the document', async function () {
-      await this.MongoManager.promises.upsertIntoDocCollection(
+      await this.MongoManager.upsertIntoDocCollection(
         this.projectId,
         this.docId,
         this.oldRev,
@@ -223,7 +219,7 @@ describe('MongoManager', function () {
     it('should handle update error', async function () {
       this.db.docs.updateOne.rejects(this.stubbedErr)
       await expect(
-        this.MongoManager.promises.upsertIntoDocCollection(
+        this.MongoManager.upsertIntoDocCollection(
           this.projectId,
           this.docId,
           this.rev,
@@ -235,7 +231,7 @@ describe('MongoManager', function () {
     })
 
     it('should insert without a previous rev', async function () {
-      await this.MongoManager.promises.upsertIntoDocCollection(
+      await this.MongoManager.upsertIntoDocCollection(
         this.projectId,
         this.docId,
         null,
@@ -254,7 +250,7 @@ describe('MongoManager', function () {
     it('should handle generic insert error', async function () {
       this.db.docs.insertOne.rejects(this.stubbedErr)
       await expect(
-        this.MongoManager.promises.upsertIntoDocCollection(
+        this.MongoManager.upsertIntoDocCollection(
           this.projectId,
           this.docId,
           null,
@@ -266,7 +262,7 @@ describe('MongoManager', function () {
     it('should handle duplicate insert error', async function () {
       this.db.docs.insertOne.rejects({ code: 11000 })
       await expect(
-        this.MongoManager.promises.upsertIntoDocCollection(
+        this.MongoManager.upsertIntoDocCollection(
           this.projectId,
           this.docId,
           null,
@@ -280,7 +276,7 @@ describe('MongoManager', function () {
     beforeEach(async function () {
       this.projectId = new ObjectId()
       this.db.docs.deleteMany = sinon.stub().resolves()
-      await this.MongoManager.promises.destroyProject(this.projectId)
+      await this.MongoManager.destroyProject(this.projectId)
     })
 
     it('should destroy all docs', function () {
@@ -297,13 +293,13 @@ describe('MongoManager', function () {
 
     it('should not error when the rev has not changed', async function () {
       this.db.docs.findOne = sinon.stub().resolves({ rev: 1 })
-      await this.MongoManager.promises.checkRevUnchanged(this.doc)
+      await this.MongoManager.checkRevUnchanged(this.doc)
     })
 
     it('should return an error when the rev has changed', async function () {
       this.db.docs.findOne = sinon.stub().resolves({ rev: 2 })
       await expect(
-        this.MongoManager.promises.checkRevUnchanged(this.doc)
+        this.MongoManager.checkRevUnchanged(this.doc)
       ).to.be.rejectedWith(Errors.DocModifiedError)
     })
 
@@ -311,14 +307,14 @@ describe('MongoManager', function () {
       this.db.docs.findOne = sinon.stub().resolves({ rev: 2 })
       this.doc = { _id: new ObjectId(), name: 'mock-doc', rev: NaN }
       await expect(
-        this.MongoManager.promises.checkRevUnchanged(this.doc)
+        this.MongoManager.checkRevUnchanged(this.doc)
       ).to.be.rejectedWith(Errors.DocRevValueError)
     })
 
     it('should return a value error if checked doc rev is NaN', async function () {
       this.db.docs.findOne = sinon.stub().resolves({ rev: NaN })
       await expect(
-        this.MongoManager.promises.checkRevUnchanged(this.doc)
+        this.MongoManager.checkRevUnchanged(this.doc)
       ).to.be.rejectedWith(Errors.DocRevValueError)
     })
   })
@@ -334,7 +330,7 @@ describe('MongoManager', function () {
 
     describe('complete doc', function () {
       beforeEach(async function () {
-        await this.MongoManager.promises.restoreArchivedDoc(
+        await this.MongoManager.restoreArchivedDoc(
           this.projectId,
           this.docId,
           this.archivedDoc
@@ -364,7 +360,7 @@ describe('MongoManager', function () {
     describe('without ranges', function () {
       beforeEach(async function () {
         delete this.archivedDoc.ranges
-        await this.MongoManager.promises.restoreArchivedDoc(
+        await this.MongoManager.restoreArchivedDoc(
           this.projectId,
           this.docId,
           this.archivedDoc
@@ -395,7 +391,7 @@ describe('MongoManager', function () {
       it('throws a DocRevValueError', async function () {
         this.db.docs.updateOne.resolves({ matchedCount: 0 })
         await expect(
-          this.MongoManager.promises.restoreArchivedDoc(
+          this.MongoManager.restoreArchivedDoc(
             this.projectId,
             this.docId,
             this.archivedDoc
diff --git a/services/docstore/test/unit/js/RangeManagerTests.js b/services/docstore/test/unit/js/RangeManagerTests.js
index 7a2de7352e..ba99280a7a 100644
--- a/services/docstore/test/unit/js/RangeManagerTests.js
+++ b/services/docstore/test/unit/js/RangeManagerTests.js
@@ -30,7 +30,7 @@ describe('RangeManager', function () {
   })
 
   describe('jsonRangesToMongo', function () {
-    it('should convert ObjectIds and dates to proper objects', function () {
+    it('should convert ObjectIds and dates to proper objects and fix comment id', function () {
       const changeId = new ObjectId().toString()
       const commentId = new ObjectId().toString()
       const userId = new ObjectId().toString()
@@ -66,7 +66,7 @@ describe('RangeManager', function () {
         ],
         comments: [
           {
-            id: new ObjectId(commentId),
+            id: new ObjectId(threadId),
             op: { c: 'foo', p: 3, t: new ObjectId(threadId) },
           },
         ],
@@ -110,7 +110,6 @@ describe('RangeManager', function () {
 
     return it('should be consistent when transformed through json -> mongo -> json', function () {
       const changeId = new ObjectId().toString()
-      const commentId = new ObjectId().toString()
       const userId = new ObjectId().toString()
       const threadId = new ObjectId().toString()
       const ts = new Date().toJSON()
@@ -127,7 +126,7 @@ describe('RangeManager', function () {
         ],
         comments: [
           {
-            id: commentId,
+            id: threadId,
             op: { c: 'foo', p: 3, t: threadId },
           },
         ],
@@ -142,6 +141,7 @@ describe('RangeManager', function () {
 
   return describe('shouldUpdateRanges', function () {
     beforeEach(function () {
+      const threadId = new ObjectId()
       this.ranges = {
         changes: [
           {
@@ -155,8 +155,8 @@ describe('RangeManager', function () {
         ],
         comments: [
           {
-            id: new ObjectId(),
-            op: { c: 'foo', p: 3, t: new ObjectId() },
+            id: threadId,
+            op: { c: 'foo', p: 3, t: threadId },
           },
         ],
       }
diff --git a/services/document-updater/app/js/DiffCodec.js b/services/document-updater/app/js/DiffCodec.js
index 8c574cff70..17da409386 100644
--- a/services/document-updater/app/js/DiffCodec.js
+++ b/services/document-updater/app/js/DiffCodec.js
@@ -1,3 +1,4 @@
+const OError = require('@overleaf/o-error')
 const DMP = require('diff-match-patch')
 const { TextOperation } = require('overleaf-editor-core')
 const dmp = new DMP()
@@ -38,23 +39,62 @@ module.exports = {
     return ops
   },
 
-  diffAsHistoryV1EditOperation(before, after) {
-    const diffs = dmp.diff_main(before, after)
+  /**
+   * @param {import("overleaf-editor-core").StringFileData} file
+   * @param {string} after
+   * @return {TextOperation}
+   */
+  diffAsHistoryOTEditOperation(file, after) {
+    const beforeWithoutTrackedDeletes = file.getContent({
+      filterTrackedDeletes: true,
+    })
+    const diffs = dmp.diff_main(beforeWithoutTrackedDeletes, after)
     dmp.diff_cleanupSemantic(diffs)
 
+    const trackedChanges = file.trackedChanges.asSorted()
+    let nextTc = trackedChanges.shift()
+
     const op = new TextOperation()
     for (const diff of diffs) {
-      const [type, content] = diff
+      let [type, content] = diff
       if (type === this.ADDED) {
         op.insert(content)
-      } else if (type === this.REMOVED) {
-        op.remove(content.length)
-      } else if (type === this.UNCHANGED) {
-        op.retain(content.length)
+      } else if (type === this.REMOVED || type === this.UNCHANGED) {
+        while (op.baseLength + content.length > nextTc?.range.start) {
+          if (nextTc.tracking.type === 'delete') {
+            const untilRange = nextTc.range.start - op.baseLength
+            if (type === this.REMOVED) {
+              op.remove(untilRange)
+            } else if (type === this.UNCHANGED) {
+              op.retain(untilRange)
+            }
+            op.retain(nextTc.range.end - nextTc.range.start)
+            content = content.slice(untilRange)
+          }
+          nextTc = trackedChanges.shift()
+        }
+        if (type === this.REMOVED) {
+          op.remove(content.length)
+        } else if (type === this.UNCHANGED) {
+          op.retain(content.length)
+        }
       } else {
         throw new Error('Unknown type')
       }
     }
+    while (nextTc) {
+      if (
+        nextTc.tracking.type !== 'delete' ||
+        nextTc.range.start !== op.baseLength
+      ) {
+        throw new OError(
+          'StringFileData.trackedChanges out of sync: unexpected range after end of diff',
+          { nextTc, baseLength: op.baseLength }
+        )
+      }
+      op.retain(nextTc.range.end - nextTc.range.start)
+      nextTc = trackedChanges.shift()
+    }
     return op
   },
 }
diff --git a/services/document-updater/app/js/DocumentManager.js b/services/document-updater/app/js/DocumentManager.js
index 4803056423..3fb3d10a6e 100644
--- a/services/document-updater/app/js/DocumentManager.js
+++ b/services/document-updater/app/js/DocumentManager.js
@@ -194,9 +194,8 @@ const DocumentManager = {
     let op
     if (type === 'history-ot') {
       const file = StringFileData.fromRaw(oldLines)
-      const operation = DiffCodec.diffAsHistoryV1EditOperation(
-        // TODO(24596): tc support for history-ot
-        file.getContent({ filterTrackedDeletes: true }),
+      const operation = DiffCodec.diffAsHistoryOTEditOperation(
+        file,
         newLines.join('\n')
       )
       if (operation.isNoop()) {
@@ -536,11 +535,6 @@ const DocumentManager = {
     if (opts.historyRangesMigration) {
       historyRangesSupport = opts.historyRangesMigration === 'forwards'
     }
-    if (!Array.isArray(lines)) {
-      const file = StringFileData.fromRaw(lines)
-      // TODO(24596): tc support for history-ot
-      lines = file.getLines()
-    }
 
     await ProjectHistoryRedisManager.promises.queueResyncDocContent(
       projectId,
diff --git a/services/document-updater/app/js/Limits.js b/services/document-updater/app/js/Limits.js
index 268ccd3f9b..cbd9293042 100644
--- a/services/document-updater/app/js/Limits.js
+++ b/services/document-updater/app/js/Limits.js
@@ -28,4 +28,19 @@ module.exports = {
     // since we didn't hit the limit in the loop, the document is within the allowed length
     return false
   },
+
+  /**
+   * @param {StringFileRawData} raw
+   * @param {number} maxDocLength
+   */
+  stringFileDataContentIsTooLarge(raw, maxDocLength) {
+    let n = raw.content.length
+    if (n <= maxDocLength) return false // definitely under the limit, no need to calculate the total size
+    for (const tc of raw.trackedChanges ?? []) {
+      if (tc.tracking.type !== 'delete') continue
+      n -= tc.range.length
+      if (n <= maxDocLength) return false // under the limit now, no need to calculate the exact size
+    }
+    return true
+  },
 }
diff --git a/services/document-updater/app/js/ProjectHistoryRedisManager.js b/services/document-updater/app/js/ProjectHistoryRedisManager.js
index 9a9985d99a..78e9c2ea4c 100644
--- a/services/document-updater/app/js/ProjectHistoryRedisManager.js
+++ b/services/document-updater/app/js/ProjectHistoryRedisManager.js
@@ -8,13 +8,14 @@ const rclient = require('@overleaf/redis-wrapper').createClient(
 )
 const logger = require('@overleaf/logger')
 const metrics = require('./Metrics')
-const { docIsTooLarge } = require('./Limits')
+const { docIsTooLarge, stringFileDataContentIsTooLarge } = require('./Limits')
 const { addTrackedDeletesToContent, extractOriginOrSource } = require('./Utils')
 const HistoryConversions = require('./HistoryConversions')
 const OError = require('@overleaf/o-error')
 
 /**
  * @import { Ranges } from './types'
+ * @import { StringFileRawData } from 'overleaf-editor-core/lib/types'
  */
 
 const ProjectHistoryRedisManager = {
@@ -180,7 +181,7 @@ const ProjectHistoryRedisManager = {
    * @param {string} projectId
    * @param {string} projectHistoryId
    * @param {string} docId
-   * @param {string[]} lines
+   * @param {string[] | StringFileRawData} lines
    * @param {Ranges} ranges
    * @param {string[]} resolvedCommentIds
    * @param {number} version
@@ -204,13 +205,8 @@ const ProjectHistoryRedisManager = {
       'queue doc content resync'
     )
 
-    let content = lines.join('\n')
-    if (historyRangesSupport) {
-      content = addTrackedDeletesToContent(content, ranges.changes ?? [])
-    }
-
     const projectUpdate = {
-      resyncDocContent: { content, version },
+      resyncDocContent: { version },
       projectHistoryId,
       path: pathname,
       doc: docId,
@@ -219,17 +215,38 @@ const ProjectHistoryRedisManager = {
       },
     }
 
-    if (historyRangesSupport) {
-      projectUpdate.resyncDocContent.ranges =
-        HistoryConversions.toHistoryRanges(ranges)
-      projectUpdate.resyncDocContent.resolvedCommentIds = resolvedCommentIds
+    let content = ''
+    if (Array.isArray(lines)) {
+      content = lines.join('\n')
+      if (historyRangesSupport) {
+        content = addTrackedDeletesToContent(content, ranges.changes ?? [])
+        projectUpdate.resyncDocContent.ranges =
+          HistoryConversions.toHistoryRanges(ranges)
+        projectUpdate.resyncDocContent.resolvedCommentIds = resolvedCommentIds
+      }
+    } else {
+      content = lines.content
+      projectUpdate.resyncDocContent.historyOTRanges = {
+        comments: lines.comments,
+        trackedChanges: lines.trackedChanges,
+      }
     }
+    projectUpdate.resyncDocContent.content = content
 
     const jsonUpdate = JSON.stringify(projectUpdate)
     // Do an optimised size check on the docLines using the serialised
     // project update length as an upper bound
     const sizeBound = jsonUpdate.length
-    if (docIsTooLarge(sizeBound, lines, Settings.max_doc_length)) {
+    if (Array.isArray(lines)) {
+      if (docIsTooLarge(sizeBound, lines, Settings.max_doc_length)) {
+        throw new OError(
+          'blocking resync doc content insert into project history queue: doc is too large',
+          { projectId, docId, docSize: sizeBound }
+        )
+      }
+    } else if (
+      stringFileDataContentIsTooLarge(lines, Settings.max_doc_length)
+    ) {
       throw new OError(
         'blocking resync doc content insert into project history queue: doc is too large',
         { projectId, docId, docSize: sizeBound }
diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml
index 2fe97bd9b3..ca15f35fef 100644
--- a/services/document-updater/docker-compose.ci.yml
+++ b/services/document-updater/docker-compose.ci.yml
@@ -28,12 +28,15 @@ services:
       MOCHA_GREP: ${MOCHA_GREP}
       NODE_ENV: test
       NODE_OPTIONS: "--unhandled-rejections=strict"
+    volumes:
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     depends_on:
       mongo:
         condition: service_started
       redis:
         condition: service_healthy
     user: node
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run test:acceptance
 
 
@@ -45,7 +48,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   redis:
-    image: redis
+    image: redis:7.4.3
     healthcheck:
       test: ping="$$(redis-cli ping)" && [ "$$ping" = 'PONG' ]
       interval: 1s
diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml
index 8a94d1a24c..3688d21d0b 100644
--- a/services/document-updater/docker-compose.yml
+++ b/services/document-updater/docker-compose.yml
@@ -26,6 +26,7 @@ services:
       - .:/overleaf/services/document-updater
       - ../../node_modules:/overleaf/node_modules
       - ../../libraries:/overleaf/libraries
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     working_dir: /overleaf/services/document-updater
     environment:
       ELASTIC_SEARCH_DSN: es:9200
@@ -45,10 +46,11 @@ services:
         condition: service_started
       redis:
         condition: service_healthy
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run --silent test:acceptance
 
   redis:
-    image: redis
+    image: redis:7.4.3
     healthcheck:
       test: ping=$$(redis-cli ping) && [ "$$ping" = 'PONG' ]
       interval: 1s
diff --git a/services/document-updater/scripts/check_redis_mongo_sync_state.js b/services/document-updater/scripts/check_redis_mongo_sync_state.js
index 08209400aa..51db47af4d 100644
--- a/services/document-updater/scripts/check_redis_mongo_sync_state.js
+++ b/services/document-updater/scripts/check_redis_mongo_sync_state.js
@@ -15,6 +15,7 @@ const request = require('requestretry').defaults({
   retryDelay: 10,
 })
 
+const ONLY_PROJECT_ID = process.env.ONLY_PROJECT_ID
 const AUTO_FIX_VERSION_MISMATCH =
   process.env.AUTO_FIX_VERSION_MISMATCH === 'true'
 const AUTO_FIX_PARTIALLY_DELETED_DOC_METADATA =
@@ -319,10 +320,12 @@ async function processProject(projectId) {
  * @return {Promise<{perIterationOutOfSync: number, done: boolean}>}
  */
 async function scanOnce(processed, outOfSync) {
-  const projectIds = await ProjectFlusher.promises.flushAllProjects({
-    limit: LIMIT,
-    dryRun: true,
-  })
+  const projectIds = ONLY_PROJECT_ID
+    ? [ONLY_PROJECT_ID]
+    : await ProjectFlusher.promises.flushAllProjects({
+        limit: LIMIT,
+        dryRun: true,
+      })
 
   let perIterationOutOfSync = 0
   for (const projectId of projectIds) {
diff --git a/services/document-updater/test/acceptance/js/SettingADocumentTests.js b/services/document-updater/test/acceptance/js/SettingADocumentTests.js
index fd1851a221..e1bc54dc90 100644
--- a/services/document-updater/test/acceptance/js/SettingADocumentTests.js
+++ b/services/document-updater/test/acceptance/js/SettingADocumentTests.js
@@ -686,4 +686,285 @@ describe('Setting a document', function () {
       })
     })
   })
+
+  describe('with track changes (history-ot)', function () {
+    const lines = ['one', 'one and a half', 'two', 'three']
+    const userId = DocUpdaterClient.randomId()
+    const ts = new Date().toISOString()
+    beforeEach(function (done) {
+      numberOfReceivedUpdates = 0
+      this.newLines = ['one', 'two', 'three']
+      this.project_id = DocUpdaterClient.randomId()
+      this.doc_id = DocUpdaterClient.randomId()
+      this.historyOTUpdate = {
+        doc: this.doc_id,
+        op: [
+          {
+            textOperation: [
+              4,
+              {
+                r: 'one and a half\n'.length,
+                tracking: {
+                  type: 'delete',
+                  userId,
+                  ts,
+                },
+              },
+              9,
+            ],
+          },
+        ],
+        v: this.version,
+        meta: { source: 'random-publicId' },
+      }
+      MockWebApi.insertDoc(this.project_id, this.doc_id, {
+        lines,
+        version: this.version,
+        otMigrationStage: 1,
+      })
+      DocUpdaterClient.preloadDoc(this.project_id, this.doc_id, error => {
+        if (error) {
+          throw error
+        }
+        DocUpdaterClient.sendUpdate(
+          this.project_id,
+          this.doc_id,
+          this.historyOTUpdate,
+          error => {
+            if (error) {
+              throw error
+            }
+            DocUpdaterClient.waitForPendingUpdates(
+              this.project_id,
+              this.doc_id,
+              done
+            )
+          }
+        )
+      })
+    })
+
+    afterEach(function () {
+      MockProjectHistoryApi.flushProject.resetHistory()
+      MockWebApi.setDocument.resetHistory()
+    })
+    it('should record tracked changes', function (done) {
+      docUpdaterRedis.get(
+        Keys.docLines({ doc_id: this.doc_id }),
+        (error, data) => {
+          if (error) {
+            throw error
+          }
+          expect(JSON.parse(data)).to.deep.equal({
+            content: lines.join('\n'),
+            trackedChanges: [
+              {
+                range: {
+                  pos: 4,
+                  length: 15,
+                },
+                tracking: {
+                  ts,
+                  type: 'delete',
+                  userId,
+                },
+              },
+            ],
+          })
+          done()
+        }
+      )
+    })
+
+    it('should apply the change', function (done) {
+      DocUpdaterClient.getDoc(
+        this.project_id,
+        this.doc_id,
+        (error, res, data) => {
+          if (error) {
+            throw error
+          }
+          expect(data.lines).to.deep.equal(this.newLines)
+          done()
+        }
+      )
+    })
+    const cases = [
+      {
+        name: 'when resetting the content',
+        lines,
+        want: {
+          content: 'one\none and a half\none and a half\ntwo\nthree',
+          trackedChanges: [
+            {
+              range: {
+                pos: 'one and a half\n'.length + 4,
+                length: 15,
+              },
+              tracking: {
+                ts,
+                type: 'delete',
+                userId,
+              },
+            },
+          ],
+        },
+      },
+      {
+        name: 'when adding content before a tracked delete',
+        lines: ['one', 'INSERT', 'two', 'three'],
+        want: {
+          content: 'one\nINSERT\none and a half\ntwo\nthree',
+          trackedChanges: [
+            {
+              range: {
+                pos: 'INSERT\n'.length + 4,
+                length: 15,
+              },
+              tracking: {
+                ts,
+                type: 'delete',
+                userId,
+              },
+            },
+          ],
+        },
+      },
+      {
+        name: 'when adding content after a tracked delete',
+        lines: ['one', 'two', 'INSERT', 'three'],
+        want: {
+          content: 'one\none and a half\ntwo\nINSERT\nthree',
+          trackedChanges: [
+            {
+              range: {
+                pos: 4,
+                length: 15,
+              },
+              tracking: {
+                ts,
+                type: 'delete',
+                userId,
+              },
+            },
+          ],
+        },
+      },
+      {
+        name: 'when deleting content before a tracked delete',
+        lines: ['two', 'three'],
+        want: {
+          content: 'one and a half\ntwo\nthree',
+          trackedChanges: [
+            {
+              range: {
+                pos: 0,
+                length: 15,
+              },
+              tracking: {
+                ts,
+                type: 'delete',
+                userId,
+              },
+            },
+          ],
+        },
+      },
+      {
+        name: 'when deleting content after a tracked delete',
+        lines: ['one', 'two'],
+        want: {
+          content: 'one\none and a half\ntwo',
+          trackedChanges: [
+            {
+              range: {
+                pos: 4,
+                length: 15,
+              },
+              tracking: {
+                ts,
+                type: 'delete',
+                userId,
+              },
+            },
+          ],
+        },
+      },
+      {
+        name: 'when deleting content immediately after a tracked delete',
+        lines: ['one', 'three'],
+        want: {
+          content: 'one\none and a half\nthree',
+          trackedChanges: [
+            {
+              range: {
+                pos: 4,
+                length: 15,
+              },
+              tracking: {
+                ts,
+                type: 'delete',
+                userId,
+              },
+            },
+          ],
+        },
+      },
+      {
+        name: 'when deleting content across a tracked delete',
+        lines: ['onethree'],
+        want: {
+          content: 'oneone and a half\nthree',
+          trackedChanges: [
+            {
+              range: {
+                pos: 3,
+                length: 15,
+              },
+              tracking: {
+                ts,
+                type: 'delete',
+                userId,
+              },
+            },
+          ],
+        },
+      },
+    ]
+
+    for (const { name, lines, want } of cases) {
+      describe(name, function () {
+        beforeEach(function (done) {
+          DocUpdaterClient.setDocLines(
+            this.project_id,
+            this.doc_id,
+            lines,
+            this.source,
+            userId,
+            false,
+            (error, res, body) => {
+              if (error) {
+                return done(error)
+              }
+              this.statusCode = res.statusCode
+              this.body = body
+              done()
+            }
+          )
+        })
+        it('should update accordingly', function (done) {
+          docUpdaterRedis.get(
+            Keys.docLines({ doc_id: this.doc_id }),
+            (error, data) => {
+              if (error) {
+                throw error
+              }
+              expect(JSON.parse(data)).to.deep.equal(want)
+              done()
+            }
+          )
+        })
+      })
+    }
+  })
 })
diff --git a/services/document-updater/test/unit/js/Limits/LimitsTests.js b/services/document-updater/test/unit/js/Limits/LimitsTests.js
index 34a5c13c26..11ca38746a 100644
--- a/services/document-updater/test/unit/js/Limits/LimitsTests.js
+++ b/services/document-updater/test/unit/js/Limits/LimitsTests.js
@@ -81,4 +81,88 @@ describe('Limits', function () {
       })
     })
   })
+
+  describe('stringFileDataContentIsTooLarge', function () {
+    it('should handle small docs', function () {
+      expect(
+        this.Limits.stringFileDataContentIsTooLarge({ content: '' }, 123)
+      ).to.equal(false)
+    })
+    it('should handle docs at the limit', function () {
+      expect(
+        this.Limits.stringFileDataContentIsTooLarge(
+          { content: 'x'.repeat(123) },
+          123
+        )
+      ).to.equal(false)
+    })
+    it('should handle docs above the limit', function () {
+      expect(
+        this.Limits.stringFileDataContentIsTooLarge(
+          { content: 'x'.repeat(123 + 1) },
+          123
+        )
+      ).to.equal(true)
+    })
+    it('should handle docs above the limit and below with tracked-deletes removed', function () {
+      expect(
+        this.Limits.stringFileDataContentIsTooLarge(
+          {
+            content: 'x'.repeat(123 + 1),
+            trackedChanges: [
+              {
+                range: { pos: 1, length: 1 },
+                tracking: {
+                  type: 'delete',
+                  ts: '2025-06-16T14:31:44.910Z',
+                  userId: 'user-id',
+                },
+              },
+            ],
+          },
+          123
+        )
+      ).to.equal(false)
+    })
+    it('should handle docs above the limit and above with tracked-deletes removed', function () {
+      expect(
+        this.Limits.stringFileDataContentIsTooLarge(
+          {
+            content: 'x'.repeat(123 + 2),
+            trackedChanges: [
+              {
+                range: { pos: 1, length: 1 },
+                tracking: {
+                  type: 'delete',
+                  ts: '2025-06-16T14:31:44.910Z',
+                  userId: 'user-id',
+                },
+              },
+            ],
+          },
+          123
+        )
+      ).to.equal(true)
+    })
+    it('should handle docs above the limit and with tracked-inserts', function () {
+      expect(
+        this.Limits.stringFileDataContentIsTooLarge(
+          {
+            content: 'x'.repeat(123 + 1),
+            trackedChanges: [
+              {
+                range: { pos: 1, length: 1 },
+                tracking: {
+                  type: 'insert',
+                  ts: '2025-06-16T14:31:44.910Z',
+                  userId: 'user-id',
+                },
+              },
+            ],
+          },
+          123
+        )
+      ).to.equal(true)
+    })
+  })
 })
diff --git a/services/document-updater/test/unit/js/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.js b/services/document-updater/test/unit/js/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.js
index 760385b176..ad6c121dfb 100644
--- a/services/document-updater/test/unit/js/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.js
+++ b/services/document-updater/test/unit/js/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.js
@@ -15,6 +15,7 @@ describe('ProjectHistoryRedisManager', function () {
 
     this.Limits = {
       docIsTooLarge: sinon.stub().returns(false),
+      stringFileDataContentIsTooLarge: sinon.stub().returns(false),
     }
 
     this.ProjectHistoryRedisManager = SandboxedModule.require(modulePath, {
@@ -61,22 +62,18 @@ describe('ProjectHistoryRedisManager', function () {
     })
 
     it('should queue an update', function () {
-      this.multi.rpush
-        .calledWithExactly(
-          `ProjectHistory:Ops:${this.project_id}`,
-          this.ops[0],
-          this.ops[1]
-        )
-        .should.equal(true)
+      this.multi.rpush.should.have.been.calledWithExactly(
+        `ProjectHistory:Ops:${this.project_id}`,
+        this.ops[0],
+        this.ops[1]
+      )
     })
 
     it('should set the queue timestamp if not present', function () {
-      this.multi.setnx
-        .calledWithExactly(
-          `ProjectHistory:FirstOpTimestamp:${this.project_id}`,
-          Date.now()
-        )
-        .should.equal(true)
+      this.multi.setnx.should.have.been.calledWithExactly(
+        `ProjectHistory:FirstOpTimestamp:${this.project_id}`,
+        Date.now()
+      )
     })
   })
 
@@ -118,9 +115,10 @@ describe('ProjectHistoryRedisManager', function () {
         file: this.file_id,
       }
 
-      this.ProjectHistoryRedisManager.promises.queueOps
-        .calledWithExactly(this.project_id, JSON.stringify(update))
-        .should.equal(true)
+      this.ProjectHistoryRedisManager.promises.queueOps.should.have.been.calledWithExactly(
+        this.project_id,
+        JSON.stringify(update)
+      )
     })
   })
 
@@ -166,9 +164,10 @@ describe('ProjectHistoryRedisManager', function () {
         doc: this.doc_id,
       }
 
-      this.ProjectHistoryRedisManager.promises.queueOps
-        .calledWithExactly(this.project_id, JSON.stringify(update))
-        .should.equal(true)
+      this.ProjectHistoryRedisManager.promises.queueOps.should.have.been.calledWithExactly(
+        this.project_id,
+        JSON.stringify(update)
+      )
     })
 
     it('should queue an update with file metadata', async function () {
@@ -350,9 +349,10 @@ describe('ProjectHistoryRedisManager', function () {
         doc: this.doc_id,
       }
 
-      this.ProjectHistoryRedisManager.promises.queueOps
-        .calledWithExactly(this.project_id, JSON.stringify(update))
-        .should.equal(true)
+      this.ProjectHistoryRedisManager.promises.queueOps.should.have.been.calledWithExactly(
+        this.project_id,
+        JSON.stringify(update)
+      )
     })
 
     it('should not forward ranges if history ranges support is undefined', async function () {
@@ -402,9 +402,10 @@ describe('ProjectHistoryRedisManager', function () {
         doc: this.doc_id,
       }
 
-      this.ProjectHistoryRedisManager.promises.queueOps
-        .calledWithExactly(this.project_id, JSON.stringify(update))
-        .should.equal(true)
+      this.ProjectHistoryRedisManager.promises.queueOps.should.have.been.calledWithExactly(
+        this.project_id,
+        JSON.stringify(update)
+      )
     })
 
     it('should pass "false" as the createdBlob field if not provided', async function () {
@@ -432,9 +433,10 @@ describe('ProjectHistoryRedisManager', function () {
         doc: this.doc_id,
       }
 
-      this.ProjectHistoryRedisManager.promises.queueOps
-        .calledWithExactly(this.project_id, JSON.stringify(update))
-        .should.equal(true)
+      this.ProjectHistoryRedisManager.promises.queueOps.should.have.been.calledWithExactly(
+        this.project_id,
+        JSON.stringify(update)
+      )
     })
 
     it('should pass through the value of the createdBlob field', async function () {
@@ -463,9 +465,10 @@ describe('ProjectHistoryRedisManager', function () {
         doc: this.doc_id,
       }
 
-      this.ProjectHistoryRedisManager.promises.queueOps
-        .calledWithExactly(this.project_id, JSON.stringify(update))
-        .should.equal(true)
+      this.ProjectHistoryRedisManager.promises.queueOps.should.have.been.calledWithExactly(
+        this.project_id,
+        JSON.stringify(update)
+      )
     })
   })
 
@@ -493,8 +496,8 @@ describe('ProjectHistoryRedisManager', function () {
       beforeEach(async function () {
         this.update = {
           resyncDocContent: {
-            content: 'one\ntwo',
             version: this.version,
+            content: 'one\ntwo',
           },
           projectHistoryId: this.projectHistoryId,
           path: this.pathname,
@@ -516,19 +519,18 @@ describe('ProjectHistoryRedisManager', function () {
       })
 
       it('should check if the doc is too large', function () {
-        this.Limits.docIsTooLarge
-          .calledWith(
-            JSON.stringify(this.update).length,
-            this.lines,
-            this.settings.max_doc_length
-          )
-          .should.equal(true)
+        this.Limits.docIsTooLarge.should.have.been.calledWith(
+          JSON.stringify(this.update).length,
+          this.lines,
+          this.settings.max_doc_length
+        )
       })
 
       it('should queue an update', function () {
-        this.ProjectHistoryRedisManager.promises.queueOps
-          .calledWithExactly(this.project_id, JSON.stringify(this.update))
-          .should.equal(true)
+        this.ProjectHistoryRedisManager.promises.queueOps.should.have.been.calledWithExactly(
+          this.project_id,
+          JSON.stringify(this.update)
+        )
       })
     })
 
@@ -551,9 +553,8 @@ describe('ProjectHistoryRedisManager', function () {
       })
 
       it('should not queue an update if the doc is too large', function () {
-        this.ProjectHistoryRedisManager.promises.queueOps.called.should.equal(
-          false
-        )
+        this.ProjectHistoryRedisManager.promises.queueOps.should.not.have.been
+          .called
       })
     })
 
@@ -561,10 +562,10 @@ describe('ProjectHistoryRedisManager', function () {
       beforeEach(async function () {
         this.update = {
           resyncDocContent: {
-            content: 'onedeleted\ntwo',
             version: this.version,
             ranges: this.ranges,
             resolvedCommentIds: this.resolvedCommentIds,
+            content: 'onedeleted\ntwo',
           },
           projectHistoryId: this.projectHistoryId,
           path: this.pathname,
@@ -601,9 +602,76 @@ describe('ProjectHistoryRedisManager', function () {
       })
 
       it('should queue an update', function () {
-        this.ProjectHistoryRedisManager.promises.queueOps
-          .calledWithExactly(this.project_id, JSON.stringify(this.update))
-          .should.equal(true)
+        this.ProjectHistoryRedisManager.promises.queueOps.should.have.been.calledWithExactly(
+          this.project_id,
+          JSON.stringify(this.update)
+        )
+      })
+    })
+
+    describe('history-ot', function () {
+      beforeEach(async function () {
+        this.lines = {
+          content: 'onedeleted\ntwo',
+          comments: [{ id: 'id1', ranges: [{ pos: 0, length: 3 }] }],
+          trackedChanges: [
+            {
+              range: { pos: 3, length: 7 },
+              tracking: {
+                type: 'delete',
+                userId: 'user-id',
+                ts: '2025-06-16T14:31:44.910Z',
+              },
+            },
+          ],
+        }
+        this.update = {
+          resyncDocContent: {
+            version: this.version,
+            historyOTRanges: {
+              comments: this.lines.comments,
+              trackedChanges: this.lines.trackedChanges,
+            },
+            content: this.lines.content,
+          },
+          projectHistoryId: this.projectHistoryId,
+          path: this.pathname,
+          doc: this.doc_id,
+          meta: { ts: new Date() },
+        }
+
+        await this.ProjectHistoryRedisManager.promises.queueResyncDocContent(
+          this.project_id,
+          this.projectHistoryId,
+          this.doc_id,
+          this.lines,
+          this.ranges,
+          this.resolvedCommentIds,
+          this.version,
+          this.pathname,
+          true
+        )
+      })
+
+      it('should include tracked deletes in the update', function () {
+        this.ProjectHistoryRedisManager.promises.queueOps.should.have.been.calledWithExactly(
+          this.project_id,
+          JSON.stringify(this.update)
+        )
+      })
+
+      it('should check the doc length without tracked deletes', function () {
+        this.Limits.stringFileDataContentIsTooLarge.should.have.been.calledWith(
+          this.lines,
+          this.settings.max_doc_length
+        )
+      })
+
+      it('should queue an update', function () {
+        this.ProjectHistoryRedisManager.promises.queueOps.should.have.been.calledWithExactly(
+          this.project_id,
+          JSON.stringify(this.update)
+        )
       })
     })
   })
diff --git a/services/filestore/app.js b/services/filestore/app.js
index 24741e079c..178e8c7ff0 100644
--- a/services/filestore/app.js
+++ b/services/filestore/app.js
@@ -111,6 +111,11 @@ if (settings.filestore.stores.template_files) {
     keyBuilder.templateFileKeyMiddleware,
     fileController.insertFile
   )
+  app.delete(
+    '/template/:template_id/v/:version/:format',
+    keyBuilder.templateFileKeyMiddleware,
+    fileController.deleteFile
+  )
 }
 
 app.get(
diff --git a/services/filestore/app/js/FileConverter.js b/services/filestore/app/js/FileConverter.js
index ac3dccec1f..bfc34314e9 100644
--- a/services/filestore/app/js/FileConverter.js
+++ b/services/filestore/app/js/FileConverter.js
@@ -5,7 +5,7 @@ const { callbackify } = require('node:util')
 const safeExec = require('./SafeExec').promises
 const { ConversionError } = require('./Errors')
 
-const APPROVED_FORMATS = ['png']
+const APPROVED_FORMATS = ['png', 'jpg']
 const FOURTY_SECONDS = 40 * 1000
 const KILL_SIGNAL = 'SIGTERM'
 
@@ -34,16 +34,14 @@ async function convert(sourcePath, requestedFormat) {
 }
 
 async function thumbnail(sourcePath) {
-  const width = '260x'
-  return await convert(sourcePath, 'png', [
+  const width = '548x'
+  return await _convert(sourcePath, 'jpg', [
     'convert',
     '-flatten',
     '-background',
     'white',
     '-density',
     '300',
-    '-define',
-    `pdf:fit-page=${width}`,
     `${sourcePath}[0]`,
     '-resize',
     width,
@@ -51,16 +49,14 @@ async function thumbnail(sourcePath) {
 }
 
 async function preview(sourcePath) {
-  const width = '548x'
-  return await convert(sourcePath, 'png', [
+  const width = '794x'
+  return await _convert(sourcePath, 'jpg', [
     'convert',
     '-flatten',
     '-background',
     'white',
     '-density',
     '300',
-    '-define',
-    `pdf:fit-page=${width}`,
     `${sourcePath}[0]`,
     '-resize',
     width,
diff --git a/services/filestore/app/js/FileHandler.js b/services/filestore/app/js/FileHandler.js
index 2ed28bd435..0c092c85cd 100644
--- a/services/filestore/app/js/FileHandler.js
+++ b/services/filestore/app/js/FileHandler.js
@@ -150,7 +150,9 @@ async function _getConvertedFileAndCache(bucket, key, convertedKey, opts) {
   let convertedFsPath
   try {
     convertedFsPath = await _convertFile(bucket, key, opts)
-    await ImageOptimiser.promises.compressPng(convertedFsPath)
+    if (convertedFsPath.toLowerCase().endsWith(".png")) {
+      await ImageOptimiser.promises.compressPng(convertedFsPath)
+    }
     await PersistorManager.sendFile(bucket, convertedKey, convertedFsPath)
   } catch (err) {
     LocalFileWriter.deleteFile(convertedFsPath, () => {})
diff --git a/services/history-v1/api/app/rollout.js b/services/history-v1/api/app/rollout.js
new file mode 100644
index 0000000000..24ca0409f8
--- /dev/null
+++ b/services/history-v1/api/app/rollout.js
@@ -0,0 +1,76 @@
+const crypto = require('node:crypto')
+
+class Rollout {
+  constructor(config) {
+    // The history buffer level is used to determine whether to queue changes
+    // in Redis or persist them directly to the chunk store.
+    // If defaults to 0 (no queuing) if not set.
+    this.historyBufferLevel = config.has('historyBufferLevel')
+      ? parseInt(config.get('historyBufferLevel'), 10)
+      : 0
+    // The forcePersistBuffer flag will ensure the buffer is fully persisted before
+    // any persist operation. Set this to true if you want to make the persisted-version
+    // in Redis match the endVersion of the latest chunk. This should be set to true
+    // when downgrading from a history buffer level that queues changes in Redis
+    // without persisting them immediately.
+    this.forcePersistBuffer = config.has('forcePersistBuffer')
+      ? config.get('forcePersistBuffer') === 'true'
+      : false
+
+    // Support gradual rollout of the next history buffer level
+    // with a percentage of projects using it.
+    this.nextHistoryBufferLevel = config.has('nextHistoryBufferLevel')
+      ? parseInt(config.get('nextHistoryBufferLevel'), 10)
+      : null
+    this.nextHistoryBufferLevelRolloutPercentage = config.has(
+      'nextHistoryBufferLevelRolloutPercentage'
+    )
+      ? parseInt(config.get('nextHistoryBufferLevelRolloutPercentage'), 10)
+      : 0
+  }
+
+  report(logger) {
+    logger.info(
+      {
+        historyBufferLevel: this.historyBufferLevel,
+        forcePersistBuffer: this.forcePersistBuffer,
+        nextHistoryBufferLevel: this.nextHistoryBufferLevel,
+        nextHistoryBufferLevelRolloutPercentage:
+          this.nextHistoryBufferLevelRolloutPercentage,
+      },
+      this.historyBufferLevel > 0 || this.forcePersistBuffer
+        ? 'using history buffer'
+        : 'history buffer disabled'
+    )
+  }
+
+  /**
+   * Get the history buffer level for a project.
+   * @param {string} projectId
+   * @returns {Object} - An object containing the history buffer level and force persist buffer flag.
+   * @property {number} historyBufferLevel - The history buffer level to use for processing changes.
+   * @property {boolean} forcePersistBuffer - If true, forces the buffer to be persisted before any operation.
+   */
+  getHistoryBufferLevelOptions(projectId) {
+    if (
+      this.nextHistoryBufferLevel > this.historyBufferLevel &&
+      this.nextHistoryBufferLevelRolloutPercentage > 0
+    ) {
+      const hash = crypto.createHash('sha1').update(projectId).digest('hex')
+      const percentage = parseInt(hash.slice(0, 8), 16) % 100
+      // If the project is in the rollout percentage, we use the next history buffer level.
+      if (percentage < this.nextHistoryBufferLevelRolloutPercentage) {
+        return {
+          historyBufferLevel: this.nextHistoryBufferLevel,
+          forcePersistBuffer: this.forcePersistBuffer,
+        }
+      }
+    }
+    return {
+      historyBufferLevel: this.historyBufferLevel,
+      forcePersistBuffer: this.forcePersistBuffer,
+    }
+  }
+}
+
+module.exports = Rollout
diff --git a/services/history-v1/api/controllers/project_import.js b/services/history-v1/api/controllers/project_import.js
index edffb19a25..638873d105 100644
--- a/services/history-v1/api/controllers/project_import.js
+++ b/services/history-v1/api/controllers/project_import.js
@@ -2,6 +2,7 @@
 
 'use strict'
 
+const config = require('config')
 const { expressify } = require('@overleaf/promise-utils')
 
 const HTTPStatus = require('http-status')
@@ -21,10 +22,15 @@ const BatchBlobStore = storage.BatchBlobStore
 const BlobStore = storage.BlobStore
 const chunkStore = storage.chunkStore
 const HashCheckBlobStore = storage.HashCheckBlobStore
-const persistChanges = storage.persistChanges
+const commitChanges = storage.commitChanges
+const persistBuffer = storage.persistBuffer
 const InvalidChangeError = storage.InvalidChangeError
 
 const render = require('./render')
+const Rollout = require('../app/rollout')
+
+const rollout = new Rollout(config)
+rollout.report(logger) // display the rollout configuration in the logs
 
 async function importSnapshot(req, res) {
   const projectId = req.swagger.params.project_id.value
@@ -35,6 +41,7 @@ async function importSnapshot(req, res) {
   try {
     snapshot = Snapshot.fromRaw(rawSnapshot)
   } catch (err) {
+    logger.warn({ err, projectId }, 'failed to import snapshot')
     return render.unprocessableEntity(res)
   }
 
@@ -43,6 +50,7 @@ async function importSnapshot(req, res) {
     historyId = await chunkStore.initializeProject(projectId, snapshot)
   } catch (err) {
     if (err instanceof chunkStore.AlreadyInitialized) {
+      logger.warn({ err, projectId }, 'already initialized')
       return render.conflict(res)
     } else {
       throw err
@@ -108,7 +116,12 @@ async function importChanges(req, res, next) {
 
   let result
   try {
-    result = await persistChanges(projectId, changes, limits, endVersion)
+    const { historyBufferLevel, forcePersistBuffer } =
+      rollout.getHistoryBufferLevelOptions(projectId)
+    result = await commitChanges(projectId, changes, limits, endVersion, {
+      historyBufferLevel,
+      forcePersistBuffer,
+    })
   } catch (err) {
     if (
       err instanceof Chunk.ConflictingEndVersion ||
@@ -141,5 +154,29 @@ async function importChanges(req, res, next) {
   }
 }
 
+async function flushChanges(req, res, next) {
+  const projectId = req.swagger.params.project_id.value
+  // Use the same limits importChanges, since these are passed to persistChanges
+  const farFuture = new Date()
+  farFuture.setTime(farFuture.getTime() + 7 * 24 * 3600 * 1000)
+  const limits = {
+    maxChanges: 0,
+    minChangeTimestamp: farFuture,
+    maxChangeTimestamp: farFuture,
+    autoResync: true,
+  }
+  try {
+    await persistBuffer(projectId, limits)
+    res.status(HTTPStatus.OK).end()
+  } catch (err) {
+    if (err instanceof Chunk.NotFoundError) {
+      render.notFound(res)
+    } else {
+      throw err
+    }
+  }
+}
+
 exports.importSnapshot = expressify(importSnapshot)
 exports.importChanges = expressify(importChanges)
+exports.flushChanges = expressify(flushChanges)
diff --git a/services/history-v1/api/controllers/projects.js b/services/history-v1/api/controllers/projects.js
index 47a1d959ad..031833688c 100644
--- a/services/history-v1/api/controllers/projects.js
+++ b/services/history-v1/api/controllers/projects.js
@@ -34,6 +34,7 @@ async function initializeProject(req, res, next) {
     res.status(HTTPStatus.OK).json({ projectId })
   } catch (err) {
     if (err instanceof chunkStore.AlreadyInitialized) {
+      logger.warn({ err, projectId }, 'failed to initialize')
       render.conflict(res)
     } else {
       throw err
@@ -242,11 +243,15 @@ async function createProjectBlob(req, res, next) {
     const sizeLimit = new StreamSizeLimit(maxUploadSize)
     await pipeline(req, sizeLimit, fs.createWriteStream(tmpPath))
     if (sizeLimit.sizeLimitExceeded) {
+      logger.warn(
+        { projectId, expectedHash, maxUploadSize },
+        'blob exceeds size threshold'
+      )
       return render.requestEntityTooLarge(res)
     }
     const hash = await blobHash.fromFile(tmpPath)
     if (hash !== expectedHash) {
-      logger.debug({ hash, expectedHash }, 'Hash mismatch')
+      logger.warn({ projectId, hash, expectedHash }, 'Hash mismatch')
       return render.conflict(res, 'File hash mismatch')
     }
 
@@ -343,6 +348,10 @@ async function copyProjectBlob(req, res, next) {
     targetBlobStore.getBlob(blobHash),
   ])
   if (!sourceBlob) {
+    logger.warn(
+      { sourceProjectId, targetProjectId, blobHash },
+      'missing source blob when copying across projects'
+    )
     return render.notFound(res)
   }
   // Exit early if the blob exists in the target project.
diff --git a/services/history-v1/api/swagger/project_import.js b/services/history-v1/api/swagger/project_import.js
index a93f42d27e..6103eed74b 100644
--- a/services/history-v1/api/swagger/project_import.js
+++ b/services/history-v1/api/swagger/project_import.js
@@ -139,9 +139,45 @@ const getChanges = {
   ],
 }
 
+const flushChanges = {
+  'x-swagger-router-controller': 'project_import',
+  operationId: 'flushChanges',
+  tags: ['ProjectImport'],
+  description: 'Flush project changes from buffer to the chunk store.',
+  parameters: [
+    {
+      name: 'project_id',
+      in: 'path',
+      description: 'project id',
+      required: true,
+      type: 'string',
+    },
+  ],
+  responses: {
+    200: {
+      description: 'Success',
+      schema: {
+        $ref: '#/definitions/Project',
+      },
+    },
+    404: {
+      description: 'Not Found',
+      schema: {
+        $ref: '#/definitions/Error',
+      },
+    },
+  },
+  security: [
+    {
+      basic: [],
+    },
+  ],
+}
+
 exports.paths = {
   '/projects/{project_id}/import': { post: importSnapshot },
   '/projects/{project_id}/legacy_import': { post: importSnapshot },
   '/projects/{project_id}/changes': { get: getChanges, post: importChanges },
   '/projects/{project_id}/legacy_changes': { post: importChanges },
+  '/projects/{project_id}/flush': { post: flushChanges },
 }
diff --git a/services/history-v1/app.js b/services/history-v1/app.js
index 261f1001b6..dd991c1a6d 100644
--- a/services/history-v1/app.js
+++ b/services/history-v1/app.js
@@ -100,11 +100,13 @@ function setupErrorHandling() {
       })
     }
     if (err.code === 'ENUM_MISMATCH') {
+      logger.warn({ err, projectId }, err.message)
       return res.status(HTTPStatus.UNPROCESSABLE_ENTITY).json({
         message: 'invalid enum value: ' + err.paramName,
       })
     }
     if (err.code === 'REQUIRED') {
+      logger.warn({ err, projectId }, err.message)
       return res.status(HTTPStatus.UNPROCESSABLE_ENTITY).json({
         message: err.message,
       })
diff --git a/services/history-v1/config/custom-environment-variables.json b/services/history-v1/config/custom-environment-variables.json
index d07ae2925a..686ca25407 100644
--- a/services/history-v1/config/custom-environment-variables.json
+++ b/services/history-v1/config/custom-environment-variables.json
@@ -84,6 +84,10 @@
   "maxFileUploadSize": "MAX_FILE_UPLOAD_SIZE",
   "httpsOnly": "HTTPS_ONLY",
   "httpRequestTimeout": "HTTP_REQUEST_TIMEOUT",
+  "historyBufferLevel": "HISTORY_BUFFER_LEVEL",
+  "forcePersistBuffer": "FORCE_PERSIST_BUFFER",
+  "nextHistoryBufferLevel": "NEXT_HISTORY_BUFFER_LEVEL",
+  "nextHistoryBufferLevelRolloutPercentage": "NEXT_HISTORY_BUFFER_LEVEL_ROLLOUT_PERCENTAGE",
   "redis": {
     "queue": {
       "host": "QUEUES_REDIS_HOST",
@@ -100,5 +104,9 @@
       "password": "REDIS_PASSWORD",
       "port": "REDIS_PORT"
     }
+  },
+  "projectHistory": {
+    "host": "PROJECT_HISTORY_HOST",
+    "port": "PROJECT_HISTORY_PORT"
   }
 }
diff --git a/services/history-v1/config/default.json b/services/history-v1/config/default.json
index 5222b84d87..e7732fe3f7 100644
--- a/services/history-v1/config/default.json
+++ b/services/history-v1/config/default.json
@@ -39,5 +39,8 @@
   "databasePoolMin": "2",
   "databasePoolMax": "10",
   "httpsOnly": "false",
-  "httpRequestTimeout": "300000"
+  "httpRequestTimeout": "300000",
+  "projectHistory": {
+    "port": "3054"
+  }
 }
diff --git a/services/history-v1/docker-compose.ci.yml b/services/history-v1/docker-compose.ci.yml
index 0dfe8b99d3..9128451c4f 100644
--- a/services/history-v1/docker-compose.ci.yml
+++ b/services/history-v1/docker-compose.ci.yml
@@ -39,6 +39,7 @@ services:
       NODE_OPTIONS: "--unhandled-rejections=strict"
     volumes:
       - ./test/acceptance/certs:/certs
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     depends_on:
       mongo:
         condition: service_started
@@ -55,6 +56,7 @@ services:
       gcs:
         condition: service_healthy
     user: node
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run test:acceptance
 
 
@@ -66,7 +68,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   redis:
-    image: redis
+    image: redis:7.4.3
     healthcheck:
       test: ping="$$(redis-cli ping)" && [ "$$ping" = 'PONG' ]
       interval: 1s
diff --git a/services/history-v1/docker-compose.yml b/services/history-v1/docker-compose.yml
index b87d859e1e..cda379fb14 100644
--- a/services/history-v1/docker-compose.yml
+++ b/services/history-v1/docker-compose.yml
@@ -33,6 +33,7 @@ services:
       - ../../node_modules:/overleaf/node_modules
       - ../../libraries:/overleaf/libraries
       - ./test/acceptance/certs:/certs
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     working_dir: /overleaf/services/history-v1
     environment:
       ELASTIC_SEARCH_DSN: es:9200
@@ -71,10 +72,11 @@ services:
         condition: service_completed_successfully
       gcs:
         condition: service_healthy
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run --silent test:acceptance
 
   redis:
-    image: redis
+    image: redis:7.4.3
     healthcheck:
       test: ping=$$(redis-cli ping) && [ "$$ping" = 'PONG' ]
       interval: 1s
diff --git a/services/history-v1/package.json b/services/history-v1/package.json
index 1fdfd95c45..4796cafd03 100644
--- a/services/history-v1/package.json
+++ b/services/history-v1/package.json
@@ -7,6 +7,7 @@
   "private": true,
   "dependencies": {
     "@google-cloud/secret-manager": "^5.6.0",
+    "@overleaf/fetch-utils": "*",
     "@overleaf/logger": "*",
     "@overleaf/metrics": "*",
     "@overleaf/mongo-utils": "*",
@@ -36,6 +37,7 @@
     "mongodb": "6.12.0",
     "overleaf-editor-core": "*",
     "p-limit": "^6.2.0",
+    "p-queue": "^8.1.0",
     "pg": "^8.7.1",
     "pg-query-stream": "^4.2.4",
     "swagger-tools": "^0.10.4",
diff --git a/services/history-v1/storage/index.js b/services/history-v1/storage/index.js
index 2aa492f46e..82a51583be 100644
--- a/services/history-v1/storage/index.js
+++ b/services/history-v1/storage/index.js
@@ -8,6 +8,9 @@ exports.mongodb = require('./lib/mongodb')
 exports.redis = require('./lib/redis')
 exports.persistChanges = require('./lib/persist_changes')
 exports.persistor = require('./lib/persistor')
+exports.persistBuffer = require('./lib/persist_buffer')
+exports.commitChanges = require('./lib/commit_changes')
+exports.queueChanges = require('./lib/queue_changes')
 exports.ProjectArchive = require('./lib/project_archive')
 exports.streams = require('./lib/streams')
 exports.temp = require('./lib/temp')
diff --git a/services/history-v1/storage/lib/chunk_store/index.js b/services/history-v1/storage/lib/chunk_store/index.js
index 6dab84f929..286a8d8764 100644
--- a/services/history-v1/storage/lib/chunk_store/index.js
+++ b/services/history-v1/storage/lib/chunk_store/index.js
@@ -151,23 +151,48 @@ async function loadAtVersion(projectId, version, opts = {}) {
   const backend = getBackend(projectId)
   const blobStore = new BlobStore(projectId)
   const batchBlobStore = new BatchBlobStore(blobStore)
+  const latestChunkMetadata = await getLatestChunkMetadata(projectId)
 
-  const chunkRecord = await backend.getChunkForVersion(projectId, version, {
-    preferNewer: opts.preferNewer,
-  })
+  // When loading a chunk for a version there are three cases to consider:
+  // 1. If `persistedOnly` is true, we always use the requested version
+  //  to fetch the chunk.
+  // 2. If `persistedOnly` is false and the requested version is in the
+  //  persisted chunk version range, we use the requested version.
+  // 3. If `persistedOnly` is false and the requested version is ahead of
+  //  the persisted chunk versions, we fetch the latest chunk and see if
+  //  the non-persisted changes include the requested version.
+  const targetChunkVersion = opts.persistedOnly
+    ? version
+    : Math.min(latestChunkMetadata.endVersion, version)
+
+  const chunkRecord = await backend.getChunkForVersion(
+    projectId,
+    targetChunkVersion,
+    {
+      preferNewer: opts.preferNewer,
+    }
+  )
   const rawHistory = await historyStore.loadRaw(projectId, chunkRecord.id)
   const history = History.fromRaw(rawHistory)
+  const startVersion = chunkRecord.endVersion - history.countChanges()
 
   if (!opts.persistedOnly) {
+    // Try to extend the chunk with any non-persisted changes that
+    // follow the chunk's end version.
     const nonPersistedChanges = await getChunkExtension(
       projectId,
       chunkRecord.endVersion
     )
     history.pushChanges(nonPersistedChanges)
+
+    // Check that the changes do actually contain the requested version
+    if (version > chunkRecord.endVersion + nonPersistedChanges.length) {
+      throw new Chunk.VersionNotFoundError(projectId, version)
+    }
   }
 
   await lazyLoadHistoryFiles(history, batchBlobStore)
-  return new Chunk(history, chunkRecord.endVersion - history.countChanges())
+  return new Chunk(history, startVersion)
 }
 
 /**
@@ -190,6 +215,7 @@ async function loadAtTimestamp(projectId, timestamp, opts = {}) {
   const chunkRecord = await backend.getChunkForTimestamp(projectId, timestamp)
   const rawHistory = await historyStore.loadRaw(projectId, chunkRecord.id)
   const history = History.fromRaw(rawHistory)
+  const startVersion = chunkRecord.endVersion - history.countChanges()
 
   if (!opts.persistedOnly) {
     const nonPersistedChanges = await getChunkExtension(
@@ -200,7 +226,7 @@ async function loadAtTimestamp(projectId, timestamp, opts = {}) {
   }
 
   await lazyLoadHistoryFiles(history, batchBlobStore)
-  return new Chunk(history, chunkRecord.endVersion - history.countChanges())
+  return new Chunk(history, startVersion)
 }
 
 /**
diff --git a/services/history-v1/storage/lib/chunk_store/mongo.js b/services/history-v1/storage/lib/chunk_store/mongo.js
index 26c1bc48ec..49020c6be4 100644
--- a/services/history-v1/storage/lib/chunk_store/mongo.js
+++ b/services/history-v1/storage/lib/chunk_store/mongo.js
@@ -286,6 +286,27 @@ async function updateProjectRecord(
   )
 }
 
+/**
+ * @param {number} historyId
+ * @return {Promise<string>}
+ */
+async function lookupMongoProjectIdFromHistoryId(historyId) {
+  const project = await mongodb.projects.findOne(
+    // string for Object ids, number for postgres ids
+    { 'overleaf.history.id': historyId },
+    { projection: { _id: 1 } }
+  )
+  if (!project) {
+    // should not happen: We flush before allowing a project to be soft-deleted.
+    throw new OError('mongo project not found by history id', { historyId })
+  }
+  return project._id.toString()
+}
+
+async function resolveHistoryIdToMongoProjectId(projectId) {
+  return projectId
+}
+
 /**
  * Record that a chunk was replaced by a new one.
  *
@@ -533,4 +554,6 @@ module.exports = {
   deleteProjectChunks,
   getOldChunksBatch,
   deleteOldChunks,
+  lookupMongoProjectIdFromHistoryId,
+  resolveHistoryIdToMongoProjectId,
 }
diff --git a/services/history-v1/storage/lib/chunk_store/postgres.js b/services/history-v1/storage/lib/chunk_store/postgres.js
index bfb5c6954a..8906db38e1 100644
--- a/services/history-v1/storage/lib/chunk_store/postgres.js
+++ b/services/history-v1/storage/lib/chunk_store/postgres.js
@@ -5,7 +5,10 @@ const assert = require('../assert')
 const knex = require('../knex')
 const knexReadOnly = require('../knex_read_only')
 const { ChunkVersionConflictError } = require('./errors')
-const { updateProjectRecord } = require('./mongo')
+const {
+  updateProjectRecord,
+  lookupMongoProjectIdFromHistoryId,
+} = require('./mongo')
 
 const DUPLICATE_KEY_ERROR_CODE = '23505'
 
@@ -472,6 +475,10 @@ async function generateProjectId() {
   return record.doc_id.toString()
 }
 
+async function resolveHistoryIdToMongoProjectId(projectId) {
+  return await lookupMongoProjectIdFromHistoryId(parseInt(projectId, 10))
+}
+
 module.exports = {
   getLatestChunk,
   getFirstChunkBeforeTimestamp,
@@ -488,4 +495,5 @@ module.exports = {
   getOldChunksBatch,
   deleteOldChunks,
   generateProjectId,
+  resolveHistoryIdToMongoProjectId,
 }
diff --git a/services/history-v1/storage/lib/chunk_store/redis.js b/services/history-v1/storage/lib/chunk_store/redis.js
index 0ae7cee2e5..59bfd81e39 100644
--- a/services/history-v1/storage/lib/chunk_store/redis.js
+++ b/services/history-v1/storage/lib/chunk_store/redis.js
@@ -480,11 +480,12 @@ async function getNonPersistedChanges(projectId, baseVersion) {
 }
 
 rclient.defineCommand('set_persisted_version', {
-  numberOfKeys: 3,
+  numberOfKeys: 4,
   lua: `
     local headVersionKey = KEYS[1]
     local persistedVersionKey = KEYS[2]
-    local changesKey = KEYS[3]
+    local persistTimeKey = KEYS[3]
+    local changesKey = KEYS[4]
 
     local newPersistedVersion = tonumber(ARGV[1])
     local maxPersistedChanges = tonumber(ARGV[2])
@@ -501,9 +502,19 @@ rclient.defineCommand('set_persisted_version', {
       return 'too_low'
     end
 
+    -- Refuse to set a persisted version that is higher than the head version
+    if newPersistedVersion > headVersion then
+      return 'too_high'
+    end
+
     -- Set the persisted version
     redis.call('SET', persistedVersionKey, newPersistedVersion)
 
+    -- Clear the persist time if the persisted version now matches the head version
+    if newPersistedVersion == headVersion then
+      redis.call('DEL', persistTimeKey)
+    end
+
     -- Calculate the starting index, to keep only maxPersistedChanges beyond the persisted version
     -- Using negative indexing to count backwards from the end of the list
     local startIndex = newPersistedVersion - headVersion - maxPersistedChanges
@@ -530,6 +541,7 @@ async function setPersistedVersion(projectId, persistedVersion) {
     const keys = [
       keySchema.headVersion({ projectId }),
       keySchema.persistedVersion({ projectId }),
+      keySchema.persistTime({ projectId }),
       keySchema.changes({ projectId }),
     ]
 
@@ -541,6 +553,13 @@ async function setPersistedVersion(projectId, persistedVersion) {
       status,
     })
 
+    if (status === 'too_high') {
+      throw new VersionOutOfBoundsError(
+        'Persisted version cannot be higher than head version',
+        { projectId, persistedVersion }
+      )
+    }
+
     return status
   } catch (err) {
     metrics.inc('chunk_store.redis.set_persisted_version', 1, {
@@ -631,6 +650,7 @@ async function expireProject(projectId) {
     metrics.inc('chunk_store.redis.set_persisted_version', 1, {
       status,
     })
+    return status
   } catch (err) {
     metrics.inc('chunk_store.redis.set_persisted_version', 1, {
       status: 'error',
diff --git a/services/history-v1/storage/lib/commit_changes.js b/services/history-v1/storage/lib/commit_changes.js
new file mode 100644
index 0000000000..5749e5fc0e
--- /dev/null
+++ b/services/history-v1/storage/lib/commit_changes.js
@@ -0,0 +1,159 @@
+// @ts-check
+
+'use strict'
+
+const metrics = require('@overleaf/metrics')
+const redisBackend = require('./chunk_store/redis')
+const logger = require('@overleaf/logger')
+const queueChanges = require('./queue_changes')
+const persistChanges = require('./persist_changes')
+const persistBuffer = require('./persist_buffer')
+
+/**
+ * @typedef {import('overleaf-editor-core').Change} Change
+ */
+
+/**
+ * Handle incoming changes by processing them according to the specified options.
+ * @param {string} projectId
+ * @param {Change[]} changes
+ * @param {Object} limits
+ * @param {number} endVersion
+ * @param {Object} options
+ * @param {number} [options.historyBufferLevel] - The history buffer level to use for processing changes.
+ * @param {Boolean} [options.forcePersistBuffer] - If true, forces the buffer to be persisted before any operation.
+ * @return {Promise.<Object?>}
+ */
+
+async function commitChanges(
+  projectId,
+  changes,
+  limits,
+  endVersion,
+  options = {}
+) {
+  const { historyBufferLevel, forcePersistBuffer } = options
+
+  // Force the buffer to be persisted if specified.
+  if (forcePersistBuffer) {
+    try {
+      const status = await redisBackend.expireProject(projectId) // clear the project from Redis if it is persisted, returns 'not-persisted' if it was not persisted
+      if (status === 'not-persisted') {
+        await persistBuffer(projectId, limits)
+        await redisBackend.expireProject(projectId) // clear the project from Redis after persisting
+        metrics.inc('persist_buffer_force', 1, { status: 'persisted' })
+      }
+    } catch (err) {
+      metrics.inc('persist_buffer_force', 1, { status: 'error' })
+      logger.error(
+        { err, projectId },
+        'failed to persist buffer before committing changes'
+      )
+    }
+  }
+
+  metrics.inc('commit_changes', 1, {
+    history_buffer_level: historyBufferLevel || 0,
+  })
+
+  // Now handle the changes based on the configured history buffer level.
+  switch (historyBufferLevel) {
+    case 4: // Queue changes and only persist them in the background
+      await queueChanges(projectId, changes, endVersion)
+      return {}
+    case 3: // Queue changes and immediately persist with persistBuffer
+      await queueChanges(projectId, changes, endVersion)
+      return await persistBuffer(projectId, limits)
+    case 2: // Equivalent to queueChangesInRedis:true
+      await queueChangesFake(projectId, changes, endVersion)
+      return await persistChanges(projectId, changes, limits, endVersion)
+    case 1: // Queue changes with fake persist only for projects in redis already
+      await queueChangesFakeOnlyIfExists(projectId, changes, endVersion)
+      return await persistChanges(projectId, changes, limits, endVersion)
+    case 0: // Persist changes directly to the chunk store
+      return await persistChanges(projectId, changes, limits, endVersion)
+    default:
+      throw new Error(`Invalid history buffer level: ${historyBufferLevel}`)
+  }
+}
+
+/**
+ * Queues a set of changes in redis as if they had been persisted, ignoring any errors.
+ * @param {string} projectId
+ * @param {Change[]} changes
+ * @param {number} endVersion
+ * @param {Object} [options]
+ * @param {boolean} [options.onlyIfExists] - If true, only queue changes if the project
+ * already exists in Redis.
+ */
+
+async function queueChangesFake(projectId, changes, endVersion, options = {}) {
+  try {
+    await queueChanges(projectId, changes, endVersion)
+    await fakePersistRedisChanges(projectId, changes, endVersion)
+  } catch (err) {
+    logger.error({ err }, 'Chunk buffer verification failed')
+  }
+}
+
+/**
+ * Queues changes in Redis, simulating persistence, but only if the project already exists.
+ * @param {string} projectId - The ID of the project.
+ * @param {Change[]} changes - An array of changes to be queued.
+ * @param {number} endVersion - The expected version of the project before these changes are applied.
+ */
+
+async function queueChangesFakeOnlyIfExists(projectId, changes, endVersion) {
+  await queueChangesFake(projectId, changes, endVersion, {
+    onlyIfExists: true,
+  })
+}
+
+/**
+ * Simulates the persistence of changes by verifying a given set of changes against
+ * what is currently stored as non-persisted in Redis, and then updates the
+ * persisted version number in Redis.
+ *
+ * @async
+ * @param {string} projectId - The ID of the project.
+ * @param {Change[]} changesToPersist - An array of changes that are expected to be
+ *                                        persisted. These are used for verification
+ *                                        against the changes currently in Redis.
+ * @param {number} baseVersion - The base version number from which to calculate
+ *                               the new persisted version.
+ * @returns {Promise<void>} A promise that resolves when the persisted version
+ *                          in Redis has been updated.
+ */
+async function fakePersistRedisChanges(
+  projectId,
+  changesToPersist,
+  baseVersion
+) {
+  const nonPersistedChanges = await redisBackend.getNonPersistedChanges(
+    projectId,
+    baseVersion
+  )
+
+  if (
+    serializeChanges(nonPersistedChanges) === serializeChanges(changesToPersist)
+  ) {
+    metrics.inc('persist_redis_changes_verification', 1, { status: 'match' })
+  } else {
+    logger.warn({ projectId }, 'mismatch of non-persisted changes from Redis')
+    metrics.inc('persist_redis_changes_verification', 1, {
+      status: 'mismatch',
+    })
+  }
+
+  const persistedVersion = baseVersion + nonPersistedChanges.length
+  await redisBackend.setPersistedVersion(projectId, persistedVersion)
+}
+
+/**
+ * @param {Change[]} changes
+ */
+function serializeChanges(changes) {
+  return JSON.stringify(changes.map(change => change.toRaw()))
+}
+
+module.exports = commitChanges
diff --git a/services/history-v1/storage/lib/persist_buffer.js b/services/history-v1/storage/lib/persist_buffer.js
new file mode 100644
index 0000000000..d562388f87
--- /dev/null
+++ b/services/history-v1/storage/lib/persist_buffer.js
@@ -0,0 +1,206 @@
+// @ts-check
+'use strict'
+
+const logger = require('@overleaf/logger')
+const metrics = require('@overleaf/metrics')
+const OError = require('@overleaf/o-error')
+const assert = require('./assert')
+const chunkStore = require('./chunk_store')
+const { BlobStore } = require('./blob_store')
+const BatchBlobStore = require('./batch_blob_store')
+const persistChanges = require('./persist_changes')
+const resyncProject = require('./resync_project')
+const redisBackend = require('./chunk_store/redis')
+
+/**
+ * Persist the changes from Redis buffer to the main storage
+ *
+ * Algorithm Outline:
+ * 1. Get the latest chunk's endVersion from the database
+ * 2. Get non-persisted changes from Redis that are after this endVersion.
+ * 3. If no such changes, exit.
+ * 4. Load file blobs for these Redis changes.
+ * 5. Run the persistChanges() algorithm to store these changes into a new chunk(s) in GCS.
+ *    - This must not decrease the endVersion. If changes were processed, it must advance.
+ * 6. Set the new persisted version (endVersion of the latest persisted chunk) in Redis.
+ *
+ * @param {string} projectId
+ * @param {Object} limits
+ * @throws {Error | OError} If a critical error occurs during persistence.
+ */
+async function persistBuffer(projectId, limits) {
+  assert.projectId(projectId)
+  logger.debug({ projectId }, 'starting persistBuffer operation')
+
+  // 1. Get the latest chunk's endVersion from GCS/main store
+  let endVersion
+  const latestChunkMetadata = await chunkStore.getLatestChunkMetadata(projectId)
+
+  if (latestChunkMetadata) {
+    endVersion = latestChunkMetadata.endVersion
+  } else {
+    endVersion = 0 // No chunks found, start from version 0
+    logger.debug({ projectId }, 'no existing chunks found in main storage')
+  }
+
+  logger.debug({ projectId, endVersion }, 'got latest persisted chunk')
+
+  // 2. Get non-persisted changes from Redis
+  const changesToPersist = await redisBackend.getNonPersistedChanges(
+    projectId,
+    endVersion
+  )
+
+  if (changesToPersist.length === 0) {
+    logger.debug(
+      { projectId, endVersion },
+      'no new changes in Redis buffer to persist'
+    )
+    metrics.inc('persist_buffer', 1, { status: 'no_changes' })
+    // No changes to persist, update the persisted version in Redis
+    // to match the current endVersion.  This shouldn't be needed
+    // unless a worker failed to update the persisted version.
+    await redisBackend.setPersistedVersion(projectId, endVersion)
+    const { chunk } = await chunkStore.loadByChunkRecord(
+      projectId,
+      latestChunkMetadata
+    )
+    // Return the result in the same format as persistChanges
+    // so that the caller can handle it uniformly.
+    return {
+      numberOfChangesPersisted: changesToPersist.length,
+      originalEndVersion: endVersion,
+      currentChunk: chunk,
+    }
+  }
+
+  logger.debug(
+    {
+      projectId,
+      endVersion,
+      count: changesToPersist.length,
+    },
+    'found changes in Redis to persist'
+  )
+
+  // 4. Load file blobs for these Redis changes. Errors will propagate.
+  const blobStore = new BlobStore(projectId)
+  const batchBlobStore = new BatchBlobStore(blobStore)
+
+  const blobHashes = new Set()
+  for (const change of changesToPersist) {
+    change.findBlobHashes(blobHashes)
+  }
+  if (blobHashes.size > 0) {
+    await batchBlobStore.preload(Array.from(blobHashes))
+  }
+  for (const change of changesToPersist) {
+    await change.loadFiles('lazy', blobStore)
+  }
+
+  // 5. Run the persistChanges() algorithm. Errors will propagate.
+  logger.debug(
+    {
+      projectId,
+      endVersion,
+      changeCount: changesToPersist.length,
+    },
+    'calling persistChanges'
+  )
+
+  const persistResult = await persistChanges(
+    projectId,
+    changesToPersist,
+    limits,
+    endVersion
+  )
+
+  if (!persistResult || !persistResult.currentChunk) {
+    metrics.inc('persist_buffer', 1, { status: 'no-chunk-error' })
+    throw new OError(
+      'persistChanges did not produce a new chunk for non-empty changes',
+      {
+        projectId,
+        endVersion,
+        changeCount: changesToPersist.length,
+      }
+    )
+  }
+
+  const newPersistedChunk = persistResult.currentChunk
+  const newEndVersion = newPersistedChunk.getEndVersion()
+
+  if (newEndVersion <= endVersion) {
+    metrics.inc('persist_buffer', 1, { status: 'chunk-version-mismatch' })
+    throw new OError(
+      'persisted chunk endVersion must be greater than current persisted chunk end version for non-empty changes',
+      {
+        projectId,
+        newEndVersion,
+        endVersion,
+        changeCount: changesToPersist.length,
+      }
+    )
+  }
+
+  logger.debug(
+    {
+      projectId,
+      oldVersion: endVersion,
+      newVersion: newEndVersion,
+    },
+    'successfully persisted changes from Redis to main storage'
+  )
+
+  // 6. Set the persisted version in Redis. Errors will propagate.
+  const status = await redisBackend.setPersistedVersion(
+    projectId,
+    newEndVersion
+  )
+
+  if (status !== 'ok') {
+    metrics.inc('persist_buffer', 1, { status: 'error-on-persisted-version' })
+    throw new OError('failed to update persisted version in Redis', {
+      projectId,
+      newEndVersion,
+      status,
+    })
+  }
+
+  logger.debug(
+    { projectId, newEndVersion },
+    'updated persisted version in Redis'
+  )
+
+  // 7. Resync the project if content hash validation failed
+  if (limits.autoResync && persistResult.resyncNeeded) {
+    if (
+      changesToPersist.some(
+        change => change.getOrigin()?.getKind() === 'history-resync'
+      )
+    ) {
+      // To avoid an infinite loop, do not resync if the current batch of
+      // changes contains a history resync.
+      logger.warn(
+        { projectId },
+        'content hash validation failed while persisting a history resync, skipping additional resync'
+      )
+    } else {
+      const backend = chunkStore.getBackend(projectId)
+      const mongoProjectId =
+        await backend.resolveHistoryIdToMongoProjectId(projectId)
+      await resyncProject(mongoProjectId)
+    }
+  }
+
+  logger.debug(
+    { projectId, finalPersistedVersion: newEndVersion },
+    'persistBuffer operation completed successfully'
+  )
+
+  metrics.inc('persist_buffer', 1, { status: 'persisted' })
+
+  return persistResult
+}
+
+module.exports = persistBuffer
diff --git a/services/history-v1/storage/lib/persist_changes.js b/services/history-v1/storage/lib/persist_changes.js
index 5b80285eb0..d2ca00053f 100644
--- a/services/history-v1/storage/lib/persist_changes.js
+++ b/services/history-v1/storage/lib/persist_changes.js
@@ -4,7 +4,6 @@
 
 const _ = require('lodash')
 const logger = require('@overleaf/logger')
-const metrics = require('@overleaf/metrics')
 
 const core = require('overleaf-editor-core')
 const Chunk = core.Chunk
@@ -15,7 +14,6 @@ const chunkStore = require('./chunk_store')
 const { BlobStore } = require('./blob_store')
 const { InvalidChangeError } = require('./errors')
 const { getContentHash } = require('./content_hash')
-const redisBackend = require('./chunk_store/redis')
 
 function countChangeBytes(change) {
   // Note: This is not quite accurate, because the raw change may contain raw
@@ -202,45 +200,6 @@ async function persistChanges(projectId, allChanges, limits, clientEndVersion) {
     currentSnapshot.applyAll(currentChunk.getChanges())
   }
 
-  async function queueChangesInRedis() {
-    const hollowSnapshot = currentSnapshot.clone()
-    // We're transforming a lazy snapshot to a hollow snapshot, so loadFiles()
-    // doesn't really need a blobStore, but its signature still requires it.
-    const blobStore = new BlobStore(projectId)
-    await hollowSnapshot.loadFiles('hollow', blobStore)
-    hollowSnapshot.applyAll(changesToPersist, { strict: true })
-    const baseVersion = currentChunk.getEndVersion()
-    await redisBackend.queueChanges(
-      projectId,
-      hollowSnapshot,
-      baseVersion,
-      changesToPersist
-    )
-  }
-
-  async function fakePersistRedisChanges() {
-    const baseVersion = currentChunk.getEndVersion()
-    const nonPersistedChanges = await redisBackend.getNonPersistedChanges(
-      projectId,
-      baseVersion
-    )
-
-    if (
-      serializeChanges(nonPersistedChanges) ===
-      serializeChanges(changesToPersist)
-    ) {
-      metrics.inc('persist_redis_changes_verification', 1, { status: 'match' })
-    } else {
-      logger.warn({ projectId }, 'mismatch of non-persisted changes from Redis')
-      metrics.inc('persist_redis_changes_verification', 1, {
-        status: 'mismatch',
-      })
-    }
-
-    const persistedVersion = baseVersion + nonPersistedChanges.length
-    await redisBackend.setPersistedVersion(projectId, persistedVersion)
-  }
-
   async function extendLastChunkIfPossible() {
     const timer = new Timer()
     const changesPushed = await fillChunk(currentChunk, changesToPersist)
@@ -289,12 +248,6 @@ async function persistChanges(projectId, allChanges, limits, clientEndVersion) {
     const numberOfChangesToPersist = oldChanges.length
 
     await loadLatestChunk()
-    try {
-      await queueChangesInRedis()
-      await fakePersistRedisChanges()
-    } catch (err) {
-      logger.error({ err }, 'Chunk buffer verification failed')
-    }
     await extendLastChunkIfPossible()
     await createNewChunksAsNeeded()
 
@@ -309,11 +262,4 @@ async function persistChanges(projectId, allChanges, limits, clientEndVersion) {
   }
 }
 
-/**
- * @param {core.Change[]} changes
- */
-function serializeChanges(changes) {
-  return JSON.stringify(changes.map(change => change.toRaw()))
-}
-
 module.exports = persistChanges
diff --git a/services/history-v1/storage/lib/queue_changes.js b/services/history-v1/storage/lib/queue_changes.js
new file mode 100644
index 0000000000..6b8d4b22b4
--- /dev/null
+++ b/services/history-v1/storage/lib/queue_changes.js
@@ -0,0 +1,75 @@
+// @ts-check
+
+'use strict'
+
+const redisBackend = require('./chunk_store/redis')
+const { BlobStore } = require('./blob_store')
+const chunkStore = require('./chunk_store')
+const core = require('overleaf-editor-core')
+const Chunk = core.Chunk
+
+/**
+ * Queues an incoming set of changes after validating them against the current snapshot.
+ *
+ * @async
+ * @function queueChanges
+ * @param {string} projectId - The project to queue changes for.
+ * @param {Array<Object>} changesToQueue - An array of change objects to be applied and queued.
+ * @param {number} endVersion - The expected version of the project before these changes are applied.
+ *                              This is used for optimistic concurrency control.
+ * @param {Object} [opts] - Additional options for queuing changes.
+ * @throws {Chunk.ConflictingEndVersion} If the provided `endVersion` does not match the
+ *                                       current version of the project.
+ * @returns {Promise<any>} A promise that resolves with the status returned by the
+ *                         `redisBackend.queueChanges` operation.
+ */
+async function queueChanges(projectId, changesToQueue, endVersion, opts) {
+  const result = await redisBackend.getHeadSnapshot(projectId)
+  let currentSnapshot = null
+  let currentVersion = null
+  if (result) {
+    // If we have a snapshot in redis, we can use it to check the current state
+    // of the project and apply changes to it.
+    currentSnapshot = result.snapshot
+    currentVersion = result.version
+  } else {
+    // Otherwise, load the latest chunk from the chunk store.
+    const latestChunk = await chunkStore.loadLatest(projectId, {
+      persistedOnly: true,
+    })
+    // Throw an error if no latest chunk is found, indicating the project has not been initialised.
+    if (!latestChunk) {
+      throw new Chunk.NotFoundError(projectId)
+    }
+    currentSnapshot = latestChunk.getSnapshot()
+    currentSnapshot.applyAll(latestChunk.getChanges())
+    currentVersion = latestChunk.getEndVersion()
+  }
+
+  // Ensure the endVersion matches the current version of the project.
+  if (endVersion !== currentVersion) {
+    throw new Chunk.ConflictingEndVersion(endVersion, currentVersion)
+  }
+
+  // Compute the new hollow snapshot to be saved to redis.
+  const hollowSnapshot = currentSnapshot
+  const blobStore = new BlobStore(projectId)
+  await hollowSnapshot.loadFiles('hollow', blobStore)
+  // Clone the changes to avoid modifying the original ones when computing the hollow snapshot.
+  const hollowChanges = changesToQueue.map(change => change.clone())
+  for (const change of hollowChanges) {
+    await change.loadFiles('hollow', blobStore)
+  }
+  hollowSnapshot.applyAll(hollowChanges, { strict: true })
+  const baseVersion = currentVersion
+  const status = await redisBackend.queueChanges(
+    projectId,
+    hollowSnapshot,
+    baseVersion,
+    changesToQueue,
+    opts
+  )
+  return status
+}
+
+module.exports = queueChanges
diff --git a/services/history-v1/storage/lib/resync_project.js b/services/history-v1/storage/lib/resync_project.js
new file mode 100644
index 0000000000..3ec680bb5b
--- /dev/null
+++ b/services/history-v1/storage/lib/resync_project.js
@@ -0,0 +1,14 @@
+// @ts-check
+
+const config = require('config')
+const { fetchNothing } = require('@overleaf/fetch-utils')
+
+const PROJECT_HISTORY_URL = `http://${config.projectHistory.host}:${config.projectHistory.port}`
+
+async function resyncProject(projectId) {
+  await fetchNothing(`${PROJECT_HISTORY_URL}/project/${projectId}/resync`, {
+    method: 'POST',
+  })
+}
+
+module.exports = resyncProject
diff --git a/services/history-v1/storage/lib/scan.js b/services/history-v1/storage/lib/scan.js
index 1f2a335254..d55f5362c1 100644
--- a/services/history-v1/storage/lib/scan.js
+++ b/services/history-v1/storage/lib/scan.js
@@ -1,3 +1,7 @@
+// @ts-check
+
+'use strict'
+
 const logger = require('@overleaf/logger')
 const { JobNotFoundError, JobNotReadyError } = require('./chunk_store/errors')
 const BATCH_SIZE = 1000 // Default batch size for SCAN
diff --git a/services/history-v1/storage/scripts/expire_redis_chunks.js b/services/history-v1/storage/scripts/expire_redis_chunks.js
index af2be097b6..60ce4c66f6 100644
--- a/services/history-v1/storage/scripts/expire_redis_chunks.js
+++ b/services/history-v1/storage/scripts/expire_redis_chunks.js
@@ -14,12 +14,9 @@ logger.initialize('expire-redis-chunks')
 
 async function expireProjectAction(projectId) {
   const job = await claimExpireJob(projectId)
-  try {
-    await expireProject(projectId)
-  } finally {
-    if (job && job.close) {
-      await job.close()
-    }
+  await expireProject(projectId)
+  if (job && job.close) {
+    await job.close()
   }
 }
 
diff --git a/services/history-v1/storage/scripts/persist_and_expire_queues.sh b/services/history-v1/storage/scripts/persist_and_expire_queues.sh
new file mode 100644
index 0000000000..d5789541da
--- /dev/null
+++ b/services/history-v1/storage/scripts/persist_and_expire_queues.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+node storage/scripts/persist_redis_chunks.mjs --queue --max-time 270
+node storage/scripts/expire_redis_chunks.js
diff --git a/services/history-v1/storage/scripts/persist_redis_chunks.mjs b/services/history-v1/storage/scripts/persist_redis_chunks.mjs
new file mode 100644
index 0000000000..dd7e9f3a51
--- /dev/null
+++ b/services/history-v1/storage/scripts/persist_redis_chunks.mjs
@@ -0,0 +1,181 @@
+import config from 'config'
+import PQueue from 'p-queue'
+import { fetchNothing } from '@overleaf/fetch-utils'
+import logger from '@overleaf/logger'
+import commandLineArgs from 'command-line-args'
+import * as redis from '../lib/redis.js'
+import knex from '../lib/knex.js'
+import knexReadOnly from '../lib/knex_read_only.js'
+import { client } from '../lib/mongodb.js'
+import { scanAndProcessDueItems } from '../lib/scan.js'
+import persistBuffer from '../lib/persist_buffer.js'
+import { claimPersistJob } from '../lib/chunk_store/redis.js'
+import { loadGlobalBlobs } from '../lib/blob_store/index.js'
+import { EventEmitter } from 'node:events'
+import { fileURLToPath } from 'node:url'
+
+// Something is registering 11 listeners, over the limit of 10, which generates
+// a lot of warning noise.
+EventEmitter.defaultMaxListeners = 11
+
+const rclient = redis.rclientHistory
+
+const optionDefinitions = [
+  { name: 'dry-run', alias: 'd', type: Boolean },
+  { name: 'queue', type: Boolean },
+  { name: 'max-time', type: Number },
+  { name: 'min-rate', type: Number, defaultValue: 1 },
+]
+const options = commandLineArgs(optionDefinitions)
+const DRY_RUN = options['dry-run'] || false
+const USE_QUEUE = options.queue || false
+const MAX_TIME = options['max-time'] || null
+const MIN_RATE = options['min-rate']
+const HISTORY_V1_URL = `http://${process.env.HISTORY_V1_HOST || 'localhost'}:${process.env.PORT || 3100}`
+let isShuttingDown = false
+
+logger.initialize('persist-redis-chunks')
+
+async function persistProjectAction(projectId) {
+  const job = await claimPersistJob(projectId)
+  // Set limits to force us to persist all of the changes.
+  const farFuture = new Date()
+  farFuture.setTime(farFuture.getTime() + 7 * 24 * 3600 * 1000)
+  const limits = {
+    maxChanges: 0,
+    minChangeTimestamp: farFuture,
+    maxChangeTimestamp: farFuture,
+    autoResync: true,
+  }
+  await persistBuffer(projectId, limits)
+  if (job && job.close) {
+    await job.close()
+  }
+}
+
+async function requestProjectFlush(projectId) {
+  const job = await claimPersistJob(projectId)
+  logger.debug({ projectId }, 'sending project flush request')
+  const url = `${HISTORY_V1_URL}/api/projects/${projectId}/flush`
+  const credentials = Buffer.from(
+    `staging:${config.get('basicHttpAuth.password')}`
+  ).toString('base64')
+  await fetchNothing(url, {
+    method: 'POST',
+    headers: {
+      Authorization: `Basic ${credentials}`,
+    },
+  })
+  if (job && job.close) {
+    await job.close()
+  }
+}
+
+async function persistQueuedProjects(queuedProjects) {
+  const totalCount = queuedProjects.size
+  // Compute the rate at which we need to dispatch requests
+  const targetRate = MAX_TIME > 0 ? Math.ceil(totalCount / MAX_TIME) : 0
+  // Rate limit to spread the requests over the interval.
+  const queue = new PQueue({
+    intervalCap: Math.max(MIN_RATE, targetRate),
+    interval: 1000, // use a 1 second interval
+  })
+  logger.info(
+    { totalCount, targetRate, minRate: MIN_RATE, maxTime: MAX_TIME },
+    'dispatching project flush requests'
+  )
+  const startTime = Date.now()
+  let dispatchedCount = 0
+  for (const projectId of queuedProjects) {
+    if (isShuttingDown) {
+      logger.info('Shutting down, stopping project flush requests')
+      queue.clear()
+      break
+    }
+    queue.add(async () => {
+      try {
+        await requestProjectFlush(projectId)
+      } catch (err) {
+        logger.error({ err, projectId }, 'error while flushing project')
+      }
+    })
+    dispatchedCount++
+    if (dispatchedCount % 1000 === 0) {
+      logger.info(
+        { count: dispatchedCount },
+        'dispatched project flush requests'
+      )
+    }
+    await queue.onEmpty()
+  }
+  const elapsedTime = Math.floor((Date.now() - startTime) / 1000)
+  logger.info(
+    { count: totalCount, elapsedTime },
+    'dispatched project flush requests'
+  )
+  await queue.onIdle()
+}
+
+async function runPersistChunks() {
+  const queuedProjects = new Set()
+
+  async function queueProjectAction(projectId) {
+    queuedProjects.add(projectId)
+  }
+
+  await loadGlobalBlobs()
+  await scanAndProcessDueItems(
+    rclient,
+    'persistChunks',
+    'persist-time',
+    USE_QUEUE ? queueProjectAction : persistProjectAction,
+    DRY_RUN
+  )
+
+  if (USE_QUEUE) {
+    if (isShuttingDown) {
+      logger.info('Shutting down, skipping queued project persistence')
+      return
+    }
+    logger.info(
+      { count: queuedProjects.size },
+      'queued projects for persistence'
+    )
+    await persistQueuedProjects(queuedProjects)
+  }
+}
+
+async function main() {
+  try {
+    await runPersistChunks()
+  } catch (err) {
+    logger.fatal(
+      { err, taskName: 'persistChunks' },
+      'Unhandled error in runPersistChunks'
+    )
+    process.exit(1)
+  } finally {
+    await redis.disconnect()
+    await client.close()
+    await knex.destroy()
+    await knexReadOnly.destroy()
+  }
+}
+
+function gracefulShutdown() {
+  if (isShuttingDown) {
+    return
+  }
+  isShuttingDown = true
+  logger.info({ isShuttingDown }, 'received shutdown signal, cleaning up...')
+}
+
+// Check if the module is being run directly
+const currentScriptPath = fileURLToPath(import.meta.url)
+if (process.argv[1] === currentScriptPath) {
+  process.on('SIGINT', gracefulShutdown)
+  process.on('SIGTERM', gracefulShutdown)
+  main()
+}
+
+export { runPersistChunks }
diff --git a/services/history-v1/storage/scripts/show_buffer.js b/services/history-v1/storage/scripts/show_buffer.js
new file mode 100644
index 0000000000..1d80ee227d
--- /dev/null
+++ b/services/history-v1/storage/scripts/show_buffer.js
@@ -0,0 +1,117 @@
+#!/usr/bin/env node
+// @ts-check
+
+const { rclientHistory: rclient } = require('../lib/redis')
+const { keySchema } = require('../lib/chunk_store/redis')
+const commandLineArgs = require('command-line-args')
+
+const optionDefinitions = [
+  { name: 'historyId', type: String, defaultOption: true },
+]
+
+// Column width for key display alignment; can be overridden with COL_WIDTH env variable
+const COLUMN_WIDTH = process.env.COL_WIDTH
+  ? parseInt(process.env.COL_WIDTH, 10)
+  : 45
+
+let options
+try {
+  options = commandLineArgs(optionDefinitions)
+} catch (e) {
+  console.error(
+    'Error parsing command line arguments:',
+    e instanceof Error ? e.message : String(e)
+  )
+  console.error('Usage: ./show_buffer.js <historyId>')
+  process.exit(1)
+}
+
+const { historyId } = options
+
+if (!historyId) {
+  console.error('Usage: ./show_buffer.js <historyId>')
+  process.exit(1)
+}
+
+function format(str, indent = COLUMN_WIDTH + 2) {
+  const lines = str.split('\n')
+  for (let i = 1; i < lines.length; i++) {
+    lines[i] = ' '.repeat(indent) + lines[i]
+  }
+  return lines.join('\n')
+}
+
+async function displayKeyValue(
+  rclient,
+  key,
+  { parseJson = false, formatDate = false } = {}
+) {
+  const value = await rclient.get(key)
+  let displayValue = '(nil)'
+  if (value) {
+    if (parseJson) {
+      try {
+        displayValue = format(JSON.stringify(JSON.parse(value), null, 2))
+      } catch (e) {
+        displayValue = `  Raw value: ${value}`
+      }
+    } else if (formatDate) {
+      const ts = parseInt(value, 10)
+      displayValue = `${new Date(ts).toISOString()} (${value})`
+    } else {
+      displayValue = value
+    }
+  }
+  console.log(`${key.padStart(COLUMN_WIDTH)}: ${displayValue}`)
+}
+
+async function displayBuffer(projectId) {
+  console.log(`Buffer for history ID: ${projectId}`)
+  console.log('--------------------------------------------------')
+
+  try {
+    const headKey = keySchema.head({ projectId })
+    const headVersionKey = keySchema.headVersion({ projectId })
+    const persistedVersionKey = keySchema.persistedVersion({ projectId })
+    const expireTimeKey = keySchema.expireTime({ projectId })
+    const persistTimeKey = keySchema.persistTime({ projectId })
+    const changesKey = keySchema.changes({ projectId })
+
+    await displayKeyValue(rclient, headKey, { parseJson: true })
+    await displayKeyValue(rclient, headVersionKey)
+    await displayKeyValue(rclient, persistedVersionKey)
+    await displayKeyValue(rclient, expireTimeKey, { formatDate: true })
+    await displayKeyValue(rclient, persistTimeKey, { formatDate: true })
+
+    const changesList = await rclient.lrange(changesKey, 0, -1)
+
+    // 6. changes
+    let changesListDisplay = '(nil)'
+    if (changesList) {
+      changesListDisplay = changesList.length
+        ? format(
+            changesList
+              .map((change, index) => `[${index}]: ${change}`)
+              .join('\n')
+          )
+        : '(empty list)'
+    }
+    console.log(`${changesKey.padStart(COLUMN_WIDTH)}: ${changesListDisplay}`)
+  } catch (error) {
+    console.error('Error fetching data from Redis:', error)
+    throw error
+  }
+}
+
+;(async () => {
+  let errorOccurred = false
+  try {
+    await displayBuffer(historyId)
+  } catch (error) {
+    errorOccurred = true
+  } finally {
+    rclient.quit(() => {
+      process.exit(errorOccurred ? 1 : 0)
+    })
+  }
+})()
diff --git a/services/history-v1/test/acceptance/js/api/project_flush.test.js b/services/history-v1/test/acceptance/js/api/project_flush.test.js
new file mode 100644
index 0000000000..f8d0b23d8e
--- /dev/null
+++ b/services/history-v1/test/acceptance/js/api/project_flush.test.js
@@ -0,0 +1,66 @@
+'use strict'
+
+const BPromise = require('bluebird')
+const { expect } = require('chai')
+const HTTPStatus = require('http-status')
+const fetch = require('node-fetch')
+const fs = BPromise.promisifyAll(require('node:fs'))
+
+const cleanup = require('../storage/support/cleanup')
+const fixtures = require('../storage/support/fixtures')
+const testFiles = require('../storage/support/test_files')
+const testProjects = require('./support/test_projects')
+const testServer = require('./support/test_server')
+
+const { Change, File, Operation } = require('overleaf-editor-core')
+const queueChanges = require('../../../../storage/lib/queue_changes')
+const { getState } = require('../../../../storage/lib/chunk_store/redis')
+
+describe('project flush', function () {
+  beforeEach(cleanup.everything)
+  beforeEach(fixtures.create)
+
+  it('persists queued changes to the chunk store', async function () {
+    const basicAuthClient = testServer.basicAuthClient
+    const projectId = await testProjects.createEmptyProject()
+
+    // upload an empty file
+    const response = await fetch(
+      testServer.url(
+        `/api/projects/${projectId}/blobs/${File.EMPTY_FILE_HASH}`,
+        { qs: { pathname: 'main.tex' } }
+      ),
+      {
+        method: 'PUT',
+        body: fs.createReadStream(testFiles.path('empty.tex')),
+        headers: {
+          Authorization: testServer.basicAuthHeader,
+        },
+      }
+    )
+    expect(response.ok).to.be.true
+
+    const testFile = File.fromHash(File.EMPTY_FILE_HASH)
+    const testChange = new Change(
+      [Operation.addFile('main.tex', testFile)],
+      new Date()
+    )
+    await queueChanges(projectId, [testChange], 0)
+
+    // Verify that the changes are queued and not yet persisted
+    const initialState = await getState(projectId)
+    expect(initialState.persistedVersion).to.be.null
+    expect(initialState.changes).to.have.lengthOf(1)
+
+    const importResponse =
+      await basicAuthClient.apis.ProjectImport.flushChanges({
+        project_id: projectId,
+      })
+
+    expect(importResponse.status).to.equal(HTTPStatus.OK)
+
+    // Verify that the changes were persisted to the chunk store
+    const finalState = await getState(projectId)
+    expect(finalState.persistedVersion).to.equal(1)
+  })
+})
diff --git a/services/history-v1/test/acceptance/js/api/rollout.test.js b/services/history-v1/test/acceptance/js/api/rollout.test.js
new file mode 100644
index 0000000000..f1a65e5aff
--- /dev/null
+++ b/services/history-v1/test/acceptance/js/api/rollout.test.js
@@ -0,0 +1,115 @@
+const config = require('config')
+const sinon = require('sinon')
+const { expect } = require('chai')
+
+const cleanup = require('../storage/support/cleanup')
+const Rollout = require('../../../../api/app/rollout')
+
+describe('rollout', function () {
+  beforeEach(cleanup.everything)
+  beforeEach('Set up stubs', function () {
+    sinon.stub(config, 'has').callThrough()
+    sinon.stub(config, 'get').callThrough()
+  })
+  afterEach(sinon.restore)
+
+  it('should return a valid history buffer level', function () {
+    setMockConfig('historyBufferLevel', '2')
+    setMockConfig('forcePersistBuffer', 'false')
+
+    const rollout = new Rollout(config)
+    const { historyBufferLevel, forcePersistBuffer } =
+      rollout.getHistoryBufferLevelOptions('test-project-id')
+    expect(historyBufferLevel).to.equal(2)
+    expect(forcePersistBuffer).to.be.false
+  })
+
+  it('should return a valid history buffer level and force persist buffer options', function () {
+    setMockConfig('historyBufferLevel', '1')
+    setMockConfig('forcePersistBuffer', 'true')
+    const rollout = new Rollout(config)
+    const { historyBufferLevel, forcePersistBuffer } =
+      rollout.getHistoryBufferLevelOptions('test-project-id')
+    expect(historyBufferLevel).to.equal(1)
+    expect(forcePersistBuffer).to.be.true
+  })
+
+  describe('with a higher next history buffer level rollout', function () {
+    beforeEach(function () {
+      setMockConfig('historyBufferLevel', '2')
+      setMockConfig('forcePersistBuffer', 'false')
+      setMockConfig('nextHistoryBufferLevel', '3')
+    })
+    it('should return the expected history buffer level when the rollout percentage is zero', function () {
+      setMockConfig('nextHistoryBufferLevelRolloutPercentage', '0')
+      const rollout = new Rollout(config)
+      for (let i = 0; i < 1000; i++) {
+        const { historyBufferLevel, forcePersistBuffer } =
+          rollout.getHistoryBufferLevelOptions(`test-project-id-${i}`)
+        expect(historyBufferLevel).to.equal(2)
+        expect(forcePersistBuffer).to.be.false
+      }
+    })
+
+    it('should return the expected distribution of levels when the rollout percentage is 10%', function () {
+      setMockConfig('nextHistoryBufferLevelRolloutPercentage', '10')
+      const rollout = new Rollout(config)
+      let currentLevel = 0
+      let nextLevel = 0
+      for (let i = 0; i < 1000; i++) {
+        const { historyBufferLevel } = rollout.getHistoryBufferLevelOptions(
+          `test-project-id-${i}`
+        )
+        switch (historyBufferLevel) {
+          case 2:
+            currentLevel++
+            break
+          case 3:
+            nextLevel++
+            break
+          default:
+            expect.fail(
+              `Unexpected history buffer level: ${historyBufferLevel}`
+            )
+        }
+      }
+      const twoPercentage = (currentLevel / 1000) * 100
+      const threePercentage = (nextLevel / 1000) * 100
+      expect(twoPercentage).to.be.closeTo(90, 5) // 90% for level 2
+      expect(threePercentage).to.be.closeTo(10, 5) // 10% for level 3
+    })
+  })
+  describe('with a next history buffer level lower than the current level', function () {
+    beforeEach(function () {
+      setMockConfig('historyBufferLevel', '3')
+      setMockConfig('forcePersistBuffer', 'false')
+      setMockConfig('nextHistoryBufferLevel', '2')
+    })
+    it('should always return the current level when the rollout percentage is zero', function () {
+      setMockConfig('nextHistoryBufferLevelRolloutPercentage', '0')
+      const rollout = new Rollout(config)
+      for (let i = 0; i < 1000; i++) {
+        const { historyBufferLevel, forcePersistBuffer } =
+          rollout.getHistoryBufferLevelOptions(`test-project-id-${i}`)
+        expect(historyBufferLevel).to.equal(3)
+        expect(forcePersistBuffer).to.be.false
+      }
+    })
+
+    it('should always return the current level regardless of the rollout percentage', function () {
+      setMockConfig('nextHistoryBufferLevelRolloutPercentage', '10')
+      const rollout = new Rollout(config)
+      for (let i = 0; i < 1000; i++) {
+        const { historyBufferLevel } = rollout.getHistoryBufferLevelOptions(
+          `test-project-id-${i}`
+        )
+        expect(historyBufferLevel).to.equal(3)
+      }
+    })
+  })
+})
+
+function setMockConfig(path, value) {
+  config.has.withArgs(path).returns(true)
+  config.get.withArgs(path).returns(value)
+}
diff --git a/services/history-v1/test/acceptance/js/storage/chunk_store.test.js b/services/history-v1/test/acceptance/js/storage/chunk_store.test.js
index da70467934..8b06b8e412 100644
--- a/services/history-v1/test/acceptance/js/storage/chunk_store.test.js
+++ b/services/history-v1/test/acceptance/js/storage/chunk_store.test.js
@@ -470,6 +470,8 @@ describe('chunkStore', function () {
 
         describe('with changes queued in the Redis buffer', function () {
           let queuedChanges
+          const firstQueuedChangeTimestamp = new Date('2017-01-01T00:01:00')
+          const lastQueuedChangeTimestamp = new Date('2017-01-01T00:02:00')
 
           beforeEach(async function () {
             const snapshot = thirdChunk.getSnapshot()
@@ -481,7 +483,15 @@ describe('chunkStore', function () {
                   'in-redis.tex',
                   File.createLazyFromBlobs(blob)
                 ),
-                new Date()
+                firstQueuedChangeTimestamp
+              ),
+              makeChange(
+                // Add a second change to make the buffer more interesting
+                Operation.editFile(
+                  'in-redis.tex',
+                  TextOperation.fromJSON({ textOperation: ['hello'] })
+                ),
+                lastQueuedChangeTimestamp
               ),
             ]
             await redisBackend.queueChanges(
@@ -498,6 +508,15 @@ describe('chunkStore', function () {
               .getChanges()
               .concat(queuedChanges)
             expect(chunk.getChanges()).to.deep.equal(expectedChanges)
+            expect(chunk.getStartVersion()).to.equal(
+              thirdChunk.getStartVersion()
+            )
+            expect(chunk.getEndVersion()).to.equal(
+              thirdChunk.getEndVersion() + queuedChanges.length
+            )
+            expect(chunk.getEndTimestamp()).to.deep.equal(
+              lastQueuedChangeTimestamp
+            )
           })
 
           it('includes the queued changes when getting the latest chunk by timestamp', async function () {
@@ -509,6 +528,12 @@ describe('chunkStore', function () {
               .getChanges()
               .concat(queuedChanges)
             expect(chunk.getChanges()).to.deep.equal(expectedChanges)
+            expect(chunk.getStartVersion()).to.equal(
+              thirdChunk.getStartVersion()
+            )
+            expect(chunk.getEndVersion()).to.equal(
+              thirdChunk.getEndVersion() + queuedChanges.length
+            )
           })
 
           it("doesn't include the queued changes when getting another chunk by timestamp", async function () {
@@ -518,6 +543,11 @@ describe('chunkStore', function () {
             )
             const expectedChanges = secondChunk.getChanges()
             expect(chunk.getChanges()).to.deep.equal(expectedChanges)
+            expect(chunk.getStartVersion()).to.equal(
+              secondChunk.getStartVersion()
+            )
+            expect(chunk.getEndVersion()).to.equal(secondChunk.getEndVersion())
+            expect(chunk.getEndTimestamp()).to.deep.equal(secondChunkTimestamp)
           })
 
           it('includes the queued changes when getting the latest chunk by version', async function () {
@@ -529,6 +559,15 @@ describe('chunkStore', function () {
               .getChanges()
               .concat(queuedChanges)
             expect(chunk.getChanges()).to.deep.equal(expectedChanges)
+            expect(chunk.getStartVersion()).to.equal(
+              thirdChunk.getStartVersion()
+            )
+            expect(chunk.getEndVersion()).to.equal(
+              thirdChunk.getEndVersion() + queuedChanges.length
+            )
+            expect(chunk.getEndTimestamp()).to.deep.equal(
+              lastQueuedChangeTimestamp
+            )
           })
 
           it("doesn't include the queued changes when getting another chunk by version", async function () {
@@ -538,6 +577,47 @@ describe('chunkStore', function () {
             )
             const expectedChanges = secondChunk.getChanges()
             expect(chunk.getChanges()).to.deep.equal(expectedChanges)
+            expect(chunk.getStartVersion()).to.equal(
+              secondChunk.getStartVersion()
+            )
+            expect(chunk.getEndVersion()).to.equal(secondChunk.getEndVersion())
+            expect(chunk.getEndTimestamp()).to.deep.equal(secondChunkTimestamp)
+          })
+
+          it('loads a version that is only in the Redis buffer', async function () {
+            const versionInRedis = thirdChunk.getEndVersion() + 1 // the first change in Redis
+            const chunk = await chunkStore.loadAtVersion(
+              projectId,
+              versionInRedis
+            )
+            // The chunk should contain changes from the thirdChunk and the queuedChanges
+            const expectedChanges = thirdChunk
+              .getChanges()
+              .concat(queuedChanges)
+            expect(chunk.getChanges()).to.deep.equal(expectedChanges)
+            expect(chunk.getStartVersion()).to.equal(
+              thirdChunk.getStartVersion()
+            )
+            expect(chunk.getEndVersion()).to.equal(
+              thirdChunk.getEndVersion() + queuedChanges.length
+            )
+            expect(chunk.getEndTimestamp()).to.deep.equal(
+              lastQueuedChangeTimestamp
+            )
+          })
+
+          it('throws an error when loading a version beyond the Redis buffer', async function () {
+            const versionBeyondRedis =
+              thirdChunk.getEndVersion() + queuedChanges.length + 1
+            await expect(
+              chunkStore.loadAtVersion(projectId, versionBeyondRedis)
+            )
+              .to.be.rejectedWith(chunkStore.VersionOutOfBoundsError)
+              .and.eventually.satisfy(err => {
+                expect(err.info).to.have.property('projectId', projectId)
+                expect(err.info).to.have.property('version', versionBeyondRedis)
+                return true
+              })
           })
         })
 
diff --git a/services/history-v1/test/acceptance/js/storage/chunk_store_redis_backend.test.js b/services/history-v1/test/acceptance/js/storage/chunk_store_redis_backend.test.js
index 2b13343fc4..d34cd701d0 100644
--- a/services/history-v1/test/acceptance/js/storage/chunk_store_redis_backend.test.js
+++ b/services/history-v1/test/acceptance/js/storage/chunk_store_redis_backend.test.js
@@ -699,6 +699,8 @@ describe('chunk buffer Redis backend', function () {
   })
 
   describe('setPersistedVersion', function () {
+    const persistTime = Date.now() + 60 * 1000 // 1 minute from now
+
     it('should return not_found when project does not exist', async function () {
       const result = await redisBackend.setPersistedVersion(projectId, 5)
       expect(result).to.equal('not_found')
@@ -709,15 +711,41 @@ describe('chunk buffer Redis backend', function () {
         await setupState(projectId, {
           headVersion: 5,
           persistedVersion: null,
+          persistTime,
           changes: 5,
         })
       })
 
       it('should set the persisted version', async function () {
-        await redisBackend.setPersistedVersion(projectId, 3)
+        const status = await redisBackend.setPersistedVersion(projectId, 3)
+        expect(status).to.equal('ok')
         const state = await redisBackend.getState(projectId)
         expect(state.persistedVersion).to.equal(3)
       })
+
+      it('should leave the persist time if the persisted version is not current', async function () {
+        const status = await redisBackend.setPersistedVersion(projectId, 3)
+        expect(status).to.equal('ok')
+        const state = await redisBackend.getState(projectId)
+        expect(state.persistTime).to.deep.equal(persistTime) // Persist time should remain unchanged
+      })
+
+      it('should refuse to set a persisted version greater than the head version', async function () {
+        await expect(
+          redisBackend.setPersistedVersion(projectId, 10)
+        ).to.be.rejectedWith(VersionOutOfBoundsError)
+        // Ensure persisted version remains unchanged
+        const state = await redisBackend.getState(projectId)
+        expect(state.persistedVersion).to.be.null
+      })
+
+      it('should clear the persist time when the persisted version is current', async function () {
+        const status = await redisBackend.setPersistedVersion(projectId, 5)
+        expect(status).to.equal('ok')
+        const state = await redisBackend.getState(projectId)
+        expect(state.persistedVersion).to.equal(5)
+        expect(state.persistTime).to.be.null // Persist time should be cleared
+      })
     })
 
     describe('when the persisted version is set', function () {
@@ -725,18 +753,46 @@ describe('chunk buffer Redis backend', function () {
         await setupState(projectId, {
           headVersion: 5,
           persistedVersion: 3,
+          persistTime,
           changes: 5,
         })
       })
 
       it('should set the persisted version', async function () {
-        await redisBackend.setPersistedVersion(projectId, 5)
+        const status = await redisBackend.setPersistedVersion(projectId, 5)
+        expect(status).to.equal('ok')
         const state = await redisBackend.getState(projectId)
         expect(state.persistedVersion).to.equal(5)
       })
 
+      it('should clear the persist time when the persisted version is current', async function () {
+        const status = await redisBackend.setPersistedVersion(projectId, 5)
+        expect(status).to.equal('ok')
+        const state = await redisBackend.getState(projectId)
+        expect(state.persistedVersion).to.equal(5)
+        expect(state.persistTime).to.be.null // Persist time should be cleared
+      })
+
+      it('should leave the persist time if the persisted version is not current', async function () {
+        const status = await redisBackend.setPersistedVersion(projectId, 4)
+        expect(status).to.equal('ok')
+        const state = await redisBackend.getState(projectId)
+        expect(state.persistedVersion).to.equal(4)
+        expect(state.persistTime).to.deep.equal(persistTime) // Persist time should remain unchanged
+      })
+
       it('should not decrease the persisted version', async function () {
-        await redisBackend.setPersistedVersion(projectId, 2)
+        const status = await redisBackend.setPersistedVersion(projectId, 2)
+        expect(status).to.equal('too_low')
+        const state = await redisBackend.getState(projectId)
+        expect(state.persistedVersion).to.equal(3)
+      })
+
+      it('should refuse to set a persisted version greater than the head version', async function () {
+        await expect(
+          redisBackend.setPersistedVersion(projectId, 10)
+        ).to.be.rejectedWith(VersionOutOfBoundsError)
+        // Ensure persisted version remains unchanged
         const state = await redisBackend.getState(projectId)
         expect(state.persistedVersion).to.equal(3)
       })
@@ -1162,6 +1218,8 @@ function makeChange() {
  * @param {object} params
  * @param {number} params.headVersion
  * @param {number | null} params.persistedVersion
+ * @param {number | null} params.persistTime - time when the project should be persisted
+ * @param {number | null} params.expireTime - time when the project should expire
  * @param {number} params.changes - number of changes to create
  * @return {Promise<Change[]>} dummy changes that have been created
  */
@@ -1173,7 +1231,12 @@ async function setupState(projectId, params) {
       params.persistedVersion
     )
   }
-
+  if (params.persistTime) {
+    await rclient.set(keySchema.persistTime({ projectId }), params.persistTime)
+  }
+  if (params.expireTime) {
+    await rclient.set(keySchema.expireTime({ projectId }), params.expireTime)
+  }
   const changes = []
   for (let i = 1; i <= params.changes; i++) {
     const change = new Change(
diff --git a/services/history-v1/test/acceptance/js/storage/expire_redis_chunks.test.js b/services/history-v1/test/acceptance/js/storage/expire_redis_chunks.test.js
index b657991dda..f8a5943c43 100644
--- a/services/history-v1/test/acceptance/js/storage/expire_redis_chunks.test.js
+++ b/services/history-v1/test/acceptance/js/storage/expire_redis_chunks.test.js
@@ -1,91 +1,13 @@
 'use strict'
 
 const { expect } = require('chai')
-const { promisify } = require('node:util')
-const { execFile } = require('node:child_process')
-const { Snapshot, Author, Change } = require('overleaf-editor-core')
+const { Author, Change } = require('overleaf-editor-core')
 const cleanup = require('./support/cleanup')
-const redisBackend = require('../../../../storage/lib/chunk_store/redis')
-const redis = require('../../../../storage/lib/redis')
-const rclient = redis.rclientHistory
-const keySchema = redisBackend.keySchema
+const { setupProjectState, rclient, keySchema } = require('./support/redis')
+const { runScript } = require('./support/runscript')
 
 const SCRIPT_PATH = 'storage/scripts/expire_redis_chunks.js'
 
-async function runExpireScript() {
-  const TIMEOUT = 10 * 1000 // 10 seconds
-  let result
-  try {
-    result = await promisify(execFile)('node', [SCRIPT_PATH], {
-      encoding: 'utf-8',
-      timeout: TIMEOUT,
-      env: {
-        ...process.env,
-        LOG_LEVEL: 'debug', // Override LOG_LEVEL for script output
-      },
-    })
-    result.status = 0
-  } catch (err) {
-    const { stdout, stderr, code } = err
-    if (typeof code !== 'number') {
-      console.error('Error running expire script:', err)
-      throw err
-    }
-    result = { stdout, stderr, status: code }
-  }
-  // The script might exit with status 1 if it finds no keys to process, which is ok
-  if (result.status !== 0 && result.status !== 1) {
-    console.error('Expire script failed:', result.stderr)
-    throw new Error(`expire script failed with status ${result.status}`)
-  }
-  return result
-}
-
-// Helper to set up a basic project state in Redis
-async function setupProjectState(
-  projectId,
-  {
-    headVersion = 0,
-    persistedVersion = null,
-    expireTime = null,
-    persistTime = null,
-    changes = [],
-  }
-) {
-  const headSnapshot = new Snapshot()
-  await rclient.set(
-    keySchema.head({ projectId }),
-    JSON.stringify(headSnapshot.toRaw())
-  )
-  await rclient.set(
-    keySchema.headVersion({ projectId }),
-    headVersion.toString()
-  )
-
-  if (persistedVersion !== null) {
-    await rclient.set(
-      keySchema.persistedVersion({ projectId }),
-      persistedVersion.toString()
-    )
-  }
-  if (expireTime !== null) {
-    await rclient.set(
-      keySchema.expireTime({ projectId }),
-      expireTime.toString()
-    )
-  }
-  if (persistTime !== null) {
-    await rclient.set(
-      keySchema.persistTime({ projectId }),
-      persistTime.toString()
-    )
-  }
-  if (changes.length > 0) {
-    const rawChanges = changes.map(c => JSON.stringify(c.toRaw()))
-    await rclient.rpush(keySchema.changes({ projectId }), ...rawChanges)
-  }
-}
-
 function makeChange() {
   const timestamp = new Date()
   const author = new Author(123, 'test@example.com', 'Test User')
@@ -150,7 +72,7 @@ describe('expire_redis_chunks script', function () {
     })
 
     // Run the expire script once after all projects are set up
-    await runExpireScript()
+    await runScript(SCRIPT_PATH)
   })
 
   async function checkProjectStatus(projectId) {
diff --git a/services/history-v1/test/acceptance/js/storage/persist_buffer.test.mjs b/services/history-v1/test/acceptance/js/storage/persist_buffer.test.mjs
new file mode 100644
index 0000000000..138a70e626
--- /dev/null
+++ b/services/history-v1/test/acceptance/js/storage/persist_buffer.test.mjs
@@ -0,0 +1,519 @@
+'use strict'
+
+import fs from 'node:fs'
+import { expect } from 'chai'
+import {
+  Change,
+  Snapshot,
+  File,
+  TextOperation,
+  AddFileOperation,
+  EditFileOperation, // Added EditFileOperation
+} from 'overleaf-editor-core'
+import persistBuffer from '../../../../storage/lib/persist_buffer.js'
+import chunkStore from '../../../../storage/lib/chunk_store/index.js'
+import redisBackend from '../../../../storage/lib/chunk_store/redis.js'
+import persistChanges from '../../../../storage/lib/persist_changes.js'
+import cleanup from './support/cleanup.js'
+import fixtures from './support/fixtures.js'
+import testFiles from './support/test_files.js'
+
+describe('persistBuffer', function () {
+  let projectId
+  const initialVersion = 0
+  let limitsToPersistImmediately
+
+  before(function () {
+    const farFuture = new Date()
+    farFuture.setTime(farFuture.getTime() + 7 * 24 * 3600 * 1000)
+    limitsToPersistImmediately = {
+      minChangeTimestamp: farFuture,
+      maxChangeTimestamp: farFuture,
+      maxChunkChanges: 10,
+    }
+  })
+
+  beforeEach(cleanup.everything)
+  beforeEach(fixtures.create)
+
+  beforeEach(async function () {
+    projectId = fixtures.docs.uninitializedProject.id
+    await chunkStore.initializeProject(projectId)
+  })
+
+  describe('with an empty initial chunk (new project)', function () {
+    it('should persist changes from Redis to a new chunk', async function () {
+      // create an initial snapshot and add the empty file `main.tex`
+      const HELLO_TXT = fs.readFileSync(testFiles.path('hello.txt')).toString()
+
+      const createFile = new Change(
+        [new AddFileOperation('main.tex', File.fromString(HELLO_TXT))],
+        new Date(),
+        []
+      )
+
+      await persistChanges(
+        projectId,
+        [createFile],
+        limitsToPersistImmediately,
+        0
+      )
+      // Now queue some changes in Redis
+      const op1 = new TextOperation().insert('Hello').retain(HELLO_TXT.length)
+      const change1 = new Change(
+        [new EditFileOperation('main.tex', op1)],
+        new Date()
+      )
+
+      const op2 = new TextOperation()
+        .retain('Hello'.length)
+        .insert(' World')
+        .retain(HELLO_TXT.length)
+      const change2 = new Change(
+        [new EditFileOperation('main.tex', op2)],
+        new Date()
+      )
+
+      const changesToQueue = [change1, change2]
+
+      const finalHeadVersion = initialVersion + 1 + changesToQueue.length
+
+      const now = Date.now()
+      await redisBackend.queueChanges(
+        projectId,
+        new Snapshot(), // dummy snapshot
+        1,
+        changesToQueue,
+        {
+          persistTime: now + redisBackend.MAX_PERSIST_DELAY_MS,
+          expireTime: now + redisBackend.PROJECT_TTL_MS,
+        }
+      )
+      await redisBackend.setPersistedVersion(projectId, initialVersion)
+
+      // Persist the changes from Redis to the chunk store
+      const persistResult = await persistBuffer(
+        projectId,
+        limitsToPersistImmediately
+      )
+
+      // Check the return value of persistBuffer
+      expect(persistResult).to.exist
+      expect(persistResult).to.have.property('numberOfChangesPersisted')
+      expect(persistResult).to.have.property('originalEndVersion')
+      expect(persistResult).to.have.property('currentChunk')
+      expect(persistResult).to.have.property('resyncNeeded')
+      expect(persistResult.numberOfChangesPersisted).to.equal(
+        changesToQueue.length
+      )
+      expect(persistResult.originalEndVersion).to.equal(initialVersion + 1)
+      expect(persistResult.resyncNeeded).to.be.false
+
+      const latestChunk = await chunkStore.loadLatest(projectId, {
+        persistedOnly: true,
+      })
+      expect(latestChunk).to.exist
+      expect(latestChunk.getStartVersion()).to.equal(initialVersion)
+      expect(latestChunk.getEndVersion()).to.equal(finalHeadVersion)
+      expect(latestChunk.getChanges().length).to.equal(
+        changesToQueue.length + 1
+      )
+      // Check that chunk returned by persistBuffer matches the latest chunk
+      expect(latestChunk).to.deep.equal(persistResult.currentChunk)
+
+      const chunkSnapshot = latestChunk.getSnapshot()
+      expect(Object.keys(chunkSnapshot.getFileMap()).length).to.equal(1)
+
+      const persistedVersionInRedis = (await redisBackend.getState(projectId))
+        .persistedVersion
+      expect(persistedVersionInRedis).to.equal(finalHeadVersion)
+
+      const nonPersisted = await redisBackend.getNonPersistedChanges(
+        projectId,
+        finalHeadVersion
+      )
+      expect(nonPersisted).to.be.an('array').that.is.empty
+    })
+  })
+
+  describe('with an existing chunk and new changes in Redis', function () {
+    it('should persist new changes from Redis, appending to existing history', async function () {
+      const initialContent = 'Initial document content.\n'
+
+      const addInitialFileChange = new Change(
+        [new AddFileOperation('main.tex', File.fromString(initialContent))],
+        new Date(),
+        []
+      )
+
+      await persistChanges(
+        projectId,
+        [addInitialFileChange],
+        limitsToPersistImmediately,
+        initialVersion
+      )
+      const versionAfterInitialSetup = initialVersion + 1 // Now version is 1
+
+      const opForChunk1 = new TextOperation()
+        .retain(initialContent.length)
+        .insert(' First addition.')
+      const changesForChunk1 = [
+        new Change(
+          [new EditFileOperation('main.tex', opForChunk1)],
+          new Date(),
+          []
+        ),
+      ]
+
+      await persistChanges(
+        projectId,
+        changesForChunk1,
+        limitsToPersistImmediately, // Original limits for this step
+        versionAfterInitialSetup // Correct clientEndVersion
+      )
+      // Update persistedChunkEndVersion: 1 (from setup) + 1 (from changesForChunk1) = 2
+      const persistedChunkEndVersion =
+        versionAfterInitialSetup + changesForChunk1.length
+      const contentAfterChunk1 = initialContent + ' First addition.'
+
+      const opVersion2 = new TextOperation()
+        .retain(contentAfterChunk1.length)
+        .insert(' Second addition.')
+      const changeVersion2 = new Change(
+        [new EditFileOperation('main.tex', opVersion2)],
+        new Date(),
+        []
+      )
+
+      const contentAfterChange2 = contentAfterChunk1 + ' Second addition.'
+      const opVersion3 = new TextOperation()
+        .retain(contentAfterChange2.length)
+        .insert(' Third addition.')
+      const changeVersion3 = new Change(
+        [new EditFileOperation('main.tex', opVersion3)],
+        new Date(),
+        []
+      )
+
+      const redisChangesToPush = [changeVersion2, changeVersion3]
+      const finalHeadVersionAfterRedisPush =
+        persistedChunkEndVersion + redisChangesToPush.length
+      const now = Date.now()
+
+      await redisBackend.queueChanges(
+        projectId,
+        new Snapshot(), // Use new Snapshot() like in the first test
+        persistedChunkEndVersion,
+        redisChangesToPush,
+        {
+          persistTime: now + redisBackend.MAX_PERSIST_DELAY_MS,
+          expireTime: now + redisBackend.PROJECT_TTL_MS,
+        }
+      )
+      await redisBackend.setPersistedVersion(
+        projectId,
+        persistedChunkEndVersion
+      )
+
+      const persistResult = await persistBuffer(
+        projectId,
+        limitsToPersistImmediately
+      )
+
+      // Check the return value of persistBuffer
+      expect(persistResult).to.exist
+      expect(persistResult).to.have.property('numberOfChangesPersisted')
+      expect(persistResult).to.have.property('originalEndVersion')
+      expect(persistResult).to.have.property('currentChunk')
+      expect(persistResult).to.have.property('resyncNeeded')
+      expect(persistResult.numberOfChangesPersisted).to.equal(
+        redisChangesToPush.length
+      )
+      expect(persistResult.originalEndVersion).to.equal(
+        persistedChunkEndVersion
+      )
+      expect(persistResult.resyncNeeded).to.be.false
+
+      const latestChunk = await chunkStore.loadLatest(projectId, {
+        persistedOnly: true,
+      })
+      expect(latestChunk).to.exist
+      expect(latestChunk.getStartVersion()).to.equal(0)
+      expect(latestChunk.getEndVersion()).to.equal(
+        finalHeadVersionAfterRedisPush
+      )
+      expect(latestChunk.getChanges().length).to.equal(
+        persistedChunkEndVersion + redisChangesToPush.length
+      )
+
+      const persistedVersionInRedisAfter = (
+        await redisBackend.getState(projectId)
+      ).persistedVersion
+      expect(persistedVersionInRedisAfter).to.equal(
+        finalHeadVersionAfterRedisPush
+      )
+
+      // Check that chunk returned by persistBuffer matches the latest chunk
+      expect(persistResult.currentChunk).to.deep.equal(latestChunk)
+
+      const nonPersisted = await redisBackend.getNonPersistedChanges(
+        projectId,
+        finalHeadVersionAfterRedisPush
+      )
+      expect(nonPersisted).to.be.an('array').that.is.empty
+    })
+  })
+
+  describe('when Redis has no new changes', function () {
+    let persistedChunkEndVersion
+    let changesForChunk1
+
+    beforeEach(async function () {
+      const initialContent = 'Content.'
+
+      const addInitialFileChange = new Change(
+        [new AddFileOperation('main.tex', File.fromString(initialContent))],
+        new Date(),
+        []
+      )
+
+      // Replace chunkStore.create with persistChanges
+      // clientEndVersion is initialVersion (0). This advances version to 1.
+      await persistChanges(
+        projectId,
+        [addInitialFileChange],
+        limitsToPersistImmediately,
+        initialVersion
+      )
+      const versionAfterInitialSetup = initialVersion + 1 // Now version is 1
+
+      const opForChunk1 = new TextOperation()
+        .retain(initialContent.length)
+        .insert(' More.')
+      changesForChunk1 = [
+        new Change(
+          [new EditFileOperation('main.tex', opForChunk1)],
+          new Date(),
+          []
+        ),
+      ]
+      // Corrected persistChanges call: clientEndVersion is versionAfterInitialSetup (1)
+      await persistChanges(
+        projectId,
+        changesForChunk1,
+        limitsToPersistImmediately, // Original limits for this step
+        versionAfterInitialSetup // Correct clientEndVersion
+      )
+      // Update persistedChunkEndVersion: 1 (from setup) + 1 (from changesForChunk1) = 2
+      persistedChunkEndVersion =
+        versionAfterInitialSetup + changesForChunk1.length
+    })
+
+    it('should leave the persisted version and stored chunks unchanged', async function () {
+      const now = Date.now()
+      await redisBackend.queueChanges(
+        projectId,
+        new Snapshot(),
+        persistedChunkEndVersion - 1,
+        changesForChunk1,
+        {
+          persistTime: now + redisBackend.MAX_PERSIST_DELAY_MS,
+          expireTime: now + redisBackend.PROJECT_TTL_MS,
+        }
+      )
+      await redisBackend.setPersistedVersion(
+        projectId,
+        persistedChunkEndVersion
+      )
+
+      const chunksBefore = await chunkStore.getProjectChunks(projectId)
+
+      const persistResult = await persistBuffer(
+        projectId,
+        limitsToPersistImmediately
+      )
+
+      const currentChunk = await chunkStore.loadLatest(projectId, {
+        persistedOnly: true,
+      })
+      expect(persistResult).to.deep.equal({
+        numberOfChangesPersisted: 0,
+        originalEndVersion: persistedChunkEndVersion,
+        currentChunk,
+      })
+
+      const chunksAfter = await chunkStore.getProjectChunks(projectId)
+      expect(chunksAfter.length).to.equal(chunksBefore.length)
+      expect(chunksAfter).to.deep.equal(chunksBefore)
+
+      const finalPersistedVersionInRedis = (
+        await redisBackend.getState(projectId)
+      ).persistedVersion
+      expect(finalPersistedVersionInRedis).to.equal(persistedChunkEndVersion)
+    })
+
+    it('should update the persisted version if it is behind the chunk store end version', async function () {
+      const now = Date.now()
+
+      await redisBackend.queueChanges(
+        projectId,
+        new Snapshot(),
+        persistedChunkEndVersion - 1,
+        changesForChunk1,
+        {
+          persistTime: now + redisBackend.MAX_PERSIST_DELAY_MS,
+          expireTime: now + redisBackend.PROJECT_TTL_MS,
+        }
+      )
+      // Force the persisted version in Redis to lag behind the chunk store,
+      // simulating the situation where a worker has persisted changes to the
+      // chunk store but failed to update the version in redis.
+      await redisBackend.setPersistedVersion(
+        projectId,
+        persistedChunkEndVersion - 1
+      )
+
+      const chunksBefore = await chunkStore.getProjectChunks(projectId)
+
+      // Persist buffer (which should do nothing as there are no new changes)
+      const persistResult = await persistBuffer(
+        projectId,
+        limitsToPersistImmediately
+      )
+
+      // Check the return value
+      const currentChunk = await chunkStore.loadLatest(projectId, {
+        persistedOnly: true,
+      })
+      expect(persistResult).to.deep.equal({
+        numberOfChangesPersisted: 0,
+        originalEndVersion: persistedChunkEndVersion,
+        currentChunk,
+      })
+
+      const chunksAfter = await chunkStore.getProjectChunks(projectId)
+      expect(chunksAfter.length).to.equal(chunksBefore.length)
+      expect(chunksAfter).to.deep.equal(chunksBefore)
+
+      const finalPersistedVersionInRedis = (
+        await redisBackend.getState(projectId)
+      ).persistedVersion
+      expect(finalPersistedVersionInRedis).to.equal(persistedChunkEndVersion)
+    })
+  })
+
+  describe('when limits restrict the number of changes to persist', function () {
+    it('should persist only a subset of changes and update persistedVersion accordingly', async function () {
+      const now = Date.now()
+      const oneDayAgo = now - 1000 * 60 * 60 * 24
+      const oneHourAgo = now - 1000 * 60 * 60
+      const twoHoursAgo = now - 1000 * 60 * 60 * 2
+      const threeHoursAgo = now - 1000 * 60 * 60 * 3
+
+      // Create an initial file with some content
+      const initialContent = 'Initial content.'
+      const addInitialFileChange = new Change(
+        [new AddFileOperation('main.tex', File.fromString(initialContent))],
+        new Date(oneDayAgo),
+        []
+      )
+
+      await persistChanges(
+        projectId,
+        [addInitialFileChange],
+        limitsToPersistImmediately,
+        initialVersion
+      )
+      const versionAfterInitialSetup = initialVersion + 1 // Version is 1
+
+      // Queue three additional changes in Redis
+      const op1 = new TextOperation()
+        .retain(initialContent.length)
+        .insert(' Change 1.')
+      const change1 = new Change(
+        [new EditFileOperation('main.tex', op1)],
+        new Date(threeHoursAgo)
+      )
+      const contentAfterC1 = initialContent + ' Change 1.'
+
+      const op2 = new TextOperation()
+        .retain(contentAfterC1.length)
+        .insert(' Change 2.')
+      const change2 = new Change(
+        [new EditFileOperation('main.tex', op2)],
+        new Date(twoHoursAgo)
+      )
+      const contentAfterC2 = contentAfterC1 + ' Change 2.'
+
+      const op3 = new TextOperation()
+        .retain(contentAfterC2.length)
+        .insert(' Change 3.')
+      const change3 = new Change(
+        [new EditFileOperation('main.tex', op3)],
+        new Date(oneHourAgo)
+      )
+
+      const changesToQueue = [change1, change2, change3]
+      await redisBackend.queueChanges(
+        projectId,
+        new Snapshot(), // dummy snapshot
+        versionAfterInitialSetup, // startVersion for queued changes
+        changesToQueue,
+        {
+          persistTime: now + redisBackend.MAX_PERSIST_DELAY_MS,
+          expireTime: now + redisBackend.PROJECT_TTL_MS,
+        }
+      )
+      await redisBackend.setPersistedVersion(
+        projectId,
+        versionAfterInitialSetup
+      )
+
+      // Define limits to only persist 2 additional changes (on top of the initial file creation),
+      // which should leave the final change (change3) in the redis buffer.
+      const restrictiveLimits = {
+        minChangeTimestamp: new Date(oneHourAgo), // only changes more than 1 hour old are considered
+        maxChangeTimestamp: new Date(twoHoursAgo), // they will be persisted if any change is older than 2 hours
+      }
+
+      const persistResult = await persistBuffer(projectId, restrictiveLimits)
+
+      // Check the return value of persistBuffer
+      expect(persistResult).to.exist
+      expect(persistResult).to.have.property('numberOfChangesPersisted')
+      expect(persistResult).to.have.property('originalEndVersion')
+      expect(persistResult).to.have.property('currentChunk')
+      expect(persistResult).to.have.property('resyncNeeded')
+      expect(persistResult.numberOfChangesPersisted).to.equal(2) // change1 + change2
+      expect(persistResult.originalEndVersion).to.equal(
+        versionAfterInitialSetup
+      )
+      expect(persistResult.resyncNeeded).to.be.false
+
+      // Check the latest persisted chunk, it should only have the initial file and the first two changes
+      const latestChunk = await chunkStore.loadLatest(projectId, {
+        persistedOnly: true,
+      })
+      expect(latestChunk).to.exist
+      expect(latestChunk.getChanges().length).to.equal(3) // addInitialFileChange + change1 + change2
+      expect(latestChunk.getStartVersion()).to.equal(initialVersion)
+      const expectedEndVersion = versionAfterInitialSetup + 2 // Persisted two changes from the queue
+      expect(latestChunk.getEndVersion()).to.equal(expectedEndVersion)
+
+      // Check that chunk returned by persistBuffer matches the latest chunk
+      expect(persistResult.currentChunk).to.deep.equal(latestChunk)
+
+      // Check persisted version in Redis
+      const state = await redisBackend.getState(projectId)
+      expect(state.persistedVersion).to.equal(expectedEndVersion)
+
+      // Check non-persisted changes in Redis
+      const nonPersisted = await redisBackend.getNonPersistedChanges(
+        projectId,
+        expectedEndVersion
+      )
+      expect(nonPersisted).to.be.an('array').with.lengthOf(1) // change3 should remain
+      expect(nonPersisted).to.deep.equal([change3])
+    })
+  })
+})
diff --git a/services/history-v1/test/acceptance/js/storage/persist_redis_chunks.test.js b/services/history-v1/test/acceptance/js/storage/persist_redis_chunks.test.js
new file mode 100644
index 0000000000..58261703bb
--- /dev/null
+++ b/services/history-v1/test/acceptance/js/storage/persist_redis_chunks.test.js
@@ -0,0 +1,262 @@
+'use strict'
+
+const { expect } = require('chai')
+const {
+  Change,
+  AddFileOperation,
+  EditFileOperation,
+  TextOperation,
+  File,
+} = require('overleaf-editor-core')
+const cleanup = require('./support/cleanup')
+const fixtures = require('./support/fixtures')
+const chunkStore = require('../../../../storage/lib/chunk_store')
+const { getState } = require('../../../../storage/lib/chunk_store/redis')
+const { setupProjectState } = require('./support/redis')
+const { runScript } = require('./support/runscript')
+const persistChanges = require('../../../../storage/lib/persist_changes')
+
+const SCRIPT_PATH = 'storage/scripts/persist_redis_chunks.mjs'
+
+describe('persist_redis_chunks script', function () {
+  before(cleanup.everything)
+
+  let now, past, future
+  let projectIdsStore // To store the generated project IDs, keyed by scenario name
+  let limitsToPersistImmediately
+
+  before(async function () {
+    const farFuture = new Date()
+    farFuture.setTime(farFuture.getTime() + 7 * 24 * 3600 * 1000)
+    limitsToPersistImmediately = {
+      minChangeTimestamp: farFuture,
+      maxChangeTimestamp: farFuture,
+      maxChunkChanges: 100, // Allow enough changes for setup
+    }
+
+    await fixtures.create()
+
+    now = Date.now()
+    past = now - 10000 // 10 seconds ago
+    future = now + 60000 // 1 minute in the future
+
+    projectIdsStore = {}
+
+    // Scenario 1: project_due_for_persistence
+    // Goal: Has initial persisted content (v1), Redis has new changes (v1->v2) due for persistence.
+    // Expected: Script persists Redis changes, persistedVersion becomes 2.
+    {
+      const dueProjectId = await chunkStore.initializeProject()
+      projectIdsStore.project_due_for_persistence = dueProjectId
+      const initialContent = 'Initial content for due project.'
+      const initialChange = new Change(
+        [new AddFileOperation('main.tex', File.fromString(initialContent))],
+        new Date(now - 30000), // 30 seconds ago
+        []
+      )
+      await persistChanges(
+        dueProjectId,
+        [initialChange],
+        limitsToPersistImmediately,
+        0
+      )
+      const secondChangeDue = new Change(
+        [
+          new EditFileOperation(
+            'main.tex',
+            new TextOperation()
+              .retain(initialContent.length)
+              .insert(' More content.')
+          ),
+        ],
+        new Date(now - 20000), // 20 seconds ago
+        []
+      )
+      await setupProjectState(dueProjectId, {
+        persistTime: past,
+        headVersion: 2, // After secondChangeDue
+        persistedVersion: 1, // Initial content is at v1
+        changes: [secondChangeDue], // New changes in Redis (v1->v2)
+        expireTimeFuture: true,
+      })
+    }
+
+    // Scenario 2: project_not_due_for_persistence
+    // Goal: Has initial persisted content (v1), Redis has no new changes, not due.
+    // Expected: Script does nothing, persistedVersion remains 1.
+    {
+      const notDueProjectId = await chunkStore.initializeProject()
+      projectIdsStore.project_not_due_for_persistence = notDueProjectId
+      const initialContent = 'Initial content for not_due project.'
+      const initialChange = new Change(
+        [new AddFileOperation('main.tex', File.fromString(initialContent))],
+        new Date(now - 30000), // 30 seconds ago
+        []
+      )
+      await persistChanges(
+        notDueProjectId,
+        [initialChange],
+        limitsToPersistImmediately,
+        0
+      ) // Persisted: v0 -> v1
+      await setupProjectState(notDueProjectId, {
+        persistTime: future,
+        headVersion: 1, // Matches persisted version
+        persistedVersion: 1,
+        changes: [], // No new changes in Redis
+        expireTimeFuture: true,
+      })
+    }
+
+    // Scenario 3: project_no_persist_time
+    // Goal: Has initial persisted content (v1), Redis has no new changes, no persistTime.
+    // Expected: Script does nothing, persistedVersion remains 1.
+    {
+      const noPersistTimeProjectId = await chunkStore.initializeProject()
+      projectIdsStore.project_no_persist_time = noPersistTimeProjectId
+      const initialContent = 'Initial content for no_persist_time project.'
+      const initialChange = new Change(
+        [new AddFileOperation('main.tex', File.fromString(initialContent))],
+        new Date(now - 30000), // 30 seconds ago
+        []
+      )
+      await persistChanges(
+        noPersistTimeProjectId,
+        [initialChange],
+        limitsToPersistImmediately,
+        0
+      ) // Persisted: v0 -> v1
+      await setupProjectState(noPersistTimeProjectId, {
+        persistTime: null,
+        headVersion: 1, // Matches persisted version
+        persistedVersion: 1,
+        changes: [], // No new changes in Redis
+        expireTimeFuture: true,
+      })
+    }
+
+    // Scenario 4: project_due_fully_persisted
+    // Goal: Has content persisted up to v2, Redis reflects this (head=2, persisted=2), due for check.
+    // Expected: Script clears persistTime, persistedVersion remains 2.
+    {
+      const dueFullyPersistedId = await chunkStore.initializeProject()
+      projectIdsStore.project_due_fully_persisted = dueFullyPersistedId
+      const initialContent = 'Content part 1 for fully persisted.'
+      const change1 = new Change(
+        [new AddFileOperation('main.tex', File.fromString(initialContent))],
+        new Date(now - 40000), // 40 seconds ago
+        []
+      )
+      const change2 = new Change(
+        [
+          new EditFileOperation(
+            'main.tex',
+            new TextOperation()
+              .retain(initialContent.length)
+              .insert(' Content part 2.')
+          ),
+        ],
+        new Date(now - 30000), // 30 seconds ago
+        []
+      )
+      await persistChanges(
+        dueFullyPersistedId,
+        [change1, change2],
+        limitsToPersistImmediately,
+        0
+      )
+      await setupProjectState(dueFullyPersistedId, {
+        persistTime: past,
+        headVersion: 2,
+        persistedVersion: 2,
+        changes: [], // No new unpersisted changes in Redis
+        expireTimeFuture: true,
+      })
+    }
+
+    // Scenario 5: project_fails_to_persist
+    // Goal: Has initial persisted content (v1), Redis has new changes (v1->v2) due for persistence, but these changes will cause an error.
+    // Expected: Script attempts to persist, fails, and persistTime is NOT cleared.
+    {
+      const failsToPersistProjectId = await chunkStore.initializeProject()
+      projectIdsStore.project_fails_to_persist = failsToPersistProjectId
+      const initialContent = 'Initial content for failure case.'
+      const initialChange = new Change(
+        [new AddFileOperation('main.tex', File.fromString(initialContent))],
+        new Date(now - 30000), // 30 seconds ago
+        []
+      )
+      await persistChanges(
+        failsToPersistProjectId,
+        [initialChange],
+        limitsToPersistImmediately,
+        0
+      )
+      // This change will fail because it tries to insert at a non-existent offset
+      // assuming the initial content is shorter than 1000 characters.
+      const conflictingChange = new Change(
+        [
+          new EditFileOperation(
+            'main.tex',
+            new TextOperation().retain(1000).insert('This will fail.')
+          ),
+        ],
+        new Date(now - 20000), // 20 seconds ago
+        []
+      )
+      await setupProjectState(failsToPersistProjectId, {
+        persistTime: past, // Due for persistence
+        headVersion: 2, // After conflictingChange
+        persistedVersion: 1, // Initial content is at v1
+        changes: [conflictingChange], // New changes in Redis (v1->v2)
+        expireTimeFuture: true,
+      })
+    }
+
+    await runScript(SCRIPT_PATH)
+  })
+
+  describe('when the buffer has new changes', function () {
+    it('should update persisted-version when the persist-time is in the past', async function () {
+      const projectId = projectIdsStore.project_due_for_persistence
+      const state = await getState(projectId)
+      // console.log('State after running script (project_due_for_persistence):', state)
+      expect(state.persistTime).to.be.null
+      expect(state.persistedVersion).to.equal(2)
+    })
+
+    it('should not perform any operations when the persist-time is in the future', async function () {
+      const projectId = projectIdsStore.project_not_due_for_persistence
+      const state = await getState(projectId)
+      expect(state.persistTime).to.equal(future)
+      expect(state.persistedVersion).to.equal(1)
+    })
+  })
+
+  describe('when the changes in the buffer are already persisted', function () {
+    it('should delete persist-time for a project when the persist-time is in the past', async function () {
+      const projectId = projectIdsStore.project_due_fully_persisted
+      const state = await getState(projectId)
+      expect(state.persistTime).to.be.null
+      expect(state.persistedVersion).to.equal(2)
+    })
+  })
+
+  describe('when there is no persist-time set', function () {
+    it('should not change redis when there is no persist-time set initially', async function () {
+      const projectId = projectIdsStore.project_no_persist_time
+      const state = await getState(projectId)
+      expect(state.persistTime).to.be.null
+      expect(state.persistedVersion).to.equal(1)
+    })
+  })
+
+  describe('when persistence fails due to conflicting changes', function () {
+    it('should not clear persist-time and not update persisted-version', async function () {
+      const projectId = projectIdsStore.project_fails_to_persist
+      const state = await getState(projectId)
+      expect(state.persistTime).to.be.greaterThan(now) // persistTime should be pushed to the future by RETRY_DELAY_MS
+      expect(state.persistedVersion).to.equal(1) // persistedVersion should not change
+    })
+  })
+})
diff --git a/services/history-v1/test/acceptance/js/storage/queue_changes.test.js b/services/history-v1/test/acceptance/js/storage/queue_changes.test.js
new file mode 100644
index 0000000000..dbfe8c7e56
--- /dev/null
+++ b/services/history-v1/test/acceptance/js/storage/queue_changes.test.js
@@ -0,0 +1,416 @@
+'use strict'
+
+const { expect } = require('chai')
+const sinon = require('sinon')
+
+const cleanup = require('./support/cleanup')
+const fixtures = require('./support/fixtures')
+const testFiles = require('./support/test_files.js')
+const storage = require('../../../../storage')
+const chunkStore = storage.chunkStore
+const queueChanges = storage.queueChanges
+const redisBackend = require('../../../../storage/lib/chunk_store/redis')
+
+const core = require('overleaf-editor-core')
+const AddFileOperation = core.AddFileOperation
+const EditFileOperation = core.EditFileOperation
+const TextOperation = core.TextOperation
+const Change = core.Change
+const Chunk = core.Chunk
+const File = core.File
+const Snapshot = core.Snapshot
+const BlobStore = storage.BlobStore
+const persistChanges = storage.persistChanges
+
+describe('queueChanges', function () {
+  let limitsToPersistImmediately
+  before(function () {
+    // Used to provide a limit which forces us to persist all of the changes
+    const farFuture = new Date()
+    farFuture.setTime(farFuture.getTime() + 7 * 24 * 3600 * 1000)
+    limitsToPersistImmediately = {
+      minChangeTimestamp: farFuture,
+      maxChangeTimestamp: farFuture,
+      maxChanges: 10,
+      maxChunkChanges: 10,
+    }
+  })
+
+  beforeEach(cleanup.everything)
+  beforeEach(fixtures.create)
+  afterEach(function () {
+    sinon.restore()
+  })
+
+  it('queues changes when redis has no snapshot (falls back to chunkStore with an empty chunk)', async function () {
+    // Start with an empty chunk store for the project
+    const projectId = fixtures.docs.uninitializedProject.id
+    await chunkStore.initializeProject(projectId)
+
+    // Ensure that the initial state in redis is empty
+    const initialRedisState = await redisBackend.getState(projectId)
+    expect(initialRedisState.headVersion).to.be.null
+    expect(initialRedisState.headSnapshot).to.be.null
+    expect(initialRedisState.changes).to.be.an('array').that.is.empty
+
+    // Add a test file to the blob store
+    const blobStore = new BlobStore(projectId)
+    await blobStore.putFile(testFiles.path('hello.txt'))
+
+    // Prepare an initial change to add a single file to an empty project
+    const change = new Change(
+      [
+        new AddFileOperation(
+          'test.tex',
+          File.fromHash(testFiles.HELLO_TXT_HASH)
+        ),
+      ],
+      new Date(),
+      []
+    )
+    const changesToQueue = [change]
+    const endVersion = 0
+
+    // Queue the changes to add the test file
+    const status = await queueChanges(projectId, changesToQueue, endVersion)
+    expect(status).to.equal('ok')
+
+    // Verify that we now have some state in redis
+    const redisState = await redisBackend.getState(projectId)
+    expect(redisState).to.not.be.null
+
+    // Compute the expected snapshot after applying the changes
+    const expectedSnapshot = new Snapshot()
+    await expectedSnapshot.loadFiles('hollow', blobStore)
+    for (const change of changesToQueue) {
+      const hollowChange = change.clone()
+      await hollowChange.loadFiles('hollow', blobStore)
+      hollowChange.applyTo(expectedSnapshot, { strict: true })
+    }
+
+    // Confirm that state in redis matches the expected snapshot and changes queue
+    const expectedVersionInRedis = endVersion + changesToQueue.length
+    expect(redisState.headVersion).to.equal(expectedVersionInRedis)
+    expect(redisState.headSnapshot).to.deep.equal(expectedSnapshot.toRaw())
+    expect(redisState.changes).to.deep.equal(changesToQueue.map(c => c.toRaw()))
+  })
+
+  it('queues changes when redis has no snapshot (falls back to chunkStore with an existing chunk)', async function () {
+    const projectId = fixtures.docs.uninitializedProject.id
+
+    // Initialise the project in the chunk store using the "Hello World" test file
+    await chunkStore.initializeProject(projectId)
+    const blobStore = new BlobStore(projectId)
+    await blobStore.putFile(testFiles.path('hello.txt'))
+    const change = new Change(
+      [
+        new AddFileOperation(
+          'hello.tex',
+          File.fromHash(testFiles.HELLO_TXT_HASH)
+        ),
+      ],
+      new Date(),
+      []
+    )
+    const initialChanges = [change]
+    const initialVersion = 0
+
+    const result = await persistChanges(
+      projectId,
+      initialChanges,
+      limitsToPersistImmediately,
+      initialVersion
+    )
+    // Compute the state after the initial changes are persisted for later comparison
+    const endVersion = initialVersion + initialChanges.length
+    const { currentChunk } = result
+    const originalSnapshot = result.currentChunk.getSnapshot()
+    await originalSnapshot.loadFiles('hollow', blobStore)
+    originalSnapshot.applyAll(currentChunk.getChanges())
+
+    // Ensure that the initial state in redis is empty
+    const initialRedisState = await redisBackend.getState(projectId)
+    expect(initialRedisState.headVersion).to.be.null
+    expect(initialRedisState.headSnapshot).to.be.null
+    expect(initialRedisState.changes).to.be.an('array').that.is.empty
+
+    // Prepare a change to edit the existing file
+    const editFileOp = new EditFileOperation(
+      'hello.tex',
+      new TextOperation()
+        .insert('Hello')
+        .retain(testFiles.HELLO_TXT_UTF8_LENGTH)
+    )
+    const editFileChange = new Change([editFileOp], new Date(), [])
+    const changesToQueue = [editFileChange]
+
+    // Queue the changes to edit the existing file
+    const status = await queueChanges(projectId, changesToQueue, endVersion)
+    expect(status).to.equal('ok')
+
+    // Verify that we now have some state in redis
+    const redisState = await redisBackend.getState(projectId)
+    expect(redisState).to.not.be.null
+
+    // Compute the expected snapshot after applying the changes
+    const expectedSnapshot = originalSnapshot.clone()
+    await expectedSnapshot.loadFiles('hollow', blobStore)
+    expectedSnapshot.applyAll(changesToQueue)
+
+    // Confirm that state in redis matches the expected snapshot and changes queue
+    const expectedVersionInRedis = endVersion + changesToQueue.length
+    expect(redisState.headVersion).to.equal(expectedVersionInRedis)
+    expect(redisState.headSnapshot).to.deep.equal(expectedSnapshot.toRaw())
+    expect(redisState.changes).to.deep.equal(changesToQueue.map(c => c.toRaw()))
+  })
+
+  it('queues changes when redis has a snapshot with existing changes', async function () {
+    const projectId = fixtures.docs.uninitializedProject.id
+
+    // Initialise the project in redis using the "Hello World" test file
+    await chunkStore.initializeProject(projectId)
+    const blobStore = new BlobStore(projectId)
+    await blobStore.putFile(testFiles.path('hello.txt'))
+    const initialChangeOp = new AddFileOperation(
+      'existing.tex',
+      File.fromHash(testFiles.HELLO_TXT_HASH)
+    )
+    const initialChange = new Change([initialChangeOp], new Date(), [])
+    const initialChangesToQueue = [initialChange]
+    const versionBeforeInitialQueue = 0
+
+    // Queue the initial changes
+    const status = await queueChanges(
+      projectId,
+      initialChangesToQueue,
+      versionBeforeInitialQueue
+    )
+    // Confirm that the initial changes were queued successfully
+    expect(status).to.equal('ok')
+    const versionAfterInitialQueue =
+      versionBeforeInitialQueue + initialChangesToQueue.length
+
+    // Compute the snapshot after the initial changes for later use
+    const initialSnapshot = new Snapshot()
+    await initialSnapshot.loadFiles('hollow', blobStore)
+    for (const change of initialChangesToQueue) {
+      const hollowChange = change.clone()
+      await hollowChange.loadFiles('hollow', blobStore)
+      hollowChange.applyTo(initialSnapshot, { strict: true })
+    }
+
+    // Now prepare some subsequent changes for the queue
+    await blobStore.putFile(testFiles.path('graph.png'))
+    const addFileOp = new AddFileOperation(
+      'graph.png',
+      File.fromHash(testFiles.GRAPH_PNG_HASH)
+    )
+    const addFileChange = new Change([addFileOp], new Date(), [])
+    const editFileOp = new EditFileOperation(
+      'existing.tex',
+      new TextOperation()
+        .insert('Hello')
+        .retain(testFiles.HELLO_TXT_UTF8_LENGTH)
+    )
+    const editFileChange = new Change([editFileOp], new Date(), [])
+
+    const subsequentChangesToQueue = [addFileChange, editFileChange]
+    const versionBeforeSubsequentQueue = versionAfterInitialQueue
+
+    // Queue the subsequent changes
+    const subsequentStatus = await queueChanges(
+      projectId,
+      subsequentChangesToQueue,
+      versionBeforeSubsequentQueue
+    )
+    expect(subsequentStatus).to.equal('ok')
+
+    // Compute the expected snapshot after applying all changes
+    const expectedSnapshot = initialSnapshot.clone()
+    await expectedSnapshot.loadFiles('hollow', blobStore)
+    for (const change of subsequentChangesToQueue) {
+      const hollowChange = change.clone()
+      await hollowChange.loadFiles('hollow', blobStore)
+      hollowChange.applyTo(expectedSnapshot, { strict: true })
+    }
+
+    // Confirm that state in redis matches the expected snapshot and changes queue
+    const finalRedisState = await redisBackend.getState(projectId)
+    expect(finalRedisState).to.not.be.null
+    const expectedFinalVersion =
+      versionBeforeSubsequentQueue + subsequentChangesToQueue.length
+    expect(finalRedisState.headVersion).to.equal(expectedFinalVersion)
+    expect(finalRedisState.headSnapshot).to.deep.equal(expectedSnapshot.toRaw())
+    const allQueuedChangesRaw = initialChangesToQueue
+      .concat(subsequentChangesToQueue)
+      .map(c => c.toRaw())
+    expect(finalRedisState.changes).to.deep.equal(allQueuedChangesRaw)
+  })
+
+  it('skips queuing changes when there is no snapshot and the onlyIfExists flag is set', async function () {
+    // Start with an empty chunk store for the project
+    const projectId = fixtures.docs.uninitializedProject.id
+    await chunkStore.initializeProject(projectId)
+
+    // Ensure that the initial state in redis is empty
+    const initialRedisState = await redisBackend.getState(projectId)
+    expect(initialRedisState.headVersion).to.be.null
+    expect(initialRedisState.headSnapshot).to.be.null
+    expect(initialRedisState.changes).to.be.an('array').that.is.empty
+
+    // Add a test file to the blob store
+    const blobStore = new BlobStore(projectId)
+    await blobStore.putFile(testFiles.path('hello.txt'))
+
+    // Prepare an initial change to add a single file to an empty project
+    const change = new Change(
+      [
+        new AddFileOperation(
+          'test.tex',
+          File.fromHash(testFiles.HELLO_TXT_HASH)
+        ),
+      ],
+      new Date(),
+      []
+    )
+    const changesToQueue = [change]
+    const endVersion = 0
+
+    // Queue the changes to add the test file
+    const status = await queueChanges(projectId, changesToQueue, endVersion, {
+      onlyIfExists: true,
+    })
+    expect(status).to.equal('ignore')
+
+    // Verify that the state in redis has not changed
+    const redisState = await redisBackend.getState(projectId)
+    expect(redisState).to.deep.equal(initialRedisState)
+  })
+
+  it('creates an initial hollow snapshot when redis has no snapshot (falls back to chunkStore with an empty chunk)', async function () {
+    // Start with an empty chunk store for the project
+    const projectId = fixtures.docs.uninitializedProject.id
+    await chunkStore.initializeProject(projectId)
+    const blobStore = new BlobStore(projectId)
+    await blobStore.putFile(testFiles.path('hello.txt'))
+
+    // Prepare an initial change to add a single file to an empty project
+    const change = new Change(
+      [
+        new AddFileOperation(
+          'test.tex',
+          File.fromHash(testFiles.HELLO_TXT_HASH)
+        ),
+      ],
+      new Date(),
+      []
+    )
+    const changesToQueue = [change]
+    const endVersion = 0
+
+    // Queue the changes to add the test file
+    const status = await queueChanges(projectId, changesToQueue, endVersion)
+    expect(status).to.equal('ok')
+
+    // Verify that we now have some state in redis
+    const redisState = await redisBackend.getState(projectId)
+    expect(redisState).to.not.be.null
+    expect(redisState.headSnapshot.files['test.tex']).to.deep.equal({
+      stringLength: testFiles.HELLO_TXT_UTF8_LENGTH,
+    })
+  })
+
+  it('throws ConflictingEndVersion if endVersion does not match current version (from chunkStore)', async function () {
+    const projectId = fixtures.docs.uninitializedProject.id
+    // Initialise an empty project in the chunk store
+    await chunkStore.initializeProject(projectId)
+
+    // Ensure that the initial state in redis is empty
+    const initialRedisState = await redisBackend.getState(projectId)
+    expect(initialRedisState.headVersion).to.be.null
+
+    // Prepare a change to add a file
+    const change = new Change(
+      [new AddFileOperation('test.tex', File.fromString(''))],
+      new Date(),
+      []
+    )
+    const changesToQueue = [change]
+    const incorrectEndVersion = 1
+
+    // Attempt to queue the changes with an incorrect endVersion (1 instead of 0)
+    await expect(queueChanges(projectId, changesToQueue, incorrectEndVersion))
+      .to.be.rejectedWith(Chunk.ConflictingEndVersion)
+      .and.eventually.satisfies(err => {
+        expect(err.info).to.have.property(
+          'clientEndVersion',
+          incorrectEndVersion
+        )
+        expect(err.info).to.have.property('latestEndVersion', 0)
+        return true
+      })
+
+    // Verify that the state in redis has not changed
+    const redisStateAfterError = await redisBackend.getState(projectId)
+    expect(redisStateAfterError).to.deep.equal(initialRedisState)
+  })
+
+  it('throws ConflictingEndVersion if endVersion does not match current version (from redis snapshot)', async function () {
+    const projectId = fixtures.docs.uninitializedProject.id
+
+    // Initialise the project in the redis with a test file
+    await chunkStore.initializeProject(projectId)
+    const initialChange = new Change(
+      [new AddFileOperation('initial.tex', File.fromString('content'))],
+      new Date(),
+      []
+    )
+    const initialChangesToQueue = [initialChange]
+    const versionBeforeInitialQueue = 0
+
+    // Queue the initial changes
+    await queueChanges(
+      projectId,
+      initialChangesToQueue,
+      versionBeforeInitialQueue
+    )
+    const versionInRedisAfterSetup =
+      versionBeforeInitialQueue + initialChangesToQueue.length
+
+    // Confirm that the initial changes were queued successfully
+    const initialRedisState = await redisBackend.getState(projectId)
+    expect(initialRedisState).to.not.be.null
+    expect(initialRedisState.headVersion).to.equal(versionInRedisAfterSetup)
+
+    // Now prepare a subsequent change for the queue
+    const subsequentChange = new Change(
+      [new AddFileOperation('another.tex', File.fromString(''))],
+      new Date(),
+      []
+    )
+    const subsequentChangesToQueue = [subsequentChange]
+    const incorrectEndVersion = 0
+
+    //  Attempt to queue the changes with an incorrect endVersion (0 instead of 1)
+    await expect(
+      queueChanges(projectId, subsequentChangesToQueue, incorrectEndVersion)
+    )
+      .to.be.rejectedWith(Chunk.ConflictingEndVersion)
+      .and.eventually.satisfies(err => {
+        expect(err.info).to.have.property(
+          'clientEndVersion',
+          incorrectEndVersion
+        )
+        expect(err.info).to.have.property(
+          'latestEndVersion',
+          versionInRedisAfterSetup
+        )
+        return true
+      })
+
+    // Verify that the state in redis has not changed
+    const redisStateAfterError = await redisBackend.getState(projectId)
+    expect(redisStateAfterError).to.not.be.null
+    expect(redisStateAfterError).to.deep.equal(initialRedisState)
+  })
+})
diff --git a/services/history-v1/test/acceptance/js/storage/support/redis.js b/services/history-v1/test/acceptance/js/storage/support/redis.js
new file mode 100644
index 0000000000..3f5b9cda27
--- /dev/null
+++ b/services/history-v1/test/acceptance/js/storage/support/redis.js
@@ -0,0 +1,75 @@
+'use strict'
+
+const { Snapshot } = require('overleaf-editor-core')
+const redis = require('../../../../../storage/lib/redis')
+const redisBackend = require('../../../../../storage/lib/chunk_store/redis')
+const rclient = redis.rclientHistory
+const keySchema = redisBackend.keySchema
+
+// Helper to set up a basic project state in Redis
+async function setupProjectState(
+  projectId,
+  {
+    headVersion = 0,
+    persistedVersion = null,
+    expireTime = null,
+    persistTime = null,
+    changes = [],
+    expireTimeFuture = false, // Default to not setting future expire time unless specified
+  }
+) {
+  const headSnapshot = new Snapshot()
+  await rclient.set(
+    keySchema.head({ projectId }),
+    JSON.stringify(headSnapshot.toRaw())
+  )
+  await rclient.set(
+    keySchema.headVersion({ projectId }),
+    headVersion.toString()
+  )
+
+  if (persistedVersion !== null) {
+    await rclient.set(
+      keySchema.persistedVersion({ projectId }),
+      persistedVersion.toString()
+    )
+  } else {
+    await rclient.del(keySchema.persistedVersion({ projectId }))
+  }
+
+  if (expireTime !== null) {
+    await rclient.set(
+      keySchema.expireTime({ projectId }),
+      expireTime.toString()
+    )
+  } else {
+    // If expireTimeFuture is true, set it to a future time, otherwise delete it if null
+    if (expireTimeFuture) {
+      const futureExpireTime = Date.now() + 5 * 60 * 1000 // 5 minutes in the future
+      await rclient.set(
+        keySchema.expireTime({ projectId }),
+        futureExpireTime.toString()
+      )
+    } else {
+      await rclient.del(keySchema.expireTime({ projectId }))
+    }
+  }
+
+  if (persistTime !== null) {
+    await rclient.set(
+      keySchema.persistTime({ projectId }),
+      persistTime.toString()
+    )
+  } else {
+    await rclient.del(keySchema.persistTime({ projectId }))
+  }
+
+  if (changes.length > 0) {
+    const rawChanges = changes.map(c => JSON.stringify(c.toRaw()))
+    await rclient.rpush(keySchema.changes({ projectId }), ...rawChanges)
+  } else {
+    await rclient.del(keySchema.changes({ projectId }))
+  }
+}
+
+module.exports = { setupProjectState, rclient, keySchema }
diff --git a/services/history-v1/test/acceptance/js/storage/support/runscript.js b/services/history-v1/test/acceptance/js/storage/support/runscript.js
new file mode 100644
index 0000000000..7ff8355566
--- /dev/null
+++ b/services/history-v1/test/acceptance/js/storage/support/runscript.js
@@ -0,0 +1,35 @@
+'use strict'
+
+const { promisify } = require('node:util')
+const { execFile } = require('node:child_process')
+
+async function runScript(scriptPath, options = {}) {
+  const TIMEOUT = options.timeout || 10 * 1000 // 10 seconds default
+  let result
+  try {
+    result = await promisify(execFile)('node', [scriptPath], {
+      encoding: 'utf-8',
+      timeout: TIMEOUT,
+      env: {
+        ...process.env,
+        LOG_LEVEL: 'debug', // Override LOG_LEVEL for script output
+      },
+    })
+    result.status = 0
+  } catch (err) {
+    const { stdout, stderr, code } = err
+    if (typeof code !== 'number') {
+      console.error(`Error running script ${scriptPath}:`, err)
+      throw err
+    }
+    result = { stdout, stderr, status: code }
+  }
+  // The script might exit with status 1 if it finds no keys to process, which is ok
+  if (result.status !== 0 && result.status !== 1) {
+    console.error(`Script ${scriptPath} failed:`, result.stderr)
+    throw new Error(`Script ${scriptPath} failed with status ${result.status}`)
+  }
+  return result
+}
+
+module.exports = { runScript }
diff --git a/services/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml
index 8fd86c1fbb..24b57ab084 100644
--- a/services/notifications/docker-compose.ci.yml
+++ b/services/notifications/docker-compose.ci.yml
@@ -24,10 +24,13 @@ services:
       MOCHA_GREP: ${MOCHA_GREP}
       NODE_ENV: test
       NODE_OPTIONS: "--unhandled-rejections=strict"
+    volumes:
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     depends_on:
       mongo:
         condition: service_started
     user: node
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run test:acceptance
 
 
diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml
index 090742ff6d..167e45fdb1 100644
--- a/services/notifications/docker-compose.yml
+++ b/services/notifications/docker-compose.yml
@@ -26,6 +26,7 @@ services:
       - .:/overleaf/services/notifications
       - ../../node_modules:/overleaf/node_modules
       - ../../libraries:/overleaf/libraries
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     working_dir: /overleaf/services/notifications
     environment:
       ELASTIC_SEARCH_DSN: es:9200
@@ -39,6 +40,7 @@ services:
     depends_on:
       mongo:
         condition: service_started
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run --silent test:acceptance
 
   mongo:
diff --git a/services/project-history/app/js/HistoryStoreManager.js b/services/project-history/app/js/HistoryStoreManager.js
index bb41dfb3c0..38658bdf5b 100644
--- a/services/project-history/app/js/HistoryStoreManager.js
+++ b/services/project-history/app/js/HistoryStoreManager.js
@@ -35,7 +35,10 @@ class StringStream extends stream.Readable {
 _mocks.getMostRecentChunk = (projectId, historyId, callback) => {
   const path = `projects/${historyId}/latest/history`
   logger.debug({ projectId, historyId }, 'getting chunk from history service')
-  _requestChunk({ path, json: true }, callback)
+  _requestChunk({ path, json: true }, (err, chunk) => {
+    if (err) return callback(OError.tag(err))
+    callback(null, chunk)
+  })
 }
 
 /**
@@ -54,7 +57,10 @@ export function getChunkAtVersion(projectId, historyId, version, callback) {
     { projectId, historyId, version },
     'getting chunk from history service for version'
   )
-  _requestChunk({ path, json: true }, callback)
+  _requestChunk({ path, json: true }, (err, chunk) => {
+    if (err) return callback(OError.tag(err))
+    callback(null, chunk)
+  })
 }
 
 export function getMostRecentVersion(projectId, historyId, callback) {
@@ -68,8 +74,10 @@ export function getMostRecentVersion(projectId, historyId, callback) {
       _.sortBy(chunk.chunk.history.changes || [], x => x.timestamp)
     )
     // find the latest project and doc versions in the chunk
-    _getLatestProjectVersion(projectId, chunk, (err1, projectVersion) =>
+    _getLatestProjectVersion(projectId, chunk, (err1, projectVersion) => {
+      if (err1) err1 = OError.tag(err1)
       _getLatestV2DocVersions(projectId, chunk, (err2, v2DocVersions) => {
+        if (err2) err2 = OError.tag(err2)
         // return the project and doc versions
         const projectStructureAndDocVersions = {
           project: projectVersion,
@@ -83,7 +91,7 @@ export function getMostRecentVersion(projectId, historyId, callback) {
           chunk
         )
       })
-    )
+    })
   })
 }
 
@@ -211,7 +219,10 @@ export function getProjectBlob(historyId, blobHash, callback) {
   logger.debug({ historyId, blobHash }, 'getting blob from history service')
   _requestHistoryService(
     { path: `projects/${historyId}/blobs/${blobHash}` },
-    callback
+    (err, blob) => {
+      if (err) return callback(OError.tag(err))
+      callback(null, blob)
+    }
   )
 }
 
@@ -277,7 +288,10 @@ function createBlobFromString(historyId, data, fileId, callback) {
     (fsPath, cb) => {
       _createBlob(historyId, fsPath, cb)
     },
-    callback
+    (err, hash) => {
+      if (err) return callback(OError.tag(err))
+      callback(null, hash)
+    }
   )
 }
 
@@ -330,7 +344,7 @@ export function createBlobForUpdate(projectId, historyId, update, callback) {
     try {
       ranges = HistoryBlobTranslator.createRangeBlobDataFromUpdate(update)
     } catch (error) {
-      return callback(error)
+      return callback(OError.tag(error))
     }
     createBlobFromString(
       historyId,
@@ -338,7 +352,7 @@ export function createBlobForUpdate(projectId, historyId, update, callback) {
       `project-${projectId}-doc-${update.doc}`,
       (err, fileHash) => {
         if (err) {
-          return callback(err)
+          return callback(OError.tag(err))
         }
         if (ranges) {
           createBlobFromString(
@@ -347,7 +361,7 @@ export function createBlobForUpdate(projectId, historyId, update, callback) {
             `project-${projectId}-doc-${update.doc}-ranges`,
             (err, rangesHash) => {
               if (err) {
-                return callback(err)
+                return callback(OError.tag(err))
               }
               logger.debug(
                 { fileHash, rangesHash },
@@ -415,7 +429,7 @@ export function createBlobForUpdate(projectId, historyId, update, callback) {
             },
             (err, fileHash) => {
               if (err) {
-                return callback(err)
+                return callback(OError.tag(err))
               }
               if (update.hash && update.hash !== fileHash) {
                 logger.warn(
@@ -447,7 +461,7 @@ export function createBlobForUpdate(projectId, historyId, update, callback) {
               },
               (err, fileHash) => {
                 if (err) {
-                  return callback(err)
+                  return callback(OError.tag(err))
                 }
                 logger.debug({ fileHash }, 'created empty blob for file')
                 callback(null, { file: fileHash })
@@ -520,7 +534,10 @@ export function initializeProject(historyId, callback) {
 export function deleteProject(projectId, callback) {
   _requestHistoryService(
     { method: 'DELETE', path: `projects/${projectId}` },
-    callback
+    err => {
+      if (err) return callback(OError.tag(err))
+      callback(null)
+    }
   )
 }
 
diff --git a/services/project-history/app/js/SyncManager.js b/services/project-history/app/js/SyncManager.js
index ef8caf69eb..43cb61be9f 100644
--- a/services/project-history/app/js/SyncManager.js
+++ b/services/project-history/app/js/SyncManager.js
@@ -23,6 +23,7 @@ import { isInsert, isDelete } from './Utils.js'
 
 /**
  * @import { Comment as HistoryComment, TrackedChange as HistoryTrackedChange } from 'overleaf-editor-core'
+ * @import { CommentRawData, TrackedChangeRawData } from 'overleaf-editor-core/lib/types'
  * @import { Comment, Entity, ResyncDocContentUpdate, RetainOp, TrackedChange } from './types'
  * @import { TrackedChangeTransition, TrackingDirective, TrackingType, Update } from './types'
  * @import { ProjectStructureUpdate } from './types'
@@ -764,11 +765,19 @@ class SyncUpdateExpander {
     }
 
     const persistedComments = file.getComments().toArray()
-    await this.queueUpdatesForOutOfSyncComments(
-      update,
-      pathname,
-      persistedComments
-    )
+    if (update.resyncDocContent.historyOTRanges) {
+      this.queueUpdatesForOutOfSyncCommentsHistoryOT(
+        update,
+        pathname,
+        file.getComments().toRaw()
+      )
+    } else {
+      await this.queueUpdatesForOutOfSyncComments(
+        update,
+        pathname,
+        persistedComments
+      )
+    }
 
     const persistedChanges = file.getTrackedChanges().asSorted()
     await this.queueUpdatesForOutOfSyncTrackedChanges(
@@ -825,6 +834,91 @@ class SyncUpdateExpander {
     return expandedUpdate
   }
 
+  /**
+   * Queue updates for out of sync comments
+   *
+   * @param {ResyncDocContentUpdate} update
+   * @param {string} pathname
+   * @param {CommentRawData[]} persistedComments
+   */
+  queueUpdatesForOutOfSyncCommentsHistoryOT(
+    update,
+    pathname,
+    persistedComments
+  ) {
+    const expectedComments =
+      update.resyncDocContent.historyOTRanges?.comments ?? []
+    const expectedCommentsById = new Map(
+      expectedComments.map(comment => [comment.id, comment])
+    )
+    const persistedCommentsById = new Map(
+      persistedComments.map(comment => [comment.id, comment])
+    )
+
+    // Delete any persisted comment that is not in the expected comment list.
+    for (const persistedComment of persistedComments) {
+      if (!expectedCommentsById.has(persistedComment.id)) {
+        this.expandedUpdates.push({
+          doc: update.doc,
+          op: [{ deleteComment: persistedComment.id }],
+          meta: {
+            pathname,
+            resync: true,
+            origin: this.origin,
+            ts: update.meta.ts,
+          },
+        })
+      }
+    }
+
+    for (const expectedComment of expectedComments) {
+      const persistedComment = persistedCommentsById.get(expectedComment.id)
+      if (
+        persistedComment &&
+        commentRangesAreInSyncHistoryOT(persistedComment, expectedComment)
+      ) {
+        if (expectedComment.resolved === persistedComment.resolved) {
+          // Both comments are identical; do nothing
+        } else {
+          // Only the resolved state differs
+          this.expandedUpdates.push({
+            doc: update.doc,
+            op: [
+              {
+                commentId: expectedComment.id,
+                resolved: expectedComment.resolved,
+              },
+            ],
+            meta: {
+              pathname,
+              resync: true,
+              origin: this.origin,
+              ts: update.meta.ts,
+            },
+          })
+        }
+      } else {
+        // New comment or ranges differ
+        this.expandedUpdates.push({
+          doc: update.doc,
+          op: [
+            {
+              commentId: expectedComment.id,
+              ranges: expectedComment.ranges,
+              resolved: expectedComment.resolved,
+            },
+          ],
+          meta: {
+            pathname,
+            resync: true,
+            origin: this.origin,
+            ts: update.meta.ts,
+          },
+        })
+      }
+    }
+  }
+
   /**
    * Queue updates for out of sync comments
    *
@@ -951,6 +1045,7 @@ class SyncUpdateExpander {
     for (const transition of getTrackedChangesTransitions(
       persistedChanges,
       expectedChanges,
+      update.resyncDocContent.historyOTRanges?.trackedChanges || [],
       expectedContent.length
     )) {
       if (transition.pos > cursor) {
@@ -1018,6 +1113,25 @@ class SyncUpdateExpander {
   }
 }
 
+/**
+ * Compares the ranges in the persisted and expected comments
+ *
+ * @param {CommentRawData} persistedComment
+ * @param {CommentRawData} expectedComment
+ */
+function commentRangesAreInSyncHistoryOT(persistedComment, expectedComment) {
+  if (persistedComment.ranges.length !== expectedComment.ranges.length) {
+    return false
+  }
+  for (let i = 0; i < persistedComment.ranges.length; i++) {
+    const persistedRange = persistedComment.ranges[i]
+    const expectedRange = expectedComment.ranges[i]
+    if (persistedRange.pos !== expectedRange.pos) return false
+    if (persistedRange.length !== expectedRange.length) return false
+  }
+  return true
+}
+
 /**
  * Compares the ranges in the persisted and expected comments
  *
@@ -1049,11 +1163,13 @@ function commentRangesAreInSync(persistedComment, expectedComment) {
  *
  * @param {readonly HistoryTrackedChange[]} persistedChanges
  * @param {TrackedChange[]} expectedChanges
+ * @param {TrackedChangeRawData[]} persistedChangesHistoryOT
  * @param {number} docLength
  */
 function getTrackedChangesTransitions(
   persistedChanges,
   expectedChanges,
+  persistedChangesHistoryOT,
   docLength
 ) {
   /** @type {TrackedChangeTransition[]} */
@@ -1076,6 +1192,19 @@ function getTrackedChangesTransitions(
     })
   }
 
+  for (const change of persistedChangesHistoryOT) {
+    transitions.push({
+      stage: 'expected',
+      pos: change.range.pos,
+      tracking: change.tracking,
+    })
+    transitions.push({
+      stage: 'expected',
+      pos: change.range.pos + change.range.length,
+      tracking: { type: 'none' },
+    })
+  }
+
   for (const change of expectedChanges) {
     const op = change.op
     const pos = op.hpos ?? op.p
diff --git a/services/project-history/app/js/UpdateCompressor.js b/services/project-history/app/js/UpdateCompressor.js
index 471fc791ab..5ae7591a7f 100644
--- a/services/project-history/app/js/UpdateCompressor.js
+++ b/services/project-history/app/js/UpdateCompressor.js
@@ -1,8 +1,15 @@
 // @ts-check
 
+import Metrics from '@overleaf/metrics'
 import OError from '@overleaf/o-error'
 import DMP from 'diff-match-patch'
 import { EditOperationBuilder } from 'overleaf-editor-core'
+import zlib from 'node:zlib'
+import { ReadableString, WritableBuffer } from '@overleaf/stream-utils'
+import Stream from 'node:stream'
+import logger from '@overleaf/logger'
+import { callbackify } from '@overleaf/promise-utils'
+import Settings from '@overleaf/settings'
 
 /**
  * @import { DeleteOp, InsertOp, Op, Update } from './types'
@@ -162,7 +169,9 @@ export function concatUpdatesWithSameVersion(updates) {
         lastUpdate.op != null &&
         lastUpdate.v === update.v &&
         lastUpdate.doc === update.doc &&
-        lastUpdate.pathname === update.pathname
+        lastUpdate.pathname === update.pathname &&
+        EditOperationBuilder.isValid(update.op[0]) ===
+          EditOperationBuilder.isValid(lastUpdate.op[0])
       ) {
         lastUpdate.op = lastUpdate.op.concat(update.op)
         if (update.meta.doc_hash == null) {
@@ -180,6 +189,66 @@ export function concatUpdatesWithSameVersion(updates) {
   return concattedUpdates
 }
 
+async function estimateStorage(updates) {
+  const blob = JSON.stringify(updates)
+  const bytes = Buffer.from(blob).byteLength
+  const read = new ReadableString(blob)
+  const compress = zlib.createGzip()
+  const write = new WritableBuffer()
+  await Stream.promises.pipeline(read, compress, write)
+  const bytesGz = write.size()
+  return { bytes, bytesGz, nUpdates: updates.length }
+}
+
+/**
+ * @param {Update[]} rawUpdates
+ * @param {string} projectId
+ * @param {import("./Profiler").Profiler} profile
+ * @return {Promise<Update[]>}
+ */
+async function compressRawUpdatesWithMetrics(rawUpdates, projectId, profile) {
+  if (100 * Math.random() > Settings.estimateCompressionSample) {
+    return compressRawUpdatesWithProfile(rawUpdates, projectId, profile)
+  }
+  const before = await estimateStorage(rawUpdates)
+  profile.log('estimateRawUpdatesSize')
+  const updates = compressRawUpdatesWithProfile(rawUpdates, projectId, profile)
+  const after = await estimateStorage(updates)
+  for (const [path, values] of Object.entries({ before, after })) {
+    for (const [method, v] of Object.entries(values)) {
+      Metrics.summary('updates_compression_estimate', v, { path, method })
+    }
+  }
+  for (const method of Object.keys(before)) {
+    const percentage = Math.ceil(100 * (after[method] / before[method]))
+    Metrics.summary('updates_compression_percentage', percentage, { method })
+  }
+  profile.log('estimateCompressedUpdatesSize')
+  return updates
+}
+
+export const compressRawUpdatesWithMetricsCb = callbackify(
+  compressRawUpdatesWithMetrics
+)
+
+/**
+ * @param {Update[]} rawUpdates
+ * @param {string} projectId
+ * @param {import("./Profiler").Profiler} profile
+ * @return {Update[]}
+ */
+function compressRawUpdatesWithProfile(rawUpdates, projectId, profile) {
+  const updates = compressRawUpdates(rawUpdates)
+  const timeTaken = profile.log('compressRawUpdates').getTimeDelta()
+  if (timeTaken >= 1000) {
+    logger.debug(
+      { projectId, updates: rawUpdates, timeTaken },
+      'slow compression of raw updates'
+    )
+  }
+  return updates
+}
+
 export function compressRawUpdates(rawUpdates) {
   let updates = convertToSingleOpUpdates(rawUpdates)
   updates = compressUpdates(updates)
diff --git a/services/project-history/app/js/UpdatesProcessor.js b/services/project-history/app/js/UpdatesProcessor.js
index a76241d7ca..b4895c012d 100644
--- a/services/project-history/app/js/UpdatesProcessor.js
+++ b/services/project-history/app/js/UpdatesProcessor.js
@@ -546,7 +546,10 @@ export function _processUpdates(
       }
       if (filteredUpdates.length === 0) {
         // return early if there are no updates to apply
-        return SyncManager.setResyncState(projectId, newSyncState, callback)
+        return SyncManager.setResyncState(projectId, newSyncState, err => {
+          if (err) return callback(err)
+          callback(null, { resyncNeeded: false })
+        })
       }
       // only make request to history service if we have actual updates to process
       _getMostRecentVersionWithDebug(
@@ -593,17 +596,17 @@ export function _processUpdates(
                   return cb(err)
                 }
                 profile.log('skipAlreadyAppliedUpdates')
-                const compressedUpdates =
-                  UpdateCompressor.compressRawUpdates(unappliedUpdates)
-                const timeTaken = profile
-                  .log('compressRawUpdates')
-                  .getTimeDelta()
-                if (timeTaken >= 1000) {
-                  logger.debug(
-                    { projectId, updates: unappliedUpdates, timeTaken },
-                    'slow compression of raw updates'
-                  )
-                }
+                cb(null, unappliedUpdates)
+              },
+              (unappliedUpdates, cb) => {
+                UpdateCompressor.compressRawUpdatesWithMetricsCb(
+                  unappliedUpdates,
+                  projectId,
+                  profile,
+                  cb
+                )
+              },
+              (compressedUpdates, cb) => {
                 cb = profile.wrap('createBlobs', cb)
                 BlobManager.createBlobsForUpdates(
                   projectId,
diff --git a/services/project-history/app/js/types.ts b/services/project-history/app/js/types.ts
index 96701e587f..c11b7741e3 100644
--- a/services/project-history/app/js/types.ts
+++ b/services/project-history/app/js/types.ts
@@ -3,6 +3,8 @@ import {
   LinkedFileData,
   RawEditOperation,
   RawOrigin,
+  CommentRawData,
+  TrackedChangeRawData,
 } from 'overleaf-editor-core/lib/types'
 
 export type Update =
@@ -118,6 +120,10 @@ export type ResyncDocContentUpdate = {
     content: string
     version: number
     ranges?: Ranges
+    historyOTRanges?: {
+      comments: CommentRawData[]
+      trackedChanges: TrackedChangeRawData[]
+    }
     resolvedCommentIds?: string[]
   }
   projectHistoryId: string
diff --git a/services/project-history/config/settings.defaults.cjs b/services/project-history/config/settings.defaults.cjs
index d259d070b9..d767cddd96 100644
--- a/services/project-history/config/settings.defaults.cjs
+++ b/services/project-history/config/settings.defaults.cjs
@@ -110,4 +110,8 @@ module.exports = {
   shortHistoryQueues: (process.env.SHORT_HISTORY_QUEUES || '')
     .split(',')
     .filter(s => !!s),
+  estimateCompressionSample: parseInt(
+    process.env.ESTIMATE_COMPRESSION_SAMPLE || '0',
+    10
+  ),
 }
diff --git a/services/project-history/docker-compose.ci.yml b/services/project-history/docker-compose.ci.yml
index 2fe97bd9b3..ca15f35fef 100644
--- a/services/project-history/docker-compose.ci.yml
+++ b/services/project-history/docker-compose.ci.yml
@@ -28,12 +28,15 @@ services:
       MOCHA_GREP: ${MOCHA_GREP}
       NODE_ENV: test
       NODE_OPTIONS: "--unhandled-rejections=strict"
+    volumes:
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     depends_on:
       mongo:
         condition: service_started
       redis:
         condition: service_healthy
     user: node
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run test:acceptance
 
 
@@ -45,7 +48,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   redis:
-    image: redis
+    image: redis:7.4.3
     healthcheck:
       test: ping="$$(redis-cli ping)" && [ "$$ping" = 'PONG' ]
       interval: 1s
diff --git a/services/project-history/docker-compose.yml b/services/project-history/docker-compose.yml
index 68360baf44..95a36b5fcb 100644
--- a/services/project-history/docker-compose.yml
+++ b/services/project-history/docker-compose.yml
@@ -26,6 +26,7 @@ services:
       - .:/overleaf/services/project-history
       - ../../node_modules:/overleaf/node_modules
       - ../../libraries:/overleaf/libraries
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     working_dir: /overleaf/services/project-history
     environment:
       ELASTIC_SEARCH_DSN: es:9200
@@ -45,10 +46,11 @@ services:
         condition: service_started
       redis:
         condition: service_healthy
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run --silent test:acceptance
 
   redis:
-    image: redis
+    image: redis:7.4.3
     healthcheck:
       test: ping=$$(redis-cli ping) && [ "$$ping" = 'PONG' ]
       interval: 1s
diff --git a/services/project-history/package.json b/services/project-history/package.json
index 2a54a807d3..4160f36f6f 100644
--- a/services/project-history/package.json
+++ b/services/project-history/package.json
@@ -9,8 +9,8 @@
     "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "start": "node app.js",
     "nodemon": "node --watch app.js",
-    "test:acceptance:_run": "LOG_LEVEL=fatal mocha --loader=esmock --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
-    "test:unit:_run": "LOG_LEVEL=fatal mocha --loader=esmock --recursive --reporter spec $@ test/unit/js",
+    "test:acceptance:_run": "mocha --loader=esmock --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
+    "test:unit:_run": "mocha --loader=esmock --recursive --reporter spec $@ test/unit/js",
     "lint": "eslint --max-warnings 0 --format unix .",
     "format": "prettier --list-different $PWD/'**/*.*js'",
     "format:fix": "prettier --write $PWD/'**/*.*js'",
@@ -25,6 +25,7 @@
     "@overleaf/promise-utils": "*",
     "@overleaf/redis-wrapper": "*",
     "@overleaf/settings": "*",
+    "@overleaf/stream-utils": "*",
     "async": "^3.2.5",
     "aws-sdk": "^2.650.0",
     "body-parser": "^1.20.3",
diff --git a/services/project-history/scripts/retry_failures.js b/services/project-history/scripts/retry_failures.js
new file mode 100755
index 0000000000..85ee21faf4
--- /dev/null
+++ b/services/project-history/scripts/retry_failures.js
@@ -0,0 +1,26 @@
+import * as RetryManager from '../app/js/RetryManager.js'
+import minimist from 'minimist'
+
+const args = minimist(process.argv.slice(2), {
+  string: ['failureType', 'timeout', 'limit'],
+  default: {
+    failureType: 'soft',
+    timeout: (60 * 60 * 1000).toString(),
+    limit: (100_000).toString(),
+  },
+})
+
+const failureType = args.failureType
+const timeout = parseInt(args.timeout, 10)
+const limit = parseInt(args.limit, 10)
+
+RetryManager.retryFailures({ failureType, timeout, limit }, (err, result) => {
+  if (err) {
+    console.error(err)
+    process.exit(1)
+  } else {
+    console.log(JSON.stringify(result))
+    console.log('Done.')
+  }
+  process.exit(0)
+})
diff --git a/services/project-history/test/acceptance/js/SyncTests.js b/services/project-history/test/acceptance/js/SyncTests.js
index 89e002d4dd..f7420e6cdb 100644
--- a/services/project-history/test/acceptance/js/SyncTests.js
+++ b/services/project-history/test/acceptance/js/SyncTests.js
@@ -1225,7 +1225,7 @@ describe('Syncing with web and doc-updater', function () {
           )
         })
 
-        it('should fix comments in the history store', function (done) {
+        it('should add comments in the history store', function (done) {
           const commentId = 'comment-id'
           const addComment = MockHistoryStore()
             .post(`/api/projects/${historyId}/legacy_changes`, body => {
@@ -1315,6 +1315,1195 @@ describe('Syncing with web and doc-updater', function () {
             }
           )
         })
+
+        it('should add comments in the history store (history-ot)', function (done) {
+          const commentId = 'comment-id'
+          const addComment = MockHistoryStore()
+            .post(`/api/projects/${historyId}/legacy_changes`, body => {
+              expect(body).to.deep.equal([
+                {
+                  v2Authors: [],
+                  authors: [],
+                  timestamp: this.timestamp.toJSON(),
+                  operations: [
+                    {
+                      pathname: 'main.tex',
+                      commentId,
+                      ranges: [{ pos: 1, length: 10 }],
+                    },
+                  ],
+                  origin: { kind: 'test-origin' },
+                },
+              ])
+              return true
+            })
+            .query({ end_version: 0 })
+            .reply(204)
+
+          async.series(
+            [
+              cb => {
+                ProjectHistoryClient.resyncHistory(this.project_id, cb)
+              },
+              cb => {
+                const update = {
+                  projectHistoryId: historyId,
+                  resyncProjectStructure: {
+                    docs: [{ path: '/main.tex' }],
+                    files: [],
+                  },
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                const update = {
+                  path: '/main.tex',
+                  projectHistoryId: historyId,
+                  resyncDocContent: {
+                    content: 'a\nb',
+                    historyOTRanges: {
+                      comments: [
+                        {
+                          id: commentId,
+                          ranges: [
+                            {
+                              pos: 1,
+                              length: 10,
+                            },
+                          ],
+                        },
+                      ],
+                    },
+                  },
+                  doc: this.doc_id,
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                ProjectHistoryClient.flushProject(this.project_id, cb)
+              },
+            ],
+            error => {
+              if (error) {
+                return done(error)
+              }
+              assert(
+                addComment.isDone(),
+                `/api/projects/${historyId}/changes should have been called`
+              )
+              done()
+            }
+          )
+        })
+
+        it('should add tracked changes in the history store', function (done) {
+          const fixTrackedChange = MockHistoryStore()
+            .post(`/api/projects/${historyId}/legacy_changes`, body => {
+              expect(body).to.deep.equal([
+                {
+                  v2Authors: [],
+                  authors: [],
+                  timestamp: this.timestamp.toJSON(),
+                  operations: [
+                    {
+                      pathname: 'main.tex',
+                      textOperation: [
+                        {
+                          r: 1,
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'delete',
+                            userId: 'user-id',
+                          },
+                        },
+                        {
+                          r: 1,
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'insert',
+                            userId: 'user-id',
+                          },
+                        },
+                        1,
+                      ],
+                    },
+                  ],
+                  origin: { kind: 'test-origin' },
+                },
+              ])
+              return true
+            })
+            .query({ end_version: 0 })
+            .reply(204)
+
+          async.series(
+            [
+              cb => {
+                ProjectHistoryClient.resyncHistory(this.project_id, cb)
+              },
+              cb => {
+                const update = {
+                  projectHistoryId: historyId,
+                  resyncProjectStructure: {
+                    docs: [{ path: '/main.tex' }],
+                    files: [],
+                  },
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                const update = {
+                  path: '/main.tex',
+                  projectHistoryId: historyId,
+                  resyncDocContent: {
+                    content: 'a\nb',
+                    ranges: {
+                      changes: [
+                        {
+                          id: 'id1',
+                          op: {
+                            d: 'a',
+                            p: 0,
+                          },
+                          metadata: {
+                            user_id: 'user-id',
+                            ts: this.timestamp,
+                          },
+                        },
+                        {
+                          id: 'id2',
+                          op: {
+                            i: '\n',
+                            p: 0,
+                            hpos: 1,
+                          },
+                          metadata: {
+                            user_id: 'user-id',
+                            ts: this.timestamp,
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  doc: this.doc_id,
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                ProjectHistoryClient.flushProject(this.project_id, cb)
+              },
+            ],
+            error => {
+              if (error) {
+                return done(error)
+              }
+              assert(
+                fixTrackedChange.isDone(),
+                `/api/projects/${historyId}/changes should have been called`
+              )
+              done()
+            }
+          )
+        })
+
+        it('should add tracked changes in the history store (history-ot)', function (done) {
+          const fixTrackedChange = MockHistoryStore()
+            .post(`/api/projects/${historyId}/legacy_changes`, body => {
+              expect(body).to.deep.equal([
+                {
+                  v2Authors: [],
+                  authors: [],
+                  timestamp: this.timestamp.toJSON(),
+                  operations: [
+                    {
+                      pathname: 'main.tex',
+                      textOperation: [
+                        {
+                          r: 1,
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'delete',
+                            userId: 'user-id',
+                          },
+                        },
+                        {
+                          r: 1,
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'insert',
+                            userId: 'user-id',
+                          },
+                        },
+                        1,
+                      ],
+                    },
+                  ],
+                  origin: { kind: 'test-origin' },
+                },
+              ])
+              return true
+            })
+            .query({ end_version: 0 })
+            .reply(204)
+
+          async.series(
+            [
+              cb => {
+                ProjectHistoryClient.resyncHistory(this.project_id, cb)
+              },
+              cb => {
+                const update = {
+                  projectHistoryId: historyId,
+                  resyncProjectStructure: {
+                    docs: [{ path: '/main.tex' }],
+                    files: [],
+                  },
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                const update = {
+                  path: '/main.tex',
+                  projectHistoryId: historyId,
+                  resyncDocContent: {
+                    content: 'a\nb',
+                    historyOTRanges: {
+                      trackedChanges: [
+                        {
+                          range: { pos: 0, length: 1 },
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'delete',
+                            userId: 'user-id',
+                          },
+                        },
+                        {
+                          range: { pos: 1, length: 1 },
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'insert',
+                            userId: 'user-id',
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  doc: this.doc_id,
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                ProjectHistoryClient.flushProject(this.project_id, cb)
+              },
+            ],
+            error => {
+              if (error) {
+                return done(error)
+              }
+              assert(
+                fixTrackedChange.isDone(),
+                `/api/projects/${historyId}/changes should have been called`
+              )
+              done()
+            }
+          )
+        })
+      })
+
+      describe("when a doc's ranges are out of sync", function () {
+        const commentId = 'comment-id'
+        beforeEach(function () {
+          MockHistoryStore()
+            .get(`/api/projects/${historyId}/latest/history`)
+            .reply(200, {
+              chunk: {
+                history: {
+                  snapshot: {
+                    files: {
+                      'main.tex': {
+                        hash: '0a207c060e61f3b88eaee0a8cd0696f46fb155eb',
+                        rangesHash: '0a207c060e61f3b88eaee0a8cd0696f46fb155ec',
+                        stringLength: 3,
+                      },
+                    },
+                  },
+                  changes: [],
+                },
+                startVersion: 0,
+              },
+            })
+
+          MockHistoryStore()
+            .get(
+              `/api/projects/${historyId}/blobs/0a207c060e61f3b88eaee0a8cd0696f46fb155eb`
+            )
+            .reply(200, 'a\nb')
+
+          MockHistoryStore()
+            .get(
+              `/api/projects/${historyId}/blobs/0a207c060e61f3b88eaee0a8cd0696f46fb155ec`
+            )
+            .reply(
+              200,
+              JSON.stringify({
+                comments: [{ id: commentId, ranges: [{ pos: 0, length: 3 }] }],
+                trackedChanges: [
+                  {
+                    range: { pos: 0, length: 1 },
+                    tracking: {
+                      ts: this.timestamp.toJSON(),
+                      type: 'delete',
+                      userId: 'user-id',
+                    },
+                  },
+                  {
+                    range: { pos: 2, length: 1 },
+                    tracking: {
+                      ts: this.timestamp.toJSON(),
+                      type: 'insert',
+                      userId: 'user-id',
+                    },
+                  },
+                ],
+              })
+            )
+        })
+
+        it('should fix comments in the history store', function (done) {
+          const addComment = MockHistoryStore()
+            .post(`/api/projects/${historyId}/legacy_changes`, body => {
+              expect(body).to.deep.equal([
+                {
+                  v2Authors: [],
+                  authors: [],
+                  timestamp: this.timestamp.toJSON(),
+                  operations: [
+                    {
+                      pathname: 'main.tex',
+                      commentId,
+                      ranges: [{ pos: 1, length: 2 }],
+                    },
+                  ],
+                  origin: { kind: 'test-origin' },
+                },
+              ])
+              return true
+            })
+            .query({ end_version: 0 })
+            .reply(204)
+
+          async.series(
+            [
+              cb => {
+                ProjectHistoryClient.resyncHistory(this.project_id, cb)
+              },
+              cb => {
+                const update = {
+                  projectHistoryId: historyId,
+                  resyncProjectStructure: {
+                    docs: [{ path: '/main.tex' }],
+                    files: [],
+                  },
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                const update = {
+                  path: '/main.tex',
+                  projectHistoryId: historyId,
+                  resyncDocContent: {
+                    content: 'a\nb',
+                    ranges: {
+                      comments: [
+                        {
+                          id: commentId,
+                          op: {
+                            c: 'a',
+                            p: 0,
+                            hpos: 1,
+                            hlen: 2,
+                            t: commentId,
+                          },
+                          meta: {
+                            user_id: 'user-id',
+                            ts: this.timestamp,
+                          },
+                        },
+                      ],
+                      changes: [
+                        {
+                          id: 'id1',
+                          op: {
+                            d: 'a',
+                            p: 0,
+                          },
+                          metadata: {
+                            user_id: 'user-id',
+                            ts: this.timestamp,
+                          },
+                        },
+                        {
+                          id: 'id2',
+                          op: {
+                            i: '\n',
+                            p: 1,
+                            hpos: 2,
+                          },
+                          metadata: {
+                            user_id: 'user-id',
+                            ts: this.timestamp,
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  doc: this.doc_id,
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                ProjectHistoryClient.flushProject(this.project_id, cb)
+              },
+            ],
+            error => {
+              if (error) {
+                return done(error)
+              }
+              assert(
+                addComment.isDone(),
+                `/api/projects/${historyId}/changes should have been called`
+              )
+              done()
+            }
+          )
+        })
+
+        it('should fix resolved state for comments in the history store', function (done) {
+          const addComment = MockHistoryStore()
+            .post(`/api/projects/${historyId}/legacy_changes`, body => {
+              expect(body).to.deep.equal([
+                {
+                  v2Authors: [],
+                  authors: [],
+                  timestamp: this.timestamp.toJSON(),
+                  operations: [
+                    {
+                      pathname: 'main.tex',
+                      commentId,
+                      resolved: true,
+                    },
+                  ],
+                  origin: { kind: 'test-origin' },
+                },
+              ])
+              return true
+            })
+            .query({ end_version: 0 })
+            .reply(204)
+
+          async.series(
+            [
+              cb => {
+                ProjectHistoryClient.resyncHistory(this.project_id, cb)
+              },
+              cb => {
+                const update = {
+                  projectHistoryId: historyId,
+                  resyncProjectStructure: {
+                    docs: [{ path: '/main.tex' }],
+                    files: [],
+                  },
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                const update = {
+                  path: '/main.tex',
+                  projectHistoryId: historyId,
+                  resyncDocContent: {
+                    content: 'a\nb',
+                    resolvedCommentIds: [commentId],
+                    ranges: {
+                      comments: [
+                        {
+                          id: commentId,
+                          op: {
+                            c: 'a',
+                            p: 0,
+                            hpos: 0,
+                            hlen: 3,
+                            t: commentId,
+                          },
+                          meta: {
+                            user_id: 'user-id',
+                            ts: this.timestamp,
+                          },
+                        },
+                      ],
+                      changes: [
+                        {
+                          id: 'id1',
+                          op: {
+                            d: 'a',
+                            p: 0,
+                          },
+                          metadata: {
+                            user_id: 'user-id',
+                            ts: this.timestamp,
+                          },
+                        },
+                        {
+                          id: 'id2',
+                          op: {
+                            i: '\n',
+                            p: 1,
+                            hpos: 2,
+                          },
+                          metadata: {
+                            user_id: 'user-id',
+                            ts: this.timestamp,
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  doc: this.doc_id,
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                ProjectHistoryClient.flushProject(this.project_id, cb)
+              },
+            ],
+            error => {
+              if (error) {
+                return done(error)
+              }
+              assert(
+                addComment.isDone(),
+                `/api/projects/${historyId}/changes should have been called`
+              )
+              done()
+            }
+          )
+        })
+
+        it('should fix comments in the history store (history-ot)', function (done) {
+          const addComment = MockHistoryStore()
+            .post(`/api/projects/${historyId}/legacy_changes`, body => {
+              expect(body).to.deep.equal([
+                {
+                  v2Authors: [],
+                  authors: [],
+                  timestamp: this.timestamp.toJSON(),
+                  operations: [
+                    {
+                      pathname: 'main.tex',
+                      commentId,
+                      ranges: [{ pos: 1, length: 2 }],
+                    },
+                  ],
+                  origin: { kind: 'test-origin' },
+                },
+              ])
+              return true
+            })
+            .query({ end_version: 0 })
+            .reply(204)
+
+          async.series(
+            [
+              cb => {
+                ProjectHistoryClient.resyncHistory(this.project_id, cb)
+              },
+              cb => {
+                const update = {
+                  projectHistoryId: historyId,
+                  resyncProjectStructure: {
+                    docs: [{ path: '/main.tex' }],
+                    files: [],
+                  },
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                const update = {
+                  path: '/main.tex',
+                  projectHistoryId: historyId,
+                  resyncDocContent: {
+                    content: 'a\nb',
+                    historyOTRanges: {
+                      comments: [
+                        {
+                          id: commentId,
+                          ranges: [
+                            {
+                              pos: 1,
+                              length: 2,
+                            },
+                          ],
+                        },
+                      ],
+                      trackedChanges: [
+                        {
+                          range: { pos: 0, length: 1 },
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'delete',
+                            userId: 'user-id',
+                          },
+                        },
+                        {
+                          range: { pos: 2, length: 1 },
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'insert',
+                            userId: 'user-id',
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  doc: this.doc_id,
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                ProjectHistoryClient.flushProject(this.project_id, cb)
+              },
+            ],
+            error => {
+              if (error) {
+                return done(error)
+              }
+              assert(
+                addComment.isDone(),
+                `/api/projects/${historyId}/changes should have been called`
+              )
+              done()
+            }
+          )
+        })
+
+        it('should fix resolved state for comments in the history store (history-ot)', function (done) {
+          const addComment = MockHistoryStore()
+            .post(`/api/projects/${historyId}/legacy_changes`, body => {
+              expect(body).to.deep.equal([
+                {
+                  v2Authors: [],
+                  authors: [],
+                  timestamp: this.timestamp.toJSON(),
+                  operations: [
+                    {
+                      pathname: 'main.tex',
+                      commentId,
+                      resolved: true,
+                    },
+                  ],
+                  origin: { kind: 'test-origin' },
+                },
+              ])
+              return true
+            })
+            .query({ end_version: 0 })
+            .reply(204)
+
+          async.series(
+            [
+              cb => {
+                ProjectHistoryClient.resyncHistory(this.project_id, cb)
+              },
+              cb => {
+                const update = {
+                  projectHistoryId: historyId,
+                  resyncProjectStructure: {
+                    docs: [{ path: '/main.tex' }],
+                    files: [],
+                  },
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                const update = {
+                  path: '/main.tex',
+                  projectHistoryId: historyId,
+                  resyncDocContent: {
+                    content: 'a\nb',
+                    historyOTRanges: {
+                      comments: [
+                        {
+                          id: commentId,
+                          ranges: [
+                            {
+                              pos: 0,
+                              length: 3,
+                            },
+                          ],
+                          resolved: true,
+                        },
+                      ],
+                      trackedChanges: [
+                        {
+                          range: { pos: 0, length: 1 },
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'delete',
+                            userId: 'user-id',
+                          },
+                        },
+                        {
+                          range: { pos: 2, length: 1 },
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'insert',
+                            userId: 'user-id',
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  doc: this.doc_id,
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                ProjectHistoryClient.flushProject(this.project_id, cb)
+              },
+            ],
+            error => {
+              if (error) {
+                return done(error)
+              }
+              assert(
+                addComment.isDone(),
+                `/api/projects/${historyId}/changes should have been called`
+              )
+              done()
+            }
+          )
+        })
+
+        it('should fix tracked changes in the history store', function (done) {
+          const fixTrackedChange = MockHistoryStore()
+            .post(`/api/projects/${historyId}/legacy_changes`, body => {
+              expect(body).to.deep.equal([
+                {
+                  v2Authors: [],
+                  authors: [],
+                  timestamp: this.timestamp.toJSON(),
+                  operations: [
+                    {
+                      pathname: 'main.tex',
+                      textOperation: [
+                        1,
+                        {
+                          r: 1,
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'insert',
+                            userId: 'user-id',
+                          },
+                        },
+                        {
+                          r: 1,
+                          tracking: {
+                            type: 'none',
+                          },
+                        },
+                      ],
+                    },
+                  ],
+                  origin: { kind: 'test-origin' },
+                },
+              ])
+              return true
+            })
+            .query({ end_version: 0 })
+            .reply(204)
+
+          async.series(
+            [
+              cb => {
+                ProjectHistoryClient.resyncHistory(this.project_id, cb)
+              },
+              cb => {
+                const update = {
+                  projectHistoryId: historyId,
+                  resyncProjectStructure: {
+                    docs: [{ path: '/main.tex' }],
+                    files: [],
+                  },
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                const update = {
+                  path: '/main.tex',
+                  projectHistoryId: historyId,
+                  resyncDocContent: {
+                    content: 'a\nb',
+                    ranges: {
+                      comments: [
+                        {
+                          id: commentId,
+                          op: {
+                            c: 'a',
+                            p: 0,
+                            hpos: 0,
+                            hlen: 3,
+                            t: commentId,
+                          },
+                          meta: {
+                            user_id: 'user-id',
+                            ts: this.timestamp,
+                          },
+                        },
+                      ],
+                      changes: [
+                        {
+                          id: 'id1',
+                          op: {
+                            d: 'a',
+                            p: 0,
+                          },
+                          metadata: {
+                            user_id: 'user-id',
+                            ts: this.timestamp,
+                          },
+                        },
+                        {
+                          id: 'id2',
+                          op: {
+                            i: '\n',
+                            p: 0,
+                            hpos: 1,
+                          },
+                          metadata: {
+                            user_id: 'user-id',
+                            ts: this.timestamp,
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  doc: this.doc_id,
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                ProjectHistoryClient.flushProject(this.project_id, cb)
+              },
+            ],
+            error => {
+              if (error) {
+                return done(error)
+              }
+              assert(
+                fixTrackedChange.isDone(),
+                `/api/projects/${historyId}/changes should have been called`
+              )
+              done()
+            }
+          )
+        })
+
+        it('should fix tracked changes in the history store (history-ot)', function (done) {
+          const fixTrackedChange = MockHistoryStore()
+            .post(`/api/projects/${historyId}/legacy_changes`, body => {
+              expect(body).to.deep.equal([
+                {
+                  v2Authors: [],
+                  authors: [],
+                  timestamp: this.timestamp.toJSON(),
+                  operations: [
+                    {
+                      pathname: 'main.tex',
+                      textOperation: [
+                        1,
+                        {
+                          r: 1,
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'insert',
+                            userId: 'user-id',
+                          },
+                        },
+                        {
+                          r: 1,
+                          tracking: {
+                            type: 'none',
+                          },
+                        },
+                      ],
+                    },
+                  ],
+                  origin: { kind: 'test-origin' },
+                },
+              ])
+              return true
+            })
+            .query({ end_version: 0 })
+            .reply(204)
+
+          async.series(
+            [
+              cb => {
+                ProjectHistoryClient.resyncHistory(this.project_id, cb)
+              },
+              cb => {
+                const update = {
+                  projectHistoryId: historyId,
+                  resyncProjectStructure: {
+                    docs: [{ path: '/main.tex' }],
+                    files: [],
+                  },
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                const update = {
+                  path: '/main.tex',
+                  projectHistoryId: historyId,
+                  resyncDocContent: {
+                    content: 'a\nb',
+                    historyOTRanges: {
+                      comments: [
+                        {
+                          id: commentId,
+                          ranges: [
+                            {
+                              pos: 0,
+                              length: 3,
+                            },
+                          ],
+                        },
+                      ],
+                      trackedChanges: [
+                        {
+                          range: { pos: 0, length: 1 },
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'delete',
+                            userId: 'user-id',
+                          },
+                        },
+                        {
+                          range: { pos: 1, length: 1 },
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'insert',
+                            userId: 'user-id',
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  doc: this.doc_id,
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                ProjectHistoryClient.flushProject(this.project_id, cb)
+              },
+            ],
+            error => {
+              if (error) {
+                return done(error)
+              }
+              assert(
+                fixTrackedChange.isDone(),
+                `/api/projects/${historyId}/changes should have been called`
+              )
+              done()
+            }
+          )
+        })
+
+        it('should fix both comments and tracked changes in the history store (history-ot)', function (done) {
+          const fixTrackedChange = MockHistoryStore()
+            .post(`/api/projects/${historyId}/legacy_changes`, body => {
+              expect(body).to.deep.equal([
+                // not merged due to comment operation using history-ot and tracked-changes operation using sharejs ot
+                {
+                  v2Authors: [],
+                  authors: [],
+                  timestamp: this.timestamp.toJSON(),
+                  operations: [
+                    {
+                      pathname: 'main.tex',
+                      commentId,
+                      ranges: [{ pos: 1, length: 2 }],
+                    },
+                  ],
+                  origin: { kind: 'test-origin' },
+                },
+                {
+                  v2Authors: [],
+                  authors: [],
+                  timestamp: this.timestamp.toJSON(),
+                  operations: [
+                    {
+                      pathname: 'main.tex',
+                      textOperation: [
+                        1,
+                        {
+                          r: 1,
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'insert',
+                            userId: 'user-id',
+                          },
+                        },
+                        {
+                          r: 1,
+                          tracking: {
+                            type: 'none',
+                          },
+                        },
+                      ],
+                    },
+                  ],
+                  origin: { kind: 'test-origin' },
+                },
+              ])
+              return true
+            })
+            .query({ end_version: 0 })
+            .reply(204)
+
+          async.series(
+            [
+              cb => {
+                ProjectHistoryClient.resyncHistory(this.project_id, cb)
+              },
+              cb => {
+                const update = {
+                  projectHistoryId: historyId,
+                  resyncProjectStructure: {
+                    docs: [{ path: '/main.tex' }],
+                    files: [],
+                  },
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                const update = {
+                  path: '/main.tex',
+                  projectHistoryId: historyId,
+                  resyncDocContent: {
+                    content: 'a\nb',
+                    historyOTRanges: {
+                      comments: [
+                        {
+                          id: commentId,
+                          ranges: [
+                            {
+                              pos: 1,
+                              length: 2,
+                            },
+                          ],
+                        },
+                      ],
+                      trackedChanges: [
+                        {
+                          range: { pos: 0, length: 1 },
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'delete',
+                            userId: 'user-id',
+                          },
+                        },
+                        {
+                          range: { pos: 1, length: 1 },
+                          tracking: {
+                            ts: this.timestamp.toJSON(),
+                            type: 'insert',
+                            userId: 'user-id',
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  doc: this.doc_id,
+                  meta: {
+                    ts: this.timestamp,
+                  },
+                }
+                ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb)
+              },
+              cb => {
+                ProjectHistoryClient.flushProject(this.project_id, cb)
+              },
+            ],
+            error => {
+              if (error) {
+                return done(error)
+              }
+              assert(
+                fixTrackedChange.isDone(),
+                `/api/projects/${historyId}/changes should have been called`
+              )
+              done()
+            }
+          )
+        })
       })
 
       describe('resyncProjectStructureOnly', function () {
diff --git a/services/project-history/test/unit/js/UpdatesManager/UpdatesProcessorTests.js b/services/project-history/test/unit/js/UpdatesManager/UpdatesProcessorTests.js
index 6f148e5a8d..fcc0918e11 100644
--- a/services/project-history/test/unit/js/UpdatesManager/UpdatesProcessorTests.js
+++ b/services/project-history/test/unit/js/UpdatesManager/UpdatesProcessorTests.js
@@ -6,14 +6,14 @@ import * as Errors from '../../../../app/js/Errors.js'
 const MODULE_PATH = '../../../../app/js/UpdatesProcessor.js'
 
 describe('UpdatesProcessor', function () {
-  before(async function () {
+  beforeEach(async function () {
     this.extendLock = sinon.stub()
     this.BlobManager = {
       createBlobsForUpdates: sinon.stub(),
     }
     this.HistoryStoreManager = {
       getMostRecentVersion: sinon.stub(),
-      sendChanges: sinon.stub().yields(null, {}),
+      sendChanges: sinon.stub().yields(null, { resyncNeeded: true }),
     }
     this.LockManager = {
       runWithLock: sinon.spy((key, runner, callback) =>
@@ -22,7 +22,7 @@ describe('UpdatesProcessor', function () {
     }
     this.RedisManager = {}
     this.UpdateCompressor = {
-      compressRawUpdates: sinon.stub(),
+      compressRawUpdatesWithMetricsCb: sinon.stub(),
     }
     this.UpdateTranslator = {
       convertToChanges: sinon.stub(),
@@ -299,7 +299,10 @@ describe('UpdatesProcessor', function () {
         null,
         this.expandedUpdates
       )
-      this.UpdateCompressor.compressRawUpdates.returns(this.compressedUpdates)
+      this.UpdateCompressor.compressRawUpdatesWithMetricsCb.yields(
+        null,
+        this.compressedUpdates
+      )
       this.BlobManager.createBlobsForUpdates.callsArgWith(
         4,
         null,
@@ -315,8 +318,8 @@ describe('UpdatesProcessor', function () {
           this.ol_project_id,
           this.rawUpdates,
           this.extendLock,
-          err => {
-            this.callback(err)
+          (err, flushResponse) => {
+            this.callback(err, flushResponse)
             done()
           }
         )
@@ -347,7 +350,7 @@ describe('UpdatesProcessor', function () {
       })
 
       it('should compress updates', function () {
-        this.UpdateCompressor.compressRawUpdates.should.have.been.calledWith(
+        this.UpdateCompressor.compressRawUpdatesWithMetricsCb.should.have.been.calledWith(
           this.expandedUpdates
         )
       })
@@ -382,8 +385,74 @@ describe('UpdatesProcessor', function () {
         )
       })
 
-      it('should call the callback with no error', function () {
-        this.callback.should.have.been.called
+      it('should call the callback with no error and flush response', function () {
+        this.callback.should.have.been.calledWith(null, { resyncNeeded: true })
+      })
+    })
+
+    describe('no updates', function () {
+      beforeEach(function (done) {
+        this.SyncManager.skipUpdatesDuringSync.yields(
+          null,
+          [],
+          this.newSyncState
+        )
+        this.UpdatesProcessor._processUpdates(
+          this.project_id,
+          this.ol_project_id,
+          this.rawUpdates,
+          this.extendLock,
+          (err, flushResponse) => {
+            this.callback(err, flushResponse)
+            done()
+          }
+        )
+      })
+
+      it('should not get the latest version id', function () {
+        this.HistoryStoreManager.getMostRecentVersion.should.not.have.been.calledWith(
+          this.project_id,
+          this.ol_project_id
+        )
+      })
+
+      it('should skip updates when resyncing', function () {
+        this.SyncManager.skipUpdatesDuringSync.should.have.been.calledWith(
+          this.project_id,
+          this.rawUpdates
+        )
+      })
+
+      it('should not expand sync updates', function () {
+        this.SyncManager.expandSyncUpdates.should.not.have.been.called
+      })
+
+      it('should not compress updates', function () {
+        this.UpdateCompressor.compressRawUpdatesWithMetricsCb.should.not.have
+          .been.called
+      })
+
+      it('should not create any blobs for the updates', function () {
+        this.BlobManager.createBlobsForUpdates.should.not.have.been.called
+      })
+
+      it('should not convert the updates into a change requests', function () {
+        this.UpdateTranslator.convertToChanges.should.not.have.been.called
+      })
+
+      it('should not send the change request to the history store', function () {
+        this.HistoryStoreManager.sendChanges.should.not.have.been.called
+      })
+
+      it('should set the sync state', function () {
+        this.SyncManager.setResyncState.should.have.been.calledWith(
+          this.project_id,
+          this.newSyncState
+        )
+      })
+
+      it('should call the callback with fake flush response', function () {
+        this.callback.should.have.been.calledWith(null, { resyncNeeded: false })
       })
     })
 
@@ -412,7 +481,7 @@ describe('UpdatesProcessor', function () {
   })
 
   describe('_skipAlreadyAppliedUpdates', function () {
-    before(function () {
+    beforeEach(function () {
       this.UpdateTranslator.isProjectStructureUpdate.callsFake(
         update => update.version != null
       )
@@ -420,7 +489,7 @@ describe('UpdatesProcessor', function () {
     })
 
     describe('with all doc ops in order', function () {
-      before(function () {
+      beforeEach(function () {
         this.updates = [
           { doc: 'id', v: 1 },
           { doc: 'id', v: 2 },
@@ -440,7 +509,7 @@ describe('UpdatesProcessor', function () {
     })
 
     describe('with all project ops in order', function () {
-      before(function () {
+      beforeEach(function () {
         this.updates = [
           { version: 1 },
           { version: 2 },
@@ -460,7 +529,7 @@ describe('UpdatesProcessor', function () {
     })
 
     describe('with all multiple doc and ops in order', function () {
-      before(function () {
+      beforeEach(function () {
         this.updates = [
           { doc: 'id1', v: 1 },
           { doc: 'id1', v: 2 },
@@ -488,64 +557,47 @@ describe('UpdatesProcessor', function () {
     })
 
     describe('with doc ops out of order', function () {
-      before(function () {
+      beforeEach(function () {
         this.updates = [
           { doc: 'id', v: 1 },
           { doc: 'id', v: 2 },
           { doc: 'id', v: 4 },
           { doc: 'id', v: 3 },
         ]
-        this.skipFn = sinon.spy(
-          this.UpdatesProcessor._mocks,
-          '_skipAlreadyAppliedUpdates'
-        )
-        try {
-          this.updatesToApply =
-            this.UpdatesProcessor._skipAlreadyAppliedUpdates(
-              this.project_id,
-              this.updates,
-              { docs: {} }
-            )
-        } catch (error) {}
-      })
-
-      after(function () {
-        this.skipFn.restore()
       })
 
       it('should throw an exception', function () {
-        this.skipFn.threw('OpsOutOfOrderError').should.equal(true)
+        expect(() => {
+          this.UpdatesProcessor._skipAlreadyAppliedUpdates(
+            this.project_id,
+            this.updates,
+            { docs: {} }
+          )
+        }).to.throw(Errors.OpsOutOfOrderError)
       })
     })
 
     describe('with project ops out of order', function () {
-      before(function () {
+      beforeEach(function () {
+        this.UpdateTranslator.isProjectStructureUpdate.callsFake(
+          update => update.version != null
+        )
         this.updates = [
           { version: 1 },
           { version: 2 },
           { version: 4 },
           { version: 3 },
         ]
-        this.skipFn = sinon.spy(
-          this.UpdatesProcessor._mocks,
-          '_skipAlreadyAppliedUpdates'
-        )
-        try {
-          this.updatesToApply =
-            this.UpdatesProcessor._skipAlreadyAppliedUpdates(
-              this.project_id,
-              this.updates,
-              { docs: {} }
-            )
-        } catch (error) {}
-      })
-
-      after(function () {
-        this.skipFn.restore()
       })
 
       it('should throw an exception', function () {
-        this.skipFn.threw('OpsOutOfOrderError').should.equal(true)
+        expect(() => {
+          this.UpdatesProcessor._skipAlreadyAppliedUpdates(
+            this.project_id,
+            this.updates,
+            { docs: {} }
+          )
+        }).to.throw(Errors.OpsOutOfOrderError)
       })
     })
   })
diff --git a/services/real-time/docker-compose.ci.yml b/services/real-time/docker-compose.ci.yml
index 9011627c06..a5a2292e72 100644
--- a/services/real-time/docker-compose.ci.yml
+++ b/services/real-time/docker-compose.ci.yml
@@ -43,7 +43,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   redis:
-    image: redis
+    image: redis:7.4.3
     healthcheck:
       test: ping="$$(redis-cli ping)" && [ "$$ping" = 'PONG' ]
       interval: 1s
diff --git a/services/real-time/docker-compose.yml b/services/real-time/docker-compose.yml
index 9333271dcf..f1041164bc 100644
--- a/services/real-time/docker-compose.yml
+++ b/services/real-time/docker-compose.yml
@@ -46,7 +46,7 @@ services:
     command: npm run --silent test:acceptance
 
   redis:
-    image: redis
+    image: redis:7.4.3
     healthcheck:
       test: ping=$$(redis-cli ping) && [ "$$ping" = 'PONG' ]
       interval: 1s
diff --git a/services/web/.eslintrc.js b/services/web/.eslintrc.js
index 2fa9e8f547..ef3cf11de5 100644
--- a/services/web/.eslintrc.js
+++ b/services/web/.eslintrc.js
@@ -383,6 +383,18 @@ module.exports = {
               'Modify location via customLocalStorage instead of calling window.localStorage methods directly',
           },
         ],
+        'no-unused-vars': 'off',
+        '@typescript-eslint/no-unused-vars': [
+          'error',
+          {
+            args: 'after-used',
+            argsIgnorePattern: '^_',
+            ignoreRestSiblings: false,
+            caughtErrors: 'none',
+            vars: 'all',
+            varsIgnorePattern: '^_',
+          },
+        ],
       },
     },
     {
diff --git a/services/web/.prettierignore b/services/web/.prettierignore
index f4be187b87..94ab5579c2 100644
--- a/services/web/.prettierignore
+++ b/services/web/.prettierignore
@@ -6,6 +6,7 @@ frontend/js/vendor
 modules/**/frontend/js/vendor
 public/js
 public/minjs
+frontend/stylesheets/bootstrap-5/modules/metrics/nvd3.scss
 frontend/stylesheets/components/nvd3.less
 frontend/js/features/source-editor/lezer-latex/latex.mjs
 frontend/js/features/source-editor/lezer-latex/latex.terms.mjs
diff --git a/services/web/.storybook/preview.tsx b/services/web/.storybook/preview.tsx
index e3838a6f97..320caac144 100644
--- a/services/web/.storybook/preview.tsx
+++ b/services/web/.storybook/preview.tsx
@@ -122,6 +122,12 @@ const preview: Preview = {
       // render stories in iframes, to isolate modals
       inlineStories: false,
     },
+    options: {
+      storySort: {
+        method: 'alphabetical',
+        order: ['Shared'],
+      },
+    },
   },
   globalTypes: {
     theme: {
diff --git a/services/web/Makefile b/services/web/Makefile
index 58323058b8..6ebbc357c6 100644
--- a/services/web/Makefile
+++ b/services/web/Makefile
@@ -83,6 +83,11 @@ test_unit_app:
 	$(DOCKER_COMPOSE) run --name unit_test_$(BUILD_DIR_NAME) --rm test_unit
 	$(DOCKER_COMPOSE) down -v -t 0
 
+test_unit_mocha: export COMPOSE_PROJECT_NAME=unit_test_mocha_$(BUILD_DIR_NAME)
+test_unit_mocha:
+	$(DOCKER_COMPOSE) run --rm test_unit npm run test:unit:mocha
+	$(DOCKER_COMPOSE) down -v -t 0
+
 test_unit_esm: export COMPOSE_PROJECT_NAME=unit_test_esm_$(BUILD_DIR_NAME)
 test_unit_esm:
 	$(DOCKER_COMPOSE) run --rm test_unit npm run test:unit:esm
diff --git a/services/web/app/src/Features/Authorization/AuthorizationManager.js b/services/web/app/src/Features/Authorization/AuthorizationManager.js
index 2f339de83d..22d92ea9d9 100644
--- a/services/web/app/src/Features/Authorization/AuthorizationManager.js
+++ b/services/web/app/src/Features/Authorization/AuthorizationManager.js
@@ -88,9 +88,54 @@ async function getPrivilegeLevelForProject(
   opts = {}
 ) {
   if (userId) {
-    return getPrivilegeLevelForProjectWithUser(userId, projectId, opts)
+    return await getPrivilegeLevelForProjectWithUser(
+      userId,
+      projectId,
+      null,
+      opts
+    )
   } else {
-    return getPrivilegeLevelForProjectWithoutUser(projectId, token, opts)
+    return await getPrivilegeLevelForProjectWithoutUser(projectId, token, opts)
+  }
+}
+
+/**
+ * Get the privilege level that the user has for the project.
+ *
+ * @param userId - The id of the user that wants to access the project.
+ * @param projectId - The id of the project to be accessed.
+ * @param {string} token
+ * @param {ProjectAccess} projectAccess
+ * @param {Object} opts
+ * @param {boolean} opts.ignoreSiteAdmin - Do not consider whether the user is
+ *     a site admin.
+ * @param {boolean} opts.ignorePublicAccess - Do not consider the project is
+ *     publicly accessible.
+ *
+ * @returns {string|boolean} The privilege level. One of "owner",
+ *     "readAndWrite", "readOnly" or false.
+ */
+async function getPrivilegeLevelForProjectWithProjectAccess(
+  userId,
+  projectId,
+  token,
+  projectAccess,
+  opts = {}
+) {
+  if (userId) {
+    return await getPrivilegeLevelForProjectWithUser(
+      userId,
+      projectId,
+      projectAccess,
+      opts
+    )
+  } else {
+    return await _getPrivilegeLevelForProjectWithoutUserWithPublicAccessLevel(
+      projectId,
+      token,
+      projectAccess.publicAccessLevel(),
+      opts
+    )
   }
 }
 
@@ -98,6 +143,7 @@ async function getPrivilegeLevelForProject(
 async function getPrivilegeLevelForProjectWithUser(
   userId,
   projectId,
+  projectAccess,
   opts = {}
 ) {
   if (!opts.ignoreSiteAdmin) {
@@ -106,11 +152,11 @@ async function getPrivilegeLevelForProjectWithUser(
     }
   }
 
-  const privilegeLevel =
-    await CollaboratorsGetter.promises.getMemberIdPrivilegeLevel(
-      userId,
-      projectId
-    )
+  projectAccess =
+    projectAccess ||
+    (await CollaboratorsGetter.promises.getProjectAccess(projectId))
+
+  const privilegeLevel = projectAccess.privilegeLevelForUser(userId)
   if (privilegeLevel && privilegeLevel !== PrivilegeLevels.NONE) {
     // The user has direct access
     return privilegeLevel
@@ -119,7 +165,7 @@ async function getPrivilegeLevelForProjectWithUser(
   if (!opts.ignorePublicAccess) {
     // Legacy public-access system
     // User is present (not anonymous), but does not have direct access
-    const publicAccessLevel = await getPublicAccessLevel(projectId)
+    const publicAccessLevel = projectAccess.publicAccessLevel()
     if (publicAccessLevel === PublicAccessLevels.READ_ONLY) {
       return PrivilegeLevels.READ_ONLY
     }
@@ -137,7 +183,21 @@ async function getPrivilegeLevelForProjectWithoutUser(
   token,
   opts = {}
 ) {
-  const publicAccessLevel = await getPublicAccessLevel(projectId)
+  return await _getPrivilegeLevelForProjectWithoutUserWithPublicAccessLevel(
+    projectId,
+    token,
+    await getPublicAccessLevel(projectId),
+    opts
+  )
+}
+
+// User is Anonymous, Try Token-based access
+async function _getPrivilegeLevelForProjectWithoutUserWithPublicAccessLevel(
+  projectId,
+  token,
+  publicAccessLevel,
+  opts = {}
+) {
   if (!opts.ignorePublicAccess) {
     if (publicAccessLevel === PublicAccessLevels.READ_ONLY) {
       // Legacy public read-only access for anonymous user
@@ -149,7 +209,7 @@ async function getPrivilegeLevelForProjectWithoutUser(
     }
   }
   if (publicAccessLevel === PublicAccessLevels.TOKEN_BASED) {
-    return getPrivilegeLevelForProjectWithToken(projectId, token)
+    return await getPrivilegeLevelForProjectWithToken(projectId, token)
   }
 
   // Deny anonymous user access
@@ -309,6 +369,7 @@ module.exports = {
     canUserRenameProject,
     canUserAdminProject,
     getPrivilegeLevelForProject,
+    getPrivilegeLevelForProjectWithProjectAccess,
     isRestrictedUserForProject,
     isUserSiteAdmin,
   },
diff --git a/services/web/app/src/Features/Chat/ChatManager.js b/services/web/app/src/Features/Chat/ChatManager.js
index 9625881dd8..7eab6039d8 100644
--- a/services/web/app/src/Features/Chat/ChatManager.js
+++ b/services/web/app/src/Features/Chat/ChatManager.js
@@ -1,61 +1,46 @@
-const async = require('async')
-const UserInfoManager = require('../User/UserInfoManager')
 const UserInfoController = require('../User/UserInfoController')
-const { promisify } = require('@overleaf/promise-utils')
+const UserGetter = require('../User/UserGetter')
+const { callbackify } = require('@overleaf/promise-utils')
 
-function injectUserInfoIntoThreads(threads, callback) {
-  // There will be a lot of repitition of user_ids, so first build a list
-  // of unique ones to perform db look ups on, then use these to populate the
-  // user fields
-  let message, thread, threadId, userId
-  if (callback == null) {
-    callback = function () {}
-  }
-  const userIds = {}
-  for (threadId in threads) {
-    thread = threads[threadId]
+async function injectUserInfoIntoThreads(threads) {
+  const userIds = new Set()
+  for (const thread of Object.values(threads)) {
     if (thread.resolved) {
-      userIds[thread.resolved_by_user_id] = true
+      userIds.add(thread.resolved_by_user_id)
     }
-    for (message of Array.from(thread.messages)) {
-      userIds[message.user_id] = true
+    for (const message of thread.messages) {
+      userIds.add(message.user_id)
     }
   }
 
-  const jobs = []
-  const users = {}
-  for (userId in userIds) {
-    ;(userId =>
-      jobs.push(cb =>
-        UserInfoManager.getPersonalInfo(userId, function (error, user) {
-          if (error != null) return cb(error)
-          user = UserInfoController.formatPersonalInfo(user)
-          users[userId] = user
-          cb()
-        })
-      ))(userId)
+  const projection = {
+    _id: true,
+    first_name: true,
+    last_name: true,
+    email: true,
   }
-
-  return async.series(jobs, function (error) {
-    if (error != null) {
-      return callback(error)
+  const users = await UserGetter.promises.getUsers(userIds, projection)
+  const usersById = new Map()
+  for (const user of users) {
+    usersById.set(
+      user._id.toString(),
+      UserInfoController.formatPersonalInfo(user)
+    )
+  }
+  for (const thread of Object.values(threads)) {
+    if (thread.resolved) {
+      thread.resolved_by_user = usersById.get(thread.resolved_by_user_id)
     }
-    for (threadId in threads) {
-      thread = threads[threadId]
-      if (thread.resolved) {
-        thread.resolved_by_user = users[thread.resolved_by_user_id]
-      }
-      for (message of Array.from(thread.messages)) {
-        message.user = users[message.user_id]
-      }
+    for (const message of thread.messages) {
+      message.user = usersById.get(message.user_id)
     }
-    return callback(null, threads)
-  })
+  }
+  return threads
 }
 
 module.exports = {
-  injectUserInfoIntoThreads,
+  injectUserInfoIntoThreads: callbackify(injectUserInfoIntoThreads),
   promises: {
-    injectUserInfoIntoThreads: promisify(injectUserInfoIntoThreads),
+    injectUserInfoIntoThreads,
   },
 }
diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsGetter.js b/services/web/app/src/Features/Collaborators/CollaboratorsGetter.js
index caa6ef159d..a3543ae614 100644
--- a/services/web/app/src/Features/Collaborators/CollaboratorsGetter.js
+++ b/services/web/app/src/Features/Collaborators/CollaboratorsGetter.js
@@ -1,3 +1,4 @@
+// @ts-check
 const { callbackify } = require('util')
 const pLimit = require('p-limit')
 const { ObjectId } = require('mongodb-legacy')
@@ -15,9 +16,6 @@ module.exports = {
   getMemberIdsWithPrivilegeLevels: callbackify(getMemberIdsWithPrivilegeLevels),
   getMemberIds: callbackify(getMemberIds),
   getInvitedMemberIds: callbackify(getInvitedMemberIds),
-  getInvitedMembersWithPrivilegeLevels: callbackify(
-    getInvitedMembersWithPrivilegeLevels
-  ),
   getInvitedMembersWithPrivilegeLevelsFromFields: callbackify(
     getInvitedMembersWithPrivilegeLevelsFromFields
   ),
@@ -31,10 +29,10 @@ module.exports = {
   userIsTokenMember: callbackify(userIsTokenMember),
   getAllInvitedMembers: callbackify(getAllInvitedMembers),
   promises: {
+    getProjectAccess,
     getMemberIdsWithPrivilegeLevels,
     getMemberIds,
     getInvitedMemberIds,
-    getInvitedMembersWithPrivilegeLevels,
     getInvitedMembersWithPrivilegeLevelsFromFields,
     getMemberIdPrivilegeLevel,
     getInvitedEditCollaboratorCount,
@@ -50,7 +48,202 @@ module.exports = {
   },
 }
 
-async function getMemberIdsWithPrivilegeLevels(projectId) {
+/**
+ * @typedef ProjectMember
+ * @property {string} id
+ * @property {typeof PrivilegeLevels[keyof PrivilegeLevels]} privilegeLevel
+ * @property {typeof Sources[keyof Sources]} source
+ * @property {boolean} [pendingEditor]
+ * @property {boolean} [pendingReviewer]
+ */
+
+/**
+ * @typedef LoadedProjectMember
+ * @property {typeof PrivilegeLevels[keyof PrivilegeLevels]} privilegeLevel
+ * @property {{_id: ObjectId, email: string, features: any, first_name: string, last_name: string, signUpDate: Date}} user
+ * @property {boolean} [pendingEditor]
+ * @property {boolean} [pendingReviewer]
+ */
+
+// Wrapper for determining multiple dimensions of project access.
+class ProjectAccess {
+  /** @type {ProjectMember[]} */
+  #members
+
+  /** @type {typeof PublicAccessLevels[keyof PublicAccessLevels]} */
+  #publicAccessLevel
+
+  /**
+   * @param {{ owner_ref: ObjectId; collaberator_refs: ObjectId[]; readOnly_refs: ObjectId[]; tokenAccessReadAndWrite_refs: ObjectId[]; tokenAccessReadOnly_refs: ObjectId[]; publicAccesLevel: typeof PublicAccessLevels[keyof PublicAccessLevels]; pendingEditor_refs: ObjectId[]; reviewer_refs: ObjectId[]; pendingReviewer_refs: ObjectId[]; }} project
+   */
+  constructor(project) {
+    this.#members = _getMemberIdsWithPrivilegeLevelsFromFields(
+      project.owner_ref,
+      project.collaberator_refs,
+      project.readOnly_refs,
+      project.tokenAccessReadAndWrite_refs,
+      project.tokenAccessReadOnly_refs,
+      project.publicAccesLevel,
+      project.pendingEditor_refs,
+      project.reviewer_refs,
+      project.pendingReviewer_refs
+    )
+    this.#publicAccessLevel = project.publicAccesLevel
+  }
+
+  /**
+   * @return {Promise<{ownerMember: LoadedProjectMember|undefined, members: LoadedProjectMember[]}>}
+   */
+  async loadOwnerAndInvitedMembers() {
+    const all = await _loadMembers(
+      this.#members.filter(m => m.source !== Sources.TOKEN)
+    )
+    return {
+      ownerMember: all.find(m => m.privilegeLevel === PrivilegeLevels.OWNER),
+      members: all.filter(m => m.privilegeLevel !== PrivilegeLevels.OWNER),
+    }
+  }
+
+  /**
+   * @return {Promise<LoadedProjectMember[]>}
+   */
+  async loadInvitedMembers() {
+    return _loadMembers(
+      this.#members.filter(
+        m =>
+          m.source !== Sources.TOKEN &&
+          m.privilegeLevel !== PrivilegeLevels.OWNER
+      )
+    )
+  }
+
+  /**
+   * @return {Promise<LoadedProjectMember|undefined>}
+   */
+  async loadOwner() {
+    const [owner] = await _loadMembers(
+      this.#members.filter(m => m.privilegeLevel === PrivilegeLevels.OWNER)
+    )
+    return owner
+  }
+
+  /**
+   * @return {ProjectMember[]}
+   */
+  allMembers() {
+    return this.#members
+  }
+
+  /**
+   * @return {typeof PublicAccessLevels[keyof PublicAccessLevels]}
+   */
+  publicAccessLevel() {
+    return this.#publicAccessLevel
+  }
+
+  /**
+   * @return {string[]}
+   */
+  memberIds() {
+    return this.#members.map(m => m.id)
+  }
+
+  /**
+   * @return {string[]}
+   */
+  invitedMemberIds() {
+    return this.#members.filter(m => m.source !== Sources.TOKEN).map(m => m.id)
+  }
+
+  /**
+   * @param {string | ObjectId} userId
+   * @return {typeof PrivilegeLevels[keyof PrivilegeLevels]}
+   */
+  privilegeLevelForUser(userId) {
+    if (!userId) return PrivilegeLevels.NONE
+    for (const member of this.#members) {
+      if (member.id === userId.toString()) {
+        return member.privilegeLevel
+      }
+    }
+    return PrivilegeLevels.NONE
+  }
+
+  /**
+   * @param {string | ObjectId} userId
+   * @return {boolean}
+   */
+  isUserTokenMember(userId) {
+    if (!userId) return false
+    for (const member of this.#members) {
+      if (member.id === userId.toString() && member.source === Sources.TOKEN) {
+        return true
+      }
+    }
+    return false
+  }
+
+  /**
+   * @param {string | ObjectId} userId
+   * @return {boolean}
+   */
+  isUserInvitedMember(userId) {
+    if (!userId) return false
+    for (const member of this.#members) {
+      if (member.id === userId.toString() && member.source !== Sources.TOKEN) {
+        return true
+      }
+    }
+    return false
+  }
+
+  /**
+   * @param {string | ObjectId} userId
+   * @return {boolean}
+   */
+  isUserInvitedReadWriteMember(userId) {
+    for (const member of this.#members) {
+      if (
+        member.id.toString() === userId.toString() &&
+        member.source !== Sources.TOKEN &&
+        member.privilegeLevel === PrivilegeLevels.READ_AND_WRITE
+      ) {
+        return true
+      }
+    }
+    return false
+  }
+
+  /**
+   * Counts invited members with editor or reviewer roles
+   * @return {number}
+   */
+  countInvitedEditCollaborators() {
+    return this.#members.filter(
+      m =>
+        m.source === Sources.INVITE &&
+        (m.privilegeLevel === PrivilegeLevels.READ_AND_WRITE ||
+          m.privilegeLevel === PrivilegeLevels.REVIEW)
+    ).length
+  }
+
+  /**
+   * Counts invited members that are readonly pending editors or pending reviewers
+   * @return {number}
+   */
+  countInvitedPendingEditors() {
+    return this.#members.filter(
+      m =>
+        m.source === Sources.INVITE &&
+        m.privilegeLevel === PrivilegeLevels.READ_ONLY &&
+        (m.pendingEditor || m.pendingReviewer)
+    ).length
+  }
+}
+
+module.exports.ProjectAccess = ProjectAccess
+
+async function getProjectAccess(projectId) {
   const project = await ProjectGetter.promises.getProject(projectId, {
     owner_ref: 1,
     collaberator_refs: 1,
@@ -65,34 +258,19 @@ async function getMemberIdsWithPrivilegeLevels(projectId) {
   if (!project) {
     throw new Errors.NotFoundError(`no project found with id ${projectId}`)
   }
-  const memberIds = _getMemberIdsWithPrivilegeLevelsFromFields(
-    project.owner_ref,
-    project.collaberator_refs,
-    project.readOnly_refs,
-    project.tokenAccessReadAndWrite_refs,
-    project.tokenAccessReadOnly_refs,
-    project.publicAccesLevel,
-    project.pendingEditor_refs,
-    project.reviewer_refs,
-    project.pendingReviewer_refs
-  )
-  return memberIds
+  return new ProjectAccess(project)
+}
+
+async function getMemberIdsWithPrivilegeLevels(projectId) {
+  return (await getProjectAccess(projectId)).allMembers()
 }
 
 async function getMemberIds(projectId) {
-  const members = await getMemberIdsWithPrivilegeLevels(projectId)
-  return members.map(m => m.id)
+  return (await getProjectAccess(projectId)).memberIds()
 }
 
 async function getInvitedMemberIds(projectId) {
-  const members = await getMemberIdsWithPrivilegeLevels(projectId)
-  return members.filter(m => m.source !== Sources.TOKEN).map(m => m.id)
-}
-
-async function getInvitedMembersWithPrivilegeLevels(projectId) {
-  let members = await getMemberIdsWithPrivilegeLevels(projectId)
-  members = members.filter(m => m.source !== Sources.TOKEN)
-  return _loadMembers(members)
+  return (await getProjectAccess(projectId)).invitedMemberIds()
 }
 
 async function getInvitedMembersWithPrivilegeLevelsFromFields(
@@ -107,7 +285,7 @@ async function getInvitedMembersWithPrivilegeLevelsFromFields(
     readOnlyIds,
     [],
     [],
-    null,
+    'private',
     [],
     reviewerIds,
     []
@@ -121,69 +299,31 @@ async function getMemberIdPrivilegeLevel(userId, projectId) {
   if (userId == null) {
     return PrivilegeLevels.NONE
   }
-  const members = await getMemberIdsWithPrivilegeLevels(projectId)
-  for (const member of members) {
-    if (member.id === userId.toString()) {
-      return member.privilegeLevel
-    }
-  }
-  return PrivilegeLevels.NONE
+  return (await getProjectAccess(projectId)).privilegeLevelForUser(userId)
 }
 
 async function getInvitedEditCollaboratorCount(projectId) {
-  // Counts invited members with editor or reviewer roles
-  const members = await getMemberIdsWithPrivilegeLevels(projectId)
-  return members.filter(
-    m =>
-      m.source === Sources.INVITE &&
-      (m.privilegeLevel === PrivilegeLevels.READ_AND_WRITE ||
-        m.privilegeLevel === PrivilegeLevels.REVIEW)
-  ).length
+  return (await getProjectAccess(projectId)).countInvitedEditCollaborators()
 }
 
 async function getInvitedPendingEditorCount(projectId) {
-  // Only counts invited members that are readonly pending editors or pending
-  // reviewers
-  const members = await getMemberIdsWithPrivilegeLevels(projectId)
-  return members.filter(
-    m =>
-      m.source === Sources.INVITE &&
-      m.privilegeLevel === PrivilegeLevels.READ_ONLY &&
-      (m.pendingEditor || m.pendingReviewer)
-  ).length
+  return (await getProjectAccess(projectId)).countInvitedPendingEditors()
 }
 
 async function isUserInvitedMemberOfProject(userId, projectId) {
   if (!userId) {
     return false
   }
-  const members = await getMemberIdsWithPrivilegeLevels(projectId)
-  for (const member of members) {
-    if (
-      member.id.toString() === userId.toString() &&
-      member.source !== Sources.TOKEN
-    ) {
-      return true
-    }
-  }
-  return false
+  return (await getProjectAccess(projectId)).isUserInvitedMember(userId)
 }
 
 async function isUserInvitedReadWriteMemberOfProject(userId, projectId) {
   if (!userId) {
     return false
   }
-  const members = await getMemberIdsWithPrivilegeLevels(projectId)
-  for (const member of members) {
-    if (
-      member.id.toString() === userId.toString() &&
-      member.source !== Sources.TOKEN &&
-      member.privilegeLevel === PrivilegeLevels.READ_AND_WRITE
-    ) {
-      return true
-    }
-  }
-  return false
+  return (await getProjectAccess(projectId)).isUserInvitedReadWriteMember(
+    userId
+  )
 }
 
 async function getPublicShareTokens(userId, projectId) {
@@ -209,10 +349,13 @@ async function getPublicShareTokens(userId, projectId) {
     return null
   }
 
+  // @ts-ignore
   if (memberInfo.isOwner) {
     return memberInfo.tokens
+    // @ts-ignore
   } else if (memberInfo.hasTokenReadOnlyAccess) {
     return {
+      // @ts-ignore
       readOnly: memberInfo.tokens.readOnly,
     }
   } else {
@@ -224,6 +367,7 @@ async function getPublicShareTokens(userId, projectId) {
 // excluding projects where the user is listed in the token access fields when
 // token access has been disabled.
 async function getProjectsUserIsMemberOf(userId, fields) {
+  // @ts-ignore
   const limit = pLimit(2)
   const [readAndWrite, review, readOnly, tokenReadAndWrite, tokenReadOnly] =
     await Promise.all([
@@ -274,10 +418,9 @@ async function dangerouslyGetAllProjectsUserIsMemberOf(userId, fields) {
 
 async function getAllInvitedMembers(projectId) {
   try {
-    const rawMembers = await getInvitedMembersWithPrivilegeLevels(projectId)
-    const { members } =
-      ProjectEditorHandler.buildOwnerAndMembersViews(rawMembers)
-    return members
+    const projectAccess = await getProjectAccess(projectId)
+    const invitedMembers = await projectAccess.loadInvitedMembers()
+    return invitedMembers.map(ProjectEditorHandler.buildUserModelView)
   } catch (err) {
     throw OError.tag(err, 'error getting members for project', { projectId })
   }
@@ -316,6 +459,19 @@ async function userIsReadWriteTokenMember(userId, projectId) {
   return project != null
 }
 
+/**
+ * @param {ObjectId} ownerId
+ * @param {ObjectId[]} collaboratorIds
+ * @param {ObjectId[]} readOnlyIds
+ * @param {ObjectId[]} tokenAccessIds
+ * @param {ObjectId[]} tokenAccessReadOnlyIds
+ * @param {typeof PublicAccessLevels[keyof PublicAccessLevels]} publicAccessLevel
+ * @param {ObjectId[]} pendingEditorIds
+ * @param {ObjectId[]} reviewerIds
+ * @param {ObjectId[]} pendingReviewerIds
+ * @return {ProjectMember[]}
+ * @private
+ */
 function _getMemberIdsWithPrivilegeLevelsFromFields(
   ownerId,
   collaboratorIds,
@@ -384,7 +540,13 @@ function _getMemberIdsWithPrivilegeLevelsFromFields(
   return members
 }
 
+/**
+ * @param {ProjectMember[]} members
+ * @return {Promise<LoadedProjectMember[]>}
+ * @private
+ */
 async function _loadMembers(members) {
+  if (members.length === 0) return []
   const userIds = Array.from(new Set(members.map(m => m.id)))
   const users = new Map()
   for (const user of await UserGetter.promises.getUsers(userIds, {
diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
index 96b4cd6e37..8b5b1bc3c2 100644
--- a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
+++ b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
@@ -161,6 +161,7 @@ async function addUserIdToProject(
   })
   let level
   let existingUsers = project.collaberator_refs || []
+  existingUsers = existingUsers.concat(project.reviewer_refs || [])
   existingUsers = existingUsers.concat(project.readOnly_refs || [])
   existingUsers = existingUsers.map(u => u.toString())
   if (existingUsers.includes(userId.toString())) {
diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.mjs b/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.mjs
index 4c2d911709..db853afac3 100644
--- a/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.mjs
+++ b/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.mjs
@@ -16,7 +16,6 @@ import ProjectAuditLogHandler from '../Project/ProjectAuditLogHandler.js'
 import Errors from '../Errors/Errors.js'
 import AuthenticationController from '../Authentication/AuthenticationController.js'
 import PrivilegeLevels from '../Authorization/PrivilegeLevels.js'
-import SplitTestHandler from '../SplitTests/SplitTestHandler.js'
 
 // This rate limiter allows a different number of requests depending on the
 // number of callaborators a user is allowed. This is implemented by providing
@@ -246,9 +245,6 @@ async function viewInvite(req, res) {
   const projectId = req.params.Project_id
   const { token } = req.params
 
-  // Read split test assignment so that it's available for Pug to read
-  await SplitTestHandler.promises.getAssignment(req, res, 'core-pug-bs5')
-
   const _renderInvalidPage = function () {
     res.status(404)
     logger.debug({ projectId }, 'invite not valid, rendering not-valid page')
diff --git a/services/web/app/src/Features/Docstore/DocstoreManager.js b/services/web/app/src/Features/Docstore/DocstoreManager.js
index 5fe0f27dc9..4074b90605 100644
--- a/services/web/app/src/Features/Docstore/DocstoreManager.js
+++ b/services/web/app/src/Features/Docstore/DocstoreManager.js
@@ -1,10 +1,11 @@
 const { promisify } = require('util')
-const { promisifyMultiResult } = require('@overleaf/promise-utils')
+const { promisifyMultiResult, callbackify } = require('@overleaf/promise-utils')
 const request = require('request').defaults({ jar: false })
 const OError = require('@overleaf/o-error')
 const logger = require('@overleaf/logger')
 const settings = require('@overleaf/settings')
 const Errors = require('../Errors/Errors')
+const { fetchJson } = require('@overleaf/fetch-utils')
 
 const TIMEOUT = 30 * 1000 // request timeout
 
@@ -86,6 +87,22 @@ function getAllDeletedDocs(projectId, callback) {
   })
 }
 
+/**
+ * @param {string} projectId
+ */
+async function getCommentThreadIds(projectId) {
+  const url = `${settings.apis.docstore.url}/project/${projectId}/comment-thread-ids`
+  return fetchJson(url, { signal: AbortSignal.timeout(TIMEOUT) })
+}
+
+/**
+ * @param {string} projectId
+ */
+async function getTrackedChangesUserIds(projectId) {
+  const url = `${settings.apis.docstore.url}/project/${projectId}/tracked-changes-user-ids`
+  return fetchJson(url, { signal: AbortSignal.timeout(TIMEOUT) })
+}
+
 /**
  * @param {string} projectId
  * @param {Callback} callback
@@ -292,6 +309,8 @@ module.exports = {
   getAllDeletedDocs,
   getAllRanges,
   getDoc,
+  getCommentThreadIds: callbackify(getCommentThreadIds),
+  getTrackedChangesUserIds: callbackify(getTrackedChangesUserIds),
   isDocDeleted,
   updateDoc,
   projectHasRanges,
@@ -304,6 +323,8 @@ module.exports = {
     getAllDeletedDocs: promisify(getAllDeletedDocs),
     getAllRanges: promisify(getAllRanges),
     getDoc: promisifyMultiResult(getDoc, ['lines', 'rev', 'version', 'ranges']),
+    getCommentThreadIds,
+    getTrackedChangesUserIds,
     isDocDeleted: promisify(isDocDeleted),
     updateDoc: promisifyMultiResult(updateDoc, ['modified', 'rev']),
     projectHasRanges: promisify(projectHasRanges),
diff --git a/services/web/app/src/Features/Editor/EditorHttpController.js b/services/web/app/src/Features/Editor/EditorHttpController.js
index 8128a95b26..f44b57f069 100644
--- a/services/web/app/src/Features/Editor/EditorHttpController.js
+++ b/services/web/app/src/Features/Editor/EditorHttpController.js
@@ -4,14 +4,13 @@ const ProjectGetter = require('../Project/ProjectGetter')
 const AuthorizationManager = require('../Authorization/AuthorizationManager')
 const ProjectEditorHandler = require('../Project/ProjectEditorHandler')
 const Metrics = require('@overleaf/metrics')
-const CollaboratorsGetter = require('../Collaborators/CollaboratorsGetter')
 const CollaboratorsInviteGetter = require('../Collaborators/CollaboratorsInviteGetter')
-const CollaboratorsHandler = require('../Collaborators/CollaboratorsHandler')
 const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
 const SessionManager = require('../Authentication/SessionManager')
 const Errors = require('../Errors/Errors')
 const { expressify } = require('@overleaf/promise-utils')
 const Settings = require('@overleaf/settings')
+const { ProjectAccess } = require('../Collaborators/CollaboratorsGetter')
 
 module.exports = {
   joinProject: expressify(joinProject),
@@ -43,12 +42,6 @@ async function joinProject(req, res, next) {
   if (!project) {
     return res.sendStatus(403)
   }
-  // Hide sensitive data if the user is restricted
-  if (isRestrictedUser) {
-    project.owner = { _id: project.owner._id }
-    project.members = []
-    project.invites = []
-  }
   // Only show the 'renamed or deleted' message once
   if (project.deletedByExternalDataSource) {
     await ProjectDeleter.promises.unmarkAsDeletedByExternalSource(projectId)
@@ -75,42 +68,43 @@ async function _buildJoinProjectView(req, projectId, userId) {
   if (project == null) {
     throw new Errors.NotFoundError('project not found')
   }
-  const members =
-    await CollaboratorsGetter.promises.getInvitedMembersWithPrivilegeLevels(
-      projectId
-    )
+  const projectAccess = new ProjectAccess(project)
   const token = req.body.anonymousAccessToken
   const privilegeLevel =
-    await AuthorizationManager.promises.getPrivilegeLevelForProject(
+    await AuthorizationManager.promises.getPrivilegeLevelForProjectWithProjectAccess(
       userId,
       projectId,
-      token
+      token,
+      projectAccess
     )
   if (privilegeLevel == null || privilegeLevel === PrivilegeLevels.NONE) {
     return { project: null, privilegeLevel: null, isRestrictedUser: false }
   }
-  const invites =
-    await CollaboratorsInviteGetter.promises.getAllInvites(projectId)
-  const isTokenMember = await CollaboratorsHandler.promises.userIsTokenMember(
-    userId,
-    projectId
-  )
-  const isInvitedMember =
-    await CollaboratorsGetter.promises.isUserInvitedMemberOfProject(
-      userId,
-      projectId
-    )
+  const isTokenMember = projectAccess.isUserTokenMember(userId)
+  const isInvitedMember = projectAccess.isUserInvitedMember(userId)
   const isRestrictedUser = AuthorizationManager.isRestrictedUser(
     userId,
     privilegeLevel,
     isTokenMember,
     isInvitedMember
   )
+  let ownerMember
+  let members = []
+  let invites = []
+  if (isRestrictedUser) {
+    ownerMember = await projectAccess.loadOwner()
+  } else {
+    ;({ ownerMember, members } =
+      await projectAccess.loadOwnerAndInvitedMembers())
+    invites = await CollaboratorsInviteGetter.promises.getAllInvites(projectId)
+  }
   return {
     project: ProjectEditorHandler.buildProjectModelView(
       project,
+      ownerMember,
       members,
-      invites
+      invites,
+      isRestrictedUser
     ),
     privilegeLevel,
     isTokenMember,
diff --git a/services/web/app/src/Features/Email/EmailBuilder.js b/services/web/app/src/Features/Email/EmailBuilder.js
index 01565201ac..4741838b15 100644
--- a/services/web/app/src/Features/Email/EmailBuilder.js
+++ b/services/web/app/src/Features/Email/EmailBuilder.js
@@ -949,6 +949,33 @@ templates.welcomeWithoutCTA = NoCTAEmailTemplate({
   },
 })
 
+templates.removeGroupMember = NoCTAEmailTemplate({
+  subject(opts) {
+    return `Your ${settings.appName} account has been removed from ${opts.adminName}’s group`
+  },
+  title(opts) {
+    return `Your ${settings.appName} account has been removed from ${opts.adminName}’s group`
+  },
+  greeting() {
+    return ''
+  },
+  message() {
+    const passwordResetUrl = `${settings.siteUrl}/user/password/reset`
+
+    return [
+      'Don’t worry, your account and projects are still accessible. But there are a few changes to be aware of:',
+      '<ul>' +
+        `<li>Your account will have reverted to a free ${settings.appName} plan.</li>`,
+      `<li>Any project collaborators have been set to read-only (you can invite one collaborator per project on the free plan).</li>`,
+      `<li>If you previously logged in via SSO, you’ll need to <a href="${passwordResetUrl}">set a password</a> to access your account.</li>` +
+        '</ul>',
+      `If you think this has been done in error, please contact your group admin.`,
+      `Thanks!`,
+      `Team ${settings.appName}`,
+    ]
+  },
+})
+
 function _formatUserNameAndEmail(user, placeholder) {
   if (user.first_name && user.last_name) {
     const fullName = `${user.first_name} ${user.last_name}`
diff --git a/services/web/app/src/Features/History/RestoreManager.js b/services/web/app/src/Features/History/RestoreManager.js
index 8c73695eed..16ef2024f6 100644
--- a/services/web/app/src/Features/History/RestoreManager.js
+++ b/services/web/app/src/Features/History/RestoreManager.js
@@ -18,6 +18,12 @@ const OError = require('@overleaf/o-error')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
 
+async function getCommentThreadIds(projectId) {
+  await DocumentUpdaterHandler.promises.flushProjectToMongo(projectId)
+  const raw = await DocstoreManager.promises.getCommentThreadIds(projectId)
+  return new Map(Object.entries(raw).map(([doc, ids]) => [doc, new Set(ids)]))
+}
+
 const RestoreManager = {
   async restoreFileFromV2(userId, projectId, version, pathname) {
     const fsPath = await RestoreManager._writeFileVersionToDisk(
@@ -52,6 +58,25 @@ const RestoreManager = {
   },
 
   async revertFile(userId, projectId, version, pathname, options = {}) {
+    const threadIds = await getCommentThreadIds(projectId)
+    return await RestoreManager._revertSingleFile(
+      userId,
+      projectId,
+      version,
+      pathname,
+      threadIds,
+      options
+    )
+  },
+
+  async _revertSingleFile(
+    userId,
+    projectId,
+    version,
+    pathname,
+    threadIds,
+    options = {}
+  ) {
     const project = await ProjectGetter.promises.getProject(projectId, {
       overleaf: true,
     })
@@ -115,6 +140,7 @@ const RestoreManager = {
         origin,
         userId
       )
+      threadIds.delete(file.element._id.toString())
     }
 
     const { metadata } = await RestoreManager._getMetadataFromHistory(
@@ -154,22 +180,12 @@ const RestoreManager = {
     const documentCommentIds = new Set(
       ranges.comments?.map(({ op: { t } }) => t)
     )
-
-    await DocumentUpdaterHandler.promises.flushProjectToMongo(projectId)
-
-    const docsWithRanges =
-      await DocstoreManager.promises.getAllRanges(projectId)
-
-    const nonOrphanedThreadIds = new Set()
-    for (const { ranges } of docsWithRanges) {
-      for (const comment of ranges.comments ?? []) {
-        nonOrphanedThreadIds.add(comment.op.t)
+    const commentIdsToDuplicate = Array.from(documentCommentIds).filter(id => {
+      for (const ids of threadIds.values()) {
+        if (ids.has(id)) return true
       }
-    }
-
-    const commentIdsToDuplicate = Array.from(documentCommentIds).filter(id =>
-      nonOrphanedThreadIds.has(id)
-    )
+      return false
+    })
 
     const newRanges = { changes: ranges.changes, comments: [] }
 
@@ -191,6 +207,7 @@ const RestoreManager = {
             continue
           }
           // We have a new id for this comment thread
+          comment.id = result.duplicateId
           comment.op.t = result.duplicateId
         }
         newRanges.comments.push(comment)
@@ -231,8 +248,6 @@ const RestoreManager = {
         delete threadData.resolved_by_user_id
         delete threadData.resolved_at
       }
-      // remove the resolved property from the comment range as the chat service is synced at this point
-      delete commentRange.op.resolved
     }
 
     await ChatManager.promises.injectUserInfoIntoThreads(newCommentThreadData)
@@ -259,6 +274,11 @@ const RestoreManager = {
       origin,
       userId
     )
+    // For revertProject: The next doc that gets reverted will need to duplicate all the threads seen here.
+    threadIds.set(
+      _id.toString(),
+      new Set(newRanges.comments.map(({ op: { t } }) => t))
+    )
 
     return {
       _id,
@@ -321,11 +341,17 @@ const RestoreManager = {
       version,
       timestamp: new Date(updateAtVersion.meta.end_ts).toISOString(),
     }
+    const threadIds = await getCommentThreadIds(projectId)
 
     for (const pathname of pathsAtPastVersion) {
-      await RestoreManager.revertFile(userId, projectId, version, pathname, {
-        origin,
-      })
+      await RestoreManager._revertSingleFile(
+        userId,
+        projectId,
+        version,
+        pathname,
+        threadIds,
+        { origin }
+      )
     }
 
     const entitiesAtLiveVersion =
diff --git a/services/web/app/src/Features/Notifications/NotificationsController.mjs b/services/web/app/src/Features/Notifications/NotificationsController.mjs
index ae1d9208f3..35b5f0a677 100644
--- a/services/web/app/src/Features/Notifications/NotificationsController.mjs
+++ b/services/web/app/src/Features/Notifications/NotificationsController.mjs
@@ -33,4 +33,26 @@ export default {
       res.sendStatus(200)
     )
   },
+
+  getNotification(req, res, next) {
+    const userId = SessionManager.getLoggedInUserId(req.session)
+    const { notificationId } = req.params
+    NotificationsHandler.getUserNotifications(
+      userId,
+      function (err, unreadNotifications) {
+        if (err) {
+          return next(err)
+        }
+        const notification = unreadNotifications.find(
+          n => n._id === notificationId
+        )
+
+        if (!notification) {
+          return res.status(404).end()
+        }
+
+        res.json(notification)
+      }
+    )
+  },
 }
diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs b/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
index b7fc2da9c8..771782c302 100644
--- a/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
+++ b/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
@@ -119,7 +119,11 @@ async function requestReset(req, res, next) {
     OError.tag(err, 'failed to generate and email password reset token', {
       email,
     })
-    if (err.message === 'user does not have permission for change-password') {
+
+    if (
+      err.message ===
+      'user does not have one or more permissions within change-password'
+    ) {
       return res.status(403).json({
         message: {
           key: 'no-password-allowed-due-to-sso',
diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index ec128ffd54..4ffd8bcc1b 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -14,6 +14,7 @@ const ProjectHelper = require('./ProjectHelper')
 const metrics = require('@overleaf/metrics')
 const { User } = require('../../models/User')
 const SubscriptionLocator = require('../Subscription/SubscriptionLocator')
+const { isPaidSubscription } = require('../Subscription/SubscriptionHelper')
 const LimitationsManager = require('../Subscription/LimitationsManager')
 const Settings = require('@overleaf/settings')
 const AuthorizationManager = require('../Authorization/AuthorizationManager')
@@ -352,6 +353,7 @@ const _ProjectController = {
       'overleaf-assist-bundle',
       'word-count-client',
       'editor-popup-ux-survey',
+      'new-editor-error-logs-redesign',
     ].filter(Boolean)
 
     const getUserValues = async userId =>
@@ -599,7 +601,7 @@ const _ProjectController = {
       }
 
       const isAdminOrTemplateOwner =
-        hasAdminAccess(user) || Settings.templates?.user_id === userId
+        hasAdminAccess(user) || Settings.templates?.nonAdminCanManage
       const showTemplatesServerPro =
         Features.hasFeature('templates-server-pro') && isAdminOrTemplateOwner
 
@@ -654,17 +656,12 @@ const _ProjectController = {
         }
       }
 
-      const hasNonRecurlySubscription =
-        subscription && !subscription.recurlySubscription_id
+      const hasPaidSubscription = isPaidSubscription(subscription)
       const hasManuallyCollectedSubscription =
         subscription?.collectionMethod === 'manual'
-      const canPurchaseAddons = !(
-        hasNonRecurlySubscription || hasManuallyCollectedSubscription
-      )
       const assistantDisabled = user.aiErrorAssistant?.enabled === false // the assistant has been manually disabled by the user
       const canUseErrorAssistant =
-        (user.features?.aiErrorAssistant || canPurchaseAddons) &&
-        !assistantDisabled
+        !hasManuallyCollectedSubscription && !assistantDisabled
 
       let featureUsage = {}
 
@@ -731,12 +728,11 @@ const _ProjectController = {
           ? 'project/ide-react-detached'
           : 'project/ide-react'
 
-      let chatEnabled
-      if (Features.hasFeature('saas')) {
-        chatEnabled =
-          Features.hasFeature('chat') && req.capabilitySet.has('chat')
-      } else {
-        chatEnabled = Features.hasFeature('chat')
+      const capabilities = [...req.capabilitySet]
+
+      // make sure the capability is added to CE/SP when the feature is enabled
+      if (!Features.hasFeature('saas') && Features.hasFeature('chat')) {
+        capabilities.push('chat')
       }
 
       const isOverleafAssistBundleEnabled =
@@ -768,6 +764,12 @@ const _ProjectController = {
         isOverleafAssistBundleEnabled &&
         (await ProjectController._getAddonPrices(req, res))
 
+      const reducedTimeoutWarning =
+        await SplitTestHandler.promises.getAssignmentForUser(
+          project.owner_ref,
+          '10s-timeout-warning'
+        )
+
       let planCode = subscription?.planCode
       if (!planCode && !userInNonIndividualSub) {
         planCode = 'personal'
@@ -791,7 +793,7 @@ const _ProjectController = {
           referal_id: user.referal_id,
           signUpDate: user.signUpDate,
           allowedFreeTrial,
-          hasRecurlySubscription: subscription?.recurlySubscription_id != null,
+          hasPaidSubscription,
           featureSwitches: user.featureSwitches,
           features: fullFeatureSet,
           featureUsage,
@@ -824,6 +826,7 @@ const _ProjectController = {
           lineHeight: user.ace.lineHeight || 'normal',
           overallTheme: user.ace.overallTheme,
           mathPreview: user.ace.mathPreview,
+          breadcrumbs: user.ace.breadcrumbs,
           referencesSearchMode: user.ace.referencesSearchMode,
           enableNewEditor: user.ace.enableNewEditor ?? true,
         },
@@ -837,7 +840,7 @@ const _ProjectController = {
           isTokenMember,
           isInvitedMember
         ),
-        chatEnabled,
+        capabilities,
         projectHistoryBlobsEnabled: Features.hasFeature(
           'project-history-blobs'
         ),
@@ -881,6 +884,10 @@ const _ProjectController = {
         paywallPlans,
         customerIoEnabled,
         addonPrices,
+        compileSettings: {
+          reducedTimeoutWarning: reducedTimeoutWarning?.variant,
+          compileTimeout: ownerFeatures?.compileTimeout,
+        },
       })
       timer.done()
     } catch (err) {
diff --git a/services/web/app/src/Features/Project/ProjectDeleter.js b/services/web/app/src/Features/Project/ProjectDeleter.js
index e5764bab86..b81281e319 100644
--- a/services/web/app/src/Features/Project/ProjectDeleter.js
+++ b/services/web/app/src/Features/Project/ProjectDeleter.js
@@ -106,8 +106,24 @@ async function expireDeletedProjectsAfterDuration() {
       deletedProject => deletedProject.deleterData.deletedProjectId
     )
   )
-  for (const projectId of projectIds) {
-    await expireDeletedProject(projectId)
+  logger.info(
+    { projectCount: projectIds.length },
+    'expiring batch of deleted projects'
+  )
+  try {
+    for (const projectId of projectIds) {
+      await expireDeletedProject(projectId)
+    }
+    logger.info(
+      { projectCount: projectIds.length },
+      'batch of deleted projects expired successfully'
+    )
+  } catch (error) {
+    logger.warn(
+      { error },
+      'something went wrong expiring batch of deleted projects'
+    )
+    throw error
   }
 }
 
@@ -276,12 +292,15 @@ async function deleteProject(projectId, options = {}) {
     )
 
     await Project.deleteOne({ _id: projectId }).exec()
+
+    logger.info(
+      { projectId, userId: project.owner_ref },
+      'successfully deleted project'
+    )
   } catch (err) {
     logger.warn({ err }, 'problem deleting project')
     throw err
   }
-
-  logger.debug({ projectId }, 'successfully deleted project')
 }
 
 async function undeleteProject(projectId, options = {}) {
@@ -335,17 +354,22 @@ async function undeleteProject(projectId, options = {}) {
 
 async function expireDeletedProject(projectId) {
   try {
+    logger.info({ projectId }, 'expiring deleted project')
     const activeProject = await Project.findById(projectId).exec()
     if (activeProject) {
       // That project is active. The deleted project record might be there
       // because of an incomplete delete or undelete operation. Clean it up and
       // return.
+      logger.info(
+        { projectId },
+        'deleted project record found but project is active'
+      )
       await DeletedProject.deleteOne({
         'deleterData.deletedProjectId': projectId,
       })
-      await ProjectAuditLogEntry.deleteMany({ projectId })
       return
     }
+
     const deletedProject = await DeletedProject.findOne({
       'deleterData.deletedProjectId': projectId,
     }).exec()
@@ -361,12 +385,14 @@ async function expireDeletedProject(projectId) {
       )
       return
     }
-
+    const userId = deletedProject.deletedProjectOwnerId
     const historyId =
       deletedProject.project.overleaf &&
       deletedProject.project.overleaf.history &&
       deletedProject.project.overleaf.history.id
 
+    logger.info({ projectId, userId }, 'destroying expired project data')
+
     await Promise.all([
       DocstoreManager.promises.destroyProject(deletedProject.project._id),
       HistoryManager.promises.deleteProject(
@@ -379,6 +405,10 @@ async function expireDeletedProject(projectId) {
       Modules.promises.hooks.fire('projectExpired', deletedProject.project._id),
     ])
 
+    logger.info(
+      { projectId, userId },
+      'redacting PII from the deleted project record'
+    )
     await DeletedProject.updateOne(
       {
         _id: deletedProject._id,
@@ -390,6 +420,7 @@ async function expireDeletedProject(projectId) {
         },
       }
     ).exec()
+    logger.info({ projectId, userId }, 'expired deleted project successfully')
   } catch (error) {
     logger.warn({ projectId, error }, 'error expiring deleted project')
     throw error
diff --git a/services/web/app/src/Features/Project/ProjectEditorHandler.js b/services/web/app/src/Features/Project/ProjectEditorHandler.js
index 05e5beba09..3d3d300e66 100644
--- a/services/web/app/src/Features/Project/ProjectEditorHandler.js
+++ b/services/web/app/src/Features/Project/ProjectEditorHandler.js
@@ -6,8 +6,13 @@ const Features = require('../../infrastructure/Features')
 module.exports = ProjectEditorHandler = {
   trackChangesAvailable: false,
 
-  buildProjectModelView(project, members, invites) {
-    let owner, ownerFeatures
+  buildProjectModelView(
+    project,
+    ownerMember,
+    members,
+    invites,
+    isRestrictedUser
+  ) {
     const result = {
       _id: project._id,
       name: project.name,
@@ -20,20 +25,23 @@ module.exports = ProjectEditorHandler = {
       description: project.description,
       spellCheckLanguage: project.spellCheckLanguage,
       deletedByExternalDataSource: project.deletedByExternalDataSource || false,
-      members: [],
-      invites: this.buildInvitesView(invites),
       imageName:
         project.imageName != null
           ? Path.basename(project.imageName)
           : undefined,
     }
 
-    ;({ owner, ownerFeatures, members } =
-      this.buildOwnerAndMembersViews(members))
-    result.owner = owner
-    result.members = members
+    if (isRestrictedUser) {
+      result.owner = { _id: project.owner_ref }
+      result.members = []
+      result.invites = []
+    } else {
+      result.owner = this.buildUserModelView(ownerMember)
+      result.members = members.map(this.buildUserModelView)
+      result.invites = this.buildInvitesView(invites)
+    }
 
-    result.features = _.defaults(ownerFeatures || {}, {
+    result.features = _.defaults(ownerMember?.user?.features || {}, {
       collaborators: -1, // Infinite
       versioning: false,
       dropbox: false,
@@ -62,25 +70,6 @@ module.exports = ProjectEditorHandler = {
     return result
   },
 
-  buildOwnerAndMembersViews(members) {
-    let owner = null
-    let ownerFeatures = null
-    const filteredMembers = []
-    for (const member of members || []) {
-      if (member.privilegeLevel === 'owner') {
-        ownerFeatures = member.user.features
-        owner = this.buildUserModelView(member)
-      } else {
-        filteredMembers.push(this.buildUserModelView(member))
-      }
-    }
-    return {
-      owner,
-      ownerFeatures,
-      members: filteredMembers,
-    }
-  },
-
   buildUserModelView(member) {
     const user = member.user
     return {
diff --git a/services/web/app/src/Features/Project/ProjectListController.mjs b/services/web/app/src/Features/Project/ProjectListController.mjs
index c62396e153..ab2b0e3082 100644
--- a/services/web/app/src/Features/Project/ProjectListController.mjs
+++ b/services/web/app/src/Features/Project/ProjectListController.mjs
@@ -26,6 +26,7 @@ import GeoIpLookup from '../../infrastructure/GeoIpLookup.js'
 import SplitTestHandler from '../SplitTests/SplitTestHandler.js'
 import SplitTestSessionHandler from '../SplitTests/SplitTestSessionHandler.js'
 import TutorialHandler from '../Tutorial/TutorialHandler.js'
+import SubscriptionHelper from '../Subscription/SubscriptionHelper.js'
 
 /**
  * @import { GetProjectsRequest, GetProjectsResponse, AllUsersProjects, MongoProject } from "./types"
@@ -388,13 +389,13 @@ async function projectListPage(req, res, next) {
     }
   }
 
-  let hasIndividualRecurlySubscription = false
+  let hasIndividualPaidSubscription = false
 
   try {
-    hasIndividualRecurlySubscription =
-      usersIndividualSubscription?.groupPlan === false &&
-      usersIndividualSubscription?.recurlyStatus?.state !== 'canceled' &&
-      usersIndividualSubscription?.recurlySubscription_id !== ''
+    hasIndividualPaidSubscription =
+      SubscriptionHelper.isIndividualActivePaidSubscription(
+        usersIndividualSubscription
+      )
   } catch (error) {
     logger.error({ err: error }, 'Failed to get individual subscription')
   }
@@ -408,6 +409,15 @@ async function projectListPage(req, res, next) {
     'papers-notification-banner'
   )
 
+  const customerIoEnabled =
+    await SplitTestHandler.promises.hasUserBeenAssignedToVariant(
+      req,
+      userId,
+      'customer-io-trial-conversion',
+      'enabled',
+      true
+    )
+
   res.render('project/list-react', {
     title: 'your_projects',
     usersBestSubscription,
@@ -437,8 +447,9 @@ async function projectListPage(req, res, next) {
         groupId: subscription._id,
         groupName: subscription.teamName,
       })),
-    hasIndividualRecurlySubscription,
+    hasIndividualPaidSubscription,
     userRestrictions: Array.from(req.userRestrictions || []),
+    customerIoEnabled,
   })
 }
 
diff --git a/services/web/app/src/Features/Subscription/Errors.js b/services/web/app/src/Features/Subscription/Errors.js
index cbcd0014f7..9ebb08c6db 100644
--- a/services/web/app/src/Features/Subscription/Errors.js
+++ b/services/web/app/src/Features/Subscription/Errors.js
@@ -26,10 +26,17 @@ class SubtotalLimitExceededError extends OError {}
 
 class HasPastDueInvoiceError extends OError {}
 
+class PaymentActionRequiredError extends OError {
+  constructor(info) {
+    super('Payment action required', info)
+  }
+}
+
 module.exports = {
   RecurlyTransactionError,
   DuplicateAddOnError,
   AddOnNotPresentError,
+  PaymentActionRequiredError,
   MissingBillingInfoError,
   ManuallyCollectedError,
   PendingChangeError,
diff --git a/services/web/app/src/Features/Subscription/FeaturesUpdater.js b/services/web/app/src/Features/Subscription/FeaturesUpdater.js
index a8c27f705f..16413c501c 100644
--- a/services/web/app/src/Features/Subscription/FeaturesUpdater.js
+++ b/services/web/app/src/Features/Subscription/FeaturesUpdater.js
@@ -3,6 +3,7 @@ const { callbackify } = require('util')
 const { callbackifyMultiResult } = require('@overleaf/promise-utils')
 const PlansLocator = require('./PlansLocator')
 const SubscriptionLocator = require('./SubscriptionLocator')
+const SubscriptionHelper = require('./SubscriptionHelper')
 const UserFeaturesUpdater = require('./UserFeaturesUpdater')
 const FeaturesHelper = require('./FeaturesHelper')
 const Settings = require('@overleaf/settings')
@@ -117,7 +118,10 @@ async function computeFeatures(userId) {
 async function _getIndividualFeatures(userId) {
   const subscription =
     await SubscriptionLocator.promises.getUsersSubscription(userId)
-  if (subscription == null || subscription?.recurlyStatus?.state === 'paused') {
+  if (
+    subscription == null ||
+    SubscriptionHelper.getPaidSubscriptionState(subscription) === 'paused'
+  ) {
     return {}
   }
 
diff --git a/services/web/app/src/Features/Subscription/PaymentProviderEntities.js b/services/web/app/src/Features/Subscription/PaymentProviderEntities.js
index 6fe8638389..21bd504caf 100644
--- a/services/web/app/src/Features/Subscription/PaymentProviderEntities.js
+++ b/services/web/app/src/Features/Subscription/PaymentProviderEntities.js
@@ -8,11 +8,13 @@
 const OError = require('@overleaf/o-error')
 const { DuplicateAddOnError, AddOnNotPresentError } = require('./Errors')
 const PlansLocator = require('./PlansLocator')
-const SubscriptionHelper = require('./SubscriptionHelper')
 
-const AI_ADD_ON_CODE = 'assistant'
+let SubscriptionHelper = null // Work around circular import (loaded at the bottom of the file)
+
 const MEMBERS_LIMIT_ADD_ON_CODE = 'additional-license'
-const STANDALONE_AI_ADD_ON_CODES = ['assistant', 'assistant-annual']
+const AI_ASSIST_STANDALONE_MONTHLY_PLAN_CODE = 'assistant'
+const AI_ASSIST_STANDALONE_ANNUAL_PLAN_CODE = 'assistant-annual'
+const AI_ADD_ON_CODE = 'assistant'
 
 class PaymentProviderSubscription {
   /**
@@ -132,9 +134,11 @@ class PaymentProviderSubscription {
     if (newPlan == null) {
       throw new OError('Unable to find plan in settings', { planCode })
     }
+    const isInTrial = SubscriptionHelper.isInTrial(this.trialPeriodEnd)
     const shouldChangeAtTermEnd = SubscriptionHelper.shouldPlanChangeAtTermEnd(
       currentPlan,
-      newPlan
+      newPlan,
+      isInTrial
     )
 
     const changeRequest = new PaymentProviderSubscriptionChangeRequest({
@@ -248,9 +252,10 @@ class PaymentProviderSubscription {
     const addOnUpdates = this.addOns
       .filter(addOn => addOn.code !== code)
       .map(addOn => addOn.toAddOnUpdate())
+    const isInTrial = SubscriptionHelper.isInTrial(this.trialPeriodEnd)
     return new PaymentProviderSubscriptionChangeRequest({
       subscription: this,
-      timeframe: 'term_end',
+      timeframe: isInTrial ? 'now' : 'term_end',
       addOnUpdates,
     })
   }
@@ -587,7 +592,10 @@ class PaymentProviderAccount {
  * @param {string} planCode
  */
 function isStandaloneAiAddOnPlanCode(planCode) {
-  return STANDALONE_AI_ADD_ON_CODES.includes(planCode)
+  return (
+    planCode === AI_ASSIST_STANDALONE_MONTHLY_PLAN_CODE ||
+    planCode === AI_ASSIST_STANDALONE_ANNUAL_PLAN_CODE
+  )
 }
 
 /**
@@ -618,7 +626,8 @@ function subscriptionChangeIsAiAssistUpgrade(subscriptionChange) {
 module.exports = {
   AI_ADD_ON_CODE,
   MEMBERS_LIMIT_ADD_ON_CODE,
-  STANDALONE_AI_ADD_ON_CODES,
+  AI_ASSIST_STANDALONE_MONTHLY_PLAN_CODE,
+  AI_ASSIST_STANDALONE_ANNUAL_PLAN_CODE,
   PaymentProviderSubscription,
   PaymentProviderSubscriptionAddOn,
   PaymentProviderSubscriptionChange,
@@ -636,3 +645,5 @@ module.exports = {
   subscriptionChangeIsAiAssistUpgrade,
   PaymentProviderImmediateCharge,
 }
+
+SubscriptionHelper = require('./SubscriptionHelper')
diff --git a/services/web/app/src/Features/Subscription/PlansLocator.js b/services/web/app/src/Features/Subscription/PlansLocator.js
index 24343e1109..67d2f31c52 100644
--- a/services/web/app/src/Features/Subscription/PlansLocator.js
+++ b/services/web/app/src/Features/Subscription/PlansLocator.js
@@ -1,10 +1,15 @@
-// TODO: This file may be deleted when Stripe is fully implemented to all users, so, consider deleting it
+// @ts-check
+
 const Settings = require('@overleaf/settings')
 const logger = require('@overleaf/logger')
 
 /**
  * @typedef {import('../../../../types/subscription/plan').RecurlyPlanCode} RecurlyPlanCode
  * @typedef {import('../../../../types/subscription/plan').StripeLookupKey} StripeLookupKey
+ * @typedef {import('../../../../types/subscription/plan').StripeBaseLookupKey} StripeBaseLookupKey
+ * @typedef {import('../../../../types/subscription/plan').Plan} Plan
+ * @typedef {import('../../../../types/subscription/currency').StripeCurrencyCode} StripeCurrencyCode
+ * @typedef {import('stripe').Stripe.Price.Recurring.Interval} BillingCycleInterval
  */
 
 function ensurePlansAreSetupCorrectly() {
@@ -24,61 +29,105 @@ function ensurePlansAreSetupCorrectly() {
   })
 }
 
-const recurlyPlanCodeToStripeLookupKey = {
-  'professional-annual': 'professional_annual',
-  professional: 'professional_monthly',
-  professional_free_trial_7_days: 'professional_monthly',
-  'collaborator-annual': 'standard_annual',
+/**
+ * @type {Record<RecurlyPlanCode, StripeBaseLookupKey>}
+ */
+const recurlyCodeToStripeBaseLookupKey = {
   collaborator: 'standard_monthly',
+  'collaborator-annual': 'standard_annual',
   collaborator_free_trial_7_days: 'standard_monthly',
-  'student-annual': 'student_annual',
+
+  professional: 'professional_monthly',
+  'professional-annual': 'professional_annual',
+  professional_free_trial_7_days: 'professional_monthly',
+
   student: 'student_monthly',
+  'student-annual': 'student_annual',
   student_free_trial_7_days: 'student_monthly',
-  group_professional: 'group_professional_enterprise',
-  group_professional_educational: 'group_professional_educational',
+
+  // TODO: change all group plans' lookup_keys to match the UK account after they have been added
   group_collaborator: 'group_standard_enterprise',
   group_collaborator_educational: 'group_standard_educational',
-  assistant_annual: 'error_assist_annual',
-  assistant: 'error_assist_monthly',
+  group_professional: 'group_professional_enterprise',
+  group_professional_educational: 'group_professional_educational',
+
+  assistant: 'assistant_monthly',
+  'assistant-annual': 'assistant_annual',
+}
+
+const LATEST_STRIPE_LOOKUP_KEY_VERSION = 'jun2025'
+
+/**
+ * Build the Stripe lookup key, will be in this format:
+ * `${productCode}_${billingInterval}_${latestVersion}_${currency}`
+ * (for example: 'assistant_annual_jun2025_clp')
+ *
+ * @param {RecurlyPlanCode} recurlyCode
+ * @param {StripeCurrencyCode} currency
+ * @param {BillingCycleInterval} [billingCycleInterval] -- needed for handling 'assistant' add-on
+ * @returns {StripeLookupKey|null}
+ */
+function buildStripeLookupKey(recurlyCode, currency, billingCycleInterval) {
+  let stripeBaseLookupKey = recurlyCodeToStripeBaseLookupKey[recurlyCode]
+
+  // Recurly always uses 'assistant' as the code regardless of the subscription duration
+  if (recurlyCode === 'assistant' && billingCycleInterval) {
+    if (billingCycleInterval === 'month') {
+      stripeBaseLookupKey = 'assistant_monthly'
+    }
+    if (billingCycleInterval === 'year') {
+      stripeBaseLookupKey = 'assistant_annual'
+    }
+  }
+
+  if (stripeBaseLookupKey == null) {
+    return null
+  }
+
+  return `${stripeBaseLookupKey}_${LATEST_STRIPE_LOOKUP_KEY_VERSION}_${currency}`
 }
 
 /**
- *
- * @param {RecurlyPlanCode} recurlyPlanCode
- * @returns {StripeLookupKey}
+ * @typedef {{ planType: 'individual' | 'group' | 'student' | null, period: 'annual' | 'monthly' }} PlanTypeAndPeriod
+ * @type {Record<RecurlyPlanCode, PlanTypeAndPeriod>}
  */
-function mapRecurlyPlanCodeToStripeLookupKey(recurlyPlanCode) {
-  return recurlyPlanCodeToStripeLookupKey[recurlyPlanCode]
-}
-
 const recurlyPlanCodeToPlanTypeAndPeriod = {
   collaborator: { planType: 'individual', period: 'monthly' },
-  collaborator_free_trial_7_days: { planType: 'individual', period: 'monthly' },
   'collaborator-annual': { planType: 'individual', period: 'annual' },
+  collaborator_free_trial_7_days: { planType: 'individual', period: 'monthly' },
+
   professional: { planType: 'individual', period: 'monthly' },
+  'professional-annual': { planType: 'individual', period: 'annual' },
   professional_free_trial_7_days: {
     planType: 'individual',
     period: 'monthly',
   },
-  'professional-annual': { planType: 'individual', period: 'annual' },
+
   student: { planType: 'student', period: 'monthly' },
-  student_free_trial_7_days: { planType: 'student', period: 'monthly' },
   'student-annual': { planType: 'student', period: 'annual' },
-  group_professional: { planType: 'group', period: 'annual' },
-  group_professional_educational: { planType: 'group', period: 'annual' },
+  student_free_trial_7_days: { planType: 'student', period: 'monthly' },
+
   group_collaborator: { planType: 'group', period: 'annual' },
   group_collaborator_educational: { planType: 'group', period: 'annual' },
+  group_professional: { planType: 'group', period: 'annual' },
+  group_professional_educational: { planType: 'group', period: 'annual' },
+
+  assistant: { planType: null, period: 'monthly' },
+  'assistant-annual': { planType: null, period: 'annual' },
 }
 
 /**
- *
  * @param {RecurlyPlanCode} recurlyPlanCode
- * @returns {{ planType: 'individual' | 'group' | 'student', period: 'annual' | 'monthly'}}
+ * @returns {PlanTypeAndPeriod}
  */
 function getPlanTypeAndPeriodFromRecurlyPlanCode(recurlyPlanCode) {
   return recurlyPlanCodeToPlanTypeAndPeriod[recurlyPlanCode]
 }
 
+/**
+ * @param {string|null} [planCode]
+ * @returns {Plan|null}
+ */
 function findLocalPlanInSettings(planCode) {
   for (const plan of Settings.plans) {
     if (plan.planCode === planCode) {
@@ -91,6 +140,6 @@ function findLocalPlanInSettings(planCode) {
 module.exports = {
   ensurePlansAreSetupCorrectly,
   findLocalPlanInSettings,
-  mapRecurlyPlanCodeToStripeLookupKey,
+  buildStripeLookupKey,
   getPlanTypeAndPeriodFromRecurlyPlanCode,
 }
diff --git a/services/web/app/src/Features/Subscription/RecurlyClient.js b/services/web/app/src/Features/Subscription/RecurlyClient.js
index 753d49ba0f..25332a9c34 100644
--- a/services/web/app/src/Features/Subscription/RecurlyClient.js
+++ b/services/web/app/src/Features/Subscription/RecurlyClient.js
@@ -22,6 +22,7 @@ const {
   MissingBillingInfoError,
   SubtotalLimitExceededError,
 } = require('./Errors')
+const RecurlyMetrics = require('./RecurlyMetrics')
 
 /**
  * @import { PaymentProviderSubscriptionChangeRequest } from './PaymentProviderEntities'
@@ -29,10 +30,28 @@ const {
  * @import { PaymentMethod } from './types'
  */
 
+class RecurlyClientWithErrorHandling extends recurly.Client {
+  /**
+   * @param {import('recurly/lib/recurly/Http').Response} response
+   * @return {Error | null}
+   * @private
+   */
+  _errorFromResponse(response) {
+    RecurlyMetrics.recordMetrics(
+      response.status,
+      response.rateLimit,
+      response.rateLimitRemaining,
+      response.rateLimitReset.getTime()
+    )
+    // @ts-ignore
+    return super._errorFromResponse(response)
+  }
+}
+
 const recurlySettings = Settings.apis.recurly
 const recurlyApiKey = recurlySettings ? recurlySettings.apiKey : undefined
 
-const client = new recurly.Client(recurlyApiKey)
+const client = new RecurlyClientWithErrorHandling(recurlyApiKey)
 
 /**
  * Get account for a given user
@@ -717,6 +736,21 @@ async function failInvoice(invoiceId) {
   await client.markInvoiceFailed(invoiceId)
 }
 
+async function terminateSubscriptionByUuid(subscriptionUuid) {
+  const subscription = await client.terminateSubscription(
+    'uuid-' + subscriptionUuid,
+    {
+      body: {
+        refund: 'none',
+      },
+    }
+  )
+
+  logger.debug({ subscriptionUuid }, 'subscription terminated')
+
+  return subscription
+}
+
 module.exports = {
   errors: recurly.errors,
 
@@ -740,6 +774,7 @@ module.exports = {
   resumeSubscriptionByUuid: callbackify(resumeSubscriptionByUuid),
   getPastDueInvoices: callbackify(getPastDueInvoices),
   failInvoice: callbackify(failInvoice),
+  terminateSubscriptionByUuid: callbackify(terminateSubscriptionByUuid),
 
   promises: {
     getSubscription,
@@ -762,5 +797,6 @@ module.exports = {
     getPlan,
     getPastDueInvoices,
     failInvoice,
+    terminateSubscriptionByUuid,
   },
 }
diff --git a/services/web/app/src/Features/Subscription/RecurlyMetrics.js b/services/web/app/src/Features/Subscription/RecurlyMetrics.js
new file mode 100644
index 0000000000..1b709d7dc4
--- /dev/null
+++ b/services/web/app/src/Features/Subscription/RecurlyMetrics.js
@@ -0,0 +1,38 @@
+const Metrics = require('@overleaf/metrics')
+
+/**
+ * @param {number} status
+ * @param {number} rateLimit
+ * @param {number} rateLimitRemaining
+ * @param {number} rateLimitReset
+ */
+function recordMetrics(status, rateLimit, rateLimitRemaining, rateLimitReset) {
+  Metrics.inc('recurly_request', 1, { status })
+  const metrics = { rateLimit, rateLimitRemaining, rateLimitReset }
+  for (const [method, v] of Object.entries(metrics)) {
+    if (Number.isNaN(v)) continue
+    Metrics.gauge('recurly_request_rate_limiting', v, 1, { method })
+  }
+}
+
+/**
+ * @param {Response} response
+ */
+function recordMetricsFromResponse(response) {
+  const rateLimit = parseInt(
+    response.headers.get('X-RateLimit-Limit') || '',
+    10
+  )
+  const rateLimitRemaining = parseInt(
+    response.headers.get('X-RateLimit-Remaining') || '',
+    10
+  )
+  const rateLimitReset =
+    parseInt(response.headers.get('X-RateLimit-Reset') || '', 10) * 1000
+  recordMetrics(response.status, rateLimit, rateLimitRemaining, rateLimitReset)
+}
+
+module.exports = {
+  recordMetrics,
+  recordMetricsFromResponse,
+}
diff --git a/services/web/app/src/Features/Subscription/RecurlyWrapper.js b/services/web/app/src/Features/Subscription/RecurlyWrapper.js
index 2227597737..243da6edce 100644
--- a/services/web/app/src/Features/Subscription/RecurlyWrapper.js
+++ b/services/web/app/src/Features/Subscription/RecurlyWrapper.js
@@ -9,24 +9,30 @@ const logger = require('@overleaf/logger')
 const Errors = require('../Errors/Errors')
 const SubscriptionErrors = require('./Errors')
 const { callbackify } = require('@overleaf/promise-utils')
+const RecurlyMetrics = require('./RecurlyMetrics')
 
 /**
- * @param accountId
- * @param newEmail
+ * Updates the email address of a Recurly account
+ *
+ * @param userId
+ * @param newAccountEmail - the new email address to set for the Recurly account
  */
-async function updateAccountEmailAddress(accountId, newEmail) {
+async function updateAccountEmailAddress(userId, newAccountEmail) {
   const data = {
-    email: newEmail,
+    email: newAccountEmail,
   }
   let requestBody
   try {
     requestBody = RecurlyWrapper._buildXml('account', data)
   } catch (error) {
-    throw OError.tag(error, 'error building xml', { accountId, newEmail })
+    throw OError.tag(error, 'error building xml', {
+      accountId: userId,
+      newEmail: newAccountEmail,
+    })
   }
 
   const { body } = await RecurlyWrapper.promises.apiRequest({
-    url: `accounts/${accountId}`,
+    url: `accounts/${userId}`,
     method: 'PUT',
     body: requestBody,
   })
@@ -412,9 +418,15 @@ const promises = {
     }
 
     try {
-      return await fetchStringWithResponse(fetchUrl, fetchOptions)
+      const { body, response } = await fetchStringWithResponse(
+        fetchUrl,
+        fetchOptions
+      )
+      RecurlyMetrics.recordMetricsFromResponse(response)
+      return { body, response }
     } catch (error) {
       if (error instanceof RequestFailedError) {
+        RecurlyMetrics.recordMetricsFromResponse(error.response)
         if (error.response.status === 404 && expect404) {
           return { response: error.response, body: null }
         } else if (error.response.status === 422 && expect422) {
@@ -681,12 +693,15 @@ const promises = {
     }
   },
 
-  async extendTrial(subscriptionId, daysUntilExpire) {
+  async extendTrial(subscriptionId, trialEndsAt, daysUntilExpire) {
     if (daysUntilExpire == null) {
       daysUntilExpire = 7
     }
+    if (trialEndsAt == null) {
+      trialEndsAt = new Date()
+    }
     const nextRenewalDate = new Date()
-    nextRenewalDate.setDate(nextRenewalDate.getDate() + daysUntilExpire)
+    nextRenewalDate.setDate(trialEndsAt.getDate() + daysUntilExpire)
     logger.debug(
       { subscriptionId, daysUntilExpire },
       'Exending Free trial for user'
diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js
index 7aa345e7a8..5856682166 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionController.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionController.js
@@ -2,6 +2,7 @@
 
 const SessionManager = require('../Authentication/SessionManager')
 const SubscriptionHandler = require('./SubscriptionHandler')
+const SubscriptionHelper = require('./SubscriptionHelper')
 const SubscriptionViewModelBuilder = require('./SubscriptionViewModelBuilder')
 const LimitationsManager = require('./LimitationsManager')
 const RecurlyWrapper = require('./RecurlyWrapper')
@@ -15,7 +16,11 @@ const AnalyticsManager = require('../Analytics/AnalyticsManager')
 const RecurlyEventHandler = require('./RecurlyEventHandler')
 const { expressify } = require('@overleaf/promise-utils')
 const OError = require('@overleaf/o-error')
-const { DuplicateAddOnError, AddOnNotPresentError } = require('./Errors')
+const {
+  DuplicateAddOnError,
+  AddOnNotPresentError,
+  PaymentActionRequiredError,
+} = require('./Errors')
 const SplitTestHandler = require('../SplitTests/SplitTestHandler')
 const AuthorizationManager = require('../Authorization/AuthorizationManager')
 const Modules = require('../../infrastructure/Modules')
@@ -27,6 +32,11 @@ const PlansLocator = require('./PlansLocator')
 const PaymentProviderEntities = require('./PaymentProviderEntities')
 const { User } = require('../../models/User')
 const UserGetter = require('../User/UserGetter')
+const PermissionsManager = require('../Authorization/PermissionsManager')
+const {
+  sanitizeSessionUserForFrontEnd,
+} = require('../../infrastructure/FrontEndUser')
+const { IndeterminateInvoiceError } = require('../Errors/Errors')
 
 /**
  * @import { SubscriptionChangeDescription } from '../../../../types/subscription/subscription-change-preview'
@@ -78,9 +88,13 @@ async function userSubscriptionPage(req, res) {
     await Modules.promises.hooks.fire('userCanExtendTrial', user)
   )?.[0]
   const fromPlansPage = req.query.hasSubscription
+  const isInTrial = SubscriptionHelper.isInTrial(
+    personalSubscription?.payment?.trialEndsAt
+  )
   const plansData =
     SubscriptionViewModelBuilder.buildPlansListForSubscriptionDash(
-      personalSubscription?.plan
+      personalSubscription?.plan,
+      isInTrial
     )
 
   AnalyticsManager.recordEventForSession(req.session, 'subscription-page-view')
@@ -258,7 +272,8 @@ async function pauseSubscription(req, res, next) {
       {
         pause_length: pauseCycles,
         plan_code: subscription?.planCode,
-        subscriptionId: subscription?.recurlySubscription_id,
+        subscriptionId:
+          SubscriptionHelper.getPaymentProviderSubscriptionId(subscription),
       }
     )
 
@@ -311,7 +326,9 @@ function cancelSubscription(req, res, next) {
 async function canceledSubscription(req, res, next) {
   return res.render('subscriptions/canceled-subscription-react', {
     title: 'subscription_canceled',
-    user: SessionManager.getSessionUser(req.session),
+    user: sanitizeSessionUserForFrontEnd(
+      SessionManager.getSessionUser(req.session)
+    ),
   })
 }
 
@@ -330,7 +347,8 @@ function cancelV1Subscription(req, res, next) {
 }
 
 async function previewAddonPurchase(req, res) {
-  const userId = SessionManager.getLoggedInUserId(req.session)
+  const user = SessionManager.getSessionUser(req.session)
+  const userId = user._id
   const addOnCode = req.params.addOnCode
   const purchaseReferrer = req.query.purchaseReferrer
 
@@ -338,6 +356,16 @@ async function previewAddonPurchase(req, res) {
     return HttpErrorHandler.notFound(req, res, `Unknown add-on: ${addOnCode}`)
   }
 
+  const canUseAi = await PermissionsManager.promises.checkUserPermissions(
+    user,
+    ['use-ai']
+  )
+  if (!canUseAi) {
+    return res.redirect(
+      '/user/subscription?redirect-reason=ai-assist-unavailable'
+    )
+  }
+
   /** @type {PaymentMethod[]} */
   const paymentMethod = await Modules.promises.hooks.fire(
     'getPaymentMethod',
@@ -410,8 +438,6 @@ async function purchaseAddon(req, res, next) {
 
   logger.debug({ userId: user._id, addOnCode }, 'purchasing add-ons')
   try {
-    // set a restore point in the case of a failed payment for the upgrade (Recurly only)
-    await SubscriptionHandler.promises.setSubscriptionRestorePoint(user._id)
     await SubscriptionHandler.promises.purchaseAddon(
       user._id,
       addOnCode,
@@ -425,6 +451,11 @@ async function purchaseAddon(req, res, next) {
         'Your subscription already includes this add-on',
         { addon: addOnCode }
       )
+    } else if (err instanceof PaymentActionRequiredError) {
+      return res.status(402).json({
+        message: 'Payment action required',
+        clientSecret: err.info.clientSecret,
+      })
     } else {
       if (err instanceof Error) {
         OError.tag(err, 'something went wrong purchasing add-ons', {
@@ -526,18 +557,18 @@ function cancelPendingSubscriptionChange(req, res, next) {
   })
 }
 
-function updateAccountEmailAddress(req, res, next) {
+async function updateAccountEmailAddress(req, res, next) {
   const user = SessionManager.getSessionUser(req.session)
-  RecurlyWrapper.updateAccountEmailAddress(
-    user._id,
-    user.email,
-    function (error) {
-      if (error) {
-        return next(error)
-      }
-      res.sendStatus(200)
-    }
-  )
+  try {
+    await Modules.promises.hooks.fire(
+      'updateAccountEmailAddress',
+      user._id,
+      user.email
+    )
+    return res.sendStatus(200)
+  } catch (error) {
+    return next(error)
+  }
 }
 
 function reactivateSubscription(req, res, next) {
@@ -596,6 +627,13 @@ function recurlyCallback(req, res, next) {
           eventData.transaction.subscription_id,
           lastSubscription,
           function (err) {
+            if (err instanceof IndeterminateInvoiceError) {
+              logger.warn(
+                { recurlySubscriptionId: err.info.recurlySubscriptionId },
+                'could not determine invoice to fail for subscription'
+              )
+              return res.sendStatus(200)
+            }
             if (err) {
               return next(err)
             }
@@ -695,7 +733,7 @@ async function getRecommendedCurrency(req, res) {
     ip = req.query.ip
   }
   const currencyLookup = await GeoIpLookup.promises.getCurrencyCode(ip)
-  let countryCode = currencyLookup.countryCode
+  const countryCode = currencyLookup.countryCode
   const recommendedCurrency = currencyLookup.currencyCode
 
   let currency = null
@@ -706,13 +744,6 @@ async function getRecommendedCurrency(req, res) {
     currency = recommendedCurrency
   }
 
-  const queryCountryCode = req.query.countryCode?.toUpperCase()
-
-  // only enable countryCode testing flag on staging or dev environments
-  if (queryCountryCode && process.env.NODE_ENV !== 'production') {
-    countryCode = queryCountryCode
-  }
-
   return {
     currency,
     recommendedCurrency,
@@ -812,7 +843,7 @@ function makeChangePreview(
     paymentMethod: paymentMethod?.toString(),
     netTerms: subscription.netTerms,
     nextPlan: {
-      annual: nextPlan.annual ?? false,
+      annual: nextPlan?.annual ?? false,
     },
     nextInvoice: {
       date: subscription.periodEnd.toISOString(),
@@ -850,7 +881,7 @@ module.exports = {
   cancelV1Subscription,
   previewSubscription: expressify(previewSubscription),
   cancelPendingSubscriptionChange,
-  updateAccountEmailAddress,
+  updateAccountEmailAddress: expressify(updateAccountEmailAddress),
   reactivateSubscription,
   recurlyCallback,
   extendTrial: expressify(extendTrial),
diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
index c717b2eec6..ba862baa67 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
@@ -4,6 +4,7 @@ const OError = require('@overleaf/o-error')
 const SubscriptionUpdater = require('./SubscriptionUpdater')
 const SubscriptionLocator = require('./SubscriptionLocator')
 const SubscriptionController = require('./SubscriptionController')
+const SubscriptionHelper = require('./SubscriptionHelper')
 const { Subscription } = require('../../models/Subscription')
 const { User } = require('../../models/User')
 const RecurlyClient = require('./RecurlyClient')
@@ -77,7 +78,7 @@ async function ensureFlexibleLicensingEnabled(plan) {
 }
 
 async function ensureSubscriptionIsActive(subscription) {
-  if (subscription?.recurlyStatus?.state !== 'active') {
+  if (SubscriptionHelper.getPaidSubscriptionState(subscription) !== 'active') {
     throw new InactiveError('The subscription is not active', {
       subscriptionId: subscription._id.toString(),
     })
diff --git a/services/web/app/src/Features/Subscription/SubscriptionHandler.js b/services/web/app/src/Features/Subscription/SubscriptionHandler.js
index 1296a2a7de..104acd8783 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionHandler.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionHandler.js
@@ -1,21 +1,21 @@
 // @ts-check
 
-const recurly = require('recurly')
 const RecurlyWrapper = require('./RecurlyWrapper')
 const RecurlyClient = require('./RecurlyClient')
 const { User } = require('../../models/User')
 const logger = require('@overleaf/logger')
+const SubscriptionHelper = require('./SubscriptionHelper')
 const SubscriptionUpdater = require('./SubscriptionUpdater')
 const SubscriptionLocator = require('./SubscriptionLocator')
 const LimitationsManager = require('./LimitationsManager')
 const EmailHandler = require('../Email/EmailHandler')
 const { callbackify } = require('@overleaf/promise-utils')
 const UserUpdater = require('../User/UserUpdater')
-const { NotFoundError, IndeterminateInvoiceError } = require('../Errors/Errors')
+const { IndeterminateInvoiceError } = require('../Errors/Errors')
 const Modules = require('../../infrastructure/Modules')
 
 /**
- * @import { PaymentProviderSubscription, PaymentProviderSubscriptionChange } from './PaymentProviderEntities'
+ * @import { PaymentProviderSubscriptionChange } from './PaymentProviderEntities'
  */
 
 async function validateNoSubscriptionInRecurly(userId) {
@@ -102,8 +102,7 @@ async function updateSubscription(user, planCode) {
   if (
     !hasSubscription ||
     subscription == null ||
-    (subscription.recurlySubscription_id == null &&
-      subscription.paymentProvider?.subscriptionId == null)
+    SubscriptionHelper.getPaymentProviderSubscriptionId(subscription) == null
   ) {
     return
   }
@@ -247,11 +246,8 @@ async function attemptPaypalInvoiceCollection(recurlyAccountCode) {
   )
 }
 
-async function extendTrial(subscription, daysToExend) {
-  await RecurlyWrapper.promises.extendTrial(
-    subscription.recurlySubscription_id,
-    daysToExend
-  )
+async function extendTrial(subscription, daysToExtend) {
+  await Modules.promises.hooks.fire('extendTrial', subscription, daysToExtend)
 }
 
 /**
@@ -278,24 +274,12 @@ async function previewAddonPurchase(userId, addOnCode) {
  * @param {number} quantity
  */
 async function purchaseAddon(userId, addOnCode, quantity) {
-  const subscription = await getSubscriptionForUser(userId)
-  try {
-    await RecurlyClient.promises.getAddOn(subscription.planCode, addOnCode)
-  } catch (err) {
-    if (err instanceof recurly.errors.NotFoundError) {
-      throw new NotFoundError({
-        message: 'Add-on not found',
-        info: { addOnCode },
-      })
-    }
-    throw err
-  }
-  const changeRequest = subscription.getRequestForAddOnPurchase(
+  await Modules.promises.hooks.fire(
+    'purchaseAddOn',
+    userId,
     addOnCode,
     quantity
   )
-  await RecurlyClient.promises.applySubscriptionChangeRequest(changeRequest)
-  await syncSubscription({ uuid: subscription.id }, userId)
 }
 
 /**
@@ -305,51 +289,17 @@ async function purchaseAddon(userId, addOnCode, quantity) {
  * @param {string} addOnCode
  */
 async function removeAddon(userId, addOnCode) {
-  const subscription = await getSubscriptionForUser(userId)
-  const changeRequest = subscription.getRequestForAddOnRemoval(addOnCode)
-  await RecurlyClient.promises.applySubscriptionChangeRequest(changeRequest)
-  await syncSubscription({ uuid: subscription.id }, userId)
-}
-
-/**
- * Returns the Recurly UUID for the given user
- *
- * Throws a NotFoundError if the subscription can't be found
- *
- * @param {string} userId
- * @return {Promise<PaymentProviderSubscription>}
- */
-async function getSubscriptionForUser(userId) {
-  const subscription =
-    await SubscriptionLocator.promises.getUsersSubscription(userId)
-  const recurlyId = subscription?.recurlySubscription_id
-  if (recurlyId == null) {
-    throw new NotFoundError({
-      message: 'Recurly subscription not found',
-      info: { userId },
-    })
-  }
-
-  try {
-    const subscription = await RecurlyClient.promises.getSubscription(recurlyId)
-    return subscription
-  } catch (err) {
-    if (err instanceof recurly.errors.NotFoundError) {
-      throw new NotFoundError({
-        message: 'Subscription not found',
-        info: { userId, recurlyId },
-      })
-    } else {
-      throw err
-    }
-  }
+  await Modules.promises.hooks.fire('removeAddOn', userId, addOnCode)
 }
 
 async function pauseSubscription(user, pauseCycles) {
   // only allow pausing on monthly plans not in a trial
   const { subscription } =
     await LimitationsManager.promises.userHasSubscription(user)
-  if (!subscription || !subscription.recurlyStatus) {
+  if (
+    !subscription ||
+    !SubscriptionHelper.getPaidSubscriptionState(subscription)
+  ) {
     throw new Error('No active subscription to pause')
   }
 
@@ -360,10 +310,9 @@ async function pauseSubscription(user, pauseCycles) {
   ) {
     throw new Error('Can only pause monthly individual plans')
   }
-  if (
-    subscription.recurlyStatus.trialEndsAt &&
-    subscription.recurlyStatus.trialEndsAt > new Date()
-  ) {
+  const trialEndsAt =
+    SubscriptionHelper.getSubscriptionTrialEndsAt(subscription)
+  if (trialEndsAt && trialEndsAt > new Date()) {
     throw new Error('Cannot pause a subscription in a trial')
   }
   if (subscription.addOns?.length) {
@@ -379,7 +328,10 @@ async function pauseSubscription(user, pauseCycles) {
 async function resumeSubscription(user) {
   const { subscription } =
     await LimitationsManager.promises.userHasSubscription(user)
-  if (!subscription || !subscription.recurlyStatus) {
+  if (
+    !subscription ||
+    !SubscriptionHelper.getPaidSubscriptionState(subscription)
+  ) {
     throw new Error('No active subscription to resume')
   }
   await RecurlyClient.promises.resumeSubscriptionByUuid(
@@ -432,7 +384,7 @@ async function revertPlanChange(
     throw new IndeterminateInvoiceError(
       'cant determine invoice to fail for plan revert',
       {
-        info: { recurlySubscriptionId },
+        recurlySubscriptionId,
       }
     )
   }
diff --git a/services/web/app/src/Features/Subscription/SubscriptionHelper.js b/services/web/app/src/Features/Subscription/SubscriptionHelper.js
index efb8895280..429432349d 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionHelper.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionHelper.js
@@ -1,11 +1,25 @@
 const { formatCurrency } = require('../../util/currency')
 const GroupPlansData = require('./GroupPlansData')
+const { isStandaloneAiAddOnPlanCode } = require('./PaymentProviderEntities')
 
 /**
  * If the user changes to a less expensive plan, we shouldn't apply the change immediately.
  * This is to avoid unintended/artifical credits on users Recurly accounts.
  */
-function shouldPlanChangeAtTermEnd(oldPlan, newPlan) {
+function shouldPlanChangeAtTermEnd(oldPlan, newPlan, isInTrial) {
+  if (isInTrial) {
+    // we should always upgrade or downgrade immediately if actively in trial
+    return false
+  }
+
+  if (
+    oldPlan.annual === newPlan.annual &&
+    isStandaloneAiAddOnPlanCode(oldPlan.planCode) &&
+    !isStandaloneAiAddOnPlanCode(newPlan.planCode)
+  ) {
+    // changing from an standalone AI add-on plan to a non-AI plan should not be considered a downgrade
+    return false
+  }
   return oldPlan.price_in_cents > newPlan.price_in_cents
 }
 
@@ -86,7 +100,75 @@ function generateInitialLocalizedGroupPrice(recommendedCurrency, locale) {
   }
 }
 
+function isPaidSubscription(subscription) {
+  const hasRecurlySubscription =
+    subscription?.recurlySubscription_id &&
+    subscription?.recurlySubscription_id !== ''
+  const hasStripeSubscription =
+    subscription?.paymentProvider?.subscriptionId &&
+    subscription?.paymentProvider?.subscriptionId !== ''
+  return !!(subscription && (hasRecurlySubscription || hasStripeSubscription))
+}
+
+function isIndividualActivePaidSubscription(subscription) {
+  return (
+    isPaidSubscription(subscription) &&
+    subscription?.groupPlan === false &&
+    subscription?.recurlyStatus?.state !== 'canceled' &&
+    subscription?.paymentProvider?.state !== 'canceled'
+  )
+}
+
+function getPaymentProviderSubscriptionId(subscription) {
+  if (subscription?.recurlySubscription_id) {
+    return subscription.recurlySubscription_id
+  }
+  if (subscription?.paymentProvider?.subscriptionId) {
+    return subscription.paymentProvider.subscriptionId
+  }
+  return null
+}
+
+function getPaidSubscriptionState(subscription) {
+  if (subscription?.recurlyStatus?.state) {
+    return subscription.recurlyStatus.state
+  }
+  if (subscription?.paymentProvider?.state) {
+    return subscription.paymentProvider.state
+  }
+  return null
+}
+
+function getSubscriptionTrialStartedAt(subscription) {
+  if (subscription?.recurlyStatus?.trialStartedAt) {
+    return subscription.recurlyStatus?.trialStartedAt
+  }
+  return subscription?.paymentProvider?.trialStartedAt
+}
+
+function getSubscriptionTrialEndsAt(subscription) {
+  if (subscription?.recurlyStatus?.trialEndsAt) {
+    return subscription.recurlyStatus?.trialEndsAt
+  }
+  return subscription?.paymentProvider?.trialEndsAt
+}
+
+function isInTrial(trialEndsAt) {
+  if (!trialEndsAt) {
+    return false
+  }
+
+  return trialEndsAt.getTime() > Date.now()
+}
+
 module.exports = {
   shouldPlanChangeAtTermEnd,
   generateInitialLocalizedGroupPrice,
+  isPaidSubscription,
+  isIndividualActivePaidSubscription,
+  getPaymentProviderSubscriptionId,
+  getPaidSubscriptionState,
+  getSubscriptionTrialStartedAt,
+  getSubscriptionTrialEndsAt,
+  isInTrial,
 }
diff --git a/services/web/app/src/Features/Subscription/SubscriptionLocator.js b/services/web/app/src/Features/Subscription/SubscriptionLocator.js
index 978f4d41b7..c0c107eecf 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionLocator.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionLocator.js
@@ -162,6 +162,45 @@ const SubscriptionLocator = {
         }
       : null
   },
+
+  async getUserSubscriptionStatus(userId) {
+    let usersSubscription = { personal: false, group: false }
+
+    if (!userId) {
+      return usersSubscription
+    }
+
+    const memberSubscriptions =
+      await SubscriptionLocator.getMemberSubscriptions(userId)
+
+    const hasActiveGroupSubscription = memberSubscriptions.some(
+      subscription =>
+        subscription.recurlyStatus?.state === 'active' && subscription.groupPlan
+    )
+    if (hasActiveGroupSubscription) {
+      // Member of a group plan
+      usersSubscription = { ...usersSubscription, group: true }
+    }
+
+    const personalSubscription =
+      await SubscriptionLocator.getUsersSubscription(userId)
+
+    if (personalSubscription) {
+      const hasActivePersonalSubscription =
+        personalSubscription.recurlyStatus?.state === 'active'
+      if (hasActivePersonalSubscription) {
+        if (personalSubscription.groupPlan) {
+          // Owner of a group plan
+          usersSubscription = { ...usersSubscription, group: true }
+        } else {
+          // Owner of an individual plan
+          usersSubscription = { ...usersSubscription, personal: true }
+        }
+      }
+    }
+
+    return usersSubscription
+  },
 }
 
 module.exports = {
diff --git a/services/web/app/src/Features/Subscription/SubscriptionUpdater.js b/services/web/app/src/Features/Subscription/SubscriptionUpdater.js
index b0e24ce5ad..9de194f262 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionUpdater.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionUpdater.js
@@ -10,6 +10,7 @@ const { DeletedSubscription } = require('../../models/DeletedSubscription')
 const logger = require('@overleaf/logger')
 const Features = require('../../infrastructure/Features')
 const UserAuditLogHandler = require('../User/UserAuditLogHandler')
+const UserUpdater = require('../User/UserUpdater')
 const AccountMappingHelper = require('../Analytics/AccountMappingHelper')
 const { SSOConfig } = require('../../models/SSOConfig')
 const mongoose = require('../../infrastructure/Mongoose')
@@ -145,6 +146,20 @@ async function removeUserFromGroup(subscriptionId, userId, auditLog) {
     { _id: subscriptionId },
     { $pull: { member_ids: userId } }
   ).exec()
+
+  const subscription = await Subscription.findById(subscriptionId)
+  if (subscription.managedUsersEnabled) {
+    await UserUpdater.promises.updateUser(
+      { _id: userId },
+      {
+        $unset: {
+          'enrollment.managedBy': 1,
+          'enrollment.enrolledAt': 1,
+        },
+      }
+    )
+  }
+
   await FeaturesUpdater.promises.refreshFeatures(
     userId,
     'remove-user-from-group'
@@ -318,38 +333,7 @@ async function updateSubscriptionFromRecurly(
   requesterData
 ) {
   if (recurlySubscription.state === 'expired') {
-    const hasManagedUsersFeature =
-      Features.hasFeature('saas') && subscription?.managedUsersEnabled
-
-    // If a payment lapses and if the group is managed or has group SSO, as a temporary measure we need to
-    // make sure that the group continues as-is and no destructive actions are taken.
-    if (hasManagedUsersFeature) {
-      logger.warn(
-        { subscriptionId: subscription._id },
-        'expired subscription has managedUsers feature enabled, skipping deletion'
-      )
-    } else {
-      let hasGroupSSOEnabled = false
-      if (subscription?.ssoConfig) {
-        const ssoConfig = await SSOConfig.findOne({
-          _id: subscription.ssoConfig._id || subscription.ssoConfig,
-        })
-          .lean()
-          .exec()
-        if (ssoConfig.enabled) {
-          hasGroupSSOEnabled = true
-        }
-      }
-
-      if (hasGroupSSOEnabled) {
-        logger.warn(
-          { subscriptionId: subscription._id },
-          'expired subscription has groupSSO feature enabled, skipping deletion'
-        )
-      } else {
-        await deleteSubscription(subscription, requesterData)
-      }
-    }
+    await handleExpiredSubscription(subscription, requesterData)
     return
   }
   const updatedPlanCode = recurlySubscription.plan.plan_code
@@ -450,6 +434,41 @@ async function _sendUserGroupPlanCodeUserProperty(userId) {
   }
 }
 
+async function handleExpiredSubscription(subscription, requesterData) {
+  const hasManagedUsersFeature =
+    Features.hasFeature('saas') && subscription?.managedUsersEnabled
+
+  // If a payment lapses and if the group is managed or has group SSO, as a temporary measure we need to
+  // make sure that the group continues as-is and no destructive actions are taken.
+  if (hasManagedUsersFeature) {
+    logger.warn(
+      { subscriptionId: subscription._id },
+      'expired subscription has managedUsers feature enabled, skipping deletion'
+    )
+  } else {
+    let hasGroupSSOEnabled = false
+    if (subscription?.ssoConfig) {
+      const ssoConfig = await SSOConfig.findOne({
+        _id: subscription.ssoConfig._id || subscription.ssoConfig,
+      })
+        .lean()
+        .exec()
+      if (ssoConfig.enabled) {
+        hasGroupSSOEnabled = true
+      }
+    }
+
+    if (hasGroupSSOEnabled) {
+      logger.warn(
+        { subscriptionId: subscription._id },
+        'expired subscription has groupSSO feature enabled, skipping deletion'
+      )
+    } else {
+      await deleteSubscription(subscription, requesterData)
+    }
+  }
+}
+
 async function _sendSubscriptionEvent(userId, subscriptionId, event) {
   const subscription = await Subscription.findOne(
     { _id: subscriptionId },
@@ -503,7 +522,7 @@ async function setRestorePoint(subscriptionId, planCode, addOns, consumed) {
   }
 
   if (consumed) {
-    update.$inc = { revertedDueToFailedPayment: 1 }
+    update.$inc = { timesRevertedDueToFailedPayment: 1 }
   }
 
   await Subscription.updateOne({ _id: subscriptionId }, update).exec()
@@ -568,5 +587,6 @@ module.exports = {
     setRestorePoint,
     setSubscriptionWasReverted,
     voidRestorePoint,
+    handleExpiredSubscription,
   },
 }
diff --git a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
index 441d9c2c9b..3681975a38 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
@@ -1,6 +1,5 @@
 // ts-check
 const Settings = require('@overleaf/settings')
-const RecurlyWrapper = require('./RecurlyWrapper')
 const PlansLocator = require('./PlansLocator')
 const {
   isStandaloneAiAddOnPlanCode,
@@ -8,7 +7,6 @@ const {
 } = require('./PaymentProviderEntities')
 const SubscriptionFormatters = require('./SubscriptionFormatters')
 const SubscriptionLocator = require('./SubscriptionLocator')
-const SubscriptionUpdater = require('./SubscriptionUpdater')
 const InstitutionsGetter = require('../Institutions/InstitutionsGetter')
 const InstitutionsManager = require('../Institutions/InstitutionsManager')
 const PublishersGetter = require('../Publishers/PublishersGetter')
@@ -227,6 +225,7 @@ async function buildUsersSubscriptionViewModel(user, locale = 'en') {
     // don't return subscription payment information
     delete personalSubscription.paymentProvider
     delete personalSubscription.recurly
+    delete personalSubscription.recurlySubscription_id
 
     const tax = paymentRecord.subscription.taxAmount || 0
     // Some plans allow adding more seats than the base plan provides.
@@ -374,15 +373,6 @@ async function buildUsersSubscriptionViewModel(user, locale = 'en') {
   }
 }
 
-/**
- * @param {{_id: string}} user
- * @returns {Promise<Subscription>}
- */
-async function getBestSubscription(user) {
-  const { bestSubscription } = await getUsersSubscriptionDetails(user)
-  return bestSubscription
-}
-
 /**
  * @param {{_id: string}} user
  * @returns {Promise<{bestSubscription:Subscription,individualSubscription:DBSubscription|null,memberGroupSubscriptions:DBSubscription[]}>}
@@ -400,15 +390,18 @@ async function getUsersSubscriptionDetails(user) {
   if (
     individualSubscription &&
     !individualSubscription.customAccount &&
-    individualSubscription.recurlySubscription_id &&
-    !individualSubscription.recurlyStatus?.state
+    SubscriptionHelper.getPaymentProviderSubscriptionId(
+      individualSubscription
+    ) &&
+    !SubscriptionHelper.getPaidSubscriptionState(individualSubscription)
   ) {
-    const recurlySubscription = await RecurlyWrapper.promises.getSubscription(
-      individualSubscription.recurlySubscription_id,
-      { includeAccount: true }
+    const paymentResults = await Modules.promises.hooks.fire(
+      'getPaymentFromRecordPromise',
+      individualSubscription
     )
-    await SubscriptionUpdater.promises.updateSubscriptionFromRecurly(
-      recurlySubscription,
+    await Modules.promises.hooks.fire(
+      'syncSubscription',
+      paymentResults[0]?.subscription,
       individualSubscription
     )
     individualSubscription =
@@ -477,7 +470,7 @@ async function getUsersSubscriptionDetails(user) {
   return { bestSubscription, individualSubscription, memberGroupSubscriptions }
 }
 
-function buildPlansList(currentPlan) {
+function buildPlansList(currentPlan, isInTrial) {
   const { plans } = Settings
 
   const allPlans = {}
@@ -491,7 +484,11 @@ function buildPlansList(currentPlan) {
     result.planCodesChangingAtTermEnd = _.map(
       _.filter(plans, plan => {
         if (!plan.hideFromUsers) {
-          return SubscriptionHelper.shouldPlanChangeAtTermEnd(currentPlan, plan)
+          return SubscriptionHelper.shouldPlanChangeAtTermEnd(
+            currentPlan,
+            plan,
+            isInTrial
+          )
         }
       }),
       'planCode'
@@ -540,7 +537,8 @@ function _isPlanEqualOrBetter(planA, planB) {
 
 function _getRemainingTrialDays(subscription) {
   const now = new Date()
-  const trialEndDate = subscription.recurlyStatus?.trialEndsAt
+  const trialEndDate =
+    SubscriptionHelper.getSubscriptionTrialEndsAt(subscription)
   return trialEndDate && trialEndDate > now
     ? Math.ceil(
         (trialEndDate.getTime() - now.getTime()) / (24 * 60 * 60 * 1000)
@@ -575,8 +573,8 @@ function buildGroupSubscriptionForView(groupSubscription) {
   }
 }
 
-function buildPlansListForSubscriptionDash(currentPlan) {
-  const allPlansData = buildPlansList(currentPlan)
+function buildPlansListForSubscriptionDash(currentPlan, isInTrial) {
+  const allPlansData = buildPlansList(currentPlan, isInTrial)
   const plans = []
   // only list individual and visible plans for "change plans" UI
   if (allPlansData.studentAccounts) {
@@ -605,10 +603,8 @@ module.exports = {
   buildUsersSubscriptionViewModel: callbackify(buildUsersSubscriptionViewModel),
   buildPlansList,
   buildPlansListForSubscriptionDash,
-  getBestSubscription: callbackify(getBestSubscription),
   promises: {
     buildUsersSubscriptionViewModel,
-    getBestSubscription,
     getUsersSubscriptionDetails,
   },
 }
diff --git a/services/web/app/src/Features/Subscription/TeamInvitesController.mjs b/services/web/app/src/Features/Subscription/TeamInvitesController.mjs
index b2c9840de4..1eb9ac2907 100644
--- a/services/web/app/src/Features/Subscription/TeamInvitesController.mjs
+++ b/services/web/app/src/Features/Subscription/TeamInvitesController.mjs
@@ -4,6 +4,7 @@ import OError from '@overleaf/o-error'
 import TeamInvitesHandler from './TeamInvitesHandler.js'
 import SessionManager from '../Authentication/SessionManager.js'
 import SubscriptionLocator from './SubscriptionLocator.js'
+import SubscriptionHelper from './SubscriptionHelper.js'
 import ErrorController from '../Errors/ErrorController.js'
 import EmailHelper from '../Helpers/EmailHelper.js'
 import UserGetter from '../User/UserGetter.js'
@@ -14,6 +15,7 @@ import EmailHandler from '../Email/EmailHandler.js'
 import { RateLimiter } from '../../infrastructure/RateLimiter.js'
 import Modules from '../../infrastructure/Modules.js'
 import UserAuditLogHandler from '../User/UserAuditLogHandler.js'
+import { sanitizeSessionUserForFrontEnd } from '../../infrastructure/FrontEndUser.js'
 
 const rateLimiters = {
   resendGroupInvite: new RateLimiter('resend-group-invite', {
@@ -87,12 +89,10 @@ async function viewInvite(req, res, next) {
     const personalSubscription =
       await SubscriptionLocator.promises.getUsersSubscription(userId)
 
-    const hasIndividualRecurlySubscription =
-      personalSubscription &&
-      personalSubscription.groupPlan === false &&
-      personalSubscription.recurlyStatus?.state !== 'canceled' &&
-      personalSubscription.recurlySubscription_id &&
-      personalSubscription.recurlySubscription_id !== ''
+    const hasIndividualPaidSubscription =
+      SubscriptionHelper.isIndividualActivePaidSubscription(
+        personalSubscription
+      )
 
     if (subscription?.managedUsersEnabled) {
       if (!subscription.populated('groupPolicy')) {
@@ -133,6 +133,9 @@ async function viewInvite(req, res, next) {
         logger.error({ err }, 'error getting subscription admin email')
       }
 
+      const usersSubscription =
+        await SubscriptionLocator.promises.getUserSubscriptionStatus(userId)
+
       return res.render('subscriptions/team/invite-managed', {
         inviterName: invite.inviterName,
         inviteToken: invite.token,
@@ -141,7 +144,8 @@ async function viewInvite(req, res, next) {
         currentManagedUserAdminEmail,
         groupSSOActive,
         subscriptionId: subscription._id.toString(),
-        user: sessionUser,
+        user: sanitizeSessionUserForFrontEnd(sessionUser),
+        usersSubscription,
       })
     } else {
       let currentManagedUserAdminEmail
@@ -155,13 +159,13 @@ async function viewInvite(req, res, next) {
       return res.render('subscriptions/team/invite', {
         inviterName: invite.inviterName,
         inviteToken: invite.token,
-        hasIndividualRecurlySubscription,
+        hasIndividualPaidSubscription,
         expired: req.query.expired,
         userRestrictions: Array.from(req.userRestrictions || []),
         currentManagedUserAdminEmail,
         groupSSOActive,
         subscriptionId: subscription._id.toString(),
-        user: sessionUser,
+        user: sanitizeSessionUserForFrontEnd(sessionUser),
       })
     }
   } else {
@@ -203,7 +207,7 @@ async function acceptInvite(req, res, next) {
   const subscription = await TeamInvitesHandler.promises.acceptInvite(
     token,
     userId,
-    { initiatorId: userId, ipAddress: req.ip }
+    req.ip
   )
   const groupSSOActive = (
     await Modules.promises.hooks.fire('hasGroupSSOEnabled', subscription)
diff --git a/services/web/app/src/Features/Subscription/TeamInvitesHandler.js b/services/web/app/src/Features/Subscription/TeamInvitesHandler.js
index a89f0612f2..f7a4908355 100644
--- a/services/web/app/src/Features/Subscription/TeamInvitesHandler.js
+++ b/services/web/app/src/Features/Subscription/TeamInvitesHandler.js
@@ -22,6 +22,7 @@ const {
   callbackifyMultiResult,
 } = require('@overleaf/promise-utils')
 const NotificationsBuilder = require('../Notifications/NotificationsBuilder')
+const RecurlyClient = require('./RecurlyClient')
 
 async function getInvite(token) {
   const subscription = await Subscription.findOne({
@@ -64,11 +65,50 @@ async function importInvite(subscription, inviterName, email, token, sentAt) {
   return subscription.save()
 }
 
-async function acceptInvite(token, userId, auditLog) {
+async function _deleteUserSubscription(userId, ipAddress) {
+  // Delete released user subscription to make it on a free plan
+  const subscription =
+    await SubscriptionLocator.promises.getUsersSubscription(userId)
+
+  if (subscription) {
+    logger.debug(
+      {
+        subscriptionId: subscription._id,
+      },
+      'deleting user subscription'
+    )
+
+    const deleterData = {
+      id: userId,
+      ip: ipAddress,
+    }
+    await SubscriptionUpdater.promises.deleteSubscription(
+      subscription,
+      deleterData
+    )
+
+    // Terminate the subscription in Recurly
+    if (subscription.recurlySubscription_id) {
+      try {
+        await RecurlyClient.promises.terminateSubscriptionByUuid(
+          subscription.recurlySubscription_id
+        )
+      } catch (err) {
+        logger.error(
+          { err, subscriptionId: subscription._id },
+          'terminating subscription failed'
+        )
+      }
+    }
+  }
+}
+
+async function acceptInvite(token, userId, ipAddress) {
   const { invite, subscription } = await getInvite(token)
   if (!invite) {
     throw new Errors.NotFoundError('invite not found')
   }
+  const auditLog = { initiatorId: userId, ipAddress }
 
   await SubscriptionUpdater.promises.addUserToGroup(
     subscription._id,
@@ -77,6 +117,7 @@ async function acceptInvite(token, userId, auditLog) {
   )
 
   if (subscription.managedUsersEnabled) {
+    await _deleteUserSubscription(userId, ipAddress)
     await Modules.promises.hooks.fire(
       'enrollInManagedSubscription',
       userId,
diff --git a/services/web/app/src/Features/Templates/TemplatesController.js b/services/web/app/src/Features/Templates/TemplatesController.js
index a8730a61be..257de2b0c3 100644
--- a/services/web/app/src/Features/Templates/TemplatesController.js
+++ b/services/web/app/src/Features/Templates/TemplatesController.js
@@ -4,28 +4,25 @@ const TemplatesManager = require('./TemplatesManager')
 const ProjectHelper = require('../Project/ProjectHelper')
 const logger = require('@overleaf/logger')
 const { expressify } = require('@overleaf/promise-utils')
-const SplitTestHandler = require('../SplitTests/SplitTestHandler')
 
 const TemplatesController = {
   async getV1Template(req, res) {
-    // Read split test assignment so that it's available for Pug to read
-    await SplitTestHandler.promises.getAssignment(req, res, 'core-pug-bs5')
-
-    const templateVersionId = req.params.Template_version_id
-    const templateId = req.query.id
-    if (!/^[0-9]+$/.test(templateVersionId) || !/^[0-9]+$/.test(templateId)) {
-      logger.err(
-        { templateVersionId, templateId },
-        'invalid template id or version'
-      )
-      return res.sendStatus(400)
-    }
+    const templateId = req.params.Template_version_id
+    const templateVersionId = req.query.version
+//    if (!/^[0-9]+$/.test(templateVersionId) || !/^[0-9]+$/.test(templateId)) {
+//      logger.err(
+//        { templateVersionId, templateId },
+//        'invalid template id or version'
+//      )
+//      return res.sendStatus(400)
+//    }
     const data = {
       templateVersionId,
       templateId,
-      name: req.query.templateName,
-      compiler: ProjectHelper.compilerFromV1Engine(req.query.latexEngine),
-      imageName: req.query.texImage,
+      name: req.query.name,
+      compiler: req.query.compiler,
+      language: req.query.language,
+      imageName: req.query.imageName,
       mainFile: req.query.mainFile,
       brandVariationId: req.query.brandVariationId,
     }
@@ -40,6 +37,7 @@ const TemplatesController = {
 
   async createProjectFromV1Template(req, res) {
     const userId = SessionManager.getLoggedInUserId(req.session)
+
     const project = await TemplatesManager.promises.createProjectFromV1Template(
       req.body.brandVariationId,
       req.body.compiler,
@@ -48,7 +46,8 @@ const TemplatesController = {
       req.body.templateName,
       req.body.templateVersionId,
       userId,
-      req.body.imageName
+      req.body.imageName,
+      req.body.language
     )
     delete req.session.templateData
     if (!project) {
diff --git a/services/web/app/src/Features/Templates/TemplatesManager.js b/services/web/app/src/Features/Templates/TemplatesManager.js
index 6a2b6207c1..77cde12ea9 100644
--- a/services/web/app/src/Features/Templates/TemplatesManager.js
+++ b/services/web/app/src/Features/Templates/TemplatesManager.js
@@ -18,6 +18,7 @@ const crypto = require('crypto')
 const Errors = require('../Errors/Errors')
 const { pipeline } = require('stream/promises')
 const ClsiCacheManager = require('../Compile/ClsiCacheManager')
+const TIMEOUT = 30000  // 30 sec
 
 const TemplatesManager = {
   async createProjectFromV1Template(
@@ -28,25 +29,19 @@ const TemplatesManager = {
     templateName,
     templateVersionId,
     userId,
-    imageName
+    imageName,
+    language
   ) {
-    const zipUrl = `${settings.apis.v1.url}/api/v1/overleaf/templates/${templateVersionId}`
+    const zipUrl = `${settings.apis.filestore.url}/template/${templateId}/v/${templateVersionId}/zip`
     const zipReq = await fetchStreamWithResponse(zipUrl, {
-      basicAuth: {
-        user: settings.apis.v1.user,
-        password: settings.apis.v1.pass,
-      },
-      signal: AbortSignal.timeout(settings.apis.v1.timeout),
+      signal: AbortSignal.timeout(TIMEOUT),
     })
 
     const projectName = ProjectDetailsHandler.fixProjectName(templateName)
     const dumpPath = `${settings.path.dumpFolder}/${crypto.randomUUID()}`
     const writeStream = fs.createWriteStream(dumpPath)
     try {
-      const attributes = {
-        fromV1TemplateId: templateId,
-        fromV1TemplateVersionId: templateVersionId,
-      }
+      const attributes = {}
       await pipeline(zipReq.stream, writeStream)
 
       if (zipReq.response.status !== 200) {
@@ -78,14 +73,9 @@ const TemplatesManager = {
       await TemplatesManager._setCompiler(project._id, compiler)
       await TemplatesManager._setImage(project._id, imageName)
       await TemplatesManager._setMainFile(project._id, mainFile)
+      await TemplatesManager._setSpellCheckLanguage(project._id, language)
       await TemplatesManager._setBrandVariationId(project._id, brandVariationId)
 
-      const update = {
-        fromV1TemplateId: templateId,
-        fromV1TemplateVersionId: templateVersionId,
-      }
-      await Project.updateOne({ _id: project._id }, update, {})
-
       await prepareClsiCacheInBackground
 
       return project
@@ -102,11 +92,12 @@ const TemplatesManager = {
   },
 
   async _setImage(projectId, imageName) {
-    if (!imageName) {
-      imageName = 'wl_texlive:2018.1'
+    try {
+      await ProjectOptionsHandler.setImageName(projectId, imageName)
+    } catch {
+      logger.warn({ imageName: imageName }, 'not available')
+      await ProjectOptionsHandler.setImageName(projectId, settings.currentImageName)
     }
-
-    await ProjectOptionsHandler.setImageName(projectId, imageName)
   },
 
   async _setMainFile(projectId, mainFile) {
@@ -116,6 +107,13 @@ const TemplatesManager = {
     await ProjectRootDocManager.setRootDocFromName(projectId, mainFile)
   },
 
+  async _setSpellCheckLanguage(projectId, language) {
+    if (language == null) {
+      return
+    }
+    await ProjectOptionsHandler.setSpellCheckLanguage(projectId, language)
+  },
+
   async _setBrandVariationId(projectId, brandVariationId) {
     if (brandVariationId == null) {
       return
diff --git a/services/web/app/src/Features/Tutorial/TutorialController.mjs b/services/web/app/src/Features/Tutorial/TutorialController.mjs
index e5fc940b34..b4ab3f6727 100644
--- a/services/web/app/src/Features/Tutorial/TutorialController.mjs
+++ b/services/web/app/src/Features/Tutorial/TutorialController.mjs
@@ -15,6 +15,7 @@ const VALID_KEYS = [
   'editor-popup-ux-survey',
   'wf-features-moved',
   'review-mode',
+  'new-error-logs-promo',
 ]
 
 async function completeTutorial(req, res, next) {
diff --git a/services/web/app/src/Features/User/SAMLIdentityManager.js b/services/web/app/src/Features/User/SAMLIdentityManager.js
index dc790c59ca..0d3c382775 100644
--- a/services/web/app/src/Features/User/SAMLIdentityManager.js
+++ b/services/web/app/src/Features/User/SAMLIdentityManager.js
@@ -210,9 +210,13 @@ async function getUser(providerId, externalUserId, userIdAttribute) {
     )
   }
   const user = await User.findOne({
-    'samlIdentifiers.externalUserId': externalUserId.toString(),
-    'samlIdentifiers.providerId': providerId.toString(),
-    'samlIdentifiers.userIdAttribute': userIdAttribute.toString(),
+    samlIdentifiers: {
+      $elemMatch: {
+        externalUserId: externalUserId.toString(),
+        providerId: providerId.toString(),
+        userIdAttribute: userIdAttribute.toString(),
+      },
+    },
   }).exec()
 
   return user
diff --git a/services/web/app/src/Features/User/UserAuditLogHandler.js b/services/web/app/src/Features/User/UserAuditLogHandler.js
index b1d404303e..87cd810161 100644
--- a/services/web/app/src/Features/User/UserAuditLogHandler.js
+++ b/services/web/app/src/Features/User/UserAuditLogHandler.js
@@ -8,6 +8,7 @@ function _canHaveNoIpAddressId(operation, info) {
   if (operation === 'must-reset-password-set') return true
   if (operation === 'remove-email' && info.script) return true
   if (operation === 'release-managed-user' && info.script) return true
+  if (operation === 'unlink-dropbox' && info.batch) return true
   return false
 }
 
diff --git a/services/web/app/src/Features/User/UserController.js b/services/web/app/src/Features/User/UserController.js
index e4186d39a8..b767dcd4a1 100644
--- a/services/web/app/src/Features/User/UserController.js
+++ b/services/web/app/src/Features/User/UserController.js
@@ -387,6 +387,9 @@ async function updateUserSettings(req, res, next) {
   if (req.body.mathPreview != null) {
     user.ace.mathPreview = req.body.mathPreview
   }
+  if (req.body.breadcrumbs != null) {
+    user.ace.breadcrumbs = Boolean(req.body.breadcrumbs)
+  }
   if (req.body.referencesSearchMode != null) {
     const mode =
       req.body.referencesSearchMode === 'simple' ? 'simple' : 'advanced'
diff --git a/services/web/app/src/Features/User/UserDeleter.js b/services/web/app/src/Features/User/UserDeleter.js
index 662c51ca65..c8d9891bf9 100644
--- a/services/web/app/src/Features/User/UserDeleter.js
+++ b/services/web/app/src/Features/User/UserDeleter.js
@@ -87,17 +87,29 @@ async function deleteMongoUser(userId) {
 }
 
 async function expireDeletedUser(userId) {
-  await Modules.promises.hooks.fire('expireDeletedUser', userId)
-  const deletedUser = await DeletedUser.findOne({
-    'deleterData.deletedUserId': userId,
-  }).exec()
-
-  await Feedback.deleteMany({ userId }).exec()
-  await OnboardingDataCollectionManager.deleteOnboardingDataCollection(userId)
-
-  deletedUser.user = undefined
-  deletedUser.deleterData.deleterIpAddress = undefined
-  await deletedUser.save()
+  logger.info({ userId }, 'expiring deleted user')
+  try {
+    logger.info({ userId }, 'firing expireDeletedUser hook')
+    await Modules.promises.hooks.fire('expireDeletedUser', userId)
+    logger.info({ userId }, 'removing deleted user feedback records')
+    await Feedback.deleteMany({ userId }).exec()
+    logger.info({ userId }, 'removing deleted user onboarding data')
+    await OnboardingDataCollectionManager.deleteOnboardingDataCollection(userId)
+    logger.info({ userId }, 'redacting PII from the deleted user record')
+    const deletedUser = await DeletedUser.findOne({
+      'deleterData.deletedUserId': userId,
+    }).exec()
+    deletedUser.user = undefined
+    deletedUser.deleterData.deleterIpAddress = undefined
+    await deletedUser.save()
+    logger.info({ userId }, 'deleted user expiry complete')
+  } catch (error) {
+    logger.warn(
+      { error, userId },
+      'something went wrong expiring the deleted user'
+    )
+    throw error
+  }
 }
 
 async function expireDeletedUsersAfterDuration() {
@@ -112,11 +124,27 @@ async function expireDeletedUsersAfterDuration() {
   if (deletedUsers.length === 0) {
     return
   }
-
-  for (let i = 0; i < deletedUsers.length; i++) {
-    const deletedUserId = deletedUsers[i].deleterData.deletedUserId
-    await expireDeletedUser(deletedUserId)
-    await UserAuditLogEntry.deleteMany({ userId: deletedUserId }).exec()
+  logger.info(
+    { deletedUsers: deletedUsers.length, retentionPeriodInDays: DURATION },
+    'expiring batch of deleted users older than retention period'
+  )
+  try {
+    for (let i = 0; i < deletedUsers.length; i++) {
+      const deletedUserId = deletedUsers[i].deleterData.deletedUserId
+      await expireDeletedUser(deletedUserId)
+      logger.info({ deletedUserId }, 'removing deleted user audit log entries')
+      await UserAuditLogEntry.deleteMany({ userId: deletedUserId }).exec()
+    }
+    logger.info(
+      { deletedUsers: deletedUsers.length },
+      'batch of deleted users expired successfully'
+    )
+  } catch (error) {
+    logger.warn(
+      { error },
+      'something went wrong expiring batch of deleted users'
+    )
+    throw error
   }
 }
 
diff --git a/services/web/app/src/Features/User/UserGetter.js b/services/web/app/src/Features/User/UserGetter.js
index bce4568880..a5fbe42651 100644
--- a/services/web/app/src/Features/User/UserGetter.js
+++ b/services/web/app/src/Features/User/UserGetter.js
@@ -269,6 +269,7 @@ const UserGetter = {
   getUsers(query, projection, callback) {
     try {
       query = normalizeMultiQuery(query)
+      if (query?._id?.$in?.length === 0) return callback(null, []) // shortcut for getUsers([])
       db.users.find(query, { projection }).toArray(callback)
     } catch (err) {
       callback(err)
diff --git a/services/web/app/src/Features/User/UserPagesController.mjs b/services/web/app/src/Features/User/UserPagesController.mjs
index 29fc505a7c..d353ca88e3 100644
--- a/services/web/app/src/Features/User/UserPagesController.mjs
+++ b/services/web/app/src/Features/User/UserPagesController.mjs
@@ -176,6 +176,7 @@ async function settingsPage(req, res) {
     gitBridgeEnabled: Settings.enableGitBridge,
     isSaas: Features.hasFeature('saas'),
     memberOfSSOEnabledGroups,
+    capabilities: [...req.capabilitySet],
   })
 }
 
diff --git a/services/web/app/src/Features/User/UserUpdater.js b/services/web/app/src/Features/User/UserUpdater.js
index 627e73875d..f21ee9a1ed 100644
--- a/services/web/app/src/Features/User/UserUpdater.js
+++ b/services/web/app/src/Features/User/UserUpdater.js
@@ -11,7 +11,6 @@ const EmailHandler = require('../Email/EmailHandler')
 const EmailHelper = require('../Helpers/EmailHelper')
 const Errors = require('../Errors/Errors')
 const NewsletterManager = require('../Newsletter/NewsletterManager')
-const RecurlyWrapper = require('../Subscription/RecurlyWrapper')
 const UserAuditLogHandler = require('./UserAuditLogHandler')
 const AnalyticsManager = require('../Analytics/AnalyticsManager')
 const SubscriptionLocator = require('../Subscription/SubscriptionLocator')
@@ -252,7 +251,11 @@ async function setDefaultEmailAddress(
   }
 
   try {
-    await RecurlyWrapper.promises.updateAccountEmailAddress(user._id, email)
+    await Modules.promises.hooks.fire(
+      'updateAccountEmailAddress',
+      user._id,
+      email
+    )
   } catch (error) {
     // errors are ignored
   }
diff --git a/services/web/app/src/Features/UserMembership/UserMembershipController.mjs b/services/web/app/src/Features/UserMembership/UserMembershipController.mjs
index aaa8fa5812..4be1221255 100644
--- a/services/web/app/src/Features/UserMembership/UserMembershipController.mjs
+++ b/services/web/app/src/Features/UserMembership/UserMembershipController.mjs
@@ -31,8 +31,11 @@ async function manageGroupMembers(req, res, next) {
   )
   const ssoConfig = await SSOConfig.findById(subscription.ssoConfig).exec()
   const plan = PlansLocator.findLocalPlanInSettings(subscription.planCode)
-  const userId = SessionManager.getLoggedInUserId(req.session)
+  const userId = SessionManager.getLoggedInUserId(req.session)?.toString()
   const isAdmin = subscription.admin_id.toString() === userId
+  const isUserGroupManager =
+    Boolean(subscription.manager_ids?.some(id => id.toString() === userId)) &&
+    !isAdmin
   const recurlySubscription = subscription.recurlySubscription_id
     ? await RecurlyClient.promises.getSubscription(
         subscription.recurlySubscription_id
@@ -51,6 +54,7 @@ async function manageGroupMembers(req, res, next) {
     users,
     groupSize: subscription.membersLimit,
     managedUsersActive: subscription.managedUsersEnabled,
+    isUserGroupManager,
     groupSSOActive: ssoConfig?.enabled,
     canUseFlexibleLicensing: plan?.canUseFlexibleLicensing,
     canUseAddSeatsFeature,
diff --git a/services/web/app/src/infrastructure/ExpressLocals.js b/services/web/app/src/infrastructure/ExpressLocals.js
index eae1b48219..23a6882d64 100644
--- a/services/web/app/src/infrastructure/ExpressLocals.js
+++ b/services/web/app/src/infrastructure/ExpressLocals.js
@@ -19,6 +19,7 @@ const {
 const {
   addOptionalCleanupHandlerAfterDrainingConnections,
 } = require('./GracefulShutdown')
+const { sanitizeSessionUserForFrontEnd } = require('./FrontEndUser')
 
 const IEEE_BRAND_ID = Settings.ieeeBrandId
 
@@ -300,11 +301,7 @@ module.exports = function (webRouter, privateApiRouter, publicApiRouter) {
   webRouter.use(function (req, res, next) {
     const currentUser = SessionManager.getSessionUser(req.session)
     if (currentUser != null) {
-      res.locals.user = {
-        email: currentUser.email,
-        first_name: currentUser.first_name,
-        last_name: currentUser.last_name,
-      }
+      res.locals.user = sanitizeSessionUserForFrontEnd(currentUser)
     }
     next()
   })
@@ -428,7 +425,7 @@ module.exports = function (webRouter, privateApiRouter, publicApiRouter) {
       labsEnabled: Settings.labs && Settings.labs.enable,
       wikiEnabled: Settings.overleaf != null || Settings.proxyLearn,
       templatesEnabled:
-        Settings.overleaf != null || Settings.templates?.user_id != null,
+        Settings.overleaf != null || Boolean(Settings.templates),
       cioWriteKey: Settings.analytics?.cio?.writeKey,
       cioSiteId: Settings.analytics?.cio?.siteId,
     }
diff --git a/services/web/app/src/infrastructure/Features.js b/services/web/app/src/infrastructure/Features.js
index aaf51103b9..ed231a6caa 100644
--- a/services/web/app/src/infrastructure/Features.js
+++ b/services/web/app/src/infrastructure/Features.js
@@ -69,7 +69,7 @@ const Features = {
       case 'oauth':
         return Boolean(Settings.oauth)
       case 'templates-server-pro':
-        return Boolean(Settings.templates?.user_id)
+        return Boolean(Settings.templates)
       case 'affiliations':
       case 'analytics':
         return Boolean(_.get(Settings, ['apis', 'v1', 'url']))
diff --git a/services/web/app/src/infrastructure/FrontEndUser.js b/services/web/app/src/infrastructure/FrontEndUser.js
new file mode 100644
index 0000000000..5a4af9868c
--- /dev/null
+++ b/services/web/app/src/infrastructure/FrontEndUser.js
@@ -0,0 +1,15 @@
+function sanitizeSessionUserForFrontEnd(sessionUser) {
+  if (sessionUser != null) {
+    return {
+      email: sessionUser.email,
+      first_name: sessionUser.first_name,
+      last_name: sessionUser.last_name,
+    }
+  }
+
+  return null
+}
+
+module.exports = {
+  sanitizeSessionUserForFrontEnd,
+}
diff --git a/services/web/app/src/infrastructure/mongodb.js b/services/web/app/src/infrastructure/mongodb.js
index a3342c6575..24103b2d82 100644
--- a/services/web/app/src/infrastructure/mongodb.js
+++ b/services/web/app/src/infrastructure/mongodb.js
@@ -61,7 +61,6 @@ const db = {
   projectHistoryFailures: internalDb.collection('projectHistoryFailures'),
   projectHistoryGlobalBlobs: internalDb.collection('projectHistoryGlobalBlobs'),
   projectHistoryLabels: internalDb.collection('projectHistoryLabels'),
-  projectHistoryMetaData: internalDb.collection('projectHistoryMetaData'),
   projectHistorySyncState: internalDb.collection('projectHistorySyncState'),
   projectInvites: internalDb.collection('projectInvites'),
   projects: internalDb.collection('projects'),
diff --git a/services/web/app/src/models/GroupPolicy.js b/services/web/app/src/models/GroupPolicy.js
index e975834008..55728a2415 100644
--- a/services/web/app/src/models/GroupPolicy.js
+++ b/services/web/app/src/models/GroupPolicy.js
@@ -27,6 +27,9 @@ const GroupPolicySchema = new Schema(
 
     // User can't use the chat feature
     userCannotUseChat: Boolean,
+
+    // User can't use the Dropbox feature
+    userCannotUseDropbox: Boolean,
   },
   { minimize: false }
 )
diff --git a/services/web/app/src/models/SSOConfig.js b/services/web/app/src/models/SSOConfig.js
index 5d50d51d02..6734b29f57 100644
--- a/services/web/app/src/models/SSOConfig.js
+++ b/services/web/app/src/models/SSOConfig.js
@@ -10,6 +10,7 @@ const SSOConfigSchema = new Schema(
     userLastNameAttribute: { type: String },
     validated: { type: Boolean, default: false },
     enabled: { type: Boolean, default: false },
+    useSettingsUKAMF: { type: Boolean, default: false },
   },
 
   {
diff --git a/services/web/app/src/models/User.js b/services/web/app/src/models/User.js
index d228c46b82..c1701023c4 100644
--- a/services/web/app/src/models/User.js
+++ b/services/web/app/src/models/User.js
@@ -97,6 +97,7 @@ const UserSchema = new Schema(
       fontFamily: { type: String },
       lineHeight: { type: String },
       mathPreview: { type: Boolean, default: true },
+      breadcrumbs: { type: Boolean, default: true },
       referencesSearchMode: { type: String, default: 'advanced' }, // 'advanced' or 'simple'
       enableNewEditor: { type: Boolean },
     },
diff --git a/services/web/app/src/router.mjs b/services/web/app/src/router.mjs
index a7e8d5e05f..c482b9c9e2 100644
--- a/services/web/app/src/router.mjs
+++ b/services/web/app/src/router.mjs
@@ -262,6 +262,8 @@ async function initialize(webRouter, privateApiRouter, publicApiRouter) {
     '/read-only/one-time-login'
   )
 
+  await Modules.applyRouter(webRouter, privateApiRouter, publicApiRouter)
+
   webRouter.post('/logout', UserController.logout)
 
   webRouter.get('/restricted', AuthorizationMiddleware.restricted)
@@ -285,8 +287,6 @@ async function initialize(webRouter, privateApiRouter, publicApiRouter) {
   TokenAccessRouter.apply(webRouter)
   HistoryRouter.apply(webRouter, privateApiRouter)
 
-  await Modules.applyRouter(webRouter, privateApiRouter, publicApiRouter)
-
   if (Settings.enableSubscriptions) {
     webRouter.get(
       '/user/bonus',
@@ -915,6 +915,12 @@ async function initialize(webRouter, privateApiRouter, publicApiRouter) {
     NotificationsController.markNotificationAsRead
   )
 
+  webRouter.get(
+    '/user/notification/:notificationId',
+    AuthenticationController.requireLogin(),
+    NotificationsController.getNotification
+  )
+
   // Deprecated in favour of /internal/project/:project_id but still used by versioning
   privateApiRouter.get(
     '/project/:project_id/details',
diff --git a/services/web/app/views/_customer_io.pug b/services/web/app/views/_customer_io.pug
index 81d75f7d7f..781dfaab13 100644
--- a/services/web/app/views/_customer_io.pug
+++ b/services/web/app/views/_customer_io.pug
@@ -1,10 +1,12 @@
 if(customerIoEnabled && ExposedSettings.cioWriteKey && ExposedSettings.cioSiteId)
-	script(type="text/javascript", id="cio-loader", nonce=scriptNonce, data-cio-write-key=ExposedSettings.cioWriteKey, data-cio-site-id=ExposedSettings.cioSiteId, data-session-analytics-id=getSessionAnalyticsId(), data-user-id=getLoggedInUserId()).
+	script(type="text/javascript", id="cio-loader", nonce=scriptNonce, data-best-subscription=(usersBestSubscription && usersBestSubscription.type), data-cio-write-key=ExposedSettings.cioWriteKey, data-cio-site-id=ExposedSettings.cioSiteId, data-session-analytics-id=getSessionAnalyticsId(), data-user-id=getLoggedInUserId()).
 		var cioSettings = document.querySelector('#cio-loader').dataset;
 		var analyticsId = cioSettings.sessionAnalyticsId;
 		var siteId = cioSettings.cioSiteId;
 		var writeKey = cioSettings.cioWriteKey;
 		var userId = cioSettings.userId;
+		var usersBestSubscription = cioSettings.bestSubscription
+
 
 		!function(){var i="cioanalytics", analytics=(window[i]=window[i]||[]);if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on","addSourceMiddleware","addIntegrationMiddleware","setAnonymousId","addDestinationMiddleware"];analytics.factory=function(e){return function(){var t=Array.prototype.slice.call(arguments);t.unshift(e);analytics.push(t);return analytics}};for(var e=0;e<analytics.methods.length;e++){var key=analytics.methods[e];analytics[key]=analytics.factory(key)}analytics.load=function(key,e){var t=document.createElement("script");t.type="text/javascript";t.async=!0;t.setAttribute('data-global-customerio-analytics-key', i);t.src="https://cdp.customer.io/v1/analytics-js/snippet/" + key + "/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n);analytics._writeKey=key;analytics._loadOptions=e};analytics.SNIPPET_VERSION="4.15.3";
 			analytics.load(
@@ -21,6 +23,5 @@ if(customerIoEnabled && ExposedSettings.cioWriteKey && ExposedSettings.cioSiteId
 			if (analyticsId) {
 				analytics.setAnonymousId(analyticsId);
 			};
-			// If userId is undefined, identify sends only the anonymousId (aka analyticsId)
-			analytics.identify(userId);
+			analytics.identify(analyticsId, {overleafId: userId, 'best-subscription-type': usersBestSubscription  });
 		}}();
diff --git a/services/web/app/views/_mixins/back_to_btns.pug b/services/web/app/views/_mixins/back_to_btns.pug
index 570237b5bc..dacd9ea7a2 100644
--- a/services/web/app/views/_mixins/back_to_btns.pug
+++ b/services/web/app/views/_mixins/back_to_btns.pug
@@ -1,4 +1,4 @@
 mixin back-to-btns(settingsAnchor)
-	a.btn.btn-secondary(href=`/user/settings${settingsAnchor ? '#' + settingsAnchor : '' }`) #{translate('back_to_account_settings')}
-	| 
-	a.btn.btn-secondary(href='/project') #{translate('back_to_your_projects')}
+	.d-flex.flex-column.flex-sm-row.gap-3
+		a.btn.btn-secondary(href=`/user/settings${settingsAnchor ? '#' + settingsAnchor : '' }`) #{translate('back_to_account_settings')}
+		a.btn.btn-secondary(href='/project') #{translate('back_to_your_projects')}
diff --git a/services/web/app/views/_mixins/formMessages.pug b/services/web/app/views/_mixins/formMessages.pug
index 9a76d118c7..2fab7e40d8 100644
--- a/services/web/app/views/_mixins/formMessages.pug
+++ b/services/web/app/views/_mixins/formMessages.pug
@@ -1,3 +1,5 @@
+include ./material_symbol
+
 mixin formMessages()
 	div(
 		data-ol-form-messages='',
@@ -48,7 +50,7 @@ mixin customFormMessageNewStyle(key, kind, extraClass = 'mb-3')
 			aria-live="polite"
 		)
 			div.notification-icon
-				span.material-symbols(aria-hidden="true") check_circle
+				+material-symbol("check_circle")
 			div.notification-content.text-left
 				block
 	else if kind === 'danger'
@@ -60,7 +62,7 @@ mixin customFormMessageNewStyle(key, kind, extraClass = 'mb-3')
 			aria-live="polite"
 		)
 			div.notification-icon
-				span.material-symbols(aria-hidden="true") error
+				+material-symbol("error")
 			div.notification-content.text-left
 				block
 	else
@@ -72,7 +74,7 @@ mixin customFormMessageNewStyle(key, kind, extraClass = 'mb-3')
 			aria-live="polite"
 		)
 			div.notification-icon
-				span.material-symbols(aria-hidden="true") warning
+				+material-symbol("warning")
 			div.notification-content.text-left
 				block
 
@@ -91,6 +93,6 @@ mixin customValidationMessageNewStyle(key)
 			data-ol-custom-form-message=key
 		)
 		div.notification-icon
-			span.material-symbols(aria-hidden="true") error
+			+material-symbol("error")
 		div.notification-content.text-left.small
 			block
diff --git a/services/web/app/views/_mixins/links.pug b/services/web/app/views/_mixins/links.pug
index 9036f86e17..566c90ee50 100644
--- a/services/web/app/views/_mixins/links.pug
+++ b/services/web/app/views/_mixins/links.pug
@@ -1,3 +1,5 @@
+include ./material_symbol
+
 mixin linkAdvisors(linkText, linkClass, track)
 	//- To Do: verify path
 	- var gaCategory = track && track.category ? track.category : 'All'
@@ -120,4 +122,4 @@ mixin linkUniversities(linkText, linkClass)
 mixin linkWithArrow({text, href, eventTracking, eventSegmentation, eventTrackingTrigger})
 	a.link-with-arrow(href=href event-tracking=eventTracking event-segmentation=eventSegmentation, event-tracking-trigger=eventTrackingTrigger event-tracking-mb)
 		| #{text}
-		i.material-symbols(aria-hidden="true") arrow_right_alt
+		+material-symbol("arrow_right_alt")
diff --git a/services/web/app/views/_mixins/material_symbol.pug b/services/web/app/views/_mixins/material_symbol.pug
new file mode 100644
index 0000000000..1e97425faf
--- /dev/null
+++ b/services/web/app/views/_mixins/material_symbol.pug
@@ -0,0 +1,11 @@
+mixin material-symbol(icon, extraClass = null)
+	- extraClass = extraClass ? ' ' + extraClass : ''
+	span(aria-hidden="true", translate="no", class="material-symbols" + extraClass)&attributes(attributes) #{icon}
+	
+mixin material-symbol-outlined(icon, extraClass = null)
+	- extraClass = extraClass ? ' ' + extraClass : ''
+	+material-symbol(icon, 'material-symbols-outlined' + extraClass)&attributes(attributes)
+
+mixin material-symbol-rounded(icon, extraClass = null)
+	- extraClass = extraClass ? ' ' + extraClass : ''
+	+material-symbol(icon, 'material-symbols-rounded' + extraClass)&attributes(attributes)
diff --git a/services/web/app/views/_mixins/notification.pug b/services/web/app/views/_mixins/notification.pug
index 3e336affdf..fb0db79630 100644
--- a/services/web/app/views/_mixins/notification.pug
+++ b/services/web/app/views/_mixins/notification.pug
@@ -1,14 +1,15 @@
 //- to be kept in sync with frontend/js/shared/components/notification.tsx
+include ./material_symbol
 
 mixin notificationIcon(type)
 	if type === 'info'
-		span.material-symbols(aria-hidden="true") info
+		+material-symbol("info")
 	else if type === 'success'
-		span.material-symbols(aria-hidden="true") check_circle
+		+material-symbol("check_circle")
 	else if type === 'error'
-		span.material-symbols(aria-hidden="true") error
+		+material-symbol("error")
 	else if type === 'warning'
-		span.material-symbols(aria-hidden="true") warning
+		+material-symbol("warning")
 
 
 mixin notification(options)
@@ -39,4 +40,4 @@ mixin notification(options)
 		//- if isDismissible
 		//- 	.notification-close-btn
 		//- 		button(aria-label=translate('close'))
-		//- 			span.material-symbols(aria-hidden="true") close
+		//- 			+material-symbol("close")
diff --git a/services/web/app/views/_mixins/previous_page_link.pug b/services/web/app/views/_mixins/previous_page_link.pug
index 5218c6a6aa..1b646a04d2 100644
--- a/services/web/app/views/_mixins/previous_page_link.pug
+++ b/services/web/app/views/_mixins/previous_page_link.pug
@@ -1,4 +1,6 @@
+include ./material_symbol
+
 mixin previous-page-link(href, text)
 	a.previous-page-link(href=href)
-		i.material-symbols.material-symbols-rounded(aria-hidden="true") arrow_left_alt
+		+material-symbol-rounded("arrow_left_alt")
 		| #{text}
diff --git a/services/web/app/views/beta_program/opt_in.pug b/services/web/app/views/beta_program/opt_in.pug
index 2bbc26cfa7..3122dc127f 100644
--- a/services/web/app/views/beta_program/opt_in.pug
+++ b/services/web/app/views/beta_program/opt_in.pug
@@ -1,75 +1,76 @@
 extends ../layout-marketing
 include ../_mixins/back_to_btns
 
-block vars
-	- bootstrap5PageStatus = 'disabled'
-
 block content
 	main.content.content-alt#main-content
 		.container.beta-opt-in-wrapper
 			.row
-				.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
+				.col-lg-10.offset-lg-1.col-xl-8.offset-xl-2
 					.card
-						.page-header
-							h1 
-								| #{translate("sharelatex_beta_program")}
-						.beta-opt-in
-							.container-fluid
-								.row
-									.col-md-12
-										if user.betaProgram
-											p.text-centered
-												strong #{translate("beta_program_already_participating")}.
-											p !{translate("thank_you_for_being_part_of_our_beta_program", {}, ['strong'])}.
-										else
-											p.text-centered
-												strong #{translate("beta_program_not_participating")}.
-											p !{translate("beta_program_benefits", {}, ['strong'])}
+						.card-body
+							.page-header
+								h1 
+									| #{translate("sharelatex_beta_program")}
+							.beta-opt-in
+								.container-fluid
+									.row
+										.col-lg-12
+											if user.betaProgram
+												p.text-center
+													strong #{translate("beta_program_already_participating")}.
+												p !{translate("thank_you_for_being_part_of_our_beta_program", {}, ['strong'])}.
+											else
+												p.text-center
+													strong #{translate("beta_program_not_participating")}.
+												p !{translate("beta_program_benefits", {}, ['strong'])}
 
-										p #[strong How it works:]
-										ul
-											li #{translate("beta_program_badge_description")}&nbsp;#[span(aria-label=translate("beta_feature_badge") role="img").beta-badge]
-											li !{translate("you_will_be_able_to_contact_us_any_time_to_share_your_feedback", {}, ['strong'])}.
-											li !{translate("we_may_also_contact_you_from_time_to_time_by_email_with_a_survey", {}, ['strong'])}.
-											li !{translate("you_can_opt_in_and_out_of_the_program_at_any_time_on_this_page", {}, ['strong'])}.
-										p !{translate("note_features_under_development", {}, ['strong'])}.
+											p #[strong How it works:]
+											ul
+												li
+													| #{translate("beta_program_badge_description")}&nbsp;
+													span.badge.bg-warning-light-bg.text-warning(aria-label=translate("beta_feature_badge"))
+														span.badge-content β
+												li !{translate("you_will_be_able_to_contact_us_any_time_to_share_your_feedback", {}, ['strong'])}.
+												li !{translate("we_may_also_contact_you_from_time_to_time_by_email_with_a_survey", {}, ['strong'])}.
+												li !{translate("you_can_opt_in_and_out_of_the_program_at_any_time_on_this_page", {}, ['strong'])}.
+											p !{translate("note_features_under_development", {}, ['strong'])}.
 
-								.row.text-centered
-									.col-md-12
-										if user.betaProgram
-											form(
-												data-ol-regular-form
-												method="post"
-												action="/beta/opt-out"
-												novalidate
-											)
-												input(type="hidden", name="_csrf", value=csrfToken)
-												.form-group
-													a(
-														href="https://forms.gle/CFEsmvZQTAwHCd3X9"
-														target="_blank"
-														rel="noopener noreferrer"
-													).btn.btn-primary.btn-lg #{translate("give_feedback")}
-												.form-group
-													button.btn.btn-secondary-info.btn-secondary.btn-sm(
-														type="submit"
-														data-ol-disabled-inflight
-													)
-														span(data-ol-inflight="idle") #{translate("beta_program_opt_out_action")}
-														span(hidden data-ol-inflight="pending") #{translate("processing")}…
-										else
-											form(
-												data-ol-regular-form
-												method="post",
-												action="/beta/opt-in"
-											)
-												input(type="hidden", name="_csrf", value=csrfToken)
-												.form-group
-													button.btn.btn-primary(
-														type="submit"
-														data-ol-disabled-inflight
-													)
-														span(data-ol-inflight="idle") #{translate("beta_program_opt_in_action")}
-														span(hidden data-ol-inflight="pending") #{translate("joining")}…
-							.page-separator
-							+back-to-btns()
+									.row.text-center
+										.col-lg-12
+											if user.betaProgram
+												form(
+													data-ol-regular-form
+													method="post"
+													action="/beta/opt-out"
+													novalidate
+												)
+													input(type="hidden", name="_csrf", value=csrfToken)
+													.form-group
+														a(
+															href="https://forms.gle/CFEsmvZQTAwHCd3X9"
+															target="_blank"
+															rel="noopener noreferrer"
+														).btn.btn-primary.btn-lg #{translate("give_feedback")}
+													.form-group
+														button.btn.btn-secondary-info.btn-secondary.btn-sm(
+															type="submit"
+															data-ol-disabled-inflight
+														)
+															span(data-ol-inflight="idle") #{translate("beta_program_opt_out_action")}
+															span(hidden data-ol-inflight="pending") #{translate("processing")}…
+											else
+												form(
+													data-ol-regular-form
+													method="post",
+													action="/beta/opt-in"
+												)
+													input(type="hidden", name="_csrf", value=csrfToken)
+													.form-group
+														button.btn.btn-primary(
+															type="submit"
+															data-ol-disabled-inflight
+														)
+															span(data-ol-inflight="idle") #{translate("beta_program_opt_in_action")}
+															span(hidden data-ol-inflight="pending") #{translate("joining")}…
+								.page-separator
+								+back-to-btns()
diff --git a/services/web/app/views/general/400.pug b/services/web/app/views/general/400.pug
index 9fc97823c5..fcc3007e6f 100644
--- a/services/web/app/views/general/400.pug
+++ b/services/web/app/views/general/400.pug
@@ -2,7 +2,6 @@ extends ../layout/layout-no-js
 
 block vars
 	- metadata = { title: 'Something went wrong' }
-	- bootstrap5PageStatus = 'disabled'
 
 block body
 	body.full-height
@@ -27,5 +26,4 @@ block body
 							| .
 						p.error-actions
 							a.error-btn(href="javascript:history.back()") Back
-							| &nbsp;
 							a.btn.btn-secondary(href="/") Home
diff --git a/services/web/app/views/general/404.pug b/services/web/app/views/general/404.pug
index f4b5800cf2..f76eac6997 100644
--- a/services/web/app/views/general/404.pug
+++ b/services/web/app/views/general/404.pug
@@ -1,8 +1,5 @@
 extends ../layout-marketing
 
-block vars
-	- bootstrap5PageStatus = 'disabled'
-
 block content
 	main.content.content-alt#main-content
 		.container
diff --git a/services/web/app/views/general/500.pug b/services/web/app/views/general/500.pug
index 90cb1e3606..41e7440e0d 100644
--- a/services/web/app/views/general/500.pug
+++ b/services/web/app/views/general/500.pug
@@ -2,7 +2,6 @@ extends ../layout/layout-no-js
 
 block vars
 	- metadata = { title: 'Something went wrong' }
-	- bootstrap5PageStatus = 'disabled'
 
 block body
 	body.full-height
diff --git a/services/web/app/views/general/closed.pug b/services/web/app/views/general/closed.pug
index f4012997bd..b3f8ea2c04 100644
--- a/services/web/app/views/general/closed.pug
+++ b/services/web/app/views/general/closed.pug
@@ -1,13 +1,10 @@
 extends ../layout-marketing
 
-block vars
-	- bootstrap5PageStatus = 'disabled'
-
 block content
 	main.content#main-content
 		.container
 			.row
-				.col-md-8.col-md-offset-2.text-center
+				.col-lg-8.offset-lg-2.text-center
 					.page-header
 						h1 Maintenance
 					p
diff --git a/services/web/app/views/general/post-gateway.pug b/services/web/app/views/general/post-gateway.pug
index dcc844171a..b17e61cb41 100644
--- a/services/web/app/views/general/post-gateway.pug
+++ b/services/web/app/views/general/post-gateway.pug
@@ -5,15 +5,15 @@ block vars
 	- var suppressFooter = true
 	- var suppressSkipToContent = true
 	- var suppressCookieBanner = true
-	- bootstrap5PageStatus = 'disabled'
 
 block content
 	.content.content-alt
 		.container
 			.row
-				.col-md-6.col-md-offset-3
+				.col-lg-6.offset-lg-3
 					.card
-						p.text-center #{translate('processing_your_request')}
+						.card-body
+							p.text-center #{translate('processing_your_request')}
 
 	form(
 		data-ol-regular-form
diff --git a/services/web/app/views/general/unsupported-browser.pug b/services/web/app/views/general/unsupported-browser.pug
index f8806cf8d2..a2c2216315 100644
--- a/services/web/app/views/general/unsupported-browser.pug
+++ b/services/web/app/views/general/unsupported-browser.pug
@@ -2,7 +2,6 @@ extends ../layout/layout-no-js
 
 block vars
 	- metadata = { title: 'Unsupported browser' }
-	- bootstrap5PageStatus = 'disabled'
 
 block body
 	body.full-height
diff --git a/services/web/app/views/layout-website-redesign-bootstrap-5.pug b/services/web/app/views/layout-website-redesign-bootstrap-5.pug
deleted file mode 100644
index e6dc3a8827..0000000000
--- a/services/web/app/views/layout-website-redesign-bootstrap-5.pug
+++ /dev/null
@@ -1,28 +0,0 @@
-extends ./layout-base
-
-include ./_mixins/formMessages
-include ./_mixins/bootstrap_js
-
-block entrypointVar
-	- entrypoint = 'marketing'
-	- isWebsiteRedesign = true
-
-block body
-	if (typeof(suppressNavbar) == "undefined")
-		include layout/navbar-marketing-bootstrap-5
-
-	block content
-
-	if (typeof(suppressFooter) == "undefined")
-		if showThinFooter
-			include layout/thin-footer-bootstrap-5
-		else
-			include layout/fat-footer-website-redesign
-
-	if (typeof(suppressCookieBanner) == 'undefined')
-		include _cookie_banner
-
-	!= moduleIncludes("contactModal-marketing-bootstrap-5", locals)
-
-block prepend foot-scripts
-	+bootstrap-js(5)
diff --git a/services/web/app/views/layout-website-redesign.pug b/services/web/app/views/layout-website-redesign.pug
index 37ba2f9f32..d04d4b1202 100644
--- a/services/web/app/views/layout-website-redesign.pug
+++ b/services/web/app/views/layout-website-redesign.pug
@@ -8,20 +8,32 @@ block entrypointVar
 
 block body
 	if (typeof(suppressNavbar) == "undefined")
-		include layout/navbar-website-redesign
+		if bootstrapVersion === 5
+			include layout/navbar-marketing-bootstrap-5
+		else
+			include layout/navbar-website-redesign
 
 	block content
 
+	//- bootstrapVersion needed here, because plans.pug uses both BS version
+	//- If the `plans-page-bs5` split test has been completed, remove bootstrapVersion logic
 	if (typeof(suppressFooter) == "undefined")
 		if showThinFooter
-			include layout/thin-footer
+			if bootstrapVersion === 5
+				include layout/thin-footer-bootstrap-5
+			else 
+				include layout/thin-footer
 		else
 			include layout/fat-footer-website-redesign
 
 	if (typeof(suppressCookieBanner) == 'undefined')
 		include _cookie_banner
 
-	!= moduleIncludes("contactModal-marketing", locals)
+	block contactModal
+		if bootstrapVersion === 5
+			!= moduleIncludes("contactModal-marketing-bootstrap-5", locals)
+		else
+			!= moduleIncludes("contactModal-marketing", locals)
 
 block prepend foot-scripts
 	+bootstrap-js(bootstrapVersion)
diff --git a/services/web/app/views/layout/language-picker-bootstrap-5.pug b/services/web/app/views/layout/language-picker-bootstrap-5.pug
index 47a9bc5d53..44997a8ca4 100644
--- a/services/web/app/views/layout/language-picker-bootstrap-5.pug
+++ b/services/web/app/views/layout/language-picker-bootstrap-5.pug
@@ -1,3 +1,5 @@
+include ../_mixins/material_symbol
+
 li.dropdown.dropup.subdued(dropdown).language-picker
 	button#language-picker-toggle.btn.btn-link.btn-inline-link(
 		dropdown-toggle,
@@ -9,7 +11,7 @@ li.dropdown.dropup.subdued(dropdown).language-picker
 		tooltip=translate('language')
 		title=translate('language')
 	)
-		span.material-symbols(aria-hidden="true") translate
+		+material-symbol("translate")
 		| &nbsp;
 		span.language-picker-text #{settings.translatedLanguages[currentLngCode]}
 
@@ -22,4 +24,4 @@ li.dropdown.dropup.subdued(dropdown).language-picker
 					a.menu-indent(href=subdomainDetails.url+currentUrlWithQueryParams, role="menuitem", class=isActive ? 'dropdown-item active' : 'dropdown-item', aria-selected=isActive ? 'true' : 'false')
 						| #{settings.translatedLanguages[subdomainDetails.lngCode]}
 						if subdomainDetails.lngCode === currentLngCode
-							span.material-symbols.dropdown-item-trailing-icon(aria-hidden="true") check
+							+material-symbol("check", "dropdown-item-trailing-icon")
diff --git a/services/web/app/views/layout/layout-no-js.pug b/services/web/app/views/layout/layout-no-js.pug
index c86721a810..b5bf3cc434 100644
--- a/services/web/app/views/layout/layout-no-js.pug
+++ b/services/web/app/views/layout/layout-no-js.pug
@@ -13,6 +13,6 @@ html(lang="en")
 		link(rel="icon", href="/favicon.ico")
 
 		if buildCssPath
-			link(rel="stylesheet", href=buildCssPath())
+			link(rel="stylesheet", href=buildCssPath('', 5))
 
 block body
diff --git a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
index 92e2d4301d..097ec05a3b 100644
--- a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
+++ b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
@@ -55,7 +55,6 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={
 								event-segmentation={"item": "admin", "location": "top-menu"}
 							)
 								| Admin
-								span.caret
 							+dropdown-menu.dropdown-menu-end
 								if canDisplayAdminMenu
 									+dropdown-menu-link-item()(href="/admin") Manage Site
@@ -97,7 +96,6 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={
 										event-segmentation={"item": item.trackingKey, "location": "top-menu"}
 									)
 										| !{translate(item.text)}
-										span.caret
 									+dropdown-menu.dropdown-menu-end
 										each child in item.dropdown
 											if child.divider
@@ -146,6 +144,18 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={
 									event-segmentation={ page: currentUrl, item: 'register', location: 'top-menu' }
 								) #{translate('sign_up')}
 
+						// templates link
+						if settings.templates
+							+nav-item
+								+nav-link(
+									href="/templates"
+									event-tracking="menu-click"
+									event-tracking-action="clicked"
+									event-tracking-trigger="click"
+									event-tracking-mb="true"
+									event-segmentation={ page: currentUrl, item: 'templates', location: 'top-menu' }
+								) #{translate('templates')}
+
 						// login link
 						+nav-item
 							+nav-link(
@@ -173,7 +183,6 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={
 								event-segmentation={"item": "account", "location": "top-menu"}
 							)
 								| #{translate('Account')}
-								span.caret
 							+dropdown-menu.dropdown-menu-end
 								+dropdown-menu-item
 									div.disabled.dropdown-item #{getSessionUser().email}
diff --git a/services/web/app/views/layout/navbar-marketing.pug b/services/web/app/views/layout/navbar-marketing.pug
index c5e9f2e0bf..c3b23c4853 100644
--- a/services/web/app/views/layout/navbar-marketing.pug
+++ b/services/web/app/views/layout/navbar-marketing.pug
@@ -140,6 +140,18 @@ nav.navbar.navbar-default.navbar-main(class={
 
 					// logged out
 					if !getSessionUser()
+						// templates link
+						if settings.templates
+							li
+								a(
+									href="/templates"
+									event-tracking="menu-click"
+									event-tracking-action="clicked"
+									event-tracking-trigger="click"
+									event-tracking-mb="true"
+									event-segmentation={ page: currentUrl, item: 'templates', location: 'top-menu' }
+								) #{translate('templates')}
+
 						// register link
 						if hasFeature('registration-page')
 							li.primary
diff --git a/services/web/app/views/project/editor/_meta.pug b/services/web/app/views/project/editor/_meta.pug
index e8539e1d76..4c49fc4cc7 100644
--- a/services/web/app/views/project/editor/_meta.pug
+++ b/services/web/app/views/project/editor/_meta.pug
@@ -12,7 +12,7 @@ meta(name="ol-isRestrictedTokenMember" data-type="boolean" content=isRestrictedT
 meta(name="ol-maxDocLength" data-type="json" content=maxDocLength)
 meta(name="ol-maxReconnectGracefullyIntervalMs" data-type="json" content=maxReconnectGracefullyIntervalMs)
 meta(name="ol-wikiEnabled" data-type="boolean" content=settings.proxyLearn)
-meta(name="ol-chatEnabled" data-type="boolean" content=chatEnabled)
+meta(name="ol-capabilities" data-type="json" content=capabilities)
 meta(name="ol-projectHistoryBlobsEnabled" data-type="boolean" content=projectHistoryBlobsEnabled)
 meta(name="ol-gitBridgePublicBaseUrl" content=gitBridgePublicBaseUrl)
 meta(name="ol-gitBridgeEnabled" data-type="boolean" content=gitBridgeEnabled)
@@ -43,6 +43,7 @@ meta(name="ol-shouldLoadHotjar" data-type="boolean" content=shouldLoadHotjar)
 meta(name="ol-odcRole" data-type="string" content=odcRole)
 meta(name="ol-isPaywallChangeCompileTimeoutEnabled" data-type="boolean" content=isPaywallChangeCompileTimeoutEnabled)
 meta(name='ol-customerIoEnabled' data-type="boolean" content=customerIoEnabled)
+meta(name='ol-compileSettings' data-type="json" content=compileSettings)
 if(isPaywallChangeCompileTimeoutEnabled)
 	//- expose plans info to show prices in paywall-change-compile-timeout test 
 	meta(name="ol-paywallPlans", data-type="json" content=paywallPlans)
diff --git a/services/web/app/views/project/editor/new_from_template.pug b/services/web/app/views/project/editor/new_from_template.pug
index f2945b20f1..6c1227beab 100644
--- a/services/web/app/views/project/editor/new_from_template.pug
+++ b/services/web/app/views/project/editor/new_from_template.pug
@@ -4,8 +4,6 @@ block vars
   - var suppressFooter = true
   - var suppressCookieBanner = true
   - var suppressSkipToContent = true
-  - bootstrap5PageStatus = 'enabled'
-  - bootstrap5PageSplitTest = 'core-pug-bs5'
 
 block content
   .editor.full-size
@@ -31,8 +29,10 @@ block content
     input(type="hidden" name="templateVersionId" value=templateVersionId)
     input(type="hidden" name="templateName" value=name)
     input(type="hidden" name="compiler" value=compiler)
-    input(type="hidden" name="imageName" value=imageName)
+    if imageName
+      input(type="hidden" name="imageName" value=imageName)
     input(type="hidden" name="mainFile" value=mainFile)
+    input(type="hidden" name="language" value=language)
     if brandVariationId
       input(type="hidden" name="brandVariationId" value=brandVariationId)
     input(hidden type="submit")
diff --git a/services/web/app/views/project/invite/not-valid.pug b/services/web/app/views/project/invite/not-valid.pug
index 693c162205..b4cbc1be1b 100644
--- a/services/web/app/views/project/invite/not-valid.pug
+++ b/services/web/app/views/project/invite/not-valid.pug
@@ -1,9 +1,5 @@
 extends ../../layout-marketing
 
-block vars
-	- bootstrap5PageStatus = 'enabled'
-	- bootstrap5PageSplitTest = 'core-pug-bs5'
-
 block content
 	main.content.content-alt#main-content
 		.container
diff --git a/services/web/app/views/project/invite/show.pug b/services/web/app/views/project/invite/show.pug
index 35926977e2..a18518c716 100644
--- a/services/web/app/views/project/invite/show.pug
+++ b/services/web/app/views/project/invite/show.pug
@@ -1,9 +1,5 @@
 extends ../../layout-marketing
 
-block vars
-	- bootstrap5PageStatus = 'enabled'
-	- bootstrap5PageSplitTest = 'core-pug-bs5'
-
 block content
 	main.content.content-alt#main-content
 		.container
diff --git a/services/web/app/views/project/list-react.pug b/services/web/app/views/project/list-react.pug
index be9233ecbb..60e7d0c0fc 100644
--- a/services/web/app/views/project/list-react.pug
+++ b/services/web/app/views/project/list-react.pug
@@ -34,7 +34,7 @@ block append meta
 	meta(name="ol-recommendedCurrency" data-type="string" content=recommendedCurrency)
 	meta(name="ol-showLATAMBanner" data-type="boolean" content=showLATAMBanner)
 	meta(name="ol-groupSubscriptionsPendingEnrollment" data-type="json" content=groupSubscriptionsPendingEnrollment)
-	meta(name="ol-hasIndividualRecurlySubscription" data-type="boolean" content=hasIndividualRecurlySubscription)
+	meta(name="ol-hasIndividualPaidSubscription" data-type="boolean" content=hasIndividualPaidSubscription)
 	meta(name="ol-groupSsoSetupSuccess" data-type="boolean" content=groupSsoSetupSuccess)
 	meta(name="ol-showUSGovBanner" data-type="boolean" content=showUSGovBanner)
 	meta(name="ol-usGovBannerVariant" data-type="string" content=usGovBannerVariant)
diff --git a/services/web/app/views/referal/bonus.pug b/services/web/app/views/referal/bonus.pug
index ecd5a7160a..b1b2ccde41 100644
--- a/services/web/app/views/referal/bonus.pug
+++ b/services/web/app/views/referal/bonus.pug
@@ -1,49 +1,47 @@
 extends ../layout-marketing
 
-block vars
-	- bootstrap5PageStatus = 'disabled'
-
 block content
 	.content.content-alt#main-content
-		.container.bonus
+		.container#bonus
 			.row
-				.col-md-8.col-md-offset-2
+				.col-lg-8.offset-lg-2
 					.card
-						.container-fluid
-							.row
-								.col-md-10.col-md-offset-1
-									if (refered_user_count > 0)
-										p.thanks The Overleaf Bonus Program has been discontinued, but you'll continue to have access to the features you already earned.
-									else
-										p.thanks The Overleaf Bonus Program has been discontinued.
-									p.thanks Please <a href="/contact">contact us</a> if you have any questions.
-									
-							if (refered_user_count > 0)
-								.row.ab-bonus
-									.col-md-10.col-md-offset-1.bonus-banner(style="position: relative; height: 30px; margin-top: 20px;")
-										- for (var i = 0; i <= 10; i++) {
-											if (refered_user_count == i)
-												.number(style="left: "+i+"0%").active #{i}
-											else
-												.number(style="left: "+i+"0%") #{i}
-										- }
-	
-								.row.ab-bonus
-									.col-md-10.col-md-offset-1.bonus-banner
-										.progress
-											.progress-bar.progress-bar-info(style="width: "+refered_user_count+"0%")
-	
-								.row.ab-bonus
-									.col-md-10.col-md-offset-1.bonus-banner(style="position: relative; height: 110px;")
-										.perk(style="left: 10%;", class = refered_user_count >= 1 ? "active" : "") #{translate("one_free_collab")}
-										.perk(style="left: 30%;", class = refered_user_count >= 3 ? "active" : "") #{translate("three_free_collab")}
-										.perk(style="left: 60%;", class = refered_user_count >= 6 ? "active" : "") #{translate("free_dropbox_and_history")} + #{translate("three_free_collab")}
-										.perk(style="left: 90%;", class = refered_user_count >= 9 ? "active" : "") #{translate("free_dropbox_and_history")} + #{translate("unlimited_collabs")}
-								.row &nbsp;
-	
-								.row.ab-bonus
-									.col-md-10.col-md-offset-1.bonus-banner.bonus-status
-										if (refered_user_count == 1)
-											p.thanks You’ve introduced <strong>1</strong> person to #{settings.appName}.
+						.card-body
+							.container-fluid
+								.row
+									.col-lg-10.offset-lg-1
+										if (refered_user_count > 0)
+											p.thanks The Overleaf Bonus Program has been discontinued, but you'll continue to have access to the features you already earned.
 										else
-											p.thanks You’ve introduced <strong>#{refered_user_count}</strong> people to #{settings.appName}.
+											p.thanks The Overleaf Bonus Program has been discontinued.
+										p.thanks Please <a href="/contact">contact us</a> if you have any questions.
+										
+								if (refered_user_count > 0)
+									.row.ab-bonus
+										.col-lg-10.offset-lg-1(style="position: relative; height: 30px; margin-top: 20px;")
+											- for (var i = 0; i <= 10; i++) {
+												if (refered_user_count == i)
+													.number(style="left: "+i+"0%").active #{i}
+												else
+													.number(style="left: "+i+"0%") #{i}
+											- }
+		
+									.row.ab-bonus
+										.col-lg-10.offset-lg-1
+											.progress
+												.progress-bar.progress-bar-info(style="width: "+refered_user_count+"0%")
+		
+									.row.ab-bonus
+										.col-lg-10.offset-lg-1(style="position: relative; height: 110px;")
+											.perk(style="left: 10%;", class = refered_user_count >= 1 ? "active" : "") #{translate("one_free_collab")}
+											.perk(style="left: 30%;", class = refered_user_count >= 3 ? "active" : "") #{translate("three_free_collab")}
+											.perk(style="left: 60%;", class = refered_user_count >= 6 ? "active" : "") #{translate("free_dropbox_and_history")} + #{translate("three_free_collab")}
+											.perk(style="left: 90%;", class = refered_user_count >= 9 ? "active" : "") #{translate("free_dropbox_and_history")} + #{translate("unlimited_collabs")}
+									.row &nbsp;
+
+									.row.ab-bonus
+										.col-lg-10.offset-lg-1.bonus-status
+											if (refered_user_count == 1)
+												p.thanks You’ve introduced <strong>1</strong> person to #{settings.appName}.
+											else
+												p.thanks You’ve introduced <strong>#{refered_user_count}</strong> people to #{settings.appName}.
diff --git a/services/web/app/views/subscriptions/dashboard-react.pug b/services/web/app/views/subscriptions/dashboard-react.pug
index d6a1bff49c..2b6251f2a3 100644
--- a/services/web/app/views/subscriptions/dashboard-react.pug
+++ b/services/web/app/views/subscriptions/dashboard-react.pug
@@ -27,6 +27,7 @@ block append meta
   meta(name="ol-user" data-type="json" content=user)
   if (personalSubscription && personalSubscription.payment)
     meta(name="ol-recurlyApiKey" content=settings.apis.recurly.publicKey)
+    meta(name="ol-stripeUKApiKey" content=settings.apis.stripeUK.publishableKey)
     meta(name="ol-recommendedCurrency" content=personalSubscription.payment.currency)
     meta(name="ol-groupPlans" data-type="json" content=groupPlans)
 
diff --git a/services/web/app/views/subscriptions/plans/_faq_new.pug b/services/web/app/views/subscriptions/plans/_faq_new.pug
index baefb6ed3f..3c926fb22d 100644
--- a/services/web/app/views/subscriptions/plans/_faq_new.pug
+++ b/services/web/app/views/subscriptions/plans/_faq_new.pug
@@ -1,5 +1,6 @@
 include ./_plans_faq_tabs
 include ../../_mixins/eyebrow
+include ../../_mixins/material_symbol
 
 - var managingYourSubscription = 'managingYourSubscription'
 - var overleafIndividualPlans = 'overleafIndividualPlans'
@@ -81,6 +82,10 @@ include ../../_mixins/eyebrow
 	.row
 		.col-xs-12.plans-faq-support
 			span #{translate('still_have_questions')}
-			button(data-ol-open-contact-form-modal="general")
+			button(
+				data-ol-open-contact-form-modal="general"
+				data-bs-toggle=bootstrapVersion === 5 ? "modal" : undefined
+				data-bs-target=bootstrapVersion === 5 ? "#contactUsModal" : undefined
+			)
 				span(style="margin-right: 4px") #{translate('contact_support')}
-				i.icon-md.material-symbols.material-symbols-rounded.material-symbols-arrow-right(aria-hidden="true") arrow_right_alt
+				+material-symbol-rounded("arrow_right_alt", "icon-md")
diff --git a/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug b/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
index f312ebeb46..a598f4774c 100644
--- a/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
+++ b/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
@@ -1,5 +1,6 @@
 //- If the `plans-page-bs5` split test has been completed, remove the `data-toggle` and `data-target` because it is not needed anymore (bs5 uses `data-bs-toggle` and `data-bs-target`)
-
+include ../../_mixins/material_symbol
+	
 mixin managingYourSubscription()
 	.ol-accordions-container
 		.custom-accordion-item
@@ -14,7 +15,7 @@ mixin managingYourSubscription()
 			)
 				| Can I change plans or cancel later?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="managingYourSubscriptionQ1")
 				.custom-accordion-body
 					span Yes, you can do this at any time by going to 
@@ -32,7 +33,7 @@ mixin managingYourSubscription()
 			)
 				| If I change or cancel my Overleaf plan, will I lose my projects?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="managingYourSubscriptionQ2")
 				.custom-accordion-body
 					| No. Changing or canceling your plan won’t affect your projects, the only change will be to the features available to you. You can see which features are available only on paid plans in the comparison table.
@@ -48,7 +49,7 @@ mixin managingYourSubscription()
 			)
 				| Can I pay by invoice or purchase order?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="managingYourSubscriptionQ3")
 				.custom-accordion-body
 					| This is possible when you’re purchasing a group subscription for five or more people, or a site license. For individual subscriptions, we can only accept payment online via credit card, debit card, or PayPal.
@@ -64,7 +65,7 @@ mixin managingYourSubscription()
 			)
 				| How do I view/update the credit card being charged for my subscription?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="managingYourSubscriptionQ4")
 				.custom-accordion-body
 					| You can view and update the card on file by going to Account > 
@@ -96,7 +97,7 @@ mixin overleafIndividualPlans()
 			)
 				| How does the free trial work?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="overleafIndividualPlansQ1")
 				.custom-accordion-body
 					span You get full access to your chosen plan during your 7-day free trial, and there’s no obligation to continue beyond the trial. Your card will be charged at the end of your trial unless you cancel before then. To cancel, go to 
@@ -124,7 +125,7 @@ mixin overleafIndividualPlans()
 			)
 				| What’s a collaborator on an Overleaf individual subscription?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="overleafIndividualPlansQ2")
 				.custom-accordion-body
 					| A collaborator is someone you invite to work with you on a project. So, for example, on our Standard plan you can have up to 10 people collaborating with you on any given project. 
@@ -141,7 +142,7 @@ mixin overleafIndividualPlans()
 			)
 				| The individual Standard plan has 10 project collaborators, does it mean that 10 people will be upgraded?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="overleafIndividualPlansQ3")
 				.custom-accordion-body
 					span No. Only the subscriber’s account will be upgraded. An individual Standard subscription allows you to invite 10 people per project to edit the project with you. Your collaborators can access features such as the full document history and extended compile time, but 
@@ -159,7 +160,7 @@ mixin overleafIndividualPlans()
 			)
 				| Do collaborators also have access to the editing and collaboration features I’ve paid for?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="overleafIndividualPlansQ4")
 				.custom-accordion-body
 					span If you have an Overleaf subscription, then your project collaborators will have access to features like real-time track changes and document history, but 
@@ -177,7 +178,7 @@ mixin overleafIndividualPlans()
 			)
 				| Can I purchase an individual plan on behalf of someone else?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="overleafIndividualPlansQ5")
 				.custom-accordion-body
 					| Individual subscriptions must be purchased by the account that will be the end user. If you want to purchase a plan for someone else, you’ll need to provide them with relevant payment details to enable them to make the purchase. 
@@ -193,7 +194,7 @@ mixin overleafIndividualPlans()
 			)
 				| Who is eligible for the Student plan?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="overleafIndividualPlansQ6")
 				.custom-accordion-body
 					| As the name suggests, the Student plan is only for students at educational institutions. This includes graduate students.
@@ -209,7 +210,7 @@ mixin overleafIndividualPlans()
 			)
 				| Can I transfer an individual subscription to someone else?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="overleafIndividualPlansQ7")
 				.custom-accordion-body
 					| No. Individual plans can’t be transferred. 
@@ -232,7 +233,7 @@ mixin overleafGroupPlans()
 			)
 				| What’s the difference between users and collaborators on an Overleaf group subscription?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="overleafGroupPlansQ1")
 				.custom-accordion-body
 					div On any of our group plans, the number of users refers to the number of people you can invite to join your group. All of these people will have access to the plan’s paid-for features across all their projects, such as real-time track changes and document history. 
@@ -249,7 +250,7 @@ mixin overleafGroupPlans()
 			)
 				| What is the benefit of purchasing an Overleaf Group plan?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="overleafGroupPlansQ2")
 				.custom-accordion-body
 					| Our Group subscriptions allow you to purchase access to our premium features for multiple people. They’re easy to manage, help save on paperwork, and allow groups of 5 or more to purchase via purchase order (PO). We also offer discounts on purchases of Group subscriptions for more than 20 users; just get in touch with our 
@@ -275,7 +276,7 @@ mixin overleafGroupPlans()
 			)
 				| Who is eligible for the educational discount?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="overleafGroupPlansQ3")
 				.custom-accordion-body
 					| The educational discount for group subscriptions is for students or faculty who are using Overleaf primarily for teaching. 
@@ -291,7 +292,7 @@ mixin overleafGroupPlans()
 			)
 				| How do I add more licenses to my group subscription, and what will it cost?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="overleafGroupPlansQ4")
 				.custom-accordion-body
 					div 
@@ -340,7 +341,7 @@ mixin overleafGroupPlans()
 			)
 				| How do I upgrade my plan from Group Standard to Group Professional?
 				span.custom-accordion-icon
-					i.material-symbols.material-symbols-outlined(aria-hidden="true") keyboard_arrow_down
+					+material-symbol-outlined("keyboard_arrow_down")
 			.collapse(id="overleafGroupPlansQ5")
 				.custom-accordion-body
 					| You can upgrade your plan from Group Standard to Group Professional on the 
diff --git a/services/web/app/views/subscriptions/team/invite-managed.pug b/services/web/app/views/subscriptions/team/invite-managed.pug
index f59b8b4937..d31f12656b 100644
--- a/services/web/app/views/subscriptions/team/invite-managed.pug
+++ b/services/web/app/views/subscriptions/team/invite-managed.pug
@@ -13,6 +13,7 @@ block append meta
 	meta(name="ol-groupSSOActive" data-type="boolean" content=groupSSOActive)
 	meta(name="ol-subscriptionId" data-type="string" content=subscriptionId)
 	meta(name="ol-user" data-type="json" content=user)
+	meta(name="ol-usersSubscription" data-type="json" content=usersSubscription)
 
 block content
 	main.content.content-alt.team-invite#invite-managed-root
diff --git a/services/web/app/views/subscriptions/team/invite.pug b/services/web/app/views/subscriptions/team/invite.pug
index dc1b509cbf..1b2ecb4646 100644
--- a/services/web/app/views/subscriptions/team/invite.pug
+++ b/services/web/app/views/subscriptions/team/invite.pug
@@ -4,7 +4,7 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/invite'
 
 block append meta
-	meta(name="ol-hasIndividualRecurlySubscription" data-type="boolean" content=hasIndividualRecurlySubscription)
+	meta(name="ol-hasIndividualPaidSubscription" data-type="boolean" content=hasIndividualPaidSubscription)
 	meta(name="ol-inviterName" data-type="string" content=inviterName)
 	meta(name="ol-inviteToken" data-type="string" content=inviteToken)
 	meta(name="ol-currentManagedUserAdminEmail" data-type="string" content=currentManagedUserAdminEmail)
diff --git a/services/web/app/views/subscriptions/team/invite_logged_out.pug b/services/web/app/views/subscriptions/team/invite_logged_out.pug
index d07fa5368c..e5930aba4f 100644
--- a/services/web/app/views/subscriptions/team/invite_logged_out.pug
+++ b/services/web/app/views/subscriptions/team/invite_logged_out.pug
@@ -1,4 +1,4 @@
-extends ../../layout-react
+extends ../../layout-marketing
 
 block append meta
 	meta(name="ol-user" data-type="json" content=user)
@@ -14,7 +14,7 @@ block content
 						.card-body
 							.page-header
 								// TODO: Remove `team-invite-name` once we fully migrated to Bootstrap 5
-								h1.text-centered !{translate("invited_to_group", {inviterName: inviterName, appName: appName }, [{name: 'span', attrs: {class: 'team-invite-name'}}])}
+								h1.text-center !{translate("invited_to_group", {inviterName: inviterName, appName: appName }, [{name: 'span', attrs: {class: 'team-invite-name'}}])}
 
 							if (accountExists)
 								div
diff --git a/services/web/app/views/template_gallery/template-gallery.pug b/services/web/app/views/template_gallery/template-gallery.pug
new file mode 100644
index 0000000000..3838d30606
--- /dev/null
+++ b/services/web/app/views/template_gallery/template-gallery.pug
@@ -0,0 +1,18 @@
+extends ../layout-react
+
+block entrypointVar
+	- entrypoint = 'pages/template-gallery'
+
+block vars
+block vars
+	- const suppressNavContentLinks = true
+	- const suppressNavbar = true
+	- const suppressFooter = true
+	- bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly'
+	- isWebsiteRedesign = false
+
+block append meta
+	meta(name="ol-templateCategory" data-type="string" content=category)
+
+block content
+	#template-gallery-root
diff --git a/services/web/app/views/template_gallery/template.pug b/services/web/app/views/template_gallery/template.pug
new file mode 100644
index 0000000000..e56fd8d2e5
--- /dev/null
+++ b/services/web/app/views/template_gallery/template.pug
@@ -0,0 +1,20 @@
+extends ../layout-react
+
+block entrypointVar
+	- entrypoint = 'pages/template'
+
+block vars
+	- const suppressNavContentLinks = true
+	- const suppressNavbar = true
+	- const suppressFooter = true
+	- bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly'
+	- isWebsiteRedesign = false
+
+block append meta
+	meta(name="ol-template" data-type="json" content=template)
+	meta(name="ol-languages" data-type="json" content=languages)
+	meta(name="ol-userIsAdmin" data-type="boolean" content=hasAdminAccess())
+
+block content
+	#template-root
+
diff --git a/services/web/app/views/user/accountSuspended.pug b/services/web/app/views/user/accountSuspended.pug
index da57f4d9ff..7231713416 100644
--- a/services/web/app/views/user/accountSuspended.pug
+++ b/services/web/app/views/user/accountSuspended.pug
@@ -4,12 +4,12 @@ block vars
 	- var suppressNavbar = true
 	- var suppressFooter = true
 	- metadata.robotsNoindexNofollow = true
-	- bootstrap5PageStatus = 'disabled'
 
 block content
 	main.content.content-alt#main-content
 		.container-custom-sm.mx-auto
 			.card
-				h3 #{translate('your_account_is_suspended')}
-				p #{translate('sorry_this_account_has_been_suspended')}
-				p !{translate('please_contact_us_if_you_think_this_is_in_error', {}, [{name: 'a', attrs: {href: `mailto:${settings.adminEmail}`}}])}
+				.card-body
+					h3 #{translate('your_account_is_suspended')}
+					p #{translate('sorry_this_account_has_been_suspended')}
+					p !{translate('please_contact_us_if_you_think_this_is_in_error', {}, [{name: 'a', attrs: {href: `mailto:${settings.adminEmail}`}}])}
diff --git a/services/web/app/views/user/confirm_email.pug b/services/web/app/views/user/confirm_email.pug
index 37c04880b1..13e911f386 100644
--- a/services/web/app/views/user/confirm_email.pug
+++ b/services/web/app/views/user/confirm_email.pug
@@ -1,60 +1,57 @@
 extends ../layout-marketing
-
-block vars
-	- bootstrap5PageStatus = 'disabled'
+include ../_mixins/notification
 
 block content
 	main.content.content-alt#main-content
 		.container
 			.row
-				.col-md-8.col-md-offset-2.col-lg-6.col-lg-offset-3
+				.col-lg-8.offset-lg-2.col-xl-6.offset-xl-3
 					.card
-						.page-header(data-ol-hide-on-error-message="confirm-email-wrong-user")
-							h1 #{translate("confirm_email")}
-						form(
-							method="POST"
-							action="/logout"
-							id="logoutForm"
-						)
-							input(type="hidden", name="_csrf", value=csrfToken)
-							input(type="hidden", name="redirect", value=currentUrlWithQueryParams)
-						form(
-							data-ol-async-form,
-							data-ol-auto-submit,
-							name="confirmEmailForm"
-							action="/user/emails/confirm",
-							method="POST",
-							id="confirmEmailForm",
-						)
-							input(type="hidden", name="_csrf", value=csrfToken)
-							input(type="hidden", name="token", value=token)
+						.card-body
+							.page-header(data-ol-hide-on-error-message="confirm-email-wrong-user")
+								h1 #{translate("confirm_email")}
+							form(
+								method="POST"
+								action="/logout"
+								id="logoutForm"
+							)
+								input(type="hidden", name="_csrf", value=csrfToken)
+								input(type="hidden", name="redirect", value=currentUrlWithQueryParams)
+							form(
+								data-ol-async-form,
+								data-ol-auto-submit,
+								name="confirmEmailForm"
+								action="/user/emails/confirm",
+								method="POST",
+								id="confirmEmailForm",
+							)
+								input(type="hidden", name="_csrf", value=csrfToken)
+								input(type="hidden", name="token", value=token)
+
+								div(data-ol-not-sent)
+									+formMessages()
+									div(data-ol-custom-form-message="confirm-email-wrong-user" hidden)
+										h1.h3 #{translate("we_cant_confirm_this_email")}
+										p !{translate("to_confirm_email_address_you_must_be_logged_in_with_the_requesting_account")}
+										p !{translate("you_are_currently_logged_in_as", {email: getUserEmail()})}
+										.actions
+											button.btn-primary.btn.w-100(
+												form="logoutForm"
+											) #{translate('log_in_with_a_different_account')}
 
-							div(data-ol-not-sent)
-								+formMessages()
-								div(data-ol-custom-form-message="confirm-email-wrong-user" hidden)
-									h1.h3 #{translate("we_cant_confirm_this_email")}
-									p !{translate("to_confirm_email_address_you_must_be_logged_in_with_the_requesting_account")}
-									p !{translate("you_are_currently_logged_in_as", {email: getUserEmail()})}
 									.actions
-										button.btn-primary.btn.btn-block(
-											form="logoutForm"
-										) #{translate('log_in_with_a_different_account')}
+										button.btn-primary.btn.w-100(
+											type='submit',
+											data-ol-disabled-inflight
+											data-ol-hide-on-error-message="confirm-email-wrong-user"
+										)
+											span(data-ol-inflight="idle")
+												| #{translate('confirm')}
+											span(hidden data-ol-inflight="pending")
+												span(role='status').spinner-border.spinner-border-sm.mx-2
 
-								.actions
-									button.btn-primary.btn.btn-block(
-										type='submit',
-										data-ol-disabled-inflight
-										data-ol-hide-on-error-message="confirm-email-wrong-user"
-									)
-										span(data-ol-inflight="idle")
-											| #{translate('confirm')}
-										span(hidden data-ol-inflight="pending")
-											i.fa.fa-fw.fa-spin.fa-spinner(aria-hidden="true")
-											| &nbsp;#{translate('confirming')}… 
-
-							div(hidden data-ol-sent)
-								.alert.alert-success
-									| #{translate('thank_you_email_confirmed')}
-								div.text-center
-									a.btn.btn-primary(href="/user/settings")
-										| #{translate('go_to_account_settings')}
+								div(hidden data-ol-sent)
+									+notification({ariaLive: 'polite', type: 'success', className: 'mb-3', content: translate("thank_you_email_confirmed")})
+									div.text-center
+										a.btn.btn-primary(href="/user/settings")
+											| #{translate('go_to_account_settings')}
diff --git a/services/web/app/views/user/email-preferences.pug b/services/web/app/views/user/email-preferences.pug
index 465ffede37..86ebc5f841 100644
--- a/services/web/app/views/user/email-preferences.pug
+++ b/services/web/app/views/user/email-preferences.pug
@@ -1,49 +1,47 @@
 extends ../layout-marketing
 include ../_mixins/back_to_btns
 
-block vars
-	- bootstrap5PageStatus = 'disabled'
-
 block content
 	main.content.content-alt#main-content
 		.container
 			.row
-				.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
+				.col-lg-10.offset-lg-1.col-xl-8.offset-xl-2
 					.card
-						.page-header
-							h1 #{translate("newsletter_info_title")}
-
-						p #{translate("newsletter_info_summary")}
-
-						- var submitAction
-						if subscribed
-							- submitAction = '/user/newsletter/unsubscribe'
-							p !{translate("newsletter_info_subscribed", {}, ['strong'])}
-						else
-							- submitAction = '/user/newsletter/subscribe'
-							p !{translate("newsletter_info_unsubscribed", {}, ['strong'])}
-
-						form(
-							data-ol-async-form
-							data-ol-reload-on-success
-							name="newsletterForm"
-							action=submitAction
-							method="POST"
-						)
-							input(name='_csrf', type='hidden', value=csrfToken)
-							+formMessages()
-							p.actions.text-center
-								if subscribed
-									button.btn-danger.btn(type='submit', data-ol-disabled-inflight)
-										span(data-ol-inflight="idle") #{translate("unsubscribe")}
-										span(hidden data-ol-inflight="pending") #{translate("saving")}…
-								else
-									button.btn-primary.btn(type='submit', data-ol-disabled-inflight)
-										span(data-ol-inflight="idle") #{translate("subscribe")}
-										span(hidden data-ol-inflight="pending") #{translate("saving")}…
-
-						if subscribed
-							p #{translate("newsletter_info_note")}
-
-						.page-separator
-						+back-to-btns()
+						.card-body
+							.page-header
+								h1 #{translate("newsletter_info_title")}
+	
+							p #{translate("newsletter_info_summary")}
+	
+							- var submitAction
+							if subscribed
+								- submitAction = '/user/newsletter/unsubscribe'
+								p !{translate("newsletter_info_subscribed", {}, ['strong'])}
+							else
+								- submitAction = '/user/newsletter/subscribe'
+								p !{translate("newsletter_info_unsubscribed", {}, ['strong'])}
+	
+							form(
+								data-ol-async-form
+								data-ol-reload-on-success
+								name="newsletterForm"
+								action=submitAction
+								method="POST"
+							)
+								input(name='_csrf', type='hidden', value=csrfToken)
+								+formMessages()
+								p.actions.text-center
+									if subscribed
+										button.btn-danger.btn(type='submit', data-ol-disabled-inflight)
+											span(data-ol-inflight="idle") #{translate("unsubscribe")}
+											span(hidden data-ol-inflight="pending") #{translate("saving")}…
+									else
+										button.btn-primary.btn(type='submit', data-ol-disabled-inflight)
+											span(data-ol-inflight="idle") #{translate("subscribe")}
+											span(hidden data-ol-inflight="pending") #{translate("saving")}…
+	
+							if subscribed
+								p #{translate("newsletter_info_note")}
+	
+							.page-separator
+							+back-to-btns()
diff --git a/services/web/app/views/user/one_time_login.pug b/services/web/app/views/user/one_time_login.pug
index 89e1491913..648f6d93c1 100644
--- a/services/web/app/views/user/one_time_login.pug
+++ b/services/web/app/views/user/one_time_login.pug
@@ -1,20 +1,18 @@
 extends ../layout-marketing
 
-block vars
-	- bootstrap5PageStatus = 'disabled'
-
 block content
 	main.content.content-alt#main-content
 		.container
 			.row
-				.col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4
+				.col-lg-6.offset-lg-3.col-xl-4.offset-xl-4
 					.card
-						.page-header
-							h1 We're back!
-						p Overleaf is now running normally.
-						p
-							| Please
-							|
-							a(href="/login") log in
-							|
-							| to continue working on your projects.
+						.card-body
+							.page-header
+								h1 We're back!
+							p Overleaf is now running normally.
+							p
+								| Please
+								|
+								a(href="/login") log in
+								|
+								| to continue working on your projects.
diff --git a/services/web/app/views/user/passwordReset-bs5.pug b/services/web/app/views/user/passwordReset-bs5.pug
index 7637a91062..08e0a71b9d 100644
--- a/services/web/app/views/user/passwordReset-bs5.pug
+++ b/services/web/app/views/user/passwordReset-bs5.pug
@@ -1,10 +1,11 @@
-extends ../layout-website-redesign-bootstrap-5
+extends ../layout-website-redesign
 include ../_mixins/recaptcha
 include ../_mixins/notification
 
 block vars
 	- var suppressNavbar = true
 	- var suppressFooter = true
+	- isWebsiteRedesign = true
 
 block content
 	- var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset)
diff --git a/services/web/app/views/user/passwordReset.pug b/services/web/app/views/user/passwordReset.pug
index 410e79fbb2..ed806c32cd 100644
--- a/services/web/app/views/user/passwordReset.pug
+++ b/services/web/app/views/user/passwordReset.pug
@@ -1,5 +1,6 @@
 extends ../layout-marketing
 include ../_mixins/recaptcha
+include ../_mixins/material_symbol
 
 block vars
 	- bootstrap5PageStatus = 'disabled'
@@ -48,7 +49,7 @@ block content
 						div(data-ol-custom-form-message="no-password-allowed-due-to-sso" hidden)
 							.notification.notification-type-error(aria-live="polite" style="margin-bottom: 10px;")
 								.notification-icon
-									span.material-symbols.material-symbols-rounded(aria-hidden="true") error
+									+material-symbol-rounded("error")
 								.notification-content-and-cta
 									.notification-content
 										p
diff --git a/services/web/app/views/user/primaryEmailCheck-bs5.pug b/services/web/app/views/user/primaryEmailCheck-bs5.pug
index 0828c06e4b..b25136927a 100644
--- a/services/web/app/views/user/primaryEmailCheck-bs5.pug
+++ b/services/web/app/views/user/primaryEmailCheck-bs5.pug
@@ -1,4 +1,8 @@
-extends ../layout-website-redesign-bootstrap-5
+extends ../layout-website-redesign
+
+block vars
+	- bootstrap5PageStatus = 'enabled'
+	- isWebsiteRedesign = true
 
 block content
 	main#main-content
diff --git a/services/web/app/views/user/reconfirm-bs5.pug b/services/web/app/views/user/reconfirm-bs5.pug
index 8d9d13955f..fce9a44295 100644
--- a/services/web/app/views/user/reconfirm-bs5.pug
+++ b/services/web/app/views/user/reconfirm-bs5.pug
@@ -1,69 +1,72 @@
-extends ../layout-website-redesign-bootstrap-5
+extends ../layout-website-redesign
 include ../_mixins/recaptcha
 
+block vars
+	- isWebsiteRedesign = true
+
 block content
-    - var email = reconfirm_email ? reconfirm_email : ""
-    - var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset)
+	- var email = reconfirm_email ? reconfirm_email : ""
+	- var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset)
 
-    if showCaptcha
-        script(type="text/javascript", nonce=scriptNonce, src="https://www.recaptcha.net/recaptcha/api.js?render=explicit")
-        div(
-            id="recaptcha"
-            class="g-recaptcha"
-            data-sitekey=settings.recaptcha.siteKey
-            data-size="invisible"
-            data-badge="inline"
-        )
+	if showCaptcha
+		script(type="text/javascript", nonce=scriptNonce, src="https://www.recaptcha.net/recaptcha/api.js?render=explicit")
+		div(
+			id="recaptcha"
+			class="g-recaptcha"
+			data-sitekey=settings.recaptcha.siteKey
+			data-size="invisible"
+			data-badge="inline"
+		)
 
-    main#main-content(data-ol-captcha-retry-trigger-area="")
-        .container.auth-aux-container(style="max-width: 420px;")
-            form(
-                data-ol-async-form
-                name="reconfirmAccountForm"
-                action="/user/reconfirm"
-                method="POST"
-                aria-label=translate('request_reconfirmation_email')
-                captcha=(showCaptcha ? '' : false)
-                captcha-action-name=(showCaptcha ? "passwordReset" : false)
-            )
-                h1.h5.mb-3 #{translate("reconfirm_account")}
-                p #{translate('reconfirm_explained')}
-                    | 
-                    a(href=`mailto:${settings.adminEmail}`) #{settings.adminEmail}
-                    | .
-                
-                div(data-ol-not-sent)
-                    +formMessagesNewStyle()
+	main#main-content(data-ol-captcha-retry-trigger-area="")
+		.container.auth-aux-container(style="max-width: 420px;")
+			form(
+				data-ol-async-form
+				name="reconfirmAccountForm"
+				action="/user/reconfirm"
+				method="POST"
+				aria-label=translate('request_reconfirmation_email')
+				captcha=(showCaptcha ? '' : false)
+				captcha-action-name=(showCaptcha ? "passwordReset" : false)
+			)
+				h1.h5.mb-3 #{translate("reconfirm_account")}
+				p #{translate('reconfirm_explained')}
+					| 
+					a(href=`mailto:${settings.adminEmail}`) #{settings.adminEmail}
+					| .
+				
+				div(data-ol-not-sent)
+					+formMessagesNewStyle()
 
-                    input(type="hidden" name="_csrf" value=csrfToken)
-                    .form-group.mb-3
-                        label.form-label(for='email') #{translate("please_enter_email")}
-                        input.form-control(
-                            aria-label="email"
-                            type='email'
-                            name='email'
-                            placeholder='email@example.com'
-                            required
-                            autofocus
-                            value=email
-                        )
-                    .actions
-                        button.btn.btn-primary.w-100(
-                            style="white-space: normal;"
-                            type='submit'
-                            data-ol-disabled-inflight
-                            aria-label=translate('request_password_reset_to_reconfirm')
-                        )
-                            span(data-ol-inflight="idle")
-                                | #{translate('request_password_reset_to_reconfirm')}
-                            span(hidden data-ol-inflight="pending")
-                                | #{translate('request_password_reset_to_reconfirm')}… 
-                div(hidden data-ol-sent)
-                    div.alert.alert-success(
-                        role="alert"
-                        aria-live="polite"
-                    )
-                        span #{translate('password_reset_email_sent')}
+					input(type="hidden" name="_csrf" value=csrfToken)
+					.form-group.mb-3
+						label.form-label(for='email') #{translate("please_enter_email")}
+						input.form-control(
+							aria-label="email"
+							type='email'
+							name='email'
+							placeholder='email@example.com'
+							required
+							autofocus
+							value=email
+						)
+					.actions
+						button.btn.btn-primary.w-100(
+							style="white-space: normal;"
+							type='submit'
+							data-ol-disabled-inflight
+							aria-label=translate('request_password_reset_to_reconfirm')
+						)
+							span(data-ol-inflight="idle")
+								| #{translate('request_password_reset_to_reconfirm')}
+							span(hidden data-ol-inflight="pending")
+								| #{translate('request_password_reset_to_reconfirm')}… 
+				div(hidden data-ol-sent)
+					div.alert.alert-success(
+						role="alert"
+						aria-live="polite"
+					)
+						span #{translate('password_reset_email_sent')}
 
-            if showCaptcha
-                +recaptchaConditions
+			if showCaptcha
+				+recaptchaConditions
diff --git a/services/web/app/views/user/reconfirm.pug b/services/web/app/views/user/reconfirm.pug
index 7c17423d5a..23b77d278d 100644
--- a/services/web/app/views/user/reconfirm.pug
+++ b/services/web/app/views/user/reconfirm.pug
@@ -23,7 +23,7 @@ block content
 			.row
 				.col-sm-12.col-md-6.col-md-offset-3
 					.card
-						h1.card-header #{translate("reconfirm")} #{translate("Account")}
+						h1.card-header #{translate("reconfirm_account")}
 						p #{translate('reconfirm_explained')}&nbsp;
 							a(href=`mailto:${settings.adminEmail}`) #{settings.adminEmail}
 							| .
diff --git a/services/web/app/views/user/restricted.pug b/services/web/app/views/user/restricted.pug
index eba1d2ab05..0140064a99 100644
--- a/services/web/app/views/user/restricted.pug
+++ b/services/web/app/views/user/restricted.pug
@@ -1,4 +1,5 @@
 extends ../layout-marketing
+include ../_mixins/material_symbol
 
 block content
 	main.content#main-content
@@ -6,8 +7,8 @@ block content
 			.row
 				.col-md-8.offset-md-2.text-center
 					.page-header
-						h2 #{translate("restricted_no_permission")}
+						h1 #{translate("restricted_no_permission")}
 					p
-						span.inline-material-symbols
-							a(href="/").material-symbols(aria-hidden="true") arrow_left_alt
-							a(href="/") #{translate("take_me_home")}
+						a.inline-material-symbols(href="/")
+							+material-symbol("arrow_left_alt")
+							| #{translate("take_me_home")}
diff --git a/services/web/app/views/user/sessions.pug b/services/web/app/views/user/sessions.pug
index 187c1dae75..ffd65a3548 100644
--- a/services/web/app/views/user/sessions.pug
+++ b/services/web/app/views/user/sessions.pug
@@ -1,72 +1,70 @@
 extends ../layout-marketing
 
-block vars
-	- bootstrap5PageStatus = 'disabled'
-
 block content
 	main.content.content-alt#main-content
 		.container
 			.row
-				.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
+				.col-lg-10.offset-lg-1.col-xl-8.offset-xl-2
 					.card.clear-user-sessions
-						.page-header
-							h1  #{translate("your_sessions")}
-
-						if currentSession.ip_address && currentSession.session_created
-							h3 #{translate("current_session")}
-							div
-								table.table.table-striped
-									thead
-										tr
-											th #{translate("ip_address")}
-											th #{translate("session_created_at")}
-										tr
-											td #{currentSession.ip_address}
-											td #{moment(currentSession.session_created).utc().format('Do MMM YYYY, h:mm a')} UTC
-
-						h3 #{translate("other_sessions")}
-						div
-							p.small
-								| !{translate("clear_sessions_description")}
-
-						form(
-							data-ol-async-form
-							action='/user/sessions/clear'
-							method='POST'
-						)
-							input(name='_csrf' type='hidden' value=csrfToken)
-							div(data-ol-not-sent)
-								if sessions.length == 0
-									p.text-center
-										| #{translate("no_other_sessions")}
-
-								if sessions.length > 0
+						.card-body
+							.page-header
+								h1  #{translate("your_sessions")}
+	
+							if currentSession.ip_address && currentSession.session_created
+								h3 #{translate("current_session")}
+								div
 									table.table.table-striped
 										thead
 											tr
 												th #{translate("ip_address")}
 												th #{translate("session_created_at")}
-										for session in sessions
 											tr
-												td #{session.ip_address}
-												td #{moment(session.session_created).utc().format('Do MMM YYYY, h:mm a')} UTC
-
-									p.actions
-										.text-center
-											button.btn.btn-lg.btn-primary(
-												type="submit"
-												data-ol-disable-inflight
-											)
-												span(data-ol-inflight="idle") #{translate('clear_sessions')}
-												span(hidden data-ol-inflight="pending") #{translate("processing")}…
-
-							div(hidden data-ol-sent)
-								p.text-center
-									| #{translate("no_other_sessions")}
-
-								p.text-success.text-center
-									| #{translate('clear_sessions_success')}
-						.page-separator
-						a.btn.btn-secondary(href='/user/settings') #{translate('back_to_account_settings')}
-						| 
-						a.btn.btn-secondary(href='/project') #{translate('back_to_your_projects')}
+												td #{currentSession.ip_address}
+												td #{moment(currentSession.session_created).utc().format('Do MMM YYYY, h:mm a')} UTC
+	
+							h3 #{translate("other_sessions")}
+							div
+								p.small
+									| !{translate("clear_sessions_description")}
+	
+							form(
+								data-ol-async-form
+								action='/user/sessions/clear'
+								method='POST'
+							)
+								input(name='_csrf' type='hidden' value=csrfToken)
+								div(data-ol-not-sent)
+									if sessions.length == 0
+										p.text-center
+											| #{translate("no_other_sessions")}
+	
+									if sessions.length > 0
+										table.table.table-striped
+											thead
+												tr
+													th #{translate("ip_address")}
+													th #{translate("session_created_at")}
+											for session in sessions
+												tr
+													td #{session.ip_address}
+													td #{moment(session.session_created).utc().format('Do MMM YYYY, h:mm a')} UTC
+	
+										p.actions
+											.text-center
+												button.btn.btn-lg.btn-primary(
+													type="submit"
+													data-ol-disable-inflight
+												)
+													span(data-ol-inflight="idle") #{translate('clear_sessions')}
+													span(hidden data-ol-inflight="pending") #{translate("processing")}…
+	
+								div(hidden data-ol-sent)
+									p.text-center
+										| #{translate("no_other_sessions")}
+	
+									p.text-success.text-center
+										| #{translate('clear_sessions_success')}
+							.page-separator
+							.d-flex.gap-3
+								a.btn.btn-secondary(href='/user/settings') #{translate('back_to_account_settings')}
+								a.btn.btn-secondary(href='/project') #{translate('back_to_your_projects')}
diff --git a/services/web/app/views/user/setPassword-bs5.pug b/services/web/app/views/user/setPassword-bs5.pug
index 007ae5e87c..83c3a531bb 100644
--- a/services/web/app/views/user/setPassword-bs5.pug
+++ b/services/web/app/views/user/setPassword-bs5.pug
@@ -1,90 +1,91 @@
-extends ../layout-website-redesign-bootstrap-5
+extends ../layout-website-redesign
 
 block vars
-    - var suppressNavbar = true
-    - var suppressFooter = true
+	- var suppressNavbar = true
+	- var suppressFooter = true
+	- isWebsiteRedesign = true
 
 block content
-    main#main-content
-        a.auth-aux-logo(href="/")
-            img(src=buildImgPath("ol-brand/overleaf-o-dark.svg") alt=settings.appName)
-        .auth-aux-container
-            form(
-                data-ol-async-form
-                name="passwordResetForm"
-                action="/user/password/set"
-                method="POST"
-                data-ol-hide-on-error="token-expired"
-            )
-                div(
-                    hidden
-                    data-ol-sent
-                )
-                    h1.h3.mb-3.mt-0 #{translate("password_updated")}
-                    p.mb-4 #{translate("your_password_has_been_successfully_changed")}.
-                    a.btn.btn-primary.w-100(href='/login') #{translate("log_in_now")}
+	main#main-content
+		a.auth-aux-logo(href="/")
+			img(src=buildImgPath("ol-brand/overleaf-o-dark.svg") alt=settings.appName)
+		.auth-aux-container
+			form(
+				data-ol-async-form
+				name="passwordResetForm"
+				action="/user/password/set"
+				method="POST"
+				data-ol-hide-on-error="token-expired"
+			)
+				div(
+					hidden
+					data-ol-sent
+				)
+					h1.h3.mb-3.mt-0 #{translate("password_updated")}
+					p.mb-4 #{translate("your_password_has_been_successfully_changed")}.
+					a.btn.btn-primary.w-100(href='/login') #{translate("log_in_now")}
 
-                div(data-ol-not-sent)
-                    h1.h3.mb-3.mt-0 #{translate("reset_your_password")}
-                    p(data-ol-hide-on-error-message="token-expired") #{translate("create_a_new_password_for_your_account")}.
-                    +formMessagesNewStyle()
+				div(data-ol-not-sent)
+					h1.h3.mb-3.mt-0 #{translate("reset_your_password")}
+					p(data-ol-hide-on-error-message="token-expired") #{translate("create_a_new_password_for_your_account")}.
+					+formMessagesNewStyle()
 
-                    +customFormMessageNewStyle('password-contains-email', 'danger')
-                        | #{translate('invalid_password_contains_email')}.
-                        | #{translate('use_a_different_password')}.
+					+customFormMessageNewStyle('password-contains-email', 'danger')
+						| #{translate('invalid_password_contains_email')}.
+						| #{translate('use_a_different_password')}.
 
-                    +customFormMessageNewStyle('password-too-similar', 'danger')
-                        | #{translate('invalid_password_too_similar')}.
-                        | #{translate('use_a_different_password')}.
+					+customFormMessageNewStyle('password-too-similar', 'danger')
+						| #{translate('invalid_password_too_similar')}.
+						| #{translate('use_a_different_password')}.
 
-                    +customFormMessageNewStyle('token-expired', 'danger')
-                        | #{translate('password_reset_token_expired')}
-                        br
-                        a(href="/user/password/reset")
-                            | #{translate('request_new_password_reset_email')}
+					+customFormMessageNewStyle('token-expired', 'danger')
+						| #{translate('password_reset_token_expired')}
+						br
+						a(href="/user/password/reset")
+							| #{translate('request_new_password_reset_email')}
 
-                    input(type="hidden" name="_csrf" value=csrfToken)
-                    input(type="text" hidden name="email" autocomplete="username" value=email)
+					input(type="hidden" name="_csrf" value=csrfToken)
+					input(type="text" hidden name="email" autocomplete="username" value=email)
 
-                    .form-group.mb-3
-                        label.form-label(for='passwordField', data-ol-hide-on-error-message="token-expired") #{translate("new_password")}
-                        input.form-control.auth-aux-new-password#passwordField(
-                            type='password'
-                            name='password'
-                            autocomplete="new-password"
-                            autofocus
-                            required
-                            minlength=settings.passwordStrengthOptions.length.min
-                        )
+					.form-group.mb-3
+						label.form-label(for='passwordField', data-ol-hide-on-error-message="token-expired") #{translate("new_password")}
+						input.form-control.auth-aux-new-password#passwordField(
+							type='password'
+							name='password'
+							autocomplete="new-password"
+							autofocus
+							required
+							minlength=settings.passwordStrengthOptions.length.min
+						)
 
-                        +customValidationMessageNewStyle('invalid-password')
-                            | #{translate('invalid_password')}.
+						+customValidationMessageNewStyle('invalid-password')
+							| #{translate('invalid_password')}.
 
-                        +customValidationMessageNewStyle('password-must-be-different')
-                            | #{translate('password_cant_be_the_same_as_current_one')}.
+						+customValidationMessageNewStyle('password-must-be-different')
+							| #{translate('password_cant_be_the_same_as_current_one')}.
 
-                        +customValidationMessageNewStyle('password-must-be-strong')
-                            | !{translate('password_was_detected_on_a_public_list_of_known_compromised_passwords', {}, [{name: 'a', attrs: {href: 'https://haveibeenpwned.com/passwords', rel: 'noopener noreferrer', target: '_blank'}}])}.
-                            | #{translate('use_a_different_password')}.
+						+customValidationMessageNewStyle('password-must-be-strong')
+							| !{translate('password_was_detected_on_a_public_list_of_known_compromised_passwords', {}, [{name: 'a', attrs: {href: 'https://haveibeenpwned.com/passwords', rel: 'noopener noreferrer', target: '_blank'}}])}.
+							| #{translate('use_a_different_password')}.
 
-                        input(
-                            type="hidden"
-                            name="passwordResetToken"
-                            value=passwordResetToken
-                        )
-                    div(data-ol-hide-on-error-message="token-expired")
-                        div #{translate('in_order_to_have_a_secure_account_make_sure_your_password')}
-                        ul.mb-3.ps-4
-                            li #{translate('is_longer_than_n_characters', {n: settings.passwordStrengthOptions.length.min})}
-                            li #{translate('does_not_contain_or_significantly_match_your_email')}
-                            li #{translate('is_not_used_on_any_other_website')}
-                    .actions
-                        button.btn.btn-primary.w-100(
-                            type='submit'
-                            data-ol-disabled-inflight
-                            aria-label=translate('set_new_password')
-                        ) 
-                            span(data-ol-inflight="idle")
-                                | #{translate('set_new_password')}
-                            span(hidden data-ol-inflight="pending")
-                                | #{translate('set_new_password')}…
+						input(
+							type="hidden"
+							name="passwordResetToken"
+							value=passwordResetToken
+						)
+					div(data-ol-hide-on-error-message="token-expired")
+						div #{translate('in_order_to_have_a_secure_account_make_sure_your_password')}
+						ul.mb-3.ps-4
+							li #{translate('is_longer_than_n_characters', {n: settings.passwordStrengthOptions.length.min})}
+							li #{translate('does_not_contain_or_significantly_match_your_email')}
+							li #{translate('is_not_used_on_any_other_website')}
+					.actions
+						button.btn.btn-primary.w-100(
+							type='submit'
+							data-ol-disabled-inflight
+							aria-label=translate('set_new_password')
+						) 
+							span(data-ol-inflight="idle")
+								| #{translate('set_new_password')}
+							span(hidden data-ol-inflight="pending")
+								| #{translate('set_new_password')}…
diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug
index 4f939a41ca..4ac35bef71 100644
--- a/services/web/app/views/user/settings.pug
+++ b/services/web/app/views/user/settings.pug
@@ -32,6 +32,7 @@ block append meta
 	meta(name="ol-gitBridgeEnabled" data-type="boolean" content=gitBridgeEnabled)
 	meta(name="ol-isSaas" data-type="boolean" content=isSaas)
 	meta(name="ol-memberOfSSOEnabledGroups" data-type="json" content=memberOfSSOEnabledGroups)
+	meta(name="ol-capabilities" data-type="json" content=capabilities)
 
 block content
 	main.content.content-alt#main-content
diff --git a/services/web/app/views/user_membership/group-members-react.pug b/services/web/app/views/user_membership/group-members-react.pug
index 5e8971172d..05327c4b6d 100644
--- a/services/web/app/views/user_membership/group-members-react.pug
+++ b/services/web/app/views/user_membership/group-members-react.pug
@@ -10,6 +10,7 @@ block append meta
 	meta(name="ol-groupName", data-type="string", content=name)
 	meta(name="ol-groupSize", data-type="json", content=groupSize)
 	meta(name="ol-managedUsersActive", data-type="boolean", content=managedUsersActive)
+	meta(name="ol-isUserGroupManager", data-type="boolean", content=isUserGroupManager)
 	meta(name="ol-groupSSOActive", data-type="boolean", content=groupSSOActive)
 	meta(name="ol-canUseFlexibleLicensing", data-type="boolean", content=canUseFlexibleLicensing)
 	meta(name="ol-canUseAddSeatsFeature", data-type="boolean", content=canUseAddSeatsFeature)
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index a7ff970ef0..8d90a7ef73 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -893,6 +893,7 @@ module.exports = {
           'figcaption',
           'span',
           'source',
+          'track',
           'video',
           'del',
         ],
@@ -918,7 +919,7 @@ module.exports = {
           col: ['width'],
           figure: ['class', 'id', 'style'],
           figcaption: ['class', 'id', 'style'],
-          i: ['aria-hidden', 'aria-label', 'class', 'id'],
+          i: ['aria-hidden', 'aria-label', 'class', 'id', 'translate'],
           iframe: [
             'allowfullscreen',
             'frameborder',
@@ -943,6 +944,7 @@ module.exports = {
             'style',
           ],
           tr: ['class'],
+          track: ['src', 'kind', 'srcLang', 'label'],
           video: ['alt', 'class', 'controls', 'height', 'width'],
         },
       },
@@ -966,6 +968,7 @@ module.exports = {
     editorToolbarButtons: [],
     sourceEditorExtensions: [],
     sourceEditorComponents: [],
+    pdfLogEntryHeaderActionComponents: [],
     pdfLogEntryComponents: [],
     pdfLogEntriesComponents: [],
     pdfPreviewPromotions: [],
@@ -981,7 +984,7 @@ module.exports = {
     importProjectFromGithubModalWrapper: [],
     importProjectFromGithubMenu: [],
     editorLeftMenuSync: [],
-    editorLeftMenuManageTemplate: [],
+    editorLeftMenuManageTemplate: ['@/features/editor-left-menu/components/actions-manage-template'],
     oauth2Server: [],
     managedGroupSubscriptionEnrollmentNotification: [],
     managedGroupEnrollmentInvite: [],
@@ -996,8 +999,10 @@ module.exports = {
     toastGenerators: [],
     editorSidebarComponents: [],
     fileTreeToolbarComponents: [],
+    fullProjectSearchPanel: [],
     integrationPanelComponents: [],
     referenceSearchSetting: [],
+    errorLogsComponents: [],
   },
 
   moduleImportSequence: [
@@ -1005,6 +1010,7 @@ module.exports = {
     'launchpad',
     'server-ce-scripts',
     'user-activate',
+    'template-gallery',
   ],
   viewIncludes: {},
 
diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml
index 5cffe19810..33b5a3ca2e 100644
--- a/services/web/docker-compose.ci.yml
+++ b/services/web/docker-compose.ci.yml
@@ -13,6 +13,9 @@ services:
     logging:
       driver: local
     user: node
+    volumes:
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run test:unit:app
     working_dir: /overleaf/services/web
     env_file: docker-compose.common.env
@@ -39,6 +42,9 @@ services:
       OVERLEAF_CONFIG:
     extra_hosts:
       - 'www.overleaf.test:127.0.0.1'
+    volumes:
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run test:acceptance:app
     user: root
     depends_on:
@@ -86,7 +92,7 @@ services:
     user: root
 
   redis:
-    image: redis
+    image: redis:7.4.3
 
   mongo:
     image: mongo:7.0.20
diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml
index 5314e94ed3..10e0a7842c 100644
--- a/services/web/docker-compose.yml
+++ b/services/web/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       - .:/overleaf/services/web
       - ../../node_modules:/overleaf/node_modules
       - ../../libraries:/overleaf/libraries
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     working_dir: /overleaf/services/web
     env_file: docker-compose.common.env
     environment:
@@ -20,6 +21,7 @@ services:
       LOG_LEVEL: ${LOG_LEVEL:-}
       NODE_ENV: test
       NODE_OPTIONS: "--unhandled-rejections=strict"
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run --silent test:unit:app
     user: node
     depends_on:
@@ -31,6 +33,7 @@ services:
       - .:/overleaf/services/web
       - ../../node_modules:/overleaf/node_modules
       - ../../libraries:/overleaf/libraries
+      - ../../bin/shared/wait_for_it:/overleaf/bin/shared/wait_for_it
     user: node
     working_dir: /overleaf/services/web
     env_file: docker-compose.common.env
@@ -50,6 +53,7 @@ services:
       - mongo
       - saml
       - ldap
+    entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=0 --
     command: npm run --silent test:acceptance:app
 
   test_frontend:
@@ -84,7 +88,7 @@ services:
       - "cypress:run-ct"
 
   redis:
-    image: redis
+    image: redis:7.4.3
 
   mongo:
     image: mongo:7.0.20
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 9862e47817..bb12ae0e8f 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -1,7 +1,9 @@
 {
-  "12x_more_compile_time": "",
+  "0_free_suggestions": "",
   "1_2_width": "",
   "1_4_width": "",
+  "1_free_suggestion": "",
+  "24x_more_compile_time": "",
   "3_4_width": "",
   "About": "",
   "Account": "",
@@ -23,12 +25,14 @@
   "about_to_delete_cert": "",
   "about_to_delete_projects": "",
   "about_to_delete_tag": "",
+  "about_to_delete_template": "",
   "about_to_delete_the_following_project": "",
   "about_to_delete_the_following_projects": "",
   "about_to_delete_user_preamble": "",
   "about_to_enable_managed_users": "",
   "about_to_leave_project": "",
   "about_to_leave_projects": "",
+  "about_to_remove_user_preamble": "",
   "about_to_trash_projects": "",
   "abstract": "",
   "accept_and_continue": "",
@@ -106,6 +110,7 @@
   "agree_with_the_terms": "",
   "ai_assist_in_overleaf_is_included_via_writefull_groups": "",
   "ai_assist_in_overleaf_is_included_via_writefull_individual": "",
+  "ai_assist_unavailable_due_to_subscription_type": "",
   "ai_assistance_to_help_you": "",
   "ai_based_language_tools": "",
   "ai_can_make_mistakes": "",
@@ -124,12 +129,14 @@
   "all_premium_features_including": "",
   "all_projects": "",
   "all_projects_will_be_transferred_immediately": "",
+  "all_templates": "",
   "all_these_experiments_are_available_exclusively": "",
   "allows_to_search_by_author_title_etc_possible_to_pull_results_directly_from_your_reference_manager_if_connected": "",
   "already_have_a_papers_account": "",
   "an_email_has_already_been_sent_to": "",
   "an_error_occured_while_restoring_project": "",
   "an_error_occurred_when_verifying_the_coupon_code": "",
+  "and_upgrade_for_compile_time": "",
   "annual_discount": "",
   "anonymous": "",
   "anyone_with_link_can_edit": "",
@@ -154,6 +161,7 @@
   "ask_repo_owner_to_reconnect": "",
   "ask_repo_owner_to_renew_overleaf_subscription": "",
   "at_most_x_libraries_can_be_selected": "",
+  "author": "",
   "auto_close_brackets": "",
   "auto_compile": "",
   "auto_complete": "",
@@ -186,6 +194,7 @@
   "blog": "",
   "bold": "",
   "booktabs": "",
+  "breadcrumbs": "",
   "browser": "",
   "bullet_list": "",
   "buy_licenses": "",
@@ -197,6 +206,8 @@
   "can_view_content": "",
   "cancel": "",
   "cancel_add_on": "",
+  "cancel_any_existing_subscriptions": "",
+  "cancel_any_existing_subscriptions_and_leave_any_group_subscriptions": "",
   "cancel_anytime": "",
   "cancel_my_account": "",
   "cancel_my_subscription": "",
@@ -215,6 +226,8 @@
   "card_must_be_authenticated_by_3dsecure": "",
   "card_payment": "",
   "careers": "",
+  "categories": "",
+  "category": "",
   "category_arrows": "",
   "category_greek": "",
   "category_misc": "",
@@ -286,6 +299,8 @@
   "compile_error_entry_description": "",
   "compile_error_handling": "",
   "compile_larger_projects": "",
+  "compile_limit_reached": "",
+  "compile_limit_upgrade_prompt": "",
   "compile_mode": "",
   "compile_terminated_by_user": "",
   "compiler": "",
@@ -304,6 +319,7 @@
   "confirm_reject_selected_changes": "",
   "confirm_reject_selected_changes_plural": "",
   "confirm_remove_sso_config_enter_email": "",
+  "confirm_remove_user_type_email_address": "",
   "confirm_secondary_email": "",
   "confirm_your_email": "",
   "confirming": "",
@@ -352,6 +368,7 @@
   "customize_your_group_subscription": "",
   "customizing_figures": "",
   "customizing_tables": "",
+  "date": "",
   "date_and_owner": "",
   "dealing_with_errors": "",
   "decrease_indent": "",
@@ -377,6 +394,7 @@
   "delete_sso_config": "",
   "delete_table": "",
   "delete_tag": "",
+  "delete_template": "",
   "delete_token": "",
   "delete_user": "",
   "delete_your_account": "",
@@ -410,7 +428,6 @@
   "discount": "",
   "discount_of": "",
   "discover_the_fastest_way_to_search_and_cite": "",
-  "dismiss_error_popup": "",
   "display": "",
   "display_deleted_user": "",
   "display_math": "",
@@ -476,6 +493,7 @@
   "edit_figure": "",
   "edit_sso_configuration": "",
   "edit_tag": "",
+  "edit_template": "",
   "edit_your_custom_dictionary": "",
   "editing": "",
   "editing_captions": "",
@@ -529,6 +547,7 @@
   "error": "",
   "error_assist": "",
   "error_log": "",
+  "error_logs_have_had_an_update": "",
   "error_opening_document": "",
   "error_opening_document_detail": "",
   "error_performing_request": "",
@@ -622,6 +641,7 @@
   "generic_if_problem_continues_contact_us": "",
   "generic_linked_file_compile_error": "",
   "generic_something_went_wrong": "",
+  "get_ai_assist": "",
   "get_collaborative_benefits": "",
   "get_discounted_plan": "",
   "get_error_assist": "",
@@ -678,6 +698,8 @@
   "go_next_page": "",
   "go_page": "",
   "go_prev_page": "",
+  "go_to_account_settings": "",
+  "go_to_code_location": "",
   "go_to_code_location_in_pdf": "",
   "go_to_overleaf": "",
   "go_to_pdf_location_in_code": "",
@@ -835,6 +857,7 @@
   "integrations": "",
   "integrations_like_github": "",
   "interested_in_cheaper_personal_plan": "",
+  "introducing_shorter_compile_timeout": "",
   "invalid_confirmation_code": "",
   "invalid_email": "",
   "invalid_file_name": "",
@@ -890,6 +913,7 @@
   "last_name": "",
   "last_resort_trouble_shooting_guide": "",
   "last_suggested_fix": "",
+  "last_updated": "",
   "last_updated_date_by_x": "",
   "last_used": "",
   "latam_discount_modal_info": "",
@@ -898,6 +922,8 @@
   "latex_in_thirty_minutes": "",
   "latex_places_figures_according_to_a_special_algorithm": "",
   "latex_places_tables_according_to_a_special_algorithm": "",
+  "latex_templates": "",
+  "latex_templates_for_journal_articles": "",
   "layout": "",
   "layout_options": "",
   "layout_processing": "",
@@ -921,7 +947,8 @@
   "let_us_know_what_you_think": "",
   "lets_get_those_premium_features": "",
   "library": "",
-  "licenses": "",
+  "license": "",
+  "license_for_educational_purposes_confirmation": "",
   "limited_document_history": "",
   "limited_offer": "",
   "limited_to_n_collaborators_per_project": "",
@@ -967,6 +994,7 @@
   "login_count": "",
   "login_to_accept_invitation": "",
   "login_with_service": "",
+  "logs": "",
   "logs_and_output_files": "",
   "looking_multiple_licenses": "",
   "looks_like_youre_at": "",
@@ -1037,6 +1065,7 @@
   "more_compile_time": "",
   "more_editor_toolbar_item": "",
   "more_info": "",
+  "more_logs_and_files": "",
   "more_options": "",
   "my_library": "",
   "n_items": "",
@@ -1060,6 +1089,7 @@
   "neither_agree_nor_disagree": "",
   "new_compile_domain_notice": "",
   "new_create_tables_and_equations": "",
+  "new_error_logs_panel": "",
   "new_file": "",
   "new_folder": "",
   "new_font_open_dyslexic": "",
@@ -1105,6 +1135,7 @@
   "no_selection_select_file": "",
   "no_symbols_found": "",
   "no_thanks_cancel_now": "",
+  "no_templates_found": "",
   "normal": "",
   "normally_x_price_per_month": "",
   "normally_x_price_per_year": "",
@@ -1128,13 +1159,15 @@
   "on_free_plan_upgrade_to_access_features": "",
   "one_step_away_from_professional_features": "",
   "only_group_admin_or_managers_can_delete_your_account_1": "",
-  "only_group_admin_or_managers_can_delete_your_account_2": "",
   "only_group_admin_or_managers_can_delete_your_account_3": "",
-  "only_group_admin_or_managers_can_delete_your_account_4": "",
-  "only_group_admin_or_managers_can_delete_your_account_5": "",
+  "only_group_admin_or_managers_can_delete_your_account_6": "",
+  "only_group_admin_or_managers_can_delete_your_account_7": "",
+  "only_group_admin_or_managers_can_delete_your_account_8": "",
+  "only_group_admin_or_managers_can_delete_your_account_9": "",
   "only_importer_can_refresh": "",
   "open_action_menu": "",
   "open_advanced_reference_search": "",
+  "open_as_template": "",
   "open_file": "",
   "open_link": "",
   "open_path": "",
@@ -1146,7 +1179,6 @@
   "organization_name": "",
   "organize_tags": "",
   "other": "",
-  "other_causes_of_compile_timeouts": "",
   "other_logs_and_files": "",
   "other_output_files": "",
   "our_team_will_get_back_to_you_shortly": "",
@@ -1160,6 +1192,7 @@
   "overleaf_is_easy_to_use": "",
   "overleaf_labs": "",
   "overleaf_logo": "",
+  "overleaf_template_gallery": "",
   "overleafs_functionality_meets_my_needs": "",
   "overview": "",
   "overwrite": "",
@@ -1222,6 +1255,7 @@
   "please_change_primary_to_remove": "",
   "please_check_your_inbox_to_confirm": "",
   "please_compile_pdf_before_download": "",
+  "please_compile_pdf_before_publish_as_template": "",
   "please_compile_pdf_before_word_count": "",
   "please_confirm_primary_email_or_edit": "",
   "please_confirm_secondary_email_or_edit": "",
@@ -1256,6 +1290,7 @@
   "premium_plan_label": "",
   "presentation_mode": "",
   "press_and_awards": "",
+  "prev": "",
   "previous_page": "",
   "price": "",
   "primarily_work_study_question": "",
@@ -1291,6 +1326,7 @@
   "project_ownership_transfer_confirmation_2": "",
   "project_renamed_or_deleted": "",
   "project_renamed_or_deleted_detail": "",
+  "project_search": "",
   "project_search_file_count": "",
   "project_search_file_count_plural": "",
   "project_search_result_count": "",
@@ -1326,6 +1362,8 @@
   "reactivate_subscription": "",
   "read_lines_from_path": "",
   "read_more": "",
+  "read_more_about_compile_timeout_changes": "",
+  "read_more_about_fix_prevent_timeout": "",
   "read_more_about_free_compile_timeouts_servers": "",
   "read_only_dropbox_sync_message": "",
   "read_only_token": "",
@@ -1381,6 +1419,7 @@
   "remove_secondary_email_addresses": "",
   "remove_sso_login_option": "",
   "remove_tag": "",
+  "remove_user": "",
   "removed_from_project": "",
   "removing": "",
   "rename": "",
@@ -1401,7 +1440,6 @@
   "resend": "",
   "resend_confirmation_code": "",
   "resend_confirmation_email": "",
-  "resend_email": "",
   "resend_group_invite": "",
   "resend_link_sso": "",
   "resend_managed_user_invite": "",
@@ -1481,6 +1519,7 @@
   "search_whole_word": "",
   "search_within_selection": "",
   "searched_path_for_lines_containing": "",
+  "searching_all_project_files_is_now_available": "",
   "security": "",
   "see_suggestions_from_collaborators": "",
   "select_a_column_or_a_merged_cell_to_align": "",
@@ -1522,7 +1561,6 @@
   "send_message": "",
   "send_request": "",
   "sending": "",
-  "sent": "",
   "server_error": "",
   "server_pro_license_entitlement_line_1": "",
   "server_pro_license_entitlement_line_2": "",
@@ -1543,6 +1581,8 @@
   "sharelatex_beta_program": "",
   "shortcut_to_open_advanced_reference_search": "",
   "show_all_projects": "",
+  "show_breadcrumbs": "",
+  "show_breadcrumbs_in_toolbar": "",
   "show_document_preamble": "",
   "show_equation_preview": "",
   "show_file_tree": "",
@@ -1638,6 +1678,7 @@
   "start_a_free_trial": "",
   "start_by_adding_your_email": "",
   "start_by_fixing_the_first_error_in_your_doc": "",
+  "start_by_fixing_the_first_error_in_your_document": "",
   "start_free_trial": "",
   "start_free_trial_without_exclamation": "",
   "start_the_conversation_by_saying_hello_or_sharing_an_update": "",
@@ -1672,6 +1713,7 @@
   "suggest_a_different_fix": "",
   "suggest_fix": "",
   "suggested": "",
+  "suggested_code": "",
   "suggested_fix_for_error_in_path": "",
   "suggestion_applied": "",
   "suggests_code_completions_while_typing": "",
@@ -1709,6 +1751,7 @@
   "tell_the_project_owner_and_ask_them_to_upgrade": "",
   "template": "",
   "template_description": "",
+  "template_gallery": "",
   "template_title_taken_from_project_title": "",
   "templates": "",
   "temporarily_hides_the_preview": "",
@@ -1753,6 +1796,12 @@
   "there_is_an_unrecoverable_latex_error": "",
   "there_was_a_problem_restoring_the_project_please_try_again_in_a_few_moments_or_contact_us": "",
   "they_lose_access_to_account": "",
+  "they_will_be_removed_from_the_group": "",
+  "they_will_continue_to_have_access_to_any_projects_shared_with_them": "",
+  "they_will_no_longer_be_a_managed_user": "",
+  "they_will_retain_ownership_of_projects_currently_owned_by_them_and_collaborators_will_become_read_only": "",
+  "they_will_retain_their_existing_account_on_the_free_plan": "",
+  "they_wont_be_able_to_log_in_with_sso_they_will_need_to_set_password": "",
   "this_action_cannot_be_reversed": "",
   "this_action_cannot_be_undone": "",
   "this_address_will_be_shown_on_the_invoice": "",
@@ -1764,6 +1813,7 @@
   "this_is_a_new_feature": "",
   "this_is_the_file_that_references_pulled_from_your_reference_manager_will_be_added_to": "",
   "this_project_already_has_maximum_collaborators": "",
+  "this_project_compiled_but_soon_might_not": "",
   "this_project_contains_a_file_called_output": "",
   "this_project_exceeded_collaborator_limit": "",
   "this_project_exceeded_compile_timeout_limit_on_free_plan": "",
@@ -1948,7 +1998,7 @@
   "updating": "",
   "upgrade": "",
   "upgrade_cc_btn": "",
-  "upgrade_for_12x_more_compile_time": "",
+  "upgrade_for_more_compile_time": "",
   "upgrade_my_plan": "",
   "upgrade_now": "",
   "upgrade_plan": "",
@@ -1979,6 +2029,7 @@
   "user_deletion_error": "",
   "user_deletion_password_reset_tip": "",
   "user_first_name_attribute": "",
+  "user_has_left_organization_and_need_to_transfer_their_projects": "",
   "user_last_name_attribute": "",
   "user_sessions": "",
   "using_latex": "",
@@ -2045,8 +2096,8 @@
   "were_making_some_changes_to_project_sharing_this_means_you_will_be_visible": "",
   "were_performing_maintenance": "",
   "were_redesigning_our_editor_to_make_it_easier_to_use": "",
-  "weve_recently_reduced_the_compile_timeout_limit_which_may_have_affected_this_project": "",
-  "weve_recently_reduced_the_compile_timeout_limit_which_may_have_affected_your_project": "",
+  "were_reducing_compile_timeout": "",
+  "what_did_you_find_most_helpful": "",
   "what_do_you_need_help_with": "",
   "what_does_this_mean": "",
   "what_does_this_mean_for_you": "",
@@ -2117,6 +2168,7 @@
   "you_have_been_removed_from_this_project_and_will_be_redirected_to_project_dashboard": "",
   "you_have_x_licenses_and_your_plan_supports_up_to_y": "",
   "you_have_x_licenses_on_your_subscription": "",
+  "you_may_be_able_to_fix_issues_to_speed_up_the_compile": "",
   "you_need_to_configure_your_sso_settings": "",
   "you_unpaused_your_subscription": "",
   "you_will_be_able_to_reassign_subscription": "",
@@ -2151,6 +2203,7 @@
   "your_plan_is_limited_to_n_editors": "",
   "your_plan_is_limited_to_n_editors_plural": "",
   "your_premium_plan_is_paused": "",
+  "your_project_compiled_but_soon_might_not": "",
   "your_project_exceeded_collaborator_limit": "",
   "your_project_exceeded_compile_timeout_limit_on_free_plan": "",
   "your_project_near_compile_timeout_limit": "",
diff --git a/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2 b/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2
index df942df176..a507329c8e 100644
Binary files a/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2 and b/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2 differ
diff --git a/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs b/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
index baefac05aa..222be1fd36 100644
--- a/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
+++ b/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
@@ -4,26 +4,32 @@
 // You may need to hard reload your browser window to see the changes.
 
 export default /** @type {const} */ ([
+  'auto_delete',
   'book_5',
   'brush',
   'code',
+  'content_copy',
   'create_new_folder',
   'delete',
   'description',
+  'error',
   'experiment',
   'forum',
   'help',
   'image',
   'info',
   'integration_instructions',
+  'lightbulb',
   'note_add',
   'picture_as_pdf',
   'rate_review',
   'report',
+  'search',
   'settings',
   'space_dashboard',
   'table_chart',
+  'thumb_down',
+  'thumb_up',
   'upload_file',
   'web_asset',
-  'error',
 ])
diff --git a/services/web/frontend/js/features/chat/context/chat-context.tsx b/services/web/frontend/js/features/chat/context/chat-context.tsx
index 9feca60579..2ba0ff5f5d 100644
--- a/services/web/frontend/js/features/chat/context/chat-context.tsx
+++ b/services/web/frontend/js/features/chat/context/chat-context.tsx
@@ -193,7 +193,7 @@ export const ChatContext = createContext<
 >(undefined)
 
 export const ChatProvider: FC<React.PropsWithChildren> = ({ children }) => {
-  const chatEnabled = getMeta('ol-chatEnabled')
+  const chatEnabled = getMeta('ol-capabilities')?.includes('chat')
 
   const clientId = useRef<string>()
   if (clientId.current === undefined) {
diff --git a/services/web/frontend/js/features/contact-form/index.js b/services/web/frontend/js/features/contact-form/index.js
index 0b4a4898aa..51aff806e3 100644
--- a/services/web/frontend/js/features/contact-form/index.js
+++ b/services/web/frontend/js/features/contact-form/index.js
@@ -23,7 +23,7 @@ document
   })
 
 document.querySelectorAll('[data-ol-contact-form]').forEach(el => {
-  el.addEventListener('submit', function (e) {
+  el.addEventListener('submit', function () {
     const emailValue = document.querySelector(
       '[data-ol-contact-form-email-input]'
     ).value
diff --git a/services/web/frontend/js/features/contact-form/search.js b/services/web/frontend/js/features/contact-form/search.js
index 10e2ab2f63..1787a068be 100644
--- a/services/web/frontend/js/features/contact-form/search.js
+++ b/services/web/frontend/js/features/contact-form/search.js
@@ -47,8 +47,9 @@ export function setupSearch(formEl) {
 
         const iconEl = document.createElement('i')
         iconEl.className = 'material-symbols dropdown-item-trailing-icon'
-        iconEl.innerText = 'open_in_new'
+        iconEl.textContent = 'open_in_new'
         iconEl.setAttribute('aria-hidden', 'true')
+        iconEl.translate = false
         linkEl.append(iconEl)
 
         resultsEl.append(liEl)
diff --git a/services/web/frontend/js/features/editor-left-menu/components/actions-manage-template.tsx b/services/web/frontend/js/features/editor-left-menu/components/actions-manage-template.tsx
new file mode 100644
index 0000000000..f277111a91
--- /dev/null
+++ b/services/web/frontend/js/features/editor-left-menu/components/actions-manage-template.tsx
@@ -0,0 +1,72 @@
+import { useCallback, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import * as eventTracking from '../../../infrastructure/event-tracking'
+import getMeta from '../../../utils/meta'
+import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import { useDetachCompileContext } from '../../../shared/context/detach-compile-context'
+import EditorManageTemplateModalWrapper from '../../template/components/manage-template-modal/editor-manage-template-modal-wrapper'
+import LeftMenuButton from './left-menu-button'
+
+type TemplateManageResponse = {
+  template_id: string
+}
+
+export default function ActionsManageTemplate() {
+
+  const templatesAdmin = getMeta('ol-showTemplatesServerPro')
+  if (!templatesAdmin) {
+    return null
+  }
+
+  const [showModal, setShowModal] = useState(false)
+  const { pdfFile } = useDetachCompileContext()
+  const { t } = useTranslation()
+
+  const handleShowModal = useCallback(() => {
+    eventTracking.sendMB('left-menu-template')
+    setShowModal(true)
+  }, [])
+
+  const openTemplate = useCallback(
+    ({ template_id: templateId }: TemplateManageResponse) => {
+      location.assign(`/template/${templateId}`)
+    },
+    [location]
+  )
+
+  return (
+    <>
+      {pdfFile ? (
+        <LeftMenuButton onClick={handleShowModal} icon='open_in_new'>
+          {t('publish_as_template')}
+        </LeftMenuButton>
+      ) : (
+        <OLTooltip
+          id="disabled-publish-as-template"
+          description={t('please_compile_pdf_before_publish_as_template')}
+          overlayProps={{
+            placement: 'top',
+          }}
+        >
+          {/* OverlayTrigger won't fire unless the child is a non-react html element (e.g div, span) */}
+          <div>
+            <LeftMenuButton
+              icon='open_in_new'
+              disabled
+              disabledAccesibilityText={t(
+                'please_compile_pdf_before_publish_as_template'
+              )}
+            >
+              {t('publish_as_template')}
+            </LeftMenuButton>
+          </div>
+        </OLTooltip>
+      )}
+      <EditorManageTemplateModalWrapper
+        show={showModal}
+        handleHide={() => setShowModal(false)}
+        openTemplate={openTemplate}
+      />
+    </>
+  )
+}
diff --git a/services/web/frontend/js/features/editor-left-menu/context/project-settings-context.tsx b/services/web/frontend/js/features/editor-left-menu/context/project-settings-context.tsx
index e40c4c6872..e5cd576ba1 100644
--- a/services/web/frontend/js/features/editor-left-menu/context/project-settings-context.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/context/project-settings-context.tsx
@@ -27,6 +27,7 @@ type ProjectSettingsSetterContextValue = {
   setLineHeight: (lineHeight: UserSettings['lineHeight']) => void
   setPdfViewer: (pdfViewer: UserSettings['pdfViewer']) => void
   setMathPreview: (mathPreview: UserSettings['mathPreview']) => void
+  setBreadcrumbs: (breadcrumbs: UserSettings['breadcrumbs']) => void
 }
 
 type ProjectSettingsContextValue = Partial<ProjectSettings> &
@@ -74,6 +75,8 @@ export const ProjectSettingsProvider: FC<React.PropsWithChildren> = ({
     setPdfViewer,
     mathPreview,
     setMathPreview,
+    breadcrumbs,
+    setBreadcrumbs,
   } = useUserWideSettings()
 
   useProjectWideSettingsSocketListener()
@@ -110,6 +113,8 @@ export const ProjectSettingsProvider: FC<React.PropsWithChildren> = ({
       setPdfViewer,
       mathPreview,
       setMathPreview,
+      breadcrumbs,
+      setBreadcrumbs,
     }),
     [
       compiler,
@@ -142,6 +147,8 @@ export const ProjectSettingsProvider: FC<React.PropsWithChildren> = ({
       setPdfViewer,
       mathPreview,
       setMathPreview,
+      breadcrumbs,
+      setBreadcrumbs,
     ]
   )
 
diff --git a/services/web/frontend/js/features/editor-left-menu/hooks/use-root-doc-id.tsx b/services/web/frontend/js/features/editor-left-menu/hooks/use-root-doc-id.tsx
index ca2e85841f..8a704f87ac 100644
--- a/services/web/frontend/js/features/editor-left-menu/hooks/use-root-doc-id.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/hooks/use-root-doc-id.tsx
@@ -6,7 +6,7 @@ import useSaveProjectSettings from './use-save-project-settings'
 
 export default function useRootDocId() {
   const [rootDocId] =
-    useScopeValue<ProjectSettings['rootDocId']>('project.rootDoc_id')
+    useScopeValue<ProjectSettings['rootDocId']>('project.rootDocId')
   const { permissionsLevel } = useEditorContext()
   const saveProjectSettings = useSaveProjectSettings()
 
diff --git a/services/web/frontend/js/features/editor-left-menu/hooks/use-save-project-settings.tsx b/services/web/frontend/js/features/editor-left-menu/hooks/use-save-project-settings.tsx
index 07a20a10fa..f34c506708 100644
--- a/services/web/frontend/js/features/editor-left-menu/hooks/use-save-project-settings.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/hooks/use-save-project-settings.tsx
@@ -19,13 +19,7 @@ export default function useSaveProjectSettings() {
         await saveProjectSettings(projectId, {
           [key]: newSetting,
         })
-
-        // rootDocId is used in our tsx and our endpoint, but rootDoc_id is used in our project $scope, etc
-        // as we use both namings in many files, and convert back and forth,
-        // its complicated to seperate and choose one name for all usages
-        // todo: make rootDocId or rootDoc_id consistent, and remove need for this/ other conversions
-        const settingsKey = key === 'rootDocId' ? 'rootDoc_id' : key
-        setProjectSettings({ ...projectSettings, [settingsKey]: newSetting })
+        setProjectSettings({ ...projectSettings, [key]: newSetting })
       }
     }
   }
diff --git a/services/web/frontend/js/features/editor-left-menu/hooks/use-user-wide-settings.tsx b/services/web/frontend/js/features/editor-left-menu/hooks/use-user-wide-settings.tsx
index 70202c9446..978148721a 100644
--- a/services/web/frontend/js/features/editor-left-menu/hooks/use-user-wide-settings.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/hooks/use-user-wide-settings.tsx
@@ -20,6 +20,7 @@ export default function useUserWideSettings() {
     lineHeight,
     pdfViewer,
     mathPreview,
+    breadcrumbs,
   } = userSettings
 
   const setOverallTheme = useSetOverallTheme()
@@ -93,6 +94,13 @@ export default function useUserWideSettings() {
     [saveUserSettings]
   )
 
+  const setBreadcrumbs = useCallback(
+    (breadcrumbs: UserSettings['breadcrumbs']) => {
+      saveUserSettings('breadcrumbs', breadcrumbs)
+    },
+    [saveUserSettings]
+  )
+
   return {
     autoComplete,
     setAutoComplete,
@@ -116,5 +124,7 @@ export default function useUserWideSettings() {
     setPdfViewer,
     mathPreview,
     setMathPreview,
+    breadcrumbs,
+    setBreadcrumbs,
   }
 }
diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/components/toolbar-header.tsx b/services/web/frontend/js/features/editor-navigation-toolbar/components/toolbar-header.tsx
index 4304768c48..87bcbc0aac 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/components/toolbar-header.tsx
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/components/toolbar-header.tsx
@@ -80,7 +80,7 @@ const ToolbarHeader = React.memo(function ToolbarHeader({
   openShareModal: () => void
   trackChangesVisible: boolean | undefined
 }) {
-  const chatEnabled = getMeta('ol-chatEnabled')
+  const chatEnabled = getMeta('ol-capabilities')?.includes('chat')
 
   const { t } = useTranslation()
   const shouldDisplayPublishButton = hasPublishPermissions && PublishButton
diff --git a/services/web/frontend/js/features/event-tracking/search-events.ts b/services/web/frontend/js/features/event-tracking/search-events.ts
index cd9ff4b8ba..630d07aeaa 100644
--- a/services/web/frontend/js/features/event-tracking/search-events.ts
+++ b/services/web/frontend/js/features/event-tracking/search-events.ts
@@ -6,7 +6,7 @@ type SearchEventSegmentation = {
         searchType: 'full-project'
       } & (
         | { method: 'keyboard' }
-        | { method: 'button'; location: 'toolbar' | 'search-form' }
+        | { method: 'button'; location: 'toolbar' | 'search-form' | 'rail' }
       ))
     | ({
         searchType: 'document'
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-create/modes/file-tree-upload-doc.tsx b/services/web/frontend/js/features/file-tree/components/file-tree-create/modes/file-tree-upload-doc.tsx
index 2ffd591032..909e1a1962 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-create/modes/file-tree-upload-doc.tsx
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-create/modes/file-tree-upload-doc.tsx
@@ -176,7 +176,6 @@ export default function FileTreeUploadDoc() {
         // close the modal when all the uploads completed successfully
         .on('complete', result => {
           if (!result.failed.length) {
-            // $scope.$emit('done', { name: name })
             cancel()
           }
         })
diff --git a/services/web/frontend/js/features/form-helpers/create-icon.js b/services/web/frontend/js/features/form-helpers/create-icon.js
index fc26724bee..13b2a04bf3 100644
--- a/services/web/frontend/js/features/form-helpers/create-icon.js
+++ b/services/web/frontend/js/features/form-helpers/create-icon.js
@@ -2,6 +2,7 @@ export default function createIcon(type) {
   const icon = document.createElement('span')
   icon.className = 'material-symbols'
   icon.setAttribute('aria-hidden', 'true')
+  icon.setAttribute('translate', 'no')
   icon.textContent = type
   return icon
 }
diff --git a/services/web/frontend/js/features/group-management/components/members-table/dropdown-button.tsx b/services/web/frontend/js/features/group-management/components/members-table/dropdown-button.tsx
index bd3b5ee10e..9e7038363a 100644
--- a/services/web/frontend/js/features/group-management/components/members-table/dropdown-button.tsx
+++ b/services/web/frontend/js/features/group-management/components/members-table/dropdown-button.tsx
@@ -20,6 +20,7 @@ import getMeta from '@/utils/meta'
 import MaterialIcon from '@/shared/components/material-icon'
 import DropdownListItem from '@/features/ui/components/bootstrap-5/dropdown-list-item'
 import { Spinner } from 'react-bootstrap'
+import { sendMB } from '@/infrastructure/event-tracking'
 
 type resendInviteResponse = {
   success: boolean
@@ -28,6 +29,7 @@ type resendInviteResponse = {
 type ManagedUserDropdownButtonProps = {
   user: User
   openOffboardingModalForUser: (user: User) => void
+  openRemoveModalForUser: (user: User) => void
   openUnlinkUserModal: (user: User) => void
   groupId: string
   setGroupUserAlert: Dispatch<SetStateAction<GroupUserAlert>>
@@ -36,6 +38,7 @@ type ManagedUserDropdownButtonProps = {
 export default function DropdownButton({
   user,
   openOffboardingModalForUser,
+  openRemoveModalForUser,
   openUnlinkUserModal,
   groupId,
   setGroupUserAlert,
@@ -57,7 +60,8 @@ export default function DropdownButton({
 
   const managedUsersActive = getMeta('ol-managedUsersActive')
   const groupSSOActive = getMeta('ol-groupSSOActive')
-
+  const userId = getMeta('ol-user_id')
+  const isUserGroupManager = getMeta('ol-isUserGroupManager')
   const userPending = user.invite
   const isGroupSSOLinked =
     !userPending && user.enrollment?.sso?.some(sso => sso.groupId === groupId)
@@ -169,9 +173,15 @@ export default function DropdownButton({
   }
 
   const onDeleteUserClick = () => {
+    sendMB('delete-managed-user-selected')
     openOffboardingModalForUser(user)
   }
 
+  const onReleaseUserClick = () => {
+    sendMB('remove-managed-user-selected')
+    openRemoveModalForUser(user)
+  }
+
   const onRemoveFromGroup = () => {
     removeMember(user)
   }
@@ -229,10 +239,13 @@ export default function DropdownButton({
       </MenuItemButton>
     )
   }
-  if (isUserManaged && !user.isEntityAdmin) {
+  if (
+    isUserManaged &&
+    !user.isEntityAdmin &&
+    (!isUserGroupManager || userId !== user._id)
+  ) {
     buttons.push(
       <MenuItemButton
-        className="delete-user-action"
         key="delete-user-action"
         data-testid="delete-user-action"
         onClick={onDeleteUserClick}
@@ -240,13 +253,21 @@ export default function DropdownButton({
         {t('delete_user')}
       </MenuItemButton>
     )
+    buttons.push(
+      <MenuItemButton
+        key="release-user-action"
+        data-testid="release-user-action"
+        onClick={onReleaseUserClick}
+      >
+        {t('remove_user')}
+      </MenuItemButton>
+    )
   } else if (!isUserManaged) {
     buttons.push(
       <MenuItemButton
         key="remove-user-action"
         data-testid="remove-user-action"
         onClick={onRemoveFromGroup}
-        className="delete-user-action"
         variant="danger"
       >
         {t('remove_from_group')}
@@ -256,7 +277,7 @@ export default function DropdownButton({
 
   if (buttons.length === 0) {
     buttons.push(
-      <DropdownListItem>
+      <DropdownListItem key="no-actions-available">
         <DropdownItem
           as="button"
           tabIndex={-1}
@@ -291,7 +312,6 @@ type MenuItemButtonProps = {
 function MenuItemButton({
   children,
   onClick,
-  className,
   isLoading,
   variant,
   'data-testid': dataTestId,
diff --git a/services/web/frontend/js/features/group-management/components/members-table/member-row.tsx b/services/web/frontend/js/features/group-management/components/members-table/member-row.tsx
index 2398cbbf9d..d898494959 100644
--- a/services/web/frontend/js/features/group-management/components/members-table/member-row.tsx
+++ b/services/web/frontend/js/features/group-management/components/members-table/member-row.tsx
@@ -16,6 +16,7 @@ import classnames from 'classnames'
 type ManagedUserRowProps = {
   user: User
   openOffboardingModalForUser: (user: User) => void
+  openRemoveModalForUser: (user: User) => void
   openUnlinkUserModal: (user: User) => void
   groupId: string
   setGroupUserAlert: Dispatch<SetStateAction<GroupUserAlert>>
@@ -24,6 +25,7 @@ type ManagedUserRowProps = {
 export default function MemberRow({
   user,
   openOffboardingModalForUser,
+  openRemoveModalForUser,
   openUnlinkUserModal,
   setGroupUserAlert,
   groupId,
@@ -112,6 +114,7 @@ export default function MemberRow({
         <DropdownButton
           user={user}
           openOffboardingModalForUser={openOffboardingModalForUser}
+          openRemoveModalForUser={openRemoveModalForUser}
           openUnlinkUserModal={openUnlinkUserModal}
           setGroupUserAlert={setGroupUserAlert}
           groupId={groupId}
diff --git a/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx b/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx
index 408d7512d6..6be4c7cbda 100644
--- a/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx
+++ b/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx
@@ -5,6 +5,7 @@ import { useGroupMembersContext } from '../../context/group-members-context'
 import type { GroupUserAlert } from '../../utils/types'
 import MemberRow from './member-row'
 import OffboardManagedUserModal from './offboard-managed-user-modal'
+import RemoveManagedUserModal from '@/features/group-management/components/members-table/remove-managed-user-modal'
 import ListAlert from './list-alert'
 import SelectAllCheckbox from './select-all-checkbox'
 import classNames from 'classnames'
@@ -22,6 +23,7 @@ export default function MembersList({ groupId }: ManagedUsersListProps) {
   const [userToOffboard, setUserToOffboard] = useState<User | undefined>(
     undefined
   )
+  const [userToRemove, setUserToRemove] = useState<User | undefined>(undefined)
   const [groupUserAlert, setGroupUserAlert] =
     useState<GroupUserAlert>(undefined)
   const [userToUnlink, setUserToUnlink] = useState<User | undefined>(undefined)
@@ -101,6 +103,7 @@ export default function MembersList({ groupId }: ManagedUsersListProps) {
               key={user.email}
               user={user}
               openOffboardingModalForUser={setUserToOffboard}
+              openRemoveModalForUser={setUserToRemove}
               openUnlinkUserModal={setUserToUnlink}
               setGroupUserAlert={setGroupUserAlert}
               groupId={groupId}
@@ -116,6 +119,13 @@ export default function MembersList({ groupId }: ManagedUsersListProps) {
           onClose={() => setUserToOffboard(undefined)}
         />
       )}
+      {userToRemove && (
+        <RemoveManagedUserModal
+          user={userToRemove}
+          groupId={groupId}
+          onClose={() => setUserToRemove(undefined)}
+        />
+      )}
       {userToUnlink && (
         <UnlinkUserModal
           user={userToUnlink}
diff --git a/services/web/frontend/js/features/group-management/components/members-table/offboard-managed-user-modal.tsx b/services/web/frontend/js/features/group-management/components/members-table/offboard-managed-user-modal.tsx
index 4528aab13f..d4709bf6c3 100644
--- a/services/web/frontend/js/features/group-management/components/members-table/offboard-managed-user-modal.tsx
+++ b/services/web/frontend/js/features/group-management/components/members-table/offboard-managed-user-modal.tsx
@@ -17,6 +17,7 @@ import OLNotification from '@/features/ui/components/ol/ol-notification'
 import OLFormControl from '@/features/ui/components/ol/ol-form-control'
 import OLFormLabel from '@/features/ui/components/ol/ol-form-label'
 import OLFormSelect from '@/features/ui/components/ol/ol-form-select'
+import { sendMB } from '@/infrastructure/event-tracking'
 
 type OffboardManagedUserModalProps = {
   user: User
@@ -48,8 +49,9 @@ export default function OffboardManagedUserModal({
   const shouldEnableDeleteUserButton =
     suppliedEmail === user.email && !!selectedRecipientId
 
-  const handleDeleteUserSubmit = (event: any) => {
+  const handleDeleteUserSubmit = (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault()
+    sendMB('delete-managed-user-confirmed')
     runAsync(
       postJSON(`/manage/groups/${groupId}/offboardManagedUser/${user._id}`, {
         body: {
diff --git a/services/web/frontend/js/features/group-management/components/members-table/remove-managed-user-modal.tsx b/services/web/frontend/js/features/group-management/components/members-table/remove-managed-user-modal.tsx
new file mode 100644
index 0000000000..c3c6f8caa4
--- /dev/null
+++ b/services/web/frontend/js/features/group-management/components/members-table/remove-managed-user-modal.tsx
@@ -0,0 +1,138 @@
+import { User } from '../../../../../../types/group-management/user'
+import { useState } from 'react'
+import useAsync from '@/shared/hooks/use-async'
+import { useTranslation, Trans } from 'react-i18next'
+import { useLocation } from '@/shared/hooks/use-location'
+import { FetchError, postJSON } from '@/infrastructure/fetch-json'
+import { debugConsole } from '@/utils/debugging'
+import OLModal, {
+  OLModalBody,
+  OLModalFooter,
+  OLModalHeader,
+  OLModalTitle,
+} from '@/features/ui/components/ol/ol-modal'
+import OLFormGroup from '@/features/ui/components/ol/ol-form-group'
+import OLButton from '@/features/ui/components/ol/ol-button'
+import OLNotification from '@/features/ui/components/ol/ol-notification'
+import OLFormControl from '@/features/ui/components/ol/ol-form-control'
+import OLFormLabel from '@/features/ui/components/ol/ol-form-label'
+import { sendMB } from '@/infrastructure/event-tracking'
+
+type RemoveManagedUserModalProps = {
+  user: User
+  groupId: string
+  onClose: () => void
+}
+
+export default function RemoveManagedUserModal({
+  user,
+  groupId,
+  onClose,
+}: RemoveManagedUserModalProps) {
+  const { t } = useTranslation()
+  const location = useLocation()
+  const { isLoading, isSuccess, error, setError, runAsync } = useAsync<
+    any,
+    any
+  >()
+  const [suppliedEmail, setSuppliedEmail] = useState<string>()
+  const shouldEnableRemoveUserButton = suppliedEmail === user.email
+  const userFullName = user.last_name
+    ? `${user.first_name || ''} ${user.last_name || ''}`
+    : user.first_name
+
+  const handleReleaseUserSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault()
+    sendMB('remove-managed-user-confirmed')
+    runAsync(
+      postJSON(`/manage/groups/${groupId}/release-managed-user/${user._id}`, {
+        body: {
+          verificationEmail: suppliedEmail,
+        },
+      })
+        .then(() => {
+          location.reload()
+        })
+        .catch(err => {
+          setError(
+            err instanceof FetchError ? err.getUserFacingMessage() : err.message
+          )
+          debugConsole.error(err)
+        })
+    )
+  }
+
+  return (
+    <OLModal id={`release-user-modal-${user._id}`} show onHide={onClose}>
+      <form onSubmit={handleReleaseUserSubmit} data-testid="release-user-form">
+        <OLModalHeader>
+          <OLModalTitle>{t('remove_user')}</OLModalTitle>
+        </OLModalHeader>
+        <OLModalBody>
+          <p>
+            {t('about_to_remove_user_preamble', {
+              userName: userFullName,
+              userEmail: user.email,
+            })}
+          </p>
+          <ul>
+            <li>{t('they_will_be_removed_from_the_group')}</li>
+            <li>{t('they_will_no_longer_be_a_managed_user')}</li>
+            <li>
+              {t('they_will_retain_their_existing_account_on_the_free_plan')}
+            </li>
+            <li>
+              {t(
+                'they_will_retain_ownership_of_projects_currently_owned_by_them_and_collaborators_will_become_read_only'
+              )}
+            </li>
+            <li>
+              {t(
+                'they_will_continue_to_have_access_to_any_projects_shared_with_them'
+              )}
+            </li>
+            <li>
+              {t(
+                'they_wont_be_able_to_log_in_with_sso_they_will_need_to_set_password'
+              )}
+            </li>
+          </ul>
+          <p>
+            <Trans
+              i18nKey="user_has_left_organization_and_need_to_transfer_their_projects"
+              components={[<b />]} // eslint-disable-line react/jsx-key
+            />
+          </p>
+          <OLFormGroup controlId="supplied-email-input">
+            <OLFormLabel>
+              {t('confirm_remove_user_type_email_address', {
+                userName: userFullName,
+              })}
+            </OLFormLabel>
+            <OLFormControl
+              type="email"
+              aria-label={t('email')}
+              onChange={e => setSuppliedEmail(e.target.value)}
+            />
+          </OLFormGroup>
+          {error && (
+            <OLNotification type="error" content={error} className="mb-0" />
+          )}
+        </OLModalBody>
+        <OLModalFooter>
+          <OLButton variant="secondary" onClick={onClose}>
+            {t('cancel')}
+          </OLButton>
+          <OLButton
+            type="submit"
+            variant="danger"
+            disabled={isLoading || isSuccess || !shouldEnableRemoveUserButton}
+            isLoading={isLoading}
+          >
+            {t('remove_user')}
+          </OLButton>
+        </OLModalFooter>
+      </form>
+    </OLModal>
+  )
+}
diff --git a/services/web/frontend/js/features/history/components/change-list/dropdown/actions-dropdown.tsx b/services/web/frontend/js/features/history/components/change-list/dropdown/actions-dropdown.tsx
index 9029260057..df31a6c58f 100644
--- a/services/web/frontend/js/features/history/components/change-list/dropdown/actions-dropdown.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/dropdown/actions-dropdown.tsx
@@ -2,20 +2,21 @@ import React, { ReactNode } from 'react'
 import {
   Dropdown,
   DropdownMenu,
+  DropdownToggle,
 } from '@/features/ui/components/bootstrap-5/dropdown-menu'
-import DropdownToggleWithTooltip from '@/features/ui/components/bootstrap-5/dropdown-toggle-with-tooltip'
+import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 
 type ActionDropdownProps = {
   id: string
   children: React.ReactNode
   isOpened: boolean
   iconTag: ReactNode
-  toolTipDescription: string
+  tooltipDescription: string
   setIsOpened: (isOpened: boolean) => void
 }
 
 function ActionsDropdown(props: ActionDropdownProps) {
-  const { id, children, isOpened, iconTag, setIsOpened, toolTipDescription } =
+  const { id, children, isOpened, iconTag, setIsOpened, tooltipDescription } =
     props
   return (
     <Dropdown
@@ -24,16 +25,23 @@ function ActionsDropdown(props: ActionDropdownProps) {
       show={isOpened}
       onToggle={open => setIsOpened(open)}
     >
-      <DropdownToggleWithTooltip
+      <OLTooltip
         id={`history-version-dropdown-${id}`}
-        className="history-version-dropdown-menu-btn"
-        aria-label={toolTipDescription}
-        toolTipDescription={toolTipDescription}
-        overlayTriggerProps={{ placement: 'bottom' }}
-        tooltipProps={{ hidden: isOpened }}
+        description={tooltipDescription}
+        overlayProps={{ placement: 'bottom' }}
+        hidden={isOpened}
       >
-        {iconTag}
-      </DropdownToggleWithTooltip>
+        {/* OverlayTrigger won't fire unless the child is a non-react html element (e.g div, span) */}
+        <span>
+          <DropdownToggle
+            id={`history-version-dropdown-toggle-${id}`}
+            className="history-version-dropdown-menu-btn"
+            as="button"
+          >
+            {iconTag}
+          </DropdownToggle>
+        </span>
+      </OLTooltip>
       <DropdownMenu className="history-version-dropdown-menu">
         {children}
       </DropdownMenu>
diff --git a/services/web/frontend/js/features/history/components/change-list/dropdown/compare-version-dropdown.tsx b/services/web/frontend/js/features/history/components/change-list/dropdown/compare-version-dropdown.tsx
index 91f0bf991a..11967e3302 100644
--- a/services/web/frontend/js/features/history/components/change-list/dropdown/compare-version-dropdown.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/dropdown/compare-version-dropdown.tsx
@@ -21,7 +21,7 @@ function CompareVersionDropdown({
       id={id}
       isOpened={isOpened}
       setIsOpened={setIsOpened}
-      toolTipDescription={t('compare')}
+      tooltipDescription={t('compare')}
       iconTag={
         <MaterialIcon
           type="align_space_even"
diff --git a/services/web/frontend/js/features/history/components/change-list/dropdown/history-dropdown-content.tsx b/services/web/frontend/js/features/history/components/change-list/dropdown/history-dropdown-content.tsx
index ac7a0044d8..43858f7eb3 100644
--- a/services/web/frontend/js/features/history/components/change-list/dropdown/history-dropdown-content.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/dropdown/history-dropdown-content.tsx
@@ -28,11 +28,7 @@ function HistoryDropdownContent({
   return (
     <>
       {permissions.labelVersion && (
-        <AddLabel
-          projectId={projectId}
-          version={version}
-          closeDropdown={closeDropdown}
-        />
+        <AddLabel version={version} closeDropdown={closeDropdown} />
       )}
       <Download
         projectId={projectId}
diff --git a/services/web/frontend/js/features/history/components/change-list/dropdown/history-dropdown.tsx b/services/web/frontend/js/features/history/components/change-list/dropdown/history-dropdown.tsx
index 6e46b815c3..79667c74d2 100644
--- a/services/web/frontend/js/features/history/components/change-list/dropdown/history-dropdown.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/dropdown/history-dropdown.tsx
@@ -20,7 +20,7 @@ function HistoryDropdown({
     <ActionsDropdown
       id={id}
       isOpened={isOpened}
-      toolTipDescription={t('more_actions')}
+      tooltipDescription={t('more_actions')}
       setIsOpened={setIsOpened}
       iconTag={
         <MaterialIcon type="more_vert" accessibilityLabel={t('more_actions')} />
diff --git a/services/web/frontend/js/features/history/components/change-list/dropdown/menu-item/add-label.tsx b/services/web/frontend/js/features/history/components/change-list/dropdown/menu-item/add-label.tsx
index 882bb9a439..1381b620d4 100644
--- a/services/web/frontend/js/features/history/components/change-list/dropdown/menu-item/add-label.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/dropdown/menu-item/add-label.tsx
@@ -4,18 +4,12 @@ import OLDropdownMenuItem from '@/features/ui/components/ol/ol-dropdown-menu-ite
 import OLTagIcon from '@/features/ui/components/ol/icons/ol-tag-icon'
 import AddLabelModal from '../../add-label-modal'
 
-type DownloadProps = {
-  projectId: string
+type AddLabelProps = {
   version: number
   closeDropdown: () => void
 }
 
-function AddLabel({
-  version,
-  projectId,
-  closeDropdown,
-  ...props
-}: DownloadProps) {
+function AddLabel({ version, closeDropdown, ...props }: AddLabelProps) {
   const { t } = useTranslation()
   const [showModal, setShowModal] = useState(false)
 
diff --git a/services/web/frontend/js/features/history/components/change-list/dropdown/menu-item/compare-items.tsx b/services/web/frontend/js/features/history/components/change-list/dropdown/menu-item/compare-items.tsx
index 78ba0aae75..dd236ed98b 100644
--- a/services/web/frontend/js/features/history/components/change-list/dropdown/menu-item/compare-items.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/dropdown/menu-item/compare-items.tsx
@@ -34,7 +34,7 @@ function CompareItems({
             toVTimestamp: selRange.toVTimestamp,
           }}
           closeDropdown={closeDropdown}
-          toolTipDescription={t('history_compare_from_this_version')}
+          tooltipDescription={t('history_compare_from_this_version')}
           icon={
             <MaterialIcon
               type="align_end"
@@ -52,7 +52,7 @@ function CompareItems({
             toVTimestamp: updateRange.toVTimestamp,
           }}
           closeDropdown={closeDropdown}
-          toolTipDescription={t('history_compare_up_to_this_version')}
+          tooltipDescription={t('history_compare_up_to_this_version')}
           icon={
             <MaterialIcon
               type="align_start"
diff --git a/services/web/frontend/js/features/history/components/change-list/dropdown/menu-item/compare.tsx b/services/web/frontend/js/features/history/components/change-list/dropdown/menu-item/compare.tsx
index 90b02d1ea5..92745579c3 100644
--- a/services/web/frontend/js/features/history/components/change-list/dropdown/menu-item/compare.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/dropdown/menu-item/compare.tsx
@@ -6,14 +6,14 @@ import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 type CompareProps = {
   comparisonRange: UpdateRange
   icon: ReactNode
-  toolTipDescription?: string
+  tooltipDescription?: string
   closeDropdown: () => void
 }
 
 function Compare({
   comparisonRange,
   closeDropdown,
-  toolTipDescription,
+  tooltipDescription,
   icon,
 }: CompareProps) {
   const { setSelection } = useHistoryContext()
@@ -32,12 +32,12 @@ function Compare({
 
   return (
     <OLTooltip
-      description={toolTipDescription}
+      description={tooltipDescription}
       id="compare-btn"
       overlayProps={{ placement: 'left' }}
     >
       <button className="history-compare-btn" onClick={handleCompareVersion}>
-        <span className="visually-hidden">{toolTipDescription}</span>
+        <span className="visually-hidden">{tooltipDescription}</span>
         {icon}
       </button>
     </OLTooltip>
diff --git a/services/web/frontend/js/features/history/components/file-tree/history-file-tree-doc.tsx b/services/web/frontend/js/features/history/components/file-tree/history-file-tree-doc.tsx
index 3b788eb046..e3543ef527 100644
--- a/services/web/frontend/js/features/history/components/file-tree/history-file-tree-doc.tsx
+++ b/services/web/frontend/js/features/history/components/file-tree/history-file-tree-doc.tsx
@@ -1,9 +1,12 @@
 import { memo } from 'react'
 import classNames from 'classnames'
 import HistoryFileTreeItem from './history-file-tree-item'
-import iconTypeFromName from '../../../file-tree/util/icon-type-from-name'
+import iconTypeFromName, {
+  newEditorIconTypeFromName,
+} from '../../../file-tree/util/icon-type-from-name'
 import type { FileDiff } from '../../services/types/file'
 import MaterialIcon from '@/shared/components/material-icon'
+import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
 
 type HistoryFileTreeDocProps = {
   file: FileDiff
@@ -20,6 +23,16 @@ function HistoryFileTreeDoc({
   onClick,
   onKeyDown,
 }: HistoryFileTreeDocProps) {
+  const newEditor = useIsNewEditorEnabled()
+  const icon = newEditor ? (
+    <MaterialIcon
+      unfilled
+      type={newEditorIconTypeFromName(name)}
+      className="file-tree-icon"
+    />
+  ) : (
+    <MaterialIcon type={iconTypeFromName(name)} className="file-tree-icon" />
+  )
   return (
     <li
       role="treeitem"
@@ -33,12 +46,7 @@ function HistoryFileTreeDoc({
       <HistoryFileTreeItem
         name={name}
         operation={'operation' in file ? file.operation : undefined}
-        icons={
-          <MaterialIcon
-            type={iconTypeFromName(name)}
-            className="file-tree-icon"
-          />
-        }
+        icons={icon}
       />
     </li>
   )
diff --git a/services/web/frontend/js/features/history/components/file-tree/history-file-tree-folder.tsx b/services/web/frontend/js/features/history/components/file-tree/history-file-tree-folder.tsx
index 6c2c912f8c..44cb7f2921 100644
--- a/services/web/frontend/js/features/history/components/file-tree/history-file-tree-folder.tsx
+++ b/services/web/frontend/js/features/history/components/file-tree/history-file-tree-folder.tsx
@@ -6,6 +6,7 @@ import HistoryFileTreeFolderList from './history-file-tree-folder-list'
 
 import type { HistoryDoc, HistoryFileTree } from '../../utils/file-tree'
 import MaterialIcon from '@/shared/components/material-icon'
+import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
 
 type HistoryFileTreeFolderProps = {
   name: string
@@ -35,6 +36,7 @@ function HistoryFileTreeFolder({
   docs,
 }: HistoryFileTreeFolderProps) {
   const { t } = useTranslation()
+  const newEditor = useIsNewEditorEnabled()
 
   const [expanded, setExpanded] = useState(() => {
     return hasChanges({ name, folders, docs })
@@ -52,10 +54,12 @@ function HistoryFileTreeFolder({
           className="file-tree-expand-icon"
         />
       </button>
-      <MaterialIcon
-        type={expanded ? 'folder_open' : 'folder'}
-        className="file-tree-folder-icon"
-      />
+      {!newEditor && (
+        <MaterialIcon
+          type={expanded ? 'folder_open' : 'folder'}
+          className="file-tree-folder-icon"
+        />
+      )}
     </>
   )
 
@@ -79,7 +83,11 @@ function HistoryFileTreeFolder({
         <HistoryFileTreeItem name={name} icons={icons} />
       </li>
       {expanded ? (
-        <HistoryFileTreeFolderList folders={folders} docs={docs} />
+        <HistoryFileTreeFolderList
+          folders={folders}
+          docs={docs}
+          rootClassName="history-file-tree-list-inner"
+        />
       ) : null}
     </>
   )
diff --git a/services/web/frontend/js/features/history/extensions/highlights.ts b/services/web/frontend/js/features/history/extensions/highlights.ts
index ce274cf724..1f81f82e74 100644
--- a/services/web/frontend/js/features/history/extensions/highlights.ts
+++ b/services/web/frontend/js/features/history/extensions/highlights.ts
@@ -238,7 +238,7 @@ class EmptyLineAdditionMarkerWidget extends WidgetType {
     super()
   }
 
-  toDOM(view: EditorView): HTMLElement {
+  toDOM(): HTMLElement {
     const element = document.createElement('span')
     element.classList.add(
       'ol-cm-empty-line-addition-marker',
@@ -255,7 +255,7 @@ class EmptyLineDeletionMarkerWidget extends WidgetType {
     super()
   }
 
-  toDOM(view: EditorView): HTMLElement {
+  toDOM(): HTMLElement {
     const element = document.createElement('span')
     element.classList.add(
       'ol-cm-empty-line-deletion-marker',
@@ -297,7 +297,7 @@ class ChangeGutterMarker extends GutterMarker {
     super()
   }
 
-  toDOM(view: EditorView) {
+  toDOM() {
     const el = document.createElement('div')
     el.className = 'ol-cm-changed-line-gutter'
     el.style.setProperty('--hue', this.hue.toString())
diff --git a/services/web/frontend/js/features/ide-react/components/layout/main-layout.tsx b/services/web/frontend/js/features/ide-react/components/layout/main-layout.tsx
index b0a65e12bb..93382d613a 100644
--- a/services/web/frontend/js/features/ide-react/components/layout/main-layout.tsx
+++ b/services/web/frontend/js/features/ide-react/components/layout/main-layout.tsx
@@ -47,7 +47,8 @@ export const MainLayout: FC = () => {
     handlePaneExpand: handleChatExpand,
   } = useChatPane()
 
-  const chatEnabled = getMeta('ol-chatEnabled') && !isRestrictedTokenMember
+  const chatEnabled =
+    getMeta('ol-capabilities')?.includes('chat') && !isRestrictedTokenMember
 
   const { t } = useTranslation()
 
diff --git a/services/web/frontend/js/features/ide-react/context/command-registry-context.tsx b/services/web/frontend/js/features/ide-react/context/command-registry-context.tsx
index e8bec19b8b..ff54c21f2a 100644
--- a/services/web/frontend/js/features/ide-react/context/command-registry-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/command-registry-context.tsx
@@ -1,4 +1,11 @@
-import { createContext, useCallback, useContext, useState } from 'react'
+import { isMac } from '@/shared/utils/os'
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useMemo,
+  useState,
+} from 'react'
 
 type CommandInvocationContext = {
   location?: string
@@ -10,17 +17,21 @@ export type Command = {
   handler?: (context: CommandInvocationContext) => void
   href?: string
   disabled?: boolean
-  // TODO: Keybinding?
 }
 
 const CommandRegistryContext = createContext<CommandRegistry | undefined>(
   undefined
 )
 
+export type Shortcut = { key: string }
+
+export type Shortcuts = Record<string, Shortcut[]>
+
 type CommandRegistry = {
   registry: Map<string, Command>
   register: (...elements: Command[]) => void
   unregister: (...id: string[]) => void
+  shortcuts: Shortcuts
 }
 
 export const CommandRegistryProvider: React.FC<React.PropsWithChildren> = ({
@@ -43,8 +54,35 @@ export const CommandRegistryProvider: React.FC<React.PropsWithChildren> = ({
     )
   }, [])
 
+  // NOTE: This is where we'd add functionality for customising shortcuts.
+  const shortcuts: Record<string, Shortcut[]> = useMemo(
+    () => ({
+      undo: [
+        {
+          key: 'Mod-z',
+        },
+      ],
+      redo: [
+        {
+          key: 'Mod-y',
+        },
+        {
+          key: 'Mod-Shift-Z',
+        },
+      ],
+      find: [{ key: 'Mod-f' }],
+      'select-all': [{ key: 'Mod-a' }],
+      'insert-comment': [{ key: 'Mod-Shift-C' }],
+      'format-bold': [{ key: 'Mod-b' }],
+      'format-italics': [{ key: 'Mod-i' }],
+    }),
+    []
+  )
+
   return (
-    <CommandRegistryContext.Provider value={{ registry, register, unregister }}>
+    <CommandRegistryContext.Provider
+      value={{ registry, register, unregister, shortcuts }}
+    >
       {children}
     </CommandRegistryContext.Provider>
   )
@@ -59,3 +97,92 @@ export const useCommandRegistry = (): CommandRegistry => {
   }
   return context
 }
+
+function parseShortcut(shortcut: Shortcut) {
+  // Based on KeyBinding type of CodeMirror 6
+  let alt = false
+  let ctrl = false
+  let shift = false
+  let meta = false
+
+  let character = null
+  // isMac ? shortcut.mac : shortcut.key etc.
+  const shortcutString = shortcut.key ?? ''
+  const keys = shortcutString.split(/-(?!$)/) ?? []
+
+  for (let i = 0; i < keys.length; i++) {
+    const isLast = i === keys.length - 1
+    const key = keys[i]
+    if (!key) {
+      throw new Error('Empty key in shortcut: ' + shortcutString)
+    }
+    if (key === 'Alt' || (!isLast && key === 'a')) {
+      alt = true
+    } else if (
+      key === 'Ctrl' ||
+      key === 'Control' ||
+      (!isLast && key === 'c')
+    ) {
+      ctrl = true
+    } else if (key === 'Shift' || (!isLast && key === 's')) {
+      shift = true
+    } else if (key === 'Meta' || key === 'Cmd' || (!isLast && key === 'm')) {
+      meta = true
+    } else if (key === 'Mod') {
+      if (isMac) {
+        meta = true
+      } else {
+        ctrl = true
+      }
+    } else {
+      if (key === 'Space') {
+        character = ' '
+      }
+      if (!isLast) {
+        throw new Error(
+          'Character key must be last in shortcut: ' + shortcutString
+        )
+      }
+      if (key.length !== 1) {
+        throw new Error(`Invalid key '${key}' in shortcut: ${shortcutString}`)
+      }
+      if (character) {
+        throw new Error('Multiple characters in shortcut: ' + shortcutString)
+      }
+      character = key
+    }
+  }
+  if (!character) {
+    throw new Error('No character in shortcut: ' + shortcutString)
+  }
+
+  return {
+    alt,
+    ctrl,
+    shift,
+    meta,
+    character,
+  }
+}
+
+export const formatShortcut = (shortcut: Shortcut): string => {
+  const { alt, ctrl, shift, meta, character } = parseShortcut(shortcut)
+
+  if (isMac) {
+    return [
+      ctrl ? '⌃' : '',
+      alt ? '⌥' : '',
+      shift ? '⇧' : '',
+      meta ? '⌘' : '',
+      character.toUpperCase(),
+    ].join('')
+  }
+
+  return [
+    ctrl ? 'Ctrl' : '',
+    shift ? 'Shift' : '',
+    meta ? 'Meta' : '',
+    alt ? 'Alt' : '',
+    character.toUpperCase(),
+  ].join(' ')
+}
diff --git a/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx b/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
index e1bb49c39c..e830d7ec1a 100644
--- a/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
@@ -18,6 +18,7 @@ import { useConnectionContext } from '@/features/ide-react/context/connection-co
 import { debugConsole } from '@/utils/debugging'
 import { DocumentContainer } from '@/features/ide-react/editor/document-container'
 import { useLayoutContext } from '@/shared/context/layout-context'
+import { useUserContext } from '@/shared/context/user-context'
 import { GotoLineOptions } from '@/features/ide-react/types/goto-line-options'
 import { Doc } from '../../../../../types/doc'
 import { useFileTreeData } from '@/shared/context/file-tree-data-context'
@@ -99,6 +100,7 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
   const { view, setView } = useLayoutContext()
   const { showGenericMessageModal, genericModalVisible, showOutOfSyncModal } =
     useModalsContext()
+  const { id: userId } = useUserContext()
 
   const [showSymbolPalette, setShowSymbolPalette] = useScopeValue<boolean>(
     'editor.showSymbolPalette'
@@ -309,7 +311,7 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
       const tryToggle = () => {
         const saved = doc.getInflightOp() == null && doc.getPendingOp() == null
         if (saved) {
-          doc.setTrackingChanges(want)
+          doc.setTrackChangesUserId(want ? userId : null)
           setTrackChanges(want)
         } else {
           syncTimeoutRef.current = window.setTimeout(tryToggle, 100)
@@ -318,7 +320,7 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
 
       tryToggle()
     },
-    [setTrackChanges]
+    [setTrackChanges, userId]
   )
 
   const doOpenNewDocument = useCallback(
diff --git a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
index bb3d0c1a3c..51ecbdc6c9 100644
--- a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
@@ -16,7 +16,6 @@ import {
 } from '@/features/ide-react/create-ide-event-emitter'
 import { JoinProjectPayload } from '@/features/ide-react/connection/join-project-payload'
 import { useConnectionContext } from '@/features/ide-react/context/connection-context'
-import { getMockIde } from '@/shared/context/mock/mock-ide'
 import { populateEditorScope } from '@/features/ide-react/scope-adapters/editor-manager-context-adapter'
 import { postJSON } from '@/infrastructure/fetch-json'
 import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
@@ -128,10 +127,11 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
   // Populate scope values when joining project, then fire project:joined event
   useEffect(() => {
     function handleJoinProjectResponse({
-      project,
+      project: { rootDoc_id: rootDocId, ..._project },
       permissionsLevel,
     }: JoinProjectPayload) {
-      scopeStore.set('project', { rootDoc_id: null, ...project })
+      const project = { ..._project, rootDocId }
+      scopeStore.set('project', project)
       scopeStore.set('permissionsLevel', permissionsLevel)
       // Make watchers update immediately
       scopeStore.flushUpdates()
@@ -157,11 +157,11 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
 
   const ide = useMemo(() => {
     return {
-      ...getMockIde(),
+      _id: projectId,
       socket,
       reportError,
     }
-  }, [socket, reportError])
+  }, [projectId, socket, reportError])
 
   const value = useMemo(
     () => ({
diff --git a/services/web/frontend/js/features/ide-react/context/online-users-context.tsx b/services/web/frontend/js/features/ide-react/context/online-users-context.tsx
index 1dba40e6d7..1195f9ae7c 100644
--- a/services/web/frontend/js/features/ide-react/context/online-users-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/online-users-context.tsx
@@ -95,7 +95,7 @@ export const OnlineUsersProvider: FC<React.PropsWithChildren> = ({
       for (const [clientId, user] of Object.entries(onlineUsers)) {
         const decoratedUser = { ...user }
         const docId = user.doc_id
-        if (docId) {
+        if (docId && fileTreeData) {
           decoratedUser.doc = findDocEntityById(fileTreeData, docId)
         }
 
diff --git a/services/web/frontend/js/features/ide-react/context/snapshot-context.tsx b/services/web/frontend/js/features/ide-react/context/snapshot-context.tsx
index 70f170a8b0..817e03fe86 100644
--- a/services/web/frontend/js/features/ide-react/context/snapshot-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/snapshot-context.tsx
@@ -24,10 +24,14 @@ export const StubSnapshotUtils = {
       throw new Error('not implemented')
     }
   },
+  // unused vars kept to document the interface
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   buildFileTree(snapshot: Snapshot): Folder {
     throw new Error('not implemented')
   },
-  createFolder(_id: string, name: string): Folder {
+  // unused vars kept to document the interface
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  createFolder(id: string, name: string): Folder {
     throw new Error('not implemented')
   },
 }
diff --git a/services/web/frontend/js/features/ide-react/editor/document-container.ts b/services/web/frontend/js/features/ide-react/editor/document-container.ts
index fee359f146..28bcb955d1 100644
--- a/services/web/frontend/js/features/ide-react/editor/document-container.ts
+++ b/services/web/frontend/js/features/ide-react/editor/document-container.ts
@@ -196,9 +196,13 @@ export class DocumentContainer extends EventEmitter {
     return this.doc?.hasBufferedOps()
   }
 
-  setTrackingChanges(track_changes: boolean) {
+  setTrackChangesUserId(userId: string | null) {
+    this.track_changes_as = userId
     if (this.doc) {
-      this.doc.track_changes = track_changes
+      this.doc.setTrackChangesUserId(userId)
+    }
+    if (this.cm6) {
+      this.cm6.setTrackChangesUserId(userId)
     }
   }
 
@@ -595,7 +599,7 @@ export class DocumentContainer extends EventEmitter {
     this.doc.on('remoteop', (...ops: AnyOperation[]) => {
       return this.trigger('remoteop', ...ops)
     })
-    this.doc.on('op:sent', (op: AnyOperation) => {
+    this.doc.on('op:sent', () => {
       return this.trigger('op:sent')
     })
     this.doc.on('op:acknowledged', (op: AnyOperation) => {
@@ -605,7 +609,7 @@ export class DocumentContainer extends EventEmitter {
       })
       return this.trigger('op:acknowledged')
     })
-    this.doc.on('op:timeout', (op: AnyOperation) => {
+    this.doc.on('op:timeout', () => {
       this.trigger('op:timeout')
       return this.onError(new Error('op timed out'))
     })
diff --git a/services/web/frontend/js/features/ide-react/editor/share-js-doc.ts b/services/web/frontend/js/features/ide-react/editor/share-js-doc.ts
index 96e866afec..5b362299d2 100644
--- a/services/web/frontend/js/features/ide-react/editor/share-js-doc.ts
+++ b/services/web/frontend/js/features/ide-react/editor/share-js-doc.ts
@@ -12,17 +12,20 @@ import {
   Message,
   ShareJsConnectionState,
   ShareJsOperation,
-  ShareJsTextType,
   TrackChangesIdSeeds,
 } from '@/features/ide-react/editor/types/document'
 import { EditorFacade } from '@/features/source-editor/extensions/realtime'
 import { recordDocumentFirstChangeEvent } from '@/features/event-tracking/document-first-change-event'
 import getMeta from '@/utils/meta'
-import { HistoryOTType } from './share-js-history-ot-type'
-import { StringFileData } from 'overleaf-editor-core/index'
+import { historyOTType } from './share-js-history-ot-type'
+import {
+  StringFileData,
+  TrackedChangeList,
+  EditOperationBuilder,
+} from 'overleaf-editor-core'
 import {
-  RawEditOperation,
   StringFileRawData,
+  RawEditOperation,
 } from 'overleaf-editor-core/lib/types'
 
 // All times below are in milliseconds
@@ -68,19 +71,17 @@ export class ShareJsDoc extends EventEmitter {
     readonly type: OTType = 'sharejs-text-ot'
   ) {
     super()
-    let sharejsType: ShareJsTextType = sharejs.types.text
+    let sharejsType
     // Decode any binary bits of data
     let snapshot: string | StringFileData
     if (this.type === 'history-ot') {
       snapshot = StringFileData.fromRaw(
         docLines as unknown as StringFileRawData
       )
-      sharejsType = new HistoryOTType(snapshot) as ShareJsTextType<
-        StringFileData,
-        RawEditOperation[]
-      >
+      sharejsType = historyOTType
     } else {
       snapshot = docLines.map(line => decodeUtf8(line)).join('\n')
+      sharejsType = sharejs.types.text
     }
 
     this.connection = {
@@ -159,6 +160,18 @@ export class ShareJsDoc extends EventEmitter {
     this.removeCarriageReturnCharFromShareJsDoc()
   }
 
+  setTrackChangesUserId(userId: string | null) {
+    this.track_changes = userId != null
+  }
+
+  getTrackedChanges() {
+    if (this._doc.otType === 'history-ot') {
+      return this._doc.snapshot.getTrackedChanges() as TrackedChangeList
+    } else {
+      return null
+    }
+  }
+
   private removeCarriageReturnCharFromShareJsDoc() {
     const doc = this._doc
     let nextPos
@@ -253,7 +266,15 @@ export class ShareJsDoc extends EventEmitter {
   // issues are resolved.
   processUpdateFromServer(message: Message) {
     try {
-      this._doc._onMessage(message)
+      if (this.type === 'history-ot' && message.op != null) {
+        const ops = message.op as RawEditOperation[]
+        this._doc._onMessage({
+          ...message,
+          op: ops.map(EditOperationBuilder.fromJSON),
+        })
+      } else {
+        this._doc._onMessage(message)
+      }
     } catch (error) {
       // Version mismatches are thrown as errors
       debugConsole.log(error)
diff --git a/services/web/frontend/js/features/ide-react/editor/share-js-history-ot-type.ts b/services/web/frontend/js/features/ide-react/editor/share-js-history-ot-type.ts
index fde66d89a1..81243bb8c7 100644
--- a/services/web/frontend/js/features/ide-react/editor/share-js-history-ot-type.ts
+++ b/services/web/frontend/js/features/ide-react/editor/share-js-history-ot-type.ts
@@ -1,49 +1,79 @@
-import EventEmitter from '@/utils/EventEmitter'
 import {
-  EditOperationBuilder,
+  EditOperation,
   EditOperationTransformer,
-  InsertOp,
-  RemoveOp,
-  RetainOp,
   StringFileData,
-  TextOperation,
 } from 'overleaf-editor-core'
-import { RawEditOperation } from 'overleaf-editor-core/lib/types'
+import { ShareDoc } from '../../../../../types/share-doc'
 
-export class HistoryOTType extends EventEmitter {
-  // stub interface, these are actually on the Doc
-  api: HistoryOTType
-  snapshot: StringFileData
+type Api = {
+  otType: 'history-ot'
+  trackChangesUserId: string | null
 
-  constructor(snapshot: StringFileData) {
-    super()
-    this.api = this
-    this.snapshot = snapshot
-  }
+  getText(): string
+  getLength(): number
+}
 
-  transformX(raw1: RawEditOperation[], raw2: RawEditOperation[]) {
-    const [a, b] = EditOperationTransformer.transform(
-      EditOperationBuilder.fromJSON(raw1[0]),
-      EditOperationBuilder.fromJSON(raw2[0])
-    )
-    return [[a.toJSON()], [b.toJSON()]]
-  }
+const api: Api & ThisType<Api & ShareDoc & { snapshot: StringFileData }> = {
+  otType: 'history-ot',
+  trackChangesUserId: null,
 
-  apply(snapshot: StringFileData, rawEditOperation: RawEditOperation[]) {
-    const operation = EditOperationBuilder.fromJSON(rawEditOperation[0])
+  getText() {
+    return this.snapshot.getContent({ filterTrackedDeletes: true })
+  },
+
+  getLength() {
+    return this.snapshot.getStringLength()
+  },
+}
+
+export const historyOTType = {
+  api,
+
+  transformX(ops1: EditOperation[], ops2: EditOperation[]) {
+    // Dynamic programming algorithm: gradually transform both sides in a nested
+    // loop.
+    const left = [...ops1]
+    const right = [...ops2]
+    for (let i = 0; i < left.length; i++) {
+      for (let j = 0; j < right.length; j++) {
+        // At this point:
+        // left[0..i] is ops1[0..i] rebased over ops2[0..j-1]
+        // right[0..j] is ops2[0..j] rebased over ops1[0..i-1]
+        const [a, b] = EditOperationTransformer.transform(left[i], right[j])
+        left[i] = a
+        right[j] = b
+      }
+    }
+    return [left, right]
+  },
+
+  apply(snapshot: StringFileData, ops: EditOperation[]) {
     const afterFile = StringFileData.fromRaw(snapshot.toRaw())
-    afterFile.edit(operation)
-    this.snapshot = afterFile
+    for (const op of ops) {
+      afterFile.edit(op)
+    }
     return afterFile
-  }
+  },
 
-  compose(op1: RawEditOperation[], op2: RawEditOperation[]) {
-    return [
-      EditOperationBuilder.fromJSON(op1[0])
-        .compose(EditOperationBuilder.fromJSON(op2[0]))
-        .toJSON(),
-    ]
-  }
+  compose(ops1: EditOperation[], ops2: EditOperation[]) {
+    const ops = [...ops1, ...ops2]
+    let currentOp = ops.shift()
+    if (currentOp === undefined) {
+      // No ops to process
+      return []
+    }
+    const result = []
+    for (const op of ops) {
+      if (currentOp.canBeComposedWith(op)) {
+        currentOp = currentOp.compose(op)
+      } else {
+        result.push(currentOp)
+        currentOp = op
+      }
+    }
+    result.push(currentOp)
+    return result
+  },
 
   // Do not provide normalize, used by submitOp to fixup bad input.
   // normalize(op: TextOperation) {}
@@ -51,83 +81,4 @@ export class HistoryOTType extends EventEmitter {
   // Do not provide invert, only needed for reverting a rejected update.
   // We are displaying an out-of-sync modal when an op is rejected.
   // invert(op: TextOperation) {}
-
-  // API
-  insert(pos: number, text: string, fromUndo: boolean) {
-    const old = this.getText()
-    const op = new TextOperation()
-    op.retain(pos)
-    op.insert(text)
-    op.retain(old.length - pos)
-    this.submitOp([op.toJSON()])
-  }
-
-  del(pos: number, length: number, fromUndo: boolean) {
-    const old = this.getText()
-    const op = new TextOperation()
-    op.retain(pos)
-    op.remove(length)
-    op.retain(old.length - pos - length)
-    this.submitOp([op.toJSON()])
-  }
-
-  getText() {
-    return this.snapshot.getContent({ filterTrackedDeletes: true })
-  }
-
-  getLength() {
-    return this.getText().length
-  }
-
-  _register() {
-    this.on(
-      'remoteop',
-      (rawEditOperation: RawEditOperation[], oldSnapshot: StringFileData) => {
-        const operation = EditOperationBuilder.fromJSON(rawEditOperation[0])
-        if (operation instanceof TextOperation) {
-          const str = oldSnapshot.getContent()
-          if (str.length !== operation.baseLength)
-            throw new TextOperation.ApplyError(
-              "The operation's base length must be equal to the string's length.",
-              operation,
-              str
-            )
-
-          let outputCursor = 0
-          let inputCursor = 0
-          for (const op of operation.ops) {
-            if (op instanceof RetainOp) {
-              inputCursor += op.length
-              outputCursor += op.length
-            } else if (op instanceof InsertOp) {
-              this.emit(
-                'insert',
-                outputCursor,
-                op.insertion,
-                op.insertion.length
-              )
-              outputCursor += op.insertion.length
-            } else if (op instanceof RemoveOp) {
-              this.emit(
-                'delete',
-                outputCursor,
-                str.slice(inputCursor, inputCursor + op.length)
-              )
-              inputCursor += op.length
-            }
-          }
-
-          if (inputCursor !== str.length)
-            throw new TextOperation.ApplyError(
-              "The operation didn't operate on the whole string.",
-              operation,
-              str
-            )
-        }
-      }
-    )
-  }
-
-  // stub-interface, provided by sharejs.Doc
-  submitOp(op: RawEditOperation[]) {}
 }
diff --git a/services/web/frontend/js/features/ide-react/editor/types/document.ts b/services/web/frontend/js/features/ide-react/editor/types/document.ts
index fbed3ab8f1..f6e5f6aebb 100644
--- a/services/web/frontend/js/features/ide-react/editor/types/document.ts
+++ b/services/web/frontend/js/features/ide-react/editor/types/document.ts
@@ -1,5 +1,6 @@
 import { StringFileData } from 'overleaf-editor-core'
 import { AnyOperation } from '../../../../../../types/change'
+import { RawEditOperation } from 'overleaf-editor-core/lib/types'
 
 export type Version = number
 
@@ -36,4 +37,5 @@ export type Message = {
   doc?: string
   snapshot?: string | StringFileData
   type?: ShareJsTextType
+  op?: AnyOperation[] | RawEditOperation[]
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/breadcrumbs.tsx b/services/web/frontend/js/features/ide-redesign/components/breadcrumbs.tsx
index f148e0142e..9949b98c7f 100644
--- a/services/web/frontend/js/features/ide-redesign/components/breadcrumbs.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/breadcrumbs.tsx
@@ -1,4 +1,7 @@
-import { findInTreeOrThrow } from '@/features/file-tree/util/find-in-tree'
+import {
+  findInTree,
+  findInTreeOrThrow,
+} from '@/features/file-tree/util/find-in-tree'
 import { useFileTreeOpenContext } from '@/features/ide-react/context/file-tree-open-context'
 import { useOutlineContext } from '@/features/ide-react/context/outline-context'
 import useNestedOutline from '@/features/outline/hooks/use-nested-outline'
@@ -39,35 +42,41 @@ export default function Breadcrumbs() {
   const { highlightedLine, canShowOutline } = useOutlineContext()
 
   const folderHierarchy = useMemo(() => {
-    if (!openEntity || !fileTreeData) {
+    if (openEntity?.type !== 'doc' || !fileTreeData) {
       return []
     }
 
-    return openEntity.path
-      .filter(id => id !== fileTreeData._id) // Filter out the root folder
-      .map(id => {
-        return findInTreeOrThrow(fileTreeData, id)?.entity
-      })
+    try {
+      return openEntity.path
+        .filter(id => id !== fileTreeData._id) // Filter out the root folder
+        .map(id => {
+          return findInTreeOrThrow(fileTreeData, id)?.entity
+        })
+    } catch {
+      // If any of the folders in the path are not found, the entire hierarchy
+      // is invalid.
+      return []
+    }
   }, [openEntity, fileTreeData])
 
   const fileName = useMemo(() => {
     // NOTE: openEntity.entity.name may not always be accurate, so we read it
     // from the file tree data instead.
-    if (!openEntity || !fileTreeData) {
+    if (openEntity?.type !== 'doc' || !fileTreeData) {
       return undefined
     }
-    return findInTreeOrThrow(fileTreeData, openEntity.entity._id)?.entity.name
+    return findInTree(fileTreeData, openEntity.entity._id)?.entity.name
   }, [fileTreeData, openEntity])
 
   const outlineHierarchy = useMemo(() => {
-    if (!canShowOutline || !outline) {
+    if (openEntity?.type !== 'doc' || !canShowOutline || !outline) {
       return []
     }
 
     return constructOutlineHierarchy(outline.items, highlightedLine)
-  }, [outline, highlightedLine, canShowOutline])
+  }, [outline, highlightedLine, canShowOutline, openEntity])
 
-  if (!openEntity || !fileTreeData) {
+  if (openEntity?.type !== 'doc' || !fileTreeData) {
     return null
   }
 
diff --git a/services/web/frontend/js/features/ide-redesign/components/chat/chat.tsx b/services/web/frontend/js/features/ide-redesign/components/chat/chat.tsx
index 9ebe33e065..54d098c6c8 100644
--- a/services/web/frontend/js/features/ide-redesign/components/chat/chat.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/chat/chat.tsx
@@ -9,8 +9,8 @@ import { useUserContext } from '@/shared/context/user-context'
 import { lazy, Suspense, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import classNames from 'classnames'
-import { RailPanelHeader } from '../rail'
 import { RailIndicator } from '../rail-indicator'
+import RailPanelHeader from '../rail-panel-header'
 
 const MessageList = lazy(() => import('../../../chat/components/message-list'))
 
diff --git a/services/web/frontend/js/features/ide-redesign/components/errors.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/error-indicator.tsx
similarity index 56%
rename from services/web/frontend/js/features/ide-redesign/components/errors.tsx
rename to services/web/frontend/js/features/ide-redesign/components/error-logs/error-indicator.tsx
index 2313022d3c..7b721a1d51 100644
--- a/services/web/frontend/js/features/ide-redesign/components/errors.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/error-indicator.tsx
@@ -1,9 +1,7 @@
-import PdfLogsViewer from '@/features/pdf-preview/components/pdf-logs-viewer'
-import { PdfPreviewProvider } from '@/features/pdf-preview/components/pdf-preview-provider'
 import { useDetachCompileContext as useCompileContext } from '@/shared/context/detach-compile-context'
-import { RailIndicator } from './rail-indicator'
+import { RailIndicator } from '../rail-indicator'
 
-export const ErrorIndicator = () => {
+export default function ErrorIndicator() {
   const { logEntries } = useCompileContext()
 
   if (!logEntries) {
@@ -25,11 +23,3 @@ export const ErrorIndicator = () => {
     />
   )
 }
-
-export const ErrorPane = () => {
-  return (
-    <PdfPreviewProvider>
-      <PdfLogsViewer alwaysVisible />
-    </PdfPreviewProvider>
-  )
-}
diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs-header.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs-header.tsx
new file mode 100644
index 0000000000..2f3a54b095
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs-header.tsx
@@ -0,0 +1,98 @@
+import { useTranslation } from 'react-i18next'
+import RailPanelHeader from '../rail-panel-header'
+import OLIconButton from '@/features/ui/components/ol/ol-icon-button'
+import { useDetachCompileContext as useCompileContext } from '@/shared/context/detach-compile-context'
+import {
+  Dropdown,
+  DropdownMenu,
+  DropdownToggle,
+} from '@/features/ui/components/bootstrap-5/dropdown-menu'
+import PdfFileList from '@/features/pdf-preview/components/pdf-file-list'
+import { forwardRef } from 'react'
+import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+
+export default function ErrorLogsHeader() {
+  const { t } = useTranslation()
+
+  return (
+    <RailPanelHeader
+      title={t('logs')}
+      actions={[
+        <DownloadFileDropdown key="download-files" />,
+        <ClearCacheButton key="clear-cache" />,
+      ]}
+    />
+  )
+}
+
+const ClearCacheButton = () => {
+  const { compiling, clearCache, clearingCache } = useCompileContext()
+  const { t } = useTranslation()
+
+  return (
+    <OLTooltip
+      id="clear-cache"
+      description={t('clear_cached_files')}
+      overlayProps={{ placement: 'bottom' }}
+    >
+      <OLIconButton
+        unfilled
+        onClick={() => clearCache()}
+        className="rail-panel-header-button-subdued"
+        icon="auto_delete"
+        isLoading={clearingCache}
+        disabled={clearingCache || compiling}
+        accessibilityLabel={t('clear_cached_files')}
+        size="sm"
+      />
+    </OLTooltip>
+  )
+}
+
+const DownloadFileDropdown = () => {
+  const { fileList } = useCompileContext()
+
+  const { t } = useTranslation()
+
+  return (
+    <Dropdown align="end">
+      <DropdownToggle
+        as={DownloadFileDropdownToggleButton}
+        id="dropdown-files-dropdown-toggle"
+      >
+        {t('other_logs_and_files')}
+      </DropdownToggle>
+      {fileList && (
+        <DropdownMenu id="dropdown-files-logs-pane-list">
+          <PdfFileList fileList={fileList} />
+        </DropdownMenu>
+      )}
+    </Dropdown>
+  )
+}
+
+const DownloadFileDropdownToggleButton = forwardRef<
+  HTMLButtonElement,
+  { onClick: React.MouseEventHandler }
+>(function DownloadFileDropdownToggleButton({ onClick }, ref) {
+  const { compiling, fileList } = useCompileContext()
+  const { t } = useTranslation()
+
+  return (
+    <OLTooltip
+      id="more-logs-and-files"
+      description={t('more_logs_and_files')}
+      overlayProps={{ placement: 'bottom' }}
+    >
+      <OLIconButton
+        ref={ref}
+        onClick={onClick}
+        className="rail-panel-header-button-subdued"
+        icon="download"
+        disabled={compiling || !fileList}
+        accessibilityLabel={t('other_logs_and_files')}
+        size="sm"
+      />
+    </OLTooltip>
+  )
+})
diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs-panel.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs-panel.tsx
new file mode 100644
index 0000000000..2cff048256
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs-panel.tsx
@@ -0,0 +1,14 @@
+import { PdfPreviewProvider } from '@/features/pdf-preview/components/pdf-preview-provider'
+import ErrorLogs from './error-logs'
+import ErrorLogsHeader from './error-logs-header'
+
+export default function ErrorLogsPanel() {
+  return (
+    <PdfPreviewProvider>
+      <div className="error-logs-panel">
+        <ErrorLogsHeader />
+        <ErrorLogs />
+      </div>
+    </PdfPreviewProvider>
+  )
+}
diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs.tsx
new file mode 100644
index 0000000000..a6a62e998a
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs.tsx
@@ -0,0 +1,142 @@
+import { useTranslation } from 'react-i18next'
+import { ElementType, memo, useMemo, useState } from 'react'
+import { usePdfPreviewContext } from '@/features/pdf-preview/components/pdf-preview-provider'
+import StopOnFirstErrorPrompt from '@/features/pdf-preview/components/stop-on-first-error-prompt'
+import PdfPreviewError from '@/features/pdf-preview/components/pdf-preview-error'
+import PdfValidationIssue from '@/features/pdf-preview/components/pdf-validation-issue'
+import PdfLogsEntries from '@/features/pdf-preview/components/pdf-logs-entries'
+import PdfPreviewErrorBoundaryFallback from '@/features/pdf-preview/components/pdf-preview-error-boundary-fallback'
+import withErrorBoundary from '@/infrastructure/error-boundary'
+import { useDetachCompileContext as useCompileContext } from '@/shared/context/detach-compile-context'
+import { Nav, NavLink, TabContainer, TabContent } from 'react-bootstrap'
+import { LogEntry as LogEntryData } from '@/features/pdf-preview/util/types'
+import LogEntry from './log-entry'
+import importOverleafModules from '../../../../../macros/import-overleaf-module.macro'
+
+const logsComponents: Array<{
+  import: { default: ElementType }
+  path: string
+}> = importOverleafModules('errorLogsComponents')
+
+type ErrorLogTab = {
+  key: string
+  label: string
+  entries: LogEntryData[] | undefined
+}
+
+function ErrorLogs() {
+  const { error, logEntries, rawLog, validationIssues, stoppedOnFirstError } =
+    useCompileContext()
+
+  const tabs = useMemo(() => {
+    return [
+      { key: 'all', label: 'All', entries: logEntries?.all },
+      { key: 'errors', label: 'Errors', entries: logEntries?.errors },
+      { key: 'warnings', label: 'Warnings', entries: logEntries?.warnings },
+      { key: 'info', label: 'Info', entries: logEntries?.typesetting },
+    ]
+  }, [logEntries])
+
+  const { loadingError } = usePdfPreviewContext()
+
+  const { t } = useTranslation()
+
+  const [activeTab, setActiveTab] = useState<string | null>('all')
+
+  const entries = useMemo(() => {
+    return tabs.find(tab => tab.key === activeTab)?.entries || []
+  }, [activeTab, tabs])
+
+  const includeErrors = activeTab === 'all' || activeTab === 'errors'
+  const includeWarnings = activeTab === 'all' || activeTab === 'warnings'
+
+  return (
+    <TabContainer onSelect={setActiveTab} defaultActiveKey={activeTab ?? 'all'}>
+      <Nav defaultActiveKey="all" className="error-logs-tabs">
+        {tabs.map(tab => (
+          <TabHeader key={tab.key} tab={tab} active={activeTab === tab.key} />
+        ))}
+      </Nav>
+      {logsComponents.map(({ import: { default: Component }, path }) => (
+        <Component key={path} />
+      ))}
+      <TabContent className="error-logs">
+        <div className="logs-pane-content">
+          {stoppedOnFirstError && includeErrors && <StopOnFirstErrorPrompt />}
+
+          {loadingError && (
+            <PdfPreviewError
+              error="pdf-viewer-loading-error"
+              includeErrors={includeErrors}
+              includeWarnings={includeWarnings}
+            />
+          )}
+
+          {error && (
+            <PdfPreviewError
+              error={error}
+              includeErrors={includeErrors}
+              includeWarnings={includeWarnings}
+            />
+          )}
+
+          {includeErrors &&
+            validationIssues &&
+            Object.entries(validationIssues).map(([name, issue]) => (
+              <PdfValidationIssue key={name} name={name} issue={issue} />
+            ))}
+
+          {entries && (
+            <PdfLogsEntries
+              entries={entries}
+              hasErrors={includeErrors && entries.length > 0}
+            />
+          )}
+
+          {rawLog && activeTab === 'all' && (
+            <LogEntry
+              headerTitle={t('raw_logs')}
+              rawContent={rawLog}
+              entryAriaLabel={t('raw_logs_description')}
+              level="raw"
+              alwaysExpandRawContent
+              showSourceLocationLink={false}
+            />
+          )}
+        </div>
+      </TabContent>
+    </TabContainer>
+  )
+}
+
+function formatErrorNumber(num: number | undefined) {
+  if (num === undefined) {
+    return undefined
+  }
+
+  if (num > 99) {
+    return '99+'
+  }
+
+  return Math.floor(num).toString()
+}
+
+const TabHeader = ({ tab, active }: { tab: ErrorLogTab; active: boolean }) => {
+  return (
+    <NavLink
+      eventKey={tab.key}
+      className="error-logs-tab-header"
+      active={active}
+    >
+      {tab.label}
+      <div className="error-logs-tab-count">
+        {/* TODO: it would be nice if this number included custom errors */}
+        {formatErrorNumber(tab.entries?.length)}
+      </div>
+    </NavLink>
+  )
+}
+
+export default withErrorBoundary(memo(ErrorLogs), () => (
+  <PdfPreviewErrorBoundaryFallback type="logs" />
+))
diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry-header.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry-header.tsx
new file mode 100644
index 0000000000..ce43af3744
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry-header.tsx
@@ -0,0 +1,167 @@
+import classNames from 'classnames'
+import { useState, useRef, MouseEventHandler, ElementType } from 'react'
+import { useTranslation } from 'react-i18next'
+import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import {
+  ErrorLevel,
+  SourceLocation,
+  LogEntry as LogEntryData,
+} from '@/features/pdf-preview/util/types'
+import useResizeObserver from '@/features/preview/hooks/use-resize-observer'
+import OLIconButton from '@/features/ui/components/ol/ol-icon-button'
+import importOverleafModules from '../../../../../macros/import-overleaf-module.macro'
+import MaterialIcon from '@/shared/components/material-icon'
+
+const actionComponents = importOverleafModules(
+  'pdfLogEntryHeaderActionComponents'
+) as {
+  import: { default: ElementType }
+  path: string
+}[]
+
+function LogEntryHeader({
+  sourceLocation,
+  level,
+  headerTitle,
+  logType,
+  showSourceLocationLink = true,
+  onSourceLocationClick,
+  collapsed,
+  onToggleCollapsed,
+  id,
+  logEntry,
+  actionButtonsOverride,
+  openCollapseIconOverride,
+}: {
+  headerTitle: string | React.ReactNode
+  level: ErrorLevel
+  logType?: string
+  sourceLocation?: SourceLocation
+  showSourceLocationLink?: boolean
+  onSourceLocationClick?: MouseEventHandler<HTMLButtonElement>
+  collapsed: boolean
+  onToggleCollapsed: () => void
+  id?: string
+  logEntry?: LogEntryData
+  actionButtonsOverride?: React.ReactNode
+  openCollapseIconOverride?: string
+}) {
+  const { t } = useTranslation()
+  const logLocationSpanRef = useRef<HTMLSpanElement>(null)
+  const [locationSpanOverflown, setLocationSpanOverflown] = useState(false)
+
+  useResizeObserver(
+    logLocationSpanRef,
+    locationSpanOverflown,
+    checkLocationSpanOverflow
+  )
+
+  const file = sourceLocation ? sourceLocation.file : null
+  const line = sourceLocation ? sourceLocation.line : null
+  const logEntryHeaderTextClasses = classNames('log-entry-header-text', {
+    'log-entry-header-text-error': level === 'error',
+    'log-entry-header-text-warning': level === 'warning',
+    'log-entry-header-text-info': level === 'info' || level === 'typesetting',
+    'log-entry-header-text-success': level === 'success',
+    'log-entry-header-text-raw': level === 'raw',
+  })
+
+  function checkLocationSpanOverflow(observedElement: ResizeObserverEntry) {
+    const spanEl = observedElement.target
+    const isOverflowing = spanEl.scrollWidth > spanEl.clientWidth
+    setLocationSpanOverflown(isOverflowing)
+  }
+
+  const locationText =
+    showSourceLocationLink && file ? `${file}${line ? `, ${line}` : ''}` : null
+
+  // Because we want an ellipsis on the left-hand side (e.g. "...longfilename.tex"), the
+  // `log-entry-location` class has text laid out from right-to-left using the CSS
+  // rule `direction: rtl;`.
+  // This works most of the times, except when the first character of the filename is considered
+  // a punctuation mark, like `/` (e.g. `/foo/bar/baz.sty`). In this case, because of
+  // right-to-left writing rules, the punctuation mark is moved to the right-side of the string,
+  // resulting in `...bar/baz.sty/` instead of `...bar/baz.sty`.
+  // To avoid this edge-case, we wrap the `logLocationLinkText` in two directional formatting
+  // characters:
+  //   * \u202A LEFT-TO-RIGHT EMBEDDING Treat the following text as embedded left-to-right.
+  //   * \u202C POP DIRECTIONAL FORMATTING End the scope of the last LRE, RLE, RLO, or LRO.
+  // This essentially tells the browser that, althought the text is laid out from right-to-left,
+  // the wrapped portion of text should follow left-to-right writing rules.
+  const formattedLocationText = locationText ? (
+    <span ref={logLocationSpanRef} className="log-entry-location">
+      {`\u202A${locationText}\u202C`}
+    </span>
+  ) : null
+
+  const headerTitleText = logType ? `${logType} ${headerTitle}` : headerTitle
+
+  return (
+    <header className="log-entry-header-card">
+      <OLTooltip
+        id={`expand-collapse-${locationText}`}
+        description={collapsed ? t('expand') : t('collapse')}
+        overlayProps={{ placement: 'bottom' }}
+      >
+        <button
+          className="log-entry-header-button"
+          onClick={onToggleCollapsed}
+          aria-label={collapsed ? t('expand') : t('collapse')}
+        >
+          <MaterialIcon
+            onClick={onToggleCollapsed}
+            type={
+              openCollapseIconOverride ??
+              (collapsed ? 'chevron_right' : 'expand_more')
+            }
+          />
+          <div className="log-entry-header-content">
+            <h3 className={logEntryHeaderTextClasses}>{headerTitleText}</h3>
+            {locationSpanOverflown && formattedLocationText && locationText ? (
+              <OLTooltip
+                id={locationText}
+                description={locationText}
+                overlayProps={{ placement: 'left' }}
+                tooltipProps={{ className: 'log-location-tooltip' }}
+              >
+                {formattedLocationText}
+              </OLTooltip>
+            ) : (
+              formattedLocationText
+            )}
+          </div>
+        </button>
+      </OLTooltip>
+
+      {actionButtonsOverride ?? (
+        <div className="log-entry-header-actions">
+          {showSourceLocationLink && (
+            <OLTooltip
+              id={`go-to-location-${locationText}`}
+              description={t('go_to_code_location')}
+              overlayProps={{ placement: 'bottom' }}
+            >
+              <OLIconButton
+                onClick={onSourceLocationClick}
+                variant="ghost"
+                icon="my_location"
+                accessibilityLabel={t('go_to_code_location')}
+              />
+            </OLTooltip>
+          )}
+          {actionComponents.map(({ import: { default: Component }, path }) => (
+            <Component
+              key={path}
+              collapsed={collapsed}
+              onToggleCollapsed={onToggleCollapsed}
+              logEntry={logEntry}
+              id={id}
+            />
+          ))}
+        </div>
+      )}
+    </header>
+  )
+}
+
+export default LogEntryHeader
diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry.tsx
new file mode 100644
index 0000000000..a7539450ce
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry.tsx
@@ -0,0 +1,140 @@
+import {
+  Dispatch,
+  MouseEventHandler,
+  useCallback,
+  memo,
+  SetStateAction,
+  useState,
+} from 'react'
+import HumanReadableLogsHints from '../../../../ide/human-readable-logs/HumanReadableLogsHints'
+import { sendMB } from '@/infrastructure/event-tracking'
+import {
+  ErrorLevel,
+  LogEntry as LogEntryData,
+  SourceLocation,
+} from '@/features/pdf-preview/util/types'
+import LogEntryHeader from './log-entry-header'
+import PdfLogEntryContent from '@/features/pdf-preview/components/pdf-log-entry-content'
+import classNames from 'classnames'
+
+type LogEntryProps = {
+  headerTitle: string | React.ReactNode
+  level: ErrorLevel
+  ruleId?: string
+  rawContent?: string
+  logType?: string
+  formattedContent?: React.ReactNode
+  extraInfoURL?: string | null
+  sourceLocation?: SourceLocation
+  showSourceLocationLink?: boolean
+  entryAriaLabel?: string
+  contentDetails?: string[]
+  onSourceLocationClick?: (sourceLocation: SourceLocation) => void
+  index?: number
+  logEntry?: LogEntryData
+  id?: string
+  alwaysExpandRawContent?: boolean
+  className?: string
+  actionButtonsOverride?: React.ReactNode
+  openCollapseIconOverride?: string
+}
+
+function LogEntry(props: LogEntryProps) {
+  const [collapsed, setCollapsed] = useState(true)
+
+  return (
+    <ControlledLogEntry
+      {...props}
+      collapsed={collapsed}
+      setCollapsed={setCollapsed}
+    />
+  )
+}
+
+export function ControlledLogEntry({
+  ruleId,
+  headerTitle,
+  rawContent,
+  logType,
+  formattedContent,
+  extraInfoURL,
+  level,
+  sourceLocation,
+  showSourceLocationLink = true,
+  entryAriaLabel = undefined,
+  contentDetails,
+  onSourceLocationClick,
+  index,
+  logEntry,
+  id,
+  alwaysExpandRawContent = false,
+  className,
+  collapsed,
+  setCollapsed,
+  actionButtonsOverride,
+  openCollapseIconOverride,
+}: LogEntryProps & {
+  collapsed: boolean
+  setCollapsed: Dispatch<SetStateAction<boolean>>
+}) {
+  if (ruleId && HumanReadableLogsHints[ruleId]) {
+    const hint = HumanReadableLogsHints[ruleId]
+    formattedContent = hint.formattedContent(contentDetails)
+    extraInfoURL = hint.extraInfoURL
+  }
+
+  const handleLogEntryLinkClick: MouseEventHandler<HTMLButtonElement> =
+    useCallback(
+      event => {
+        event.preventDefault()
+
+        if (onSourceLocationClick && sourceLocation) {
+          onSourceLocationClick(sourceLocation)
+
+          const parts = sourceLocation?.file?.split('.')
+          const extension =
+            parts?.length && parts?.length > 1 ? parts.pop() : ''
+          sendMB('log-entry-link-click', { level, ruleId, extension })
+        }
+      },
+      [level, onSourceLocationClick, ruleId, sourceLocation]
+    )
+
+  return (
+    <div
+      className={classNames('log-entry', className)}
+      data-ruleid={ruleId}
+      data-log-entry-id={id}
+      aria-label={entryAriaLabel}
+    >
+      <LogEntryHeader
+        level={level}
+        sourceLocation={sourceLocation}
+        headerTitle={headerTitle}
+        logType={logType}
+        showSourceLocationLink={showSourceLocationLink}
+        onSourceLocationClick={handleLogEntryLinkClick}
+        collapsed={collapsed}
+        onToggleCollapsed={() => setCollapsed(collapsed => !collapsed)}
+        id={id}
+        logEntry={logEntry}
+        actionButtonsOverride={actionButtonsOverride}
+        openCollapseIconOverride={openCollapseIconOverride}
+      />
+      <div
+        className={classNames('horizontal-divider', { hidden: collapsed })}
+      />
+      <PdfLogEntryContent
+        className={classNames({ hidden: collapsed })}
+        alwaysExpandRawContent={alwaysExpandRawContent}
+        rawContent={rawContent}
+        formattedContent={formattedContent}
+        extraInfoURL={extraInfoURL}
+        index={index}
+        logEntry={logEntry}
+      />
+    </div>
+  )
+}
+
+export default memo(LogEntry)
diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/new-error-logs-promo.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/new-error-logs-promo.tsx
new file mode 100644
index 0000000000..1589fa819d
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/new-error-logs-promo.tsx
@@ -0,0 +1,59 @@
+import Close from '@/shared/components/close'
+import { useEditorContext } from '@/shared/context/editor-context'
+import useTutorial from '@/shared/hooks/promotions/use-tutorial'
+import { useCallback, useEffect } from 'react'
+import { Overlay, Popover } from 'react-bootstrap'
+import { useTranslation } from 'react-i18next'
+
+const TUTORIAL_KEY = 'new-error-logs-promo'
+const EVENT_DATA = { name: 'new-error-logs-promotion' }
+
+export default function NewErrorLogsPromo({
+  target,
+}: {
+  target: HTMLElement | null
+}) {
+  const { t } = useTranslation()
+
+  const { inactiveTutorials } = useEditorContext()
+  const { showPopup, tryShowingPopup, hideUntilReload, completeTutorial } =
+    useTutorial(TUTORIAL_KEY, EVENT_DATA)
+
+  useEffect(() => {
+    if (!inactiveTutorials.includes(TUTORIAL_KEY)) {
+      tryShowingPopup()
+    }
+  }, [tryShowingPopup, inactiveTutorials])
+
+  const onHide = useCallback(() => {
+    hideUntilReload()
+  }, [hideUntilReload])
+
+  const onClose = useCallback(() => {
+    completeTutorial({
+      action: 'complete',
+      event: 'promo-dismiss',
+    })
+  }, [completeTutorial])
+
+  if (!target) {
+    return null
+  }
+
+  return (
+    <Overlay
+      placement="right"
+      show={showPopup}
+      target={target}
+      rootClose
+      onHide={onHide}
+    >
+      <Popover>
+        <Popover.Body className="new-error-logs-promo">
+          {t('error_logs_have_had_an_update')}
+          <Close variant="dark" onDismiss={onClose} />
+        </Popover.Body>
+      </Popover>
+    </Overlay>
+  )
+}
diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/old-error-pane.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/old-error-pane.tsx
new file mode 100644
index 0000000000..7794747d30
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/old-error-pane.tsx
@@ -0,0 +1,10 @@
+import PdfLogsViewer from '@/features/pdf-preview/components/pdf-logs-viewer'
+import { PdfPreviewProvider } from '@/features/pdf-preview/components/pdf-preview-provider'
+
+export default function OldErrorPane() {
+  return (
+    <PdfPreviewProvider>
+      <PdfLogsViewer alwaysVisible />
+    </PdfPreviewProvider>
+  )
+}
diff --git a/services/web/frontend/js/features/ide-redesign/components/full-project-search-panel.tsx b/services/web/frontend/js/features/ide-redesign/components/full-project-search-panel.tsx
new file mode 100644
index 0000000000..926341ce89
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/full-project-search-panel.tsx
@@ -0,0 +1,19 @@
+import { ElementType } from 'react'
+import importOverleafModules from '../../../../macros/import-overleaf-module.macro'
+
+const componentModule = importOverleafModules('fullProjectSearchPanel')[0] as
+  | {
+      import: { default: ElementType }
+      path: string
+    }
+  | undefined
+
+export const FullProjectSearchPanel = () => {
+  if (!componentModule) {
+    return null
+  }
+  const FullProjectSearch = componentModule.import.default
+  return <FullProjectSearch />
+}
+
+export const hasFullProjectSearch = Boolean(componentModule)
diff --git a/services/web/frontend/js/features/ide-redesign/components/integrations-panel/integrations-panel.tsx b/services/web/frontend/js/features/ide-redesign/components/integrations-panel/integrations-panel.tsx
index d1e4358907..e477602e3e 100644
--- a/services/web/frontend/js/features/ide-redesign/components/integrations-panel/integrations-panel.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/integrations-panel/integrations-panel.tsx
@@ -1,7 +1,7 @@
 import { ElementType } from 'react'
 import importOverleafModules from '../../../../../macros/import-overleaf-module.macro'
-import { RailPanelHeader } from '../rail'
 import { useTranslation } from 'react-i18next'
+import RailPanelHeader from '../rail-panel-header'
 
 const integrationPanelComponents = importOverleafModules(
   'integrationPanelComponents'
diff --git a/services/web/frontend/js/features/ide-redesign/components/main-layout.tsx b/services/web/frontend/js/features/ide-redesign/components/main-layout.tsx
index 2c422af279..8ec00a397e 100644
--- a/services/web/frontend/js/features/ide-redesign/components/main-layout.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/main-layout.tsx
@@ -56,6 +56,9 @@ export default function MainLayout() {
             <PanelGroup
               autoSaveId="ide-redesign-editor-and-pdf-panel-group"
               direction="horizontal"
+              className={classNames({
+                hidden: view === 'history',
+              })}
             >
               <Panel
                 id="ide-redesign-editor-panel"
@@ -88,7 +91,7 @@ export default function MainLayout() {
                   tooltipWhenClosed={t('tooltip_show_pdf')}
                 />
                 {pdfLayout === 'sideBySide' && (
-                  <div className="synctex-controls" hidden>
+                  <div className="synctex-controls">
                     <DefaultSynctexControl />
                   </div>
                 )}
diff --git a/services/web/frontend/js/features/ide-redesign/components/pdf-preview/pdf-code-check-failed-banner.tsx b/services/web/frontend/js/features/ide-redesign/components/pdf-preview/pdf-code-check-failed-banner.tsx
new file mode 100644
index 0000000000..ea7c9894d7
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/pdf-preview/pdf-code-check-failed-banner.tsx
@@ -0,0 +1,22 @@
+import MaterialIcon from '@/shared/components/material-icon'
+import { useTranslation } from 'react-i18next'
+import { useDetachCompileContext as useCompileContext } from '@/shared/context/detach-compile-context'
+
+export default function PdfCodeCheckFailedBanner() {
+  const { t } = useTranslation()
+
+  const { codeCheckFailed } = useCompileContext()
+
+  if (!codeCheckFailed) {
+    return null
+  }
+
+  return (
+    <div className="pdf-code-check-failed-banner-container">
+      <div className="pdf-code-check-failed-banner">
+        <MaterialIcon unfilled type="picture_as_pdf" />
+        {t('code_check_failed_explanation')}
+      </div>
+    </div>
+  )
+}
diff --git a/services/web/frontend/js/features/ide-redesign/components/pdf-preview/pdf-error-state.tsx b/services/web/frontend/js/features/ide-redesign/components/pdf-preview/pdf-error-state.tsx
index ef77c0fa5d..a4f53ae614 100644
--- a/services/web/frontend/js/features/ide-redesign/components/pdf-preview/pdf-error-state.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/pdf-preview/pdf-error-state.tsx
@@ -5,31 +5,37 @@ import { useRailContext } from '../../contexts/rail-context'
 import { usePdfPreviewContext } from '@/features/pdf-preview/components/pdf-preview-provider'
 import { useDetachCompileContext as useCompileContext } from '@/shared/context/detach-compile-context'
 import { useIsNewEditorEnabled } from '../../utils/new-editor-utils'
+import { upgradePlan } from '@/main/account-upgrade'
+import classNames from 'classnames'
 
 function PdfErrorState() {
   const { loadingError } = usePdfPreviewContext()
   // TODO ide-redesign-cleanup: rename showLogs to something else and check usages
-  const { showLogs } = useCompileContext()
-  const { t } = useTranslation()
-  const { openTab: openRailTab } = useRailContext()
+  const { hasShortCompileTimeout, error, showLogs } = useCompileContext()
   const newEditor = useIsNewEditorEnabled()
 
   if (!newEditor || (!loadingError && !showLogs)) {
     return null
   }
 
+  if (hasShortCompileTimeout && error === 'timedout') {
+    return <CompileTimeoutErrorState />
+  }
+
+  return <GeneralErrorState />
+}
+
+const GeneralErrorState = () => {
+  const { t } = useTranslation()
+  const { openTab: openRailTab } = useRailContext()
+
   return (
-    <div className="pdf-error-state">
-      <div className="pdf-error-state-top-section">
-        <div className="pdf-error-state-warning-icon">
-          <MaterialIcon type="warning" />
-        </div>
-        <div className="pdf-error-state-text">
-          <p className="pdf-error-state-label">{t('pdf_couldnt_compile')}</p>
-          <p className="pdf-error-state-description">
-            {t('we_are_unable_to_generate_the_pdf_at_this_time')}
-          </p>
-        </div>
+    <ErrorState
+      title={t('pdf_couldnt_compile')}
+      description={t('we_are_unable_to_generate_the_pdf_at_this_time')}
+      iconType="warning"
+      iconClassName="pdf-error-state-warning-icon"
+      actions={
         <OLButton
           variant="secondary"
           size="sm"
@@ -39,20 +45,74 @@ function PdfErrorState() {
         >
           {t('check_logs')}
         </OLButton>
-      </div>
-      <div className="pdf-error-state-info-box">
-        <div className="pdf-error-state-info-box-title">
-          <MaterialIcon type="info" unfilled />
-          {t('why_might_this_happen')}
+      }
+      extraContent={
+        <div className="pdf-error-state-info-box">
+          <div className="pdf-error-state-info-box-title">
+            <MaterialIcon type="info" unfilled />
+            {t('why_might_this_happen')}
+          </div>
+          <ul className="pdf-error-state-info-box-text">
+            <li>{t('there_is_an_unrecoverable_latex_error')}</li>
+            <li>{t('the_document_environment_contains_no_content')}</li>
+            <li>{t('this_project_contains_a_file_called_output')}</li>
+          </ul>
         </div>
-        <ul className="pdf-error-state-info-box-text">
-          <li>{t('there_is_an_unrecoverable_latex_error')}</li>
-          <li>{t('the_document_environment_contains_no_content')}</li>
-          <li>{t('this_project_contains_a_file_called_output')}</li>
-        </ul>
-      </div>
-    </div>
+      }
+    />
   )
 }
 
+const CompileTimeoutErrorState = () => {
+  const { t } = useTranslation()
+
+  return (
+    <ErrorState
+      title={t('compile_limit_reached')}
+      description={t('compile_limit_upgrade_prompt')}
+      iconType="running_with_errors"
+      actions={
+        <OLButton
+          variant="premium"
+          size="sm"
+          onClick={() => upgradePlan('compile-timeout')}
+        >
+          {t('upgrade')}
+        </OLButton>
+      }
+    />
+  )
+}
+
+const ErrorState = ({
+  title,
+  description,
+  iconType,
+  actions,
+  iconClassName,
+  extraContent,
+}: {
+  title: string
+  description: string
+  iconType: string
+  actions: React.ReactNode
+  iconClassName?: string
+  extraContent?: React.ReactNode
+}) => {
+  return (
+    <div className="pdf-error-state">
+      <div className="pdf-error-state-top-section">
+        <div className={classNames('pdf-error-state-icon', iconClassName)}>
+          <MaterialIcon type={iconType} />
+        </div>
+        <div className="pdf-error-state-text">
+          <p className="pdf-error-state-label">{title}</p>
+          <p className="pdf-error-state-description">{description}</p>
+        </div>
+        {actions}
+      </div>
+      {extraContent}
+    </div>
+  )
+}
 export default PdfErrorState
diff --git a/services/web/frontend/js/features/ide-redesign/components/rail-panel-header.tsx b/services/web/frontend/js/features/ide-redesign/components/rail-panel-header.tsx
new file mode 100644
index 0000000000..94ac2f42af
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/rail-panel-header.tsx
@@ -0,0 +1,31 @@
+import { useTranslation } from 'react-i18next'
+import { useRailContext } from '../contexts/rail-context'
+import OLIconButton from '@/features/ui/components/ol/ol-icon-button'
+import React from 'react'
+
+export default function RailPanelHeader({
+  title,
+  actions,
+}: {
+  title: string
+  actions?: React.ReactNode[]
+}) {
+  const { t } = useTranslation()
+  const { handlePaneCollapse } = useRailContext()
+  return (
+    <header className="rail-panel-header">
+      <h4 className="rail-panel-title">{title}</h4>
+
+      <div className="rail-panel-header-actions">
+        {actions}
+        <OLIconButton
+          onClick={handlePaneCollapse}
+          className="rail-panel-header-button-subdued"
+          icon="close"
+          accessibilityLabel={t('close')}
+          size="sm"
+        />
+      </div>
+    </header>
+  )
+}
diff --git a/services/web/frontend/js/features/ide-redesign/components/rail.tsx b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
index d6e1112536..f3c741155c 100644
--- a/services/web/frontend/js/features/ide-redesign/components/rail.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
@@ -1,4 +1,11 @@
-import { FC, ReactElement, useCallback, useMemo } from 'react'
+import {
+  FC,
+  forwardRef,
+  ReactElement,
+  useCallback,
+  useMemo,
+  useRef,
+} from 'react'
 import { useTranslation } from 'react-i18next'
 import { Nav, NavLink, Tab, TabContainer } from 'react-bootstrap'
 import MaterialIcon, {
@@ -6,7 +13,7 @@ import MaterialIcon, {
 } from '@/shared/components/material-icon'
 import { Panel } from 'react-resizable-panels'
 import { useLayoutContext } from '@/shared/context/layout-context'
-import { ErrorIndicator, ErrorPane } from './errors'
+import ErrorIndicator from './error-logs/error-indicator'
 import {
   RailModalKey,
   RailTabKey,
@@ -34,6 +41,17 @@ import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 import OLIconButton from '@/features/ui/components/ol/ol-icon-button'
 import { useChatContext } from '@/features/chat/context/chat-context'
 import { useEditorAnalytics } from '@/shared/hooks/use-editor-analytics'
+import {
+  FullProjectSearchPanel,
+  hasFullProjectSearch,
+} from './full-project-search-panel'
+import { sendSearchEvent } from '@/features/event-tracking/search-events'
+import ErrorLogsPanel from './error-logs/error-logs-panel'
+import { useDetachCompileContext as useCompileContext } from '@/shared/context/detach-compile-context'
+import OldErrorPane from './error-logs/old-error-pane'
+import { useFeatureFlag } from '@/shared/context/split-test-context'
+import { useSurveyUrl } from '../hooks/use-survey-url'
+import NewErrorLogsPromo from './error-logs/new-error-logs-promo'
 
 type RailElement = {
   icon: AvailableUnfilledIcon
@@ -42,6 +60,7 @@ type RailElement = {
   indicator?: ReactElement
   title: string
   hide?: boolean
+  disabled?: boolean
 }
 
 type RailActionButton = {
@@ -91,6 +110,10 @@ export const RailLayout = () => {
     togglePane,
     setResizing,
   } = useRailContext()
+  const { logEntries } = useCompileContext()
+  const errorLogsDisabled = !logEntries
+
+  const errorsTabRef = useRef<HTMLAnchorElement>(null)
 
   const { view, setLeftMenuShown } = useLayoutContext()
 
@@ -98,6 +121,8 @@ export const RailLayout = () => {
 
   const isHistoryView = view === 'history'
 
+  const newErrorlogs = useFeatureFlag('new-editor-error-logs-redesign')
+
   const railTabs: RailElement[] = useMemo(
     () => [
       {
@@ -106,6 +131,13 @@ export const RailLayout = () => {
         title: t('file_tree'),
         component: <FileTreeOutlinePanel />,
       },
+      {
+        key: 'full-project-search',
+        icon: 'search',
+        title: t('project_search'),
+        component: <FullProjectSearchPanel />,
+        hide: !hasFullProjectSearch,
+      },
       {
         key: 'integrations',
         icon: 'integration_instructions',
@@ -124,17 +156,18 @@ export const RailLayout = () => {
         component: <ChatPane />,
         indicator: <ChatIndicator />,
         title: t('chat'),
-        hide: !getMeta('ol-chatEnabled'),
+        hide: !getMeta('ol-capabilities')?.includes('chat'),
       },
       {
         key: 'errors',
         icon: 'report',
         title: t('error_log'),
-        component: <ErrorPane />,
+        component: newErrorlogs ? <ErrorLogsPanel /> : <OldErrorPane />,
         indicator: <ErrorIndicator />,
+        disabled: errorLogsDisabled,
       },
     ],
-    [t]
+    [t, errorLogsDisabled, newErrorlogs]
   )
 
   const railActions: RailAction[] = useMemo(
@@ -170,10 +203,17 @@ export const RailLayout = () => {
           // Attempting to open a non-existent tab
           return
         }
-        const keyOrDefault = key ?? 'file-tree'
+        const keyOrDefault = (key ?? 'file-tree') as RailTabKey
         // Change the selected tab and make sure it's open
-        openTab(keyOrDefault as RailTabKey)
+        openTab(keyOrDefault)
         sendEvent('rail-click', { tab: keyOrDefault })
+        if (keyOrDefault === 'full-project-search') {
+          sendSearchEvent('search-open', {
+            searchType: 'full-project',
+            method: 'button',
+            location: 'rail',
+          })
+        }
 
         if (key === 'chat') {
           markMessagesAsRead()
@@ -198,24 +238,31 @@ export const RailLayout = () => {
         <Nav activeKey={selectedTab} className="ide-rail-tabs-nav">
           {railTabs
             .filter(({ hide }) => !hide)
-            .map(({ icon, key, indicator, title }) => (
+            .map(({ icon, key, indicator, title, disabled }) => (
               <RailTab
+                ref={key === 'errors' ? errorsTabRef : null}
                 open={isOpen && selectedTab === key}
                 key={key}
                 eventKey={key}
                 icon={icon}
                 indicator={indicator}
                 title={title}
+                disabled={disabled}
               />
             ))}
           <div className="flex-grow-1" />
           {railActions?.map(action => (
             <RailActionElement key={action.key} action={action} />
           ))}
+          {newErrorlogs && <NewErrorLogsPromo target={errorsTabRef.current} />}
         </Nav>
       </div>
       <Panel
-        id="ide-redesign-sidebar-panel"
+        id={
+          newErrorlogs
+            ? `ide-redesign-sidebar-panel-${selectedTab}`
+            : 'ide-redesign-sidebar-panel'
+        }
         className={classNames({ hidden: isReviewPanelOpen })}
         order={1}
         defaultSize={15}
@@ -232,7 +279,7 @@ export const RailLayout = () => {
             hidden: isHistoryView,
           })}
         >
-          <Tab.Content>
+          <Tab.Content className="ide-rail-tab-content">
             {railTabs
               .filter(({ hide }) => !hide)
               .map(({ key, component }) => (
@@ -266,19 +313,17 @@ export const RailLayout = () => {
   )
 }
 
-const RailTab = ({
-  icon,
-  eventKey,
-  open,
-  indicator,
-  title,
-}: {
-  icon: AvailableUnfilledIcon
-  eventKey: string
-  open: boolean
-  indicator?: ReactElement
-  title: string
-}) => {
+const RailTab = forwardRef<
+  HTMLAnchorElement,
+  {
+    icon: AvailableUnfilledIcon
+    eventKey: string
+    open: boolean
+    indicator?: ReactElement
+    title: string
+    disabled?: boolean
+  }
+>(({ icon, eventKey, open, indicator, title, disabled = false }, ref) => {
   return (
     <OLTooltip
       id={`rail-tab-tooltip-${eventKey}`}
@@ -286,10 +331,12 @@ const RailTab = ({
       overlayProps={{ delay: 0, placement: 'right' }}
     >
       <NavLink
+        ref={ref}
         eventKey={eventKey}
         className={classNames('ide-rail-tab-link', {
           'open-rail': open,
         })}
+        disabled={disabled}
       >
         {open ? (
           <MaterialIcon
@@ -309,7 +356,9 @@ const RailTab = ({
       </NavLink>
     </OLTooltip>
   )
-}
+})
+
+RailTab.displayName = 'RailTab'
 
 const RailActionElement = ({ action }: { action: RailAction }) => {
   const onActionClick = useCallback(() => {
@@ -363,23 +412,6 @@ const RailActionElement = ({ action }: { action: RailAction }) => {
   }
 }
 
-export const RailPanelHeader: FC<{ title: string }> = ({ title }) => {
-  const { t } = useTranslation()
-  const { handlePaneCollapse } = useRailContext()
-  return (
-    <header className="rail-panel-header">
-      <h4 className="rail-panel-title">{title}</h4>
-      <OLIconButton
-        onClick={handlePaneCollapse}
-        className="rail-panel-header-button-subdued"
-        icon="close"
-        accessibilityLabel={t('close')}
-        size="sm"
-      />
-    </header>
-  )
-}
-
 const RailHelpDropdown = () => {
   const showSupport = getMeta('ol-showSupport')
   const { t } = useTranslation()
@@ -390,6 +422,8 @@ const RailHelpDropdown = () => {
   const openContactUsModal = useCallback(() => {
     setActiveModal('contact-us')
   }, [setActiveModal])
+  const surveyURL = useSurveyUrl()
+
   return (
     <DropdownMenu>
       <DropdownItem onClick={openKeyboardShortcutsModal}>
@@ -410,7 +444,7 @@ const RailHelpDropdown = () => {
         </DropdownItem>
       )}
       <DropdownItem
-        href="https://forms.gle/soyVStc5qDx9na1Z6"
+        href={surveyURL}
         role="menuitem"
         target="_blank"
         rel="noopener noreferrer"
diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/breadcrumbs-setting.tsx b/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/breadcrumbs-setting.tsx
new file mode 100644
index 0000000000..c4dff10485
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/breadcrumbs-setting.tsx
@@ -0,0 +1,18 @@
+import { useProjectSettingsContext } from '@/features/editor-left-menu/context/project-settings-context'
+import ToggleSetting from '../toggle-setting'
+import { useTranslation } from 'react-i18next'
+
+export default function BreadcrumbsSetting() {
+  const { breadcrumbs, setBreadcrumbs } = useProjectSettingsContext()
+  const { t } = useTranslation()
+
+  return (
+    <ToggleSetting
+      id="breadcrumbs-setting"
+      label={t('breadcrumbs')}
+      description={t('show_breadcrumbs_in_toolbar')}
+      checked={breadcrumbs}
+      onChange={setBreadcrumbs}
+    />
+  )
+}
diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/editor-settings.tsx b/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/editor-settings.tsx
index 28dcef8a9b..a58b0c101e 100644
--- a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/editor-settings.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/editor-settings.tsx
@@ -9,6 +9,7 @@ import PDFViewerSetting from './pdf-viewer-setting'
 import SpellCheckSetting from './spell-check-setting'
 import DictionarySetting from './dictionary-setting'
 import importOverleafModules from '../../../../../../macros/import-overleaf-module.macro'
+import BreadcrumbsSetting from './breadcrumbs-setting'
 
 const [referenceSearchSettingModule] = importOverleafModules(
   'referenceSearchSetting'
@@ -33,6 +34,7 @@ export default function EditorSettings() {
         <DictionarySetting />
       </SettingsSection>
       <SettingsSection title={t('tools')}>
+        <BreadcrumbsSetting />
         <MathPreviewSetting />
       </SettingsSection>
     </>
diff --git a/services/web/frontend/js/features/ide-redesign/components/switcher-modal/modal.tsx b/services/web/frontend/js/features/ide-redesign/components/switcher-modal/modal.tsx
index 6942674de5..be3868ed89 100644
--- a/services/web/frontend/js/features/ide-redesign/components/switcher-modal/modal.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/switcher-modal/modal.tsx
@@ -15,6 +15,8 @@ import Notification from '@/shared/components/notification'
 import { useSwitchEnableNewEditorState } from '../../hooks/use-switch-enable-new-editor-state'
 import { Trans, useTranslation } from 'react-i18next'
 import { useEditorAnalytics } from '@/shared/hooks/use-editor-analytics'
+import { useFeatureFlag } from '@/shared/context/split-test-context'
+import { useSurveyUrl } from '../../hooks/use-survey-url'
 
 export const IdeRedesignSwitcherModal = () => {
   const { t } = useTranslation()
@@ -79,6 +81,9 @@ const SwitcherModalContentEnabled: FC<ModalContentProps> = ({
         // do nothing, we're already showing the error
       })
   }, [setEditorRedesignStatus, hide, sendEvent])
+
+  const surveyURL = useSurveyUrl()
+
   return (
     <>
       <OLModalBody>
@@ -104,7 +109,7 @@ const SwitcherModalContentEnabled: FC<ModalContentProps> = ({
           {t('cancel')}
         </OLButton>
         <OLButton
-          href="https://forms.gle/soyVStc5qDx9na1Z6"
+          href={surveyURL}
           target="_blank"
           rel="noopener noreferrer"
           variant="primary"
@@ -156,10 +161,14 @@ const SwitcherModalContentDisabled: FC<ModalContentProps> = ({
 
 const SwitcherWhatsNew = () => {
   const { t } = useTranslation()
+  const newErrorlogs = useFeatureFlag('new-editor-error-logs-redesign')
+
   return (
     <div className="ide-redesign-switcher-modal-whats-new">
       <h4>{t('latest_updates')}</h4>
       <ul>
+        {newErrorlogs && <li>{t('new_error_logs_panel')}</li>}
+        <li>{t('searching_all_project_files_is_now_available')}</li>
         <li>{t('double_clicking_on_the_pdf_shows')}</li>
       </ul>
       <hr />
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/command-dropdown.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/command-dropdown.tsx
index e08cf8873a..2dc696cdbf 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/command-dropdown.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/command-dropdown.tsx
@@ -1,5 +1,7 @@
 import {
   Command,
+  formatShortcut,
+  Shortcuts,
   useCommandRegistry,
 } from '@/features/ide-react/context/command-registry-context'
 import {
@@ -14,7 +16,10 @@ import { MenuBarOption } from '@/shared/components/menu-bar/menu-bar-option'
 import { Fragment, useCallback, useMemo } from 'react'
 
 type CommandId = string
-type TaggedCommand = Command & { type: 'command' }
+type TaggedCommand = Command & {
+  type: 'command'
+  shortcuts?: Shortcuts[CommandId]
+}
 type Entry<T> = T | GroupStructure<T>
 type GroupStructure<T> = {
   id: string
@@ -37,13 +42,13 @@ const CommandDropdown = ({
   title: string
   id: string
 }) => {
-  const { registry } = useCommandRegistry()
+  const { registry, shortcuts } = useCommandRegistry()
   const populatedSections = useMemo(
     () =>
       menu
-        .map(section => populateSectionOrGroup(section, registry))
+        .map(section => populateSectionOrGroup(section, registry, shortcuts))
         .filter(x => x.children.length > 0),
-    [menu, registry]
+    [menu, registry, shortcuts]
   )
 
   if (populatedSections.length === 0) {
@@ -76,8 +81,8 @@ export const CommandSection = ({
 }: {
   section: MenuSectionStructure<CommandId>
 }) => {
-  const { registry } = useCommandRegistry()
-  const section = populateSectionOrGroup(sectionStructure, registry)
+  const { registry, shortcuts } = useCommandRegistry()
+  const section = populateSectionOrGroup(sectionStructure, registry, shortcuts)
   if (section.children.length === 0) {
     return null
   }
@@ -108,6 +113,9 @@ const CommandDropdownChild = ({ item }: { item: Entry<TaggedCommand> }) => {
         onClick={onClickHandler}
         href={item.href}
         disabled={item.disabled}
+        trailingIcon={
+          item.shortcuts && <span>{formatShortcut(item.shortcuts[0])}</span>
+        }
       />
     )
   } else {
@@ -127,7 +135,8 @@ function populateSectionOrGroup<
   T extends { children: Array<Entry<CommandId>> },
 >(
   section: T,
-  registry: Map<string, Command>
+  registry: Map<string, Command>,
+  shortcuts: Shortcuts
 ): Omit<T, 'children'> & {
   children: Array<Entry<TaggedCommand>>
 } {
@@ -137,7 +146,11 @@ function populateSectionOrGroup<
     children: children
       .map(child => {
         if (typeof child !== 'string') {
-          const populatedChild = populateSectionOrGroup(child, registry)
+          const populatedChild = populateSectionOrGroup(
+            child,
+            registry,
+            shortcuts
+          )
           if (populatedChild.children.length === 0) {
             // Skip empty groups
             return undefined
@@ -146,7 +159,11 @@ function populateSectionOrGroup<
         }
         const command = registry.get(child)
         if (command) {
-          return { ...command, type: 'command' as const }
+          return {
+            ...command,
+            shortcuts: shortcuts[command.id],
+            type: 'command' as const,
+          }
         }
         return undefined
       })
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/duplicate-project.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/duplicate-project.tsx
new file mode 100644
index 0000000000..74f868cc91
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/duplicate-project.tsx
@@ -0,0 +1,48 @@
+import EditorCloneProjectModalWrapper from '@/features/clone-project-modal/components/editor-clone-project-modal-wrapper'
+import OLDropdownMenuItem from '@/features/ui/components/ol/ol-dropdown-menu-item'
+import { useEditorAnalytics } from '@/shared/hooks/use-editor-analytics'
+import { useLocation } from '@/shared/hooks/use-location'
+import getMeta from '@/utils/meta'
+import { useCallback, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+type ProjectCopyResponse = {
+  project_id: string
+}
+
+export const DuplicateProject = () => {
+  const { sendEvent } = useEditorAnalytics()
+  const { t } = useTranslation()
+  const [showModal, setShowModal] = useState(false)
+  const location = useLocation()
+  const anonymous = getMeta('ol-anonymous')
+
+  const openProject = useCallback(
+    ({ project_id: projectId }: ProjectCopyResponse) => {
+      location.assign(`/project/${projectId}`)
+    },
+    [location]
+  )
+
+  const handleShowModal = useCallback(() => {
+    sendEvent('copy-project', { location: 'project-title-dropdown' })
+    setShowModal(true)
+  }, [sendEvent])
+
+  if (anonymous) {
+    return null
+  }
+
+  return (
+    <>
+      <OLDropdownMenuItem onClick={handleShowModal}>
+        {t('copy')}
+      </OLDropdownMenuItem>
+      <EditorCloneProjectModalWrapper
+        show={showModal}
+        handleHide={() => setShowModal(false)}
+        openProject={openProject}
+      />
+    </>
+  )
+}
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/labs-actions.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/labs-actions.tsx
index 06a3a2ab4a..27630ca598 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/labs-actions.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/labs-actions.tsx
@@ -4,6 +4,7 @@ import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 import MaterialIcon from '@/shared/components/material-icon'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
+import { useSurveyUrl } from '../../hooks/use-survey-url'
 
 export const LabsActions = () => {
   const { t } = useTranslation()
@@ -11,6 +12,7 @@ export const LabsActions = () => {
   const openEditorRedesignSwitcherModal = useCallback(() => {
     setShowSwitcherModal(true)
   }, [setShowSwitcherModal])
+  const surveyURL = useSurveyUrl()
   return (
     <>
       <div className="ide-redesign-toolbar-button-container">
@@ -34,7 +36,7 @@ export const LabsActions = () => {
       </div>
       <div className="ide-redesign-toolbar-button-container">
         <a
-          href="https://forms.gle/soyVStc5qDx9na1Z6"
+          href={surveyURL}
           rel="noopener noreferrer"
           target="_blank"
           className="ide-redesign-toolbar-labs-feedback-link"
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/menu-bar.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/menu-bar.tsx
index ed0ebd77f8..d2593d7d07 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/menu-bar.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/menu-bar.tsx
@@ -20,12 +20,13 @@ import CommandDropdown, {
   MenuSectionStructure,
   MenuStructure,
 } from './command-dropdown'
-import { useUserSettingsContext } from '@/shared/context/user-settings-context'
 import { useRailContext } from '../../contexts/rail-context'
 import WordCountModal from '@/features/word-count-modal/components/word-count-modal'
 import { isSplitTestEnabled } from '@/utils/splitTestUtils'
 import { useDetachCompileContext as useCompileContext } from '@/shared/context/detach-compile-context'
 import { useEditorAnalytics } from '@/shared/hooks/use-editor-analytics'
+import { useProjectSettingsContext } from '@/features/editor-left-menu/context/project-settings-context'
+import { useSurveyUrl } from '../../hooks/use-survey-url'
 
 export const ToolbarMenuBar = () => {
   const { t } = useTranslation()
@@ -170,19 +171,16 @@ export const ToolbarMenuBar = () => {
     [t]
   )
 
-  const {
-    userSettings: { mathPreview },
-    setUserSettings,
-  } = useUserSettingsContext()
+  const { mathPreview, setMathPreview, breadcrumbs, setBreadcrumbs } =
+    useProjectSettingsContext()
 
   const toggleMathPreview = useCallback(() => {
-    setUserSettings(prev => {
-      return {
-        ...prev,
-        mathPreview: !prev.mathPreview,
-      }
-    })
-  }, [setUserSettings])
+    setMathPreview(!mathPreview)
+  }, [setMathPreview, mathPreview])
+
+  const toggleBreadcrumbs = useCallback(() => {
+    setBreadcrumbs(!breadcrumbs)
+  }, [setBreadcrumbs, breadcrumbs])
 
   const { setActiveModal } = useRailContext()
   const openKeyboardShortcutsModal = useCallback(() => {
@@ -191,6 +189,9 @@ export const ToolbarMenuBar = () => {
   const openContactUsModal = useCallback(() => {
     setActiveModal('contact-us')
   }, [setActiveModal])
+
+  const surveyURL = useSurveyUrl()
+
   return (
     <>
       <MenuBar
@@ -212,6 +213,14 @@ export const ToolbarMenuBar = () => {
           <ChangeLayoutOptions />
           <DropdownDivider />
           <DropdownHeader>Editor settings</DropdownHeader>
+          <MenuBarOption
+            eventKey="show_breadcrumbs"
+            title={t('show_breadcrumbs')}
+            leadingIcon={
+              breadcrumbs ? 'check' : <DropdownItem.EmptyLeadingIcon />
+            }
+            onClick={toggleBreadcrumbs}
+          />
           <MenuBarOption
             eventKey="show_equation_preview"
             title={t('show_equation_preview')}
@@ -254,7 +263,7 @@ export const ToolbarMenuBar = () => {
           <MenuBarOption
             eventKey="give_feedback"
             title={t('give_feedback')}
-            href="https://forms.gle/soyVStc5qDx9na1Z6"
+            href={surveyURL}
             target="_blank"
             rel="noopener noreferrer"
           />
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx
index 68860da4ea..61e29023a0 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx
@@ -13,6 +13,7 @@ import { DownloadProjectPDF, DownloadProjectZip } from './download-project'
 import { useCallback, useState } from 'react'
 import OLDropdownMenuItem from '@/features/ui/components/ol/ol-dropdown-menu-item'
 import EditableLabel from './editable-label'
+import { DuplicateProject } from './duplicate-project'
 
 const [publishModalModules] = importOverleafModules('publishModal')
 const SubmitProjectButton = publishModalModules?.import.NewPublishToolbarButton
@@ -73,6 +74,7 @@ export const ToolbarProjectTitle = () => {
         <DownloadProjectPDF />
         <DownloadProjectZip />
         <DropdownDivider />
+        <DuplicateProject />
         <OLDropdownMenuItem
           onClick={() => {
             setIsRenaming(true)
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
index 56c597451e..298e6f8e93 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
@@ -12,6 +12,8 @@ import BackToEditorButton from '@/features/editor-navigation-toolbar/components/
 import { useCallback } from 'react'
 import * as eventTracking from '../../../../infrastructure/event-tracking'
 import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import UpgradeButton from './upgrade-button'
+import getMeta from '@/utils/meta'
 
 export const Toolbar = () => {
   const { view, setView } = useLayoutContext()
@@ -71,6 +73,7 @@ const ToolbarButtons = () => {
       <ShowHistoryButton />
       <ChangeLayoutButton />
       <ShareProjectButton />
+      {getMeta('ol-showUpgradePrompt') && <UpgradeButton />}
     </div>
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/upgrade-button.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/upgrade-button.tsx
new file mode 100644
index 0000000000..b3059de5af
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/upgrade-button.tsx
@@ -0,0 +1,26 @@
+import { useTranslation } from 'react-i18next'
+import * as eventTracking from '../../../../infrastructure/event-tracking'
+import OLButton from '@/features/ui/components/ol/ol-button'
+
+export default function UpgradeButton() {
+  const { t } = useTranslation()
+
+  function handleClick() {
+    eventTracking.send('subscription-funnel', 'code-editor', 'upgrade')
+    eventTracking.sendMB('upgrade-button-click', { source: 'code-editor' })
+  }
+
+  return (
+    <div className="ide-redesign-toolbar-button-container">
+      <OLButton
+        variant="premium"
+        size="sm"
+        href="/user/subscription/plans?itm_referrer=editor-header-upgrade-prompt"
+        target="_blank"
+        onClick={handleClick}
+      >
+        {t('upgrade')}
+      </OLButton>
+    </div>
+  )
+}
diff --git a/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx b/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
index c02d17fb9b..c52671b42b 100644
--- a/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
+++ b/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
@@ -1,5 +1,7 @@
+import { sendSearchEvent } from '@/features/event-tracking/search-events'
 import useCollapsiblePanel from '@/features/ide-react/hooks/use-collapsible-panel'
 import useEventListener from '@/shared/hooks/use-event-listener'
+import { isMac } from '@/shared/utils/os'
 import {
   createContext,
   Dispatch,
@@ -19,6 +21,7 @@ export type RailTabKey =
   | 'review-panel'
   | 'chat'
   | 'errors'
+  | 'full-project-search'
 
 export type RailModalKey = 'keyboard-shortcuts' | 'contact-us' | 'dictionary'
 
@@ -89,6 +92,27 @@ export const RailProvider: FC<React.PropsWithChildren> = ({ children }) => {
     }, [handlePaneCollapse, selectedTab, isOpen, openTab])
   )
 
+  useEventListener(
+    'keydown',
+    useCallback(
+      (event: KeyboardEvent) => {
+        if (
+          (isMac ? event.metaKey : event.ctrlKey) &&
+          event.shiftKey &&
+          event.code === 'KeyF'
+        ) {
+          event.preventDefault()
+          sendSearchEvent('search-open', {
+            searchType: 'full-project',
+            method: 'keyboard',
+          })
+          openTab('full-project-search')
+        }
+      },
+      [openTab]
+    )
+  )
+
   const value = useMemo(
     () => ({
       selectedTab,
diff --git a/services/web/frontend/js/features/ide-redesign/hooks/use-survey-url.tsx b/services/web/frontend/js/features/ide-redesign/hooks/use-survey-url.tsx
new file mode 100644
index 0000000000..fadc077b70
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/hooks/use-survey-url.tsx
@@ -0,0 +1,9 @@
+import { useFeatureFlag } from '@/shared/context/split-test-context'
+
+export const useSurveyUrl = () => {
+  const newErrorlogs = useFeatureFlag('new-editor-error-logs-redesign')
+  if (newErrorlogs) {
+    return 'https://forms.gle/83QJ9ALJkiugxTZf8'
+  }
+  return 'https://forms.gle/soyVStc5qDx9na1Z6'
+}
diff --git a/services/web/frontend/js/features/pdf-preview/components/compile-time-changing-soon.tsx b/services/web/frontend/js/features/pdf-preview/components/compile-time-changing-soon.tsx
new file mode 100644
index 0000000000..9d9bc53711
--- /dev/null
+++ b/services/web/frontend/js/features/pdf-preview/components/compile-time-changing-soon.tsx
@@ -0,0 +1,122 @@
+import Notification from '@/shared/components/notification'
+import StartFreeTrialButton from '@/shared/components/start-free-trial-button'
+import { Trans, useTranslation } from 'react-i18next'
+import * as eventTracking from '@/infrastructure/event-tracking'
+import { FC } from 'react'
+
+export const CompileTimeoutChangingSoon: FC<{
+  isProjectOwner?: boolean
+  handleDismissChangingSoon: () => void
+  segmentation?: eventTracking.Segmentation
+}> = ({ isProjectOwner = false, handleDismissChangingSoon, segmentation }) => {
+  const { t } = useTranslation()
+
+  const sendInfoClickEvent = () => {
+    eventTracking.sendMB('paywall-info-click', {
+      'paywall-type': 'compile-time-warning',
+      ...segmentation,
+      content: 'blog',
+    })
+  }
+
+  const compileTimeoutChangesBlogLink = (
+    /* eslint-disable-next-line jsx-a11y/anchor-has-content */
+    <a
+      aria-label={t('read_more_about_compile_timeout_changes')}
+      href="/blog/changes-to-free-compile-timeout"
+      key="compileTimeoutBlogLink1"
+      rel="noopener noreferrer"
+      target="_blank"
+      onClick={sendInfoClickEvent}
+    />
+  )
+
+  const fixingCompileTimeoutsLearnLink = (
+    /* eslint-disable-next-line jsx-a11y/anchor-has-content */
+    <a
+      aria-label={t('read_more_about_fix_prevent_timeout')}
+      href="/learn/how-to/Fixing_and_preventing_compile_timeouts"
+      key="compileTimeoutBlogLink2"
+      target="_blank"
+      rel="noopener noreferrer"
+    />
+  )
+
+  if (isProjectOwner) {
+    return (
+      <Notification
+        action={
+          <StartFreeTrialButton
+            segmentation={segmentation}
+            source="compile-time-warning"
+            buttonProps={{
+              variant: 'secondary',
+              size: 'sm',
+            }}
+          >
+            {t('start_free_trial_without_exclamation')}
+          </StartFreeTrialButton>
+        }
+        ariaLive="polite"
+        content={
+          <div>
+            <p>
+              <Trans
+                i18nKey="introducing_shorter_compile_timeout"
+                components={[compileTimeoutChangesBlogLink]}
+              />
+            </p>
+            <p className="row-spaced">
+              <Trans
+                i18nKey="you_may_be_able_to_fix_issues_to_speed_up_the_compile"
+                components={[fixingCompileTimeoutsLearnLink]}
+              />{' '}
+              <Trans
+                i18nKey="and_upgrade_for_compile_time"
+                components={{ strong: <strong /> }}
+              />
+            </p>
+          </div>
+        }
+        title={t('your_project_compiled_but_soon_might_not')}
+        type="warning"
+        isActionBelowContent
+        isDismissible
+        onDismiss={handleDismissChangingSoon}
+      />
+    )
+  }
+
+  return (
+    <Notification
+      ariaLive="polite"
+      content={
+        <div>
+          <p>
+            <Trans
+              i18nKey="introducing_shorter_compile_timeout"
+              components={[compileTimeoutChangesBlogLink]}
+            />{' '}
+            <Trans
+              i18nKey="you_may_be_able_to_fix_issues_to_speed_up_the_compile"
+              components={[fixingCompileTimeoutsLearnLink]}
+            />
+          </p>
+          <p className="row-spaced">
+            <Trans
+              i18nKey="tell_the_project_owner_and_ask_them_to_upgrade"
+              components={[
+                // eslint-disable-next-line react/jsx-key
+                <strong />,
+              ]}
+            />
+          </p>
+        </div>
+      }
+      title={t('this_project_compiled_but_soon_might_not')}
+      type="warning"
+      isDismissible
+      onDismiss={handleDismissChangingSoon}
+    />
+  )
+}
diff --git a/services/web/frontend/js/features/pdf-preview/components/compile-time-warning-upgrade-prompt-inner.tsx b/services/web/frontend/js/features/pdf-preview/components/compile-time-warning-upgrade-prompt-inner.tsx
index 09cfb5ddee..463ba55be8 100644
--- a/services/web/frontend/js/features/pdf-preview/components/compile-time-warning-upgrade-prompt-inner.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/compile-time-warning-upgrade-prompt-inner.tsx
@@ -1,21 +1,24 @@
 import Notification from '@/shared/components/notification'
 import StartFreeTrialButton from '@/shared/components/start-free-trial-button'
+import * as eventTracking from '../../../infrastructure/event-tracking'
 import { useTranslation } from 'react-i18next'
 import { FC } from 'react'
 
 export const CompileTimeWarningUpgradePromptInner: FC<{
   handleDismissWarning: () => void
-}> = ({ handleDismissWarning }) => {
+  segmentation: eventTracking.Segmentation
+}> = ({ handleDismissWarning, segmentation }) => {
   const { t } = useTranslation()
 
   return (
     <Notification
       action={
         <StartFreeTrialButton
-          variant="new-10s"
           source="compile-time-warning"
+          segmentation={segmentation}
           buttonProps={{
             variant: 'secondary',
+            size: 'sm',
           }}
         >
           {t('start_free_trial_without_exclamation')}
@@ -27,7 +30,7 @@ export const CompileTimeWarningUpgradePromptInner: FC<{
           <div>
             <span>{t('your_project_near_compile_timeout_limit')}</span>
           </div>
-          <strong>{t('upgrade_for_12x_more_compile_time')}</strong>
+          <strong>{t('upgrade_for_more_compile_time')}</strong>
           {'. '}
         </div>
       }
diff --git a/services/web/frontend/js/features/pdf-preview/components/compile-time-warning-upgrade-prompt.tsx b/services/web/frontend/js/features/pdf-preview/components/compile-time-warning-upgrade-prompt.tsx
index 6595df854c..164c3c3275 100644
--- a/services/web/frontend/js/features/pdf-preview/components/compile-time-warning-upgrade-prompt.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/compile-time-warning-upgrade-prompt.tsx
@@ -1,23 +1,56 @@
-import { memo, useCallback, useEffect, useState } from 'react'
+import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import * as eventTracking from '@/infrastructure/event-tracking'
 import { useDetachCompileContext } from '@/shared/context/detach-compile-context'
 import usePersistedState from '@/shared/hooks/use-persisted-state'
 import { CompileTimeWarningUpgradePromptInner } from '@/features/pdf-preview/components/compile-time-warning-upgrade-prompt-inner'
 import getMeta from '@/utils/meta'
+import { CompileTimeoutChangingSoon } from './compile-time-changing-soon'
 
 function CompileTimeWarningUpgradePrompt() {
   const { isProjectOwner, deliveryLatencies, compiling, showLogs, error } =
     useDetachCompileContext()
 
   const [showWarning, setShowWarning] = useState(false)
+  const [showChangingSoon, setShowChangingSoon] = useState(false)
   const [dismissedUntilWarning, setDismissedUntilWarning] = usePersistedState<
     Date | undefined
   >(`has-dismissed-10s-compile-time-warning-until`)
+  const { reducedTimeoutWarning } = getMeta('ol-compileSettings')
+  const warningThreshold = reducedTimeoutWarning === 'enabled' ? 7 : 10
+
+  const sharedSegmentation = useMemo(
+    () => ({
+      '10s-timeout-warning': reducedTimeoutWarning,
+      'is-owner': isProjectOwner,
+    }),
+    [isProjectOwner, reducedTimeoutWarning]
+  )
+
+  const warningSegmentation = useMemo(
+    () => ({
+      content: 'warning',
+      compileTime: warningThreshold,
+      ...sharedSegmentation,
+    }),
+    [sharedSegmentation, warningThreshold]
+  )
+
+  const changingSoonSegmentation = useMemo(
+    () => ({
+      content: 'changes',
+      compileTime: 10,
+      ...sharedSegmentation,
+    }),
+    [sharedSegmentation]
+  )
 
   const handleNewCompile = useCallback(
     (compileTime: number) => {
       setShowWarning(false)
-      if (compileTime > 10000) {
+      setShowChangingSoon(false)
+      if (reducedTimeoutWarning === 'enabled' && compileTime > 10000) {
+        setShowChangingSoon(true)
+      } else if (compileTime > warningThreshold * 1000) {
         if (isProjectOwner) {
           if (
             !dismissedUntilWarning ||
@@ -25,26 +58,52 @@ function CompileTimeWarningUpgradePrompt() {
           ) {
             setShowWarning(true)
             eventTracking.sendMB('compile-time-warning-displayed', {
-              time: 10,
+              compileTime: warningThreshold,
               isProjectOwner,
             })
           }
         }
       }
     },
-    [isProjectOwner, dismissedUntilWarning]
+    [
+      isProjectOwner,
+      dismissedUntilWarning,
+      reducedTimeoutWarning,
+      warningThreshold,
+    ]
   )
 
   const handleDismissWarning = useCallback(() => {
     eventTracking.sendMB('compile-time-warning-dismissed', {
-      time: 10,
+      compileTime: warningThreshold,
       isProjectOwner,
     })
+    eventTracking.sendMB('paywall-dismiss', {
+      'paywall-type': 'compile-time-warning',
+      content: 'warning',
+      compileTime: warningThreshold,
+      ...sharedSegmentation,
+    })
     setShowWarning(false)
     const until = new Date()
     until.setDate(until.getDate() + 1) // 1 day
     setDismissedUntilWarning(until)
-  }, [isProjectOwner, setDismissedUntilWarning])
+  }, [
+    isProjectOwner,
+    setDismissedUntilWarning,
+    warningThreshold,
+    sharedSegmentation,
+  ])
+
+  const handleDismissChangingSoon = useCallback(() => {
+    eventTracking.sendMB('paywall-dismiss', {
+      'paywall-type': 'compile-time-warning',
+      compileTime: 10,
+      content: 'changes',
+      ...sharedSegmentation,
+    })
+    setShowChangingSoon(false)
+  }, [sharedSegmentation])
 
   useEffect(() => {
     if (compiling || error || showLogs) return
@@ -55,21 +114,32 @@ function CompileTimeWarningUpgradePrompt() {
     return null
   }
 
-  if (compiling || error || showLogs) {
+  if (
+    compiling ||
+    error ||
+    showLogs ||
+    !deliveryLatencies.compileTimeServerE2E
+  ) {
     return null
   }
 
-  if (!showWarning) {
+  if (!showWarning && !showChangingSoon) {
     return null
   }
 
-  // if showWarning is true then the 10s warning is shown
-
   return (
     <div>
       {showWarning && isProjectOwner && (
         <CompileTimeWarningUpgradePromptInner
           handleDismissWarning={handleDismissWarning}
+          segmentation={warningSegmentation}
+        />
+      )}
+      {showChangingSoon && (
+        <CompileTimeoutChangingSoon
+          isProjectOwner={isProjectOwner}
+          handleDismissChangingSoon={handleDismissChangingSoon}
+          segmentation={changingSoonSegmentation}
         />
       )}
     </div>
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-content.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-content.tsx
index 8c9a9d7761..17378f6c74 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-content.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-content.tsx
@@ -3,6 +3,7 @@ import PdfLogEntryRawContent from './pdf-log-entry-raw-content'
 import importOverleafModules from '../../../../macros/import-overleaf-module.macro'
 import { LogEntry } from '../util/types'
 import { ElementType } from 'react'
+import classNames from 'classnames'
 
 const pdfLogEntryComponents = importOverleafModules(
   'pdfLogEntryComponents'
@@ -17,17 +18,21 @@ export default function PdfLogEntryContent({
   extraInfoURL,
   index,
   logEntry,
+  alwaysExpandRawContent = false,
+  className,
 }: {
   rawContent?: string
   formattedContent?: React.ReactNode
   extraInfoURL?: string | null
   index?: number
   logEntry?: LogEntry
+  alwaysExpandRawContent?: boolean
+  className?: string
 }) {
   const { t } = useTranslation()
 
   return (
-    <div className="log-entry-content">
+    <div className={classNames('log-entry-content', className)}>
       {formattedContent && (
         <div className="log-entry-formatted-content">{formattedContent}</div>
       )}
@@ -48,7 +53,11 @@ export default function PdfLogEntryContent({
         )}
 
       {rawContent && (
-        <PdfLogEntryRawContent rawContent={rawContent} collapsedSize={150} />
+        <PdfLogEntryRawContent
+          rawContent={rawContent}
+          collapsedSize={150}
+          alwaysExpanded={alwaysExpandRawContent}
+        />
       )}
     </div>
   )
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-raw-content.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-raw-content.tsx
index 39f46fbed3..0e9cc5246d 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-raw-content.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-raw-content.tsx
@@ -8,20 +8,24 @@ import Icon from '../../../shared/components/icon'
 export default function PdfLogEntryRawContent({
   rawContent,
   collapsedSize = 0,
+  alwaysExpanded = false,
 }: {
   rawContent: string
   collapsedSize?: number
+  alwaysExpanded?: boolean
 }) {
-  const [expanded, setExpanded] = useState(false)
-  const [needsExpander, setNeedsExpander] = useState(true)
+  const [expanded, setExpanded] = useState(alwaysExpanded)
+  const [needsExpander, setNeedsExpander] = useState(!alwaysExpanded)
 
   const { elementRef } = useResizeObserver(
     useCallback(
       (element: Element) => {
         if (element.scrollHeight === 0) return // skip update when logs-pane is closed
-        setNeedsExpander(element.scrollHeight > collapsedSize)
+        setNeedsExpander(
+          !alwaysExpanded && element.scrollHeight > collapsedSize
+        )
       },
-      [collapsedSize]
+      [collapsedSize, alwaysExpanded]
     )
   )
 
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry.tsx
index 349ad79047..23ae2dca5d 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry.tsx
@@ -1,4 +1,3 @@
-import classNames from 'classnames'
 import { memo, MouseEventHandler, useCallback } from 'react'
 import PreviewLogEntryHeader from '../../preview/components/preview-log-entry-header'
 import PdfLogEntryContent from './pdf-log-entry-content'
@@ -6,6 +5,9 @@ import HumanReadableLogsHints from '../../../ide/human-readable-logs/HumanReadab
 import { sendMB } from '@/infrastructure/event-tracking'
 import getMeta from '@/utils/meta'
 import { ErrorLevel, LogEntry, SourceLocation } from '../util/types'
+import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
+import NewLogEntry from '@/features/ide-redesign/components/error-logs/log-entry'
+import { useFeatureFlag } from '@/shared/context/split-test-context'
 
 function PdfLogEntry({
   ruleId,
@@ -18,12 +20,9 @@ function PdfLogEntry({
   level,
   sourceLocation,
   showSourceLocationLink = true,
-  showCloseButton = false,
   entryAriaLabel = undefined,
-  customClass,
   contentDetails,
   onSourceLocationClick,
-  onClose,
   index,
   logEntry,
   id,
@@ -38,12 +37,9 @@ function PdfLogEntry({
   extraInfoURL?: string | null
   sourceLocation?: SourceLocation
   showSourceLocationLink?: boolean
-  showCloseButton?: boolean
   entryAriaLabel?: string
-  customClass?: string
   contentDetails?: string[]
   onSourceLocationClick?: (sourceLocation: SourceLocation) => void
-  onClose?: () => void
   index?: number
   logEntry?: LogEntry
   id?: string
@@ -73,9 +69,34 @@ function PdfLogEntry({
       [level, onSourceLocationClick, ruleId, sourceLocation]
     )
 
+  const newEditor = useIsNewEditorEnabled()
+  const newErrorlogs = useFeatureFlag('new-editor-error-logs-redesign')
+
+  if (newEditor && newErrorlogs) {
+    return (
+      <NewLogEntry
+        index={index}
+        id={id}
+        logEntry={logEntry}
+        ruleId={ruleId}
+        headerTitle={headerTitle}
+        formattedContent={formattedContent}
+        rawContent={rawContent}
+        logType={logType}
+        level={level}
+        contentDetails={contentDetails}
+        entryAriaLabel={entryAriaLabel}
+        sourceLocation={sourceLocation}
+        onSourceLocationClick={onSourceLocationClick}
+        showSourceLocationLink={showSourceLocationLink}
+        extraInfoURL={extraInfoURL}
+      />
+    )
+  }
+
   return (
     <div
-      className={classNames('log-entry', customClass)}
+      className="log-entry"
       aria-label={entryAriaLabel}
       data-ruleid={ruleId}
       data-log-entry-id={id}
@@ -88,8 +109,6 @@ function PdfLogEntry({
         logType={logType}
         showSourceLocationLink={showSourceLocationLink}
         onSourceLocationClick={handleLogEntryLinkClick}
-        showCloseButton={showCloseButton}
-        onClose={onClose}
       />
 
       {(rawContent || formattedContent || showAiErrorAssistant) && (
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.tsx
index ec834432fe..f9fbcae42a 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.tsx
@@ -21,7 +21,6 @@ function PdfLogsViewer({ alwaysVisible = false }: { alwaysVisible?: boolean }) {
   const {
     codeCheckFailed,
     error,
-    hasShortCompileTimeout,
     logEntries,
     rawLog,
     validationIssues,
@@ -32,6 +31,8 @@ function PdfLogsViewer({ alwaysVisible = false }: { alwaysVisible?: boolean }) {
 
   const { loadingError } = usePdfPreviewContext()
 
+  const { compileTimeout } = getMeta('ol-compileSettings')
+
   const { t } = useTranslation()
 
   const [
@@ -58,7 +59,7 @@ function PdfLogsViewer({ alwaysVisible = false }: { alwaysVisible?: boolean }) {
 
         {loadingError && <PdfPreviewError error="pdf-viewer-loading-error" />}
 
-        {hasShortCompileTimeout && error === 'timedout' ? (
+        {compileTimeout < 60 && error === 'timedout' ? (
           isCompileTimeoutPaywallDisplay ? (
             <TimeoutUpgradePaywallPrompt
               setIsShowingPrimary={setIsShowingPrimaryCompileTimeoutPaywall}
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-preview-error.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-preview-error.tsx
index 833e2b39d5..89726b411d 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-preview-error.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-preview-error.tsx
@@ -6,7 +6,15 @@ import { useDetachCompileContext as useCompileContext } from '../../../shared/co
 import { useStopOnFirstError } from '../../../shared/hooks/use-stop-on-first-error'
 import getMeta from '../../../utils/meta'
 
-function PdfPreviewError({ error }: { error: string }) {
+function PdfPreviewError({
+  error,
+  includeWarnings = true,
+  includeErrors = true,
+}: {
+  error: string
+  includeWarnings?: boolean
+  includeErrors?: boolean
+}) {
   const { t } = useTranslation()
 
   const { startCompile } = useCompileContext()
@@ -14,191 +22,217 @@ function PdfPreviewError({ error }: { error: string }) {
   switch (error) {
     case 'rendering-error-expected':
       return (
-        <PdfLogEntry
-          headerTitle={t('pdf_rendering_error')}
-          formattedContent={
-            <>
-              <Trans
-                i18nKey="something_went_wrong_rendering_pdf_expected"
-                components={[
-                  // eslint-disable-next-line react/jsx-key
-                  <OLButton
-                    variant="primary"
-                    size="sm"
-                    onClick={() => startCompile()}
-                  />,
-                ]}
-              />
-              <br />
-              <br />
-              <Trans
-                i18nKey="last_resort_trouble_shooting_guide"
-                components={[
-                  // eslint-disable-next-line jsx-a11y/anchor-has-content
-                  <a
-                    href="/learn/how-to/Resolving_access%2C_loading%2C_and_display_problems"
-                    target="_blank"
-                    key="troubleshooting-link"
-                  />,
-                ]}
-              />
-            </>
-          }
-          level="warning"
-        />
+        includeWarnings && (
+          <PdfLogEntry
+            headerTitle={t('pdf_rendering_error')}
+            formattedContent={
+              <>
+                <Trans
+                  i18nKey="something_went_wrong_rendering_pdf_expected"
+                  components={[
+                    // eslint-disable-next-line react/jsx-key
+                    <OLButton
+                      variant="primary"
+                      size="sm"
+                      onClick={() => startCompile()}
+                    />,
+                  ]}
+                />
+                <br />
+                <br />
+                <Trans
+                  i18nKey="last_resort_trouble_shooting_guide"
+                  components={[
+                    // eslint-disable-next-line jsx-a11y/anchor-has-content
+                    <a
+                      href="/learn/how-to/Resolving_access%2C_loading%2C_and_display_problems"
+                      target="_blank"
+                      key="troubleshooting-link"
+                    />,
+                  ]}
+                />
+              </>
+            }
+            level="warning"
+          />
+        )
       )
 
     case 'rendering-error':
       return (
-        <ErrorLogEntry title={t('pdf_rendering_error')}>
-          {t('something_went_wrong_rendering_pdf')}
-          &nbsp;
-          <Trans
-            i18nKey="try_recompile_project_or_troubleshoot"
-            components={[
-              // eslint-disable-next-line jsx-a11y/anchor-has-content
-              <a
-                href="/learn/how-to/Resolving_access%2C_loading%2C_and_display_problems"
-                target="_blank"
-                key="troubleshooting-link"
-              />,
-            ]}
-          />
-          {getMeta('ol-compilesUserContentDomain') && (
-            <>
-              <br />
-              <br />
-              <Trans
-                i18nKey="new_compile_domain_notice"
-                values={{
-                  compilesUserContentDomain: new URL(
-                    getMeta('ol-compilesUserContentDomain')
-                  ).hostname,
-                }}
-                shouldUnescape
-                tOptions={{ interpolation: { escapeValue: true } }}
-                components={[
-                  <code key="domain" />,
-                  /* eslint-disable-next-line jsx-a11y/anchor-has-content */
-                  <a
-                    href="/learn/how-to/Resolving_access%2C_loading%2C_and_display_problems"
-                    target="_blank"
-                    key="troubleshooting-link"
-                  />,
-                ]}
-              />
-            </>
-          )}
-        </ErrorLogEntry>
+        includeErrors && (
+          <ErrorLogEntry title={t('pdf_rendering_error')}>
+            {t('something_went_wrong_rendering_pdf')}
+            &nbsp;
+            <Trans
+              i18nKey="try_recompile_project_or_troubleshoot"
+              components={[
+                // eslint-disable-next-line jsx-a11y/anchor-has-content
+                <a
+                  href="/learn/how-to/Resolving_access%2C_loading%2C_and_display_problems"
+                  target="_blank"
+                  key="troubleshooting-link"
+                />,
+              ]}
+            />
+            {getMeta('ol-compilesUserContentDomain') && (
+              <>
+                <br />
+                <br />
+                <Trans
+                  i18nKey="new_compile_domain_notice"
+                  values={{
+                    compilesUserContentDomain: new URL(
+                      getMeta('ol-compilesUserContentDomain')
+                    ).hostname,
+                  }}
+                  shouldUnescape
+                  tOptions={{ interpolation: { escapeValue: true } }}
+                  components={[
+                    <code key="domain" />,
+                    /* eslint-disable-next-line jsx-a11y/anchor-has-content */
+                    <a
+                      href="/learn/how-to/Resolving_access%2C_loading%2C_and_display_problems"
+                      target="_blank"
+                      key="troubleshooting-link"
+                    />,
+                  ]}
+                />
+              </>
+            )}
+          </ErrorLogEntry>
+        )
       )
 
     case 'clsi-maintenance':
       return (
-        <ErrorLogEntry title={t('server_error')}>
-          {t('clsi_maintenance')}
-        </ErrorLogEntry>
+        includeErrors && (
+          <ErrorLogEntry title={t('server_error')}>
+            {t('clsi_maintenance')}
+          </ErrorLogEntry>
+        )
       )
 
     case 'clsi-unavailable':
       return (
-        <ErrorLogEntry title={t('server_error')}>
-          {t('clsi_unavailable')}
-        </ErrorLogEntry>
+        includeErrors && (
+          <ErrorLogEntry title={t('server_error')}>
+            {t('clsi_unavailable')}
+          </ErrorLogEntry>
+        )
       )
 
     case 'too-recently-compiled':
       return (
-        <ErrorLogEntry title={t('server_error')}>
-          {t('too_recently_compiled')}
-        </ErrorLogEntry>
+        includeErrors && (
+          <ErrorLogEntry title={t('server_error')}>
+            {t('too_recently_compiled')}
+          </ErrorLogEntry>
+        )
       )
 
     case 'terminated':
       return (
-        <ErrorLogEntry title={t('terminated')}>
-          {t('compile_terminated_by_user')}
-        </ErrorLogEntry>
+        includeErrors && (
+          <ErrorLogEntry title={t('terminated')}>
+            {t('compile_terminated_by_user')}
+          </ErrorLogEntry>
+        )
       )
 
     case 'rate-limited':
       return (
-        <ErrorLogEntry title={t('pdf_compile_rate_limit_hit')}>
-          {t('project_flagged_too_many_compiles')}
-        </ErrorLogEntry>
+        includeErrors && (
+          <ErrorLogEntry title={t('pdf_compile_rate_limit_hit')}>
+            {t('project_flagged_too_many_compiles')}
+          </ErrorLogEntry>
+        )
       )
 
     case 'compile-in-progress':
       return (
-        <ErrorLogEntry title={t('pdf_compile_in_progress_error')}>
-          {t('pdf_compile_try_again')}
-        </ErrorLogEntry>
+        includeErrors && (
+          <ErrorLogEntry title={t('pdf_compile_in_progress_error')}>
+            {t('pdf_compile_try_again')}
+          </ErrorLogEntry>
+        )
       )
 
     case 'autocompile-disabled':
       return (
-        <ErrorLogEntry title={t('autocompile_disabled')}>
-          {t('autocompile_disabled_reason')}
-        </ErrorLogEntry>
+        includeErrors && (
+          <ErrorLogEntry title={t('autocompile_disabled')}>
+            {t('autocompile_disabled_reason')}
+          </ErrorLogEntry>
+        )
       )
 
     case 'project-too-large':
       return (
-        <ErrorLogEntry title={t('project_too_large')}>
-          {t('project_too_much_editable_text')}
-        </ErrorLogEntry>
+        includeErrors && (
+          <ErrorLogEntry title={t('project_too_large')}>
+            {t('project_too_much_editable_text')}
+          </ErrorLogEntry>
+        )
       )
 
     case 'timedout':
-      return <TimedOutLogEntry />
+      return includeErrors && <TimedOutLogEntry />
 
     case 'failure':
       return (
-        <ErrorLogEntry title={t('no_pdf_error_title')}>
-          {t('no_pdf_error_explanation')}
+        includeErrors && (
+          <ErrorLogEntry title={t('no_pdf_error_title')}>
+            {t('no_pdf_error_explanation')}
 
-          <ul className="my-1 ps-3">
-            <li>{t('no_pdf_error_reason_unrecoverable_error')}</li>
-            <li>
-              <Trans
-                i18nKey="no_pdf_error_reason_no_content"
-                components={{ code: <code /> }}
-              />
-            </li>
-            <li>
-              <Trans
-                i18nKey="no_pdf_error_reason_output_pdf_already_exists"
-                components={{ code: <code /> }}
-              />
-            </li>
-          </ul>
-        </ErrorLogEntry>
+            <ul className="my-1 ps-3">
+              <li>{t('no_pdf_error_reason_unrecoverable_error')}</li>
+              <li>
+                <Trans
+                  i18nKey="no_pdf_error_reason_no_content"
+                  components={{ code: <code /> }}
+                />
+              </li>
+              <li>
+                <Trans
+                  i18nKey="no_pdf_error_reason_output_pdf_already_exists"
+                  components={{ code: <code /> }}
+                />
+              </li>
+            </ul>
+          </ErrorLogEntry>
+        )
       )
 
     case 'clear-cache':
       return (
-        <ErrorLogEntry title={t('server_error')}>
-          {t('somthing_went_wrong_compiling')}
-        </ErrorLogEntry>
+        includeErrors && (
+          <ErrorLogEntry title={t('server_error')}>
+            {t('somthing_went_wrong_compiling')}
+          </ErrorLogEntry>
+        )
       )
 
     case 'pdf-viewer-loading-error':
       return (
-        <ErrorLogEntry title={t('pdf_rendering_error')}>
-          <Trans
-            i18nKey="something_went_wrong_loading_pdf_viewer"
-            components={[
-              <strong key="strong-" />,
-              // eslint-disable-next-line jsx-a11y/anchor-has-content
-              <a
-                href="/learn/how-to/Resolving_access%2C_loading%2C_and_display_problems"
-                target="_blank"
-                key="troubleshooting-link"
-              />,
-              // eslint-disable-next-line jsx-a11y/anchor-has-content
-              <a key="contact-link" target="_blank" href="/contact" />,
-            ]}
-          />
-        </ErrorLogEntry>
+        includeErrors && (
+          <ErrorLogEntry title={t('pdf_rendering_error')}>
+            <Trans
+              i18nKey="something_went_wrong_loading_pdf_viewer"
+              components={[
+                <strong key="strong-" />,
+                // eslint-disable-next-line jsx-a11y/anchor-has-content
+                <a
+                  href="/learn/how-to/Resolving_access%2C_loading%2C_and_display_problems"
+                  target="_blank"
+                  key="troubleshooting-link"
+                />,
+                // eslint-disable-next-line jsx-a11y/anchor-has-content
+                <a key="contact-link" target="_blank" href="/contact" />,
+              ]}
+            />
+          </ErrorLogEntry>
+        )
       )
 
     case 'validation-problems':
@@ -207,9 +241,11 @@ function PdfPreviewError({ error }: { error: string }) {
     case 'error':
     default:
       return (
-        <ErrorLogEntry title={t('server_error')}>
-          {t('somthing_went_wrong_compiling')}
-        </ErrorLogEntry>
+        includeErrors && (
+          <ErrorLogEntry title={t('server_error')}>
+            {t('somthing_went_wrong_compiling')}
+          </ErrorLogEntry>
+        )
       )
   }
 }
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-preview-pane.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-preview-pane.tsx
index 7bbecbc327..e063c20c76 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-preview-pane.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-preview-pane.tsx
@@ -12,9 +12,12 @@ import PdfPreviewHybridToolbarNew from '@/features/ide-redesign/components/pdf-p
 import PdfErrorState from '@/features/ide-redesign/components/pdf-preview/pdf-error-state'
 import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
 import importOverleafModules from '../../../../macros/import-overleaf-module.macro'
+import PdfCodeCheckFailedBanner from '@/features/ide-redesign/components/pdf-preview/pdf-code-check-failed-banner'
+import getMeta from '@/utils/meta'
 
 function PdfPreviewPane() {
-  const { pdfUrl, hasShortCompileTimeout } = useCompileContext()
+  const { pdfUrl } = useCompileContext()
+  const { compileTimeout } = getMeta('ol-compileSettings')
   const classes = classNames('pdf', 'full-size', {
     'pdf-empty': !pdfUrl,
   })
@@ -32,8 +35,9 @@ function PdfPreviewPane() {
         ) : (
           <PdfHybridPreviewToolbar />
         )}
+        {newEditor && <PdfCodeCheckFailedBanner />}
         <PdfPreviewMessages>
-          {hasShortCompileTimeout && <CompileTimeWarningUpgradePrompt />}
+          {compileTimeout < 60 && <CompileTimeWarningUpgradePrompt />}
         </PdfPreviewMessages>
         <Suspense fallback={<FullSizeLoadingSpinner delay={500} />}>
           <div className="pdf-viewer">
diff --git a/services/web/frontend/js/features/pdf-preview/components/timeout-message-after-paywall-dismissal.tsx b/services/web/frontend/js/features/pdf-preview/components/timeout-message-after-paywall-dismissal.tsx
index db6140085f..64ef0fbfc1 100644
--- a/services/web/frontend/js/features/pdf-preview/components/timeout-message-after-paywall-dismissal.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/timeout-message-after-paywall-dismissal.tsx
@@ -1,39 +1,30 @@
 import getMeta from '@/utils/meta'
 import { Trans, useTranslation } from 'react-i18next'
-import { memo, useCallback, useEffect } from 'react'
+import { memo, useMemo } from 'react'
 import { useDetachCompileContext } from '@/shared/context/detach-compile-context'
 import StartFreeTrialButton from '@/shared/components/start-free-trial-button'
 import MaterialIcon from '@/shared/components/material-icon'
-import { useStopOnFirstError } from '@/shared/hooks/use-stop-on-first-error'
 import * as eventTracking from '@/infrastructure/event-tracking'
 import PdfLogEntry from './pdf-log-entry'
 
-function TimeoutMessageAfterPaywallDismissal() {
-  const {
-    startCompile,
-    lastCompileOptions,
-    setAnimateCompileDropdownArrow,
-    isProjectOwner,
-  } = useDetachCompileContext()
-
-  const { enableStopOnFirstError } = useStopOnFirstError({
-    eventSource: 'timeout-new',
-  })
-
-  const handleEnableStopOnFirstErrorClick = useCallback(() => {
-    enableStopOnFirstError()
-    startCompile({ stopOnFirstError: true })
-    setAnimateCompileDropdownArrow(true)
-  }, [enableStopOnFirstError, startCompile, setAnimateCompileDropdownArrow])
+type TimeoutMessageProps = {
+  segmentation?: eventTracking.Segmentation
+}
 
+function TimeoutMessageAfterPaywallDismissal({
+  segmentation,
+}: TimeoutMessageProps) {
+  const { lastCompileOptions, isProjectOwner } = useDetachCompileContext()
   return (
     <div className="website-redesign timeout-upgrade-paywall-prompt">
-      <CompileTimeout isProjectOwner={isProjectOwner} />
+      <CompileTimeout
+        isProjectOwner={isProjectOwner}
+        segmentation={segmentation}
+      />
       {getMeta('ol-ExposedSettings').enableSubscriptions && (
         <PreventTimeoutHelpMessage
-          handleEnableStopOnFirstErrorClick={handleEnableStopOnFirstErrorClick}
           lastCompileOptions={lastCompileOptions}
-          isProjectOwner={isProjectOwner}
+          segmentation={segmentation}
         />
       )}
     </div>
@@ -42,26 +33,22 @@ function TimeoutMessageAfterPaywallDismissal() {
 
 type CompileTimeoutProps = {
   isProjectOwner: boolean
+  segmentation?: eventTracking.Segmentation
 }
 
 const CompileTimeout = memo(function CompileTimeout({
   isProjectOwner,
+  segmentation,
 }: CompileTimeoutProps) {
   const { t } = useTranslation()
 
-  useEffect(() => {
-    eventTracking.sendMB('paywall-prompt', {
-      'paywall-type': 'compile-timeout',
+  const eventSegmentation = useMemo(
+    () => ({
+      ...segmentation,
       'paywall-version': 'secondary',
-    })
-  }, [])
-
-  function onPaywallClick() {
-    eventTracking.sendMB('paywall-click', {
-      'paywall-type': 'compile-timeout',
-      'paywall-version': 'secondary',
-    })
-  }
+    }),
+    [segmentation]
+  )
 
   return (
     <PdfLogEntry
@@ -106,7 +93,7 @@ const CompileTimeout = memo(function CompileTimeout({
                 <StartFreeTrialButton
                   source="compile-timeout"
                   buttonProps={{ variant: 'secondary' }}
-                  handleClick={onPaywallClick}
+                  segmentation={eventSegmentation}
                 >
                   {t('try_for_free')}
                 </StartFreeTrialButton>
@@ -124,22 +111,50 @@ const CompileTimeout = memo(function CompileTimeout({
 
 type PreventTimeoutHelpMessageProps = {
   lastCompileOptions: any
-  handleEnableStopOnFirstErrorClick: () => void
-  isProjectOwner: boolean
+  segmentation?: eventTracking.Segmentation
 }
 
 const PreventTimeoutHelpMessage = memo(function PreventTimeoutHelpMessage({
   lastCompileOptions,
-  handleEnableStopOnFirstErrorClick,
-  isProjectOwner,
+  segmentation,
 }: PreventTimeoutHelpMessageProps) {
   const { t } = useTranslation()
 
+  function sendInfoClickEvent() {
+    eventTracking.sendMB('paywall-info-click', {
+      'paywall-type': 'compile-timeout',
+      content: 'blog',
+      ...segmentation,
+    })
+  }
+
+  const compileTimeoutChangesBlogLink = (
+    /* eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key */
+    <a
+      aria-label={t('read_more_about_free_compile_timeouts_servers')}
+      href="/blog/changes-to-free-compile-timeout"
+      rel="noopener noreferrer"
+      target="_blank"
+      onClick={sendInfoClickEvent}
+    />
+  )
+
   return (
     <PdfLogEntry
-      headerTitle={t('other_causes_of_compile_timeouts')}
+      headerTitle={t('reasons_for_compile_timeouts')}
       formattedContent={
         <>
+          {segmentation?.['10s-timeout-warning'] === 'enabled' && (
+            <p>
+              <em>
+                <Trans
+                  i18nKey="were_reducing_compile_timeout"
+                  components={[compileTimeoutChangesBlogLink]}
+                />
+              </em>
+            </p>
+          )}
+          <p>{t('common_causes_of_compile_timeouts_include')}:</p>
           <ul>
             <li>
               {t('large_or_high_resolution_images_taking_too_long_to_process')}
diff --git a/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-paywall-prompt.tsx b/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-paywall-prompt.tsx
index b156890232..db01b0da7a 100644
--- a/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-paywall-prompt.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-paywall-prompt.tsx
@@ -1,8 +1,16 @@
-import { Dispatch, SetStateAction, useEffect, useMemo, useState } from 'react'
+import {
+  Dispatch,
+  SetStateAction,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react'
 import getMeta from '@/utils/meta'
 import * as eventTracking from '@/infrastructure/event-tracking'
 import TimeoutMessageAfterPaywallDismissal from './timeout-message-after-paywall-dismissal'
 import { UpgradePrompt } from '@/shared/components/upgrade-prompt'
+import { useDetachCompileContext } from '@/shared/context/detach-compile-context'
 
 const studentRoles = [
   'High-school student',
@@ -11,13 +19,8 @@ const studentRoles = [
   'Doctoral student (e.g. PhD, MD, EngD)',
 ]
 
-type Segmentation = Record<
-  string,
-  string | number | boolean | undefined | unknown | any
->
-
 interface TimeoutUpgradePaywallPromptProps {
-  setIsShowingPrimary: Dispatch<SetStateAction<boolean>>
+  setIsShowingPrimary?: Dispatch<SetStateAction<boolean>>
 }
 
 function TimeoutUpgradePaywallPrompt({
@@ -26,21 +29,39 @@ function TimeoutUpgradePaywallPrompt({
   const odcRole = getMeta('ol-odcRole')
   const planPrices = getMeta('ol-paywallPlans')
   const isStudent = useMemo(() => studentRoles.includes(odcRole), [odcRole])
+  const { isProjectOwner } = useDetachCompileContext()
 
   const [isPaywallDismissed, setIsPaywallDismissed] = useState<boolean>(false)
+  const { reducedTimeoutWarning, compileTimeout } =
+    getMeta('ol-compileSettings')
 
-  function sendPaywallEvent(event: string, segmentation?: Segmentation) {
-    eventTracking.sendMB(event, {
-      'paywall-type': 'compile-timeout',
-      'paywall-version': 'primary',
-      ...segmentation,
-    })
-  }
+  const sharedSegmentation = useMemo(
+    () => ({
+      '10s-timeout-warning': reducedTimeoutWarning,
+      'is-owner': isProjectOwner,
+      compileTime: compileTimeout,
+    }),
+    [isProjectOwner, reducedTimeoutWarning, compileTimeout]
+  )
+
+  const sendPaywallEvent = useCallback(
+    (event: string, segmentation?: eventTracking.Segmentation) => {
+      eventTracking.sendMB(event, {
+        'paywall-type': 'compile-timeout',
+        'paywall-version': 'primary',
+        ...sharedSegmentation,
+        ...segmentation,
+      })
+    },
+    [sharedSegmentation]
+  )
 
   function onClose() {
     sendPaywallEvent('paywall-dismiss')
     setIsPaywallDismissed(true)
-    setIsShowingPrimary(false)
+    if (setIsShowingPrimary) {
+      setIsShowingPrimary(false)
+    }
   }
 
   function onClickInfoLink() {
@@ -57,8 +78,10 @@ function TimeoutUpgradePaywallPrompt({
     sendPaywallEvent('paywall-prompt', {
       plan: isStudent ? 'student' : 'collaborator',
     })
-    setIsShowingPrimary(true)
-  }, [isStudent, setIsShowingPrimary])
+    if (setIsShowingPrimary) {
+      setIsShowingPrimary(true)
+    }
+  }, [isStudent, setIsShowingPrimary, sendPaywallEvent])
 
   return (
     <div>
@@ -77,7 +100,9 @@ function TimeoutUpgradePaywallPrompt({
           onClickPaywall={onClickPaywall}
         />
       ) : (
-        <TimeoutMessageAfterPaywallDismissal />
+        <TimeoutMessageAfterPaywallDismissal
+          segmentation={sharedSegmentation}
+        />
       )}
     </div>
   )
diff --git a/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-prompt-new.tsx b/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-prompt-new.tsx
index 58613c785c..1c4a7089da 100644
--- a/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-prompt-new.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-prompt-new.tsx
@@ -1,7 +1,7 @@
 import { Trans, useTranslation } from 'react-i18next'
 import { useDetachCompileContext } from '../../../shared/context/detach-compile-context'
 import StartFreeTrialButton from '../../../shared/components/start-free-trial-button'
-import { memo, useCallback } from 'react'
+import { memo, useCallback, useMemo } from 'react'
 import PdfLogEntry from './pdf-log-entry'
 import { useStopOnFirstError } from '../../../shared/hooks/use-stop-on-first-error'
 import OLButton from '@/features/ui/components/ol/ol-button'
@@ -26,14 +26,29 @@ function TimeoutUpgradePromptNew() {
     setAnimateCompileDropdownArrow(true)
   }, [enableStopOnFirstError, startCompile, setAnimateCompileDropdownArrow])
 
+  const { reducedTimeoutWarning, compileTimeout } =
+    getMeta('ol-compileSettings')
+
+  const sharedSegmentation = useMemo(
+    () => ({
+      '10s-timeout-warning': reducedTimeoutWarning,
+      'is-owner': isProjectOwner,
+      compileTime: compileTimeout,
+    }),
+    [isProjectOwner, reducedTimeoutWarning, compileTimeout]
+  )
+
   return (
     <>
-      <CompileTimeout isProjectOwner={isProjectOwner} />
+      <CompileTimeout
+        isProjectOwner={isProjectOwner}
+        segmentation={sharedSegmentation}
+      />
       {getMeta('ol-ExposedSettings').enableSubscriptions && (
         <PreventTimeoutHelpMessage
           handleEnableStopOnFirstErrorClick={handleEnableStopOnFirstErrorClick}
           lastCompileOptions={lastCompileOptions}
-          isProjectOwner={isProjectOwner}
+          segmentation={sharedSegmentation}
         />
       )}
     </>
@@ -42,10 +57,12 @@ function TimeoutUpgradePromptNew() {
 
 type CompileTimeoutProps = {
   isProjectOwner: boolean
+  segmentation: eventTracking.Segmentation
 }
 
 const CompileTimeout = memo(function CompileTimeout({
   isProjectOwner,
+  segmentation,
 }: CompileTimeoutProps) {
   const { t } = useTranslation()
 
@@ -62,7 +79,7 @@ const CompileTimeout = memo(function CompileTimeout({
             </p>
             {isProjectOwner ? (
               <p>
-                <strong>{t('upgrade_for_12x_more_compile_time')}</strong>{' '}
+                <strong>{t('upgrade_for_more_compile_time')}</strong>{' '}
                 {t(
                   'plus_additional_collaborators_document_history_track_changes_and_more'
                 )}
@@ -82,6 +99,7 @@ const CompileTimeout = memo(function CompileTimeout({
                 <StartFreeTrialButton
                   source="compile-timeout"
                   buttonProps={{ variant: 'primary', className: 'w-100' }}
+                  segmentation={segmentation}
                 >
                   {t('start_a_free_trial')}
                 </StartFreeTrialButton>
@@ -100,18 +118,19 @@ const CompileTimeout = memo(function CompileTimeout({
 type PreventTimeoutHelpMessageProps = {
   lastCompileOptions: any
   handleEnableStopOnFirstErrorClick: () => void
-  isProjectOwner: boolean
+  segmentation: eventTracking.Segmentation
 }
 
 const PreventTimeoutHelpMessage = memo(function PreventTimeoutHelpMessage({
   lastCompileOptions,
   handleEnableStopOnFirstErrorClick,
-  isProjectOwner,
+  segmentation,
 }: PreventTimeoutHelpMessageProps) {
   const { t } = useTranslation()
 
   function sendInfoClickEvent() {
     eventTracking.sendMB('paywall-info-click', {
+      ...segmentation,
       'paywall-type': 'compile-timeout',
       content: 'blog',
     })
@@ -121,7 +140,7 @@ const PreventTimeoutHelpMessage = memo(function PreventTimeoutHelpMessage({
     /* eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key */
     <a
       aria-label={t('read_more_about_free_compile_timeouts_servers')}
-      href="/blog/changes-to-free-compile-timeouts-and-servers"
+      href="/blog/changes-to-free-compile-timeout"
       rel="noopener noreferrer"
       target="_blank"
       onClick={sendInfoClickEvent}
@@ -133,6 +152,16 @@ const PreventTimeoutHelpMessage = memo(function PreventTimeoutHelpMessage({
       headerTitle={t('reasons_for_compile_timeouts')}
       formattedContent={
         <>
+          {segmentation?.['10s-timeout-warning'] === 'enabled' && (
+            <p>
+              <em>
+                <Trans
+                  i18nKey="were_reducing_compile_timeout"
+                  components={[compileTimeoutChangesBlogLink]}
+                />
+              </em>
+            </p>
+          )}
           <p>{t('common_causes_of_compile_timeouts_include')}:</p>
           <ul>
             <li>
@@ -194,23 +223,6 @@ const PreventTimeoutHelpMessage = memo(function PreventTimeoutHelpMessage({
               ]}
             />
           </p>
-          <p>
-            <em>
-              <>
-                {isProjectOwner ? (
-                  <Trans
-                    i18nKey="weve_recently_reduced_the_compile_timeout_limit_which_may_have_affected_your_project"
-                    components={[compileTimeoutChangesBlogLink]}
-                  />
-                ) : (
-                  <Trans
-                    i18nKey="weve_recently_reduced_the_compile_timeout_limit_which_may_have_affected_this_project"
-                    components={[compileTimeoutChangesBlogLink]}
-                  />
-                )}
-              </>
-            </em>
-          </p>
         </>
       }
       // @ts-ignore
diff --git a/services/web/frontend/js/features/pdf-preview/util/pdf-caching.js b/services/web/frontend/js/features/pdf-preview/util/pdf-caching.js
index 7fd17c87bf..c3dba41d8b 100644
--- a/services/web/frontend/js/features/pdf-preview/util/pdf-caching.js
+++ b/services/web/frontend/js/features/pdf-preview/util/pdf-caching.js
@@ -247,7 +247,6 @@ function usageAboveThreshold(chunk) {
 function cutRequestAmplification({
   potentialChunks,
   usageScore,
-  cachedUrls,
   metrics,
   start,
   end,
diff --git a/services/web/frontend/js/features/preview/components/preview-log-entry-header.tsx b/services/web/frontend/js/features/preview/components/preview-log-entry-header.tsx
index 28f163a753..8ce318b1c8 100644
--- a/services/web/frontend/js/features/preview/components/preview-log-entry-header.tsx
+++ b/services/web/frontend/js/features/preview/components/preview-log-entry-header.tsx
@@ -14,9 +14,7 @@ function PreviewLogEntryHeader({
   headerIcon,
   logType,
   showSourceLocationLink = true,
-  showCloseButton = false,
   onSourceLocationClick,
-  onClose,
 }: {
   headerTitle: string | React.ReactNode
   level: ErrorLevel
@@ -24,9 +22,7 @@ function PreviewLogEntryHeader({
   logType?: string
   sourceLocation?: SourceLocation
   showSourceLocationLink?: boolean
-  showCloseButton?: boolean
   onSourceLocationClick?: MouseEventHandler<HTMLButtonElement>
-  onClose?: () => void
 }) {
   const { t } = useTranslation()
   const logLocationSpanRef = useRef<HTMLSpanElement>(null)
@@ -116,16 +112,6 @@ function PreviewLogEntryHeader({
       ) : (
         locationLink
       )}
-      {showCloseButton ? (
-        <OLButton
-          variant="link"
-          className="btn-inline-link log-entry-header-link"
-          aria-label={t('dismiss_error_popup')}
-          onClick={onClose}
-        >
-          <span aria-hidden="true">&times;</span>
-        </OLButton>
-      ) : null}
     </header>
   )
 }
diff --git a/services/web/frontend/js/features/project-list/components/current-plan-widget/commons-plan.tsx b/services/web/frontend/js/features/project-list/components/current-plan-widget/commons-plan.tsx
index e687c8a362..ca4cb55b64 100644
--- a/services/web/frontend/js/features/project-list/components/current-plan-widget/commons-plan.tsx
+++ b/services/web/frontend/js/features/project-list/components/current-plan-widget/commons-plan.tsx
@@ -15,7 +15,10 @@ function CommonsPlan({
 }: CommonsPlanProps) {
   const { t } = useTranslation()
   const currentPlanLabel = (
-    <Trans i18nKey="premium_plan_label" components={{ b: <strong /> }} />
+    <Trans
+      i18nKey="premium_plan_label"
+      components={{ b: <strong translate="no" /> }}
+    />
   )
 
   return (
diff --git a/services/web/frontend/js/features/project-list/components/current-plan-widget/current-plan-widget.tsx b/services/web/frontend/js/features/project-list/components/current-plan-widget/current-plan-widget.tsx
index 20bfe55479..1d17fe75a3 100644
--- a/services/web/frontend/js/features/project-list/components/current-plan-widget/current-plan-widget.tsx
+++ b/services/web/frontend/js/features/project-list/components/current-plan-widget/current-plan-widget.tsx
@@ -4,6 +4,7 @@ import GroupPlan from './group-plan'
 import CommonsPlan from './commons-plan'
 import PausedPlan from './paused-plan'
 import getMeta from '../../../../utils/meta'
+import { getUserSubscriptionState } from '../../util/user'
 
 function CurrentPlanWidget() {
   const usersBestSubscription = getMeta('ol-usersBestSubscription')
@@ -19,7 +20,7 @@ function CurrentPlanWidget() {
   const isCommonsPlan = type === 'commons'
   const isPaused =
     isIndividualPlan &&
-    usersBestSubscription.subscription?.recurlyStatus?.state === 'paused'
+    getUserSubscriptionState(usersBestSubscription) === 'paused'
 
   const featuresPageURL = '/learn/how-to/Overleaf_premium_features'
   const subscriptionPageUrl = '/user/subscription'
diff --git a/services/web/frontend/js/features/project-list/components/current-plan-widget/free-plan.tsx b/services/web/frontend/js/features/project-list/components/current-plan-widget/free-plan.tsx
index fe3fb18125..feffb68598 100644
--- a/services/web/frontend/js/features/project-list/components/current-plan-widget/free-plan.tsx
+++ b/services/web/frontend/js/features/project-list/components/current-plan-widget/free-plan.tsx
@@ -10,7 +10,10 @@ type FreePlanProps = Pick<FreePlanSubscription, 'featuresPageURL'>
 function FreePlan({ featuresPageURL }: FreePlanProps) {
   const { t } = useTranslation()
   const currentPlanLabel = (
-    <Trans i18nKey="free_plan_label" components={{ b: <strong /> }} />
+    <Trans
+      i18nKey="free_plan_label"
+      components={{ b: <strong translate="no" /> }}
+    />
   )
 
   const handleClick = () => {
diff --git a/services/web/frontend/js/features/project-list/components/current-plan-widget/group-plan.tsx b/services/web/frontend/js/features/project-list/components/current-plan-widget/group-plan.tsx
index 235c34ba15..16596c5929 100644
--- a/services/web/frontend/js/features/project-list/components/current-plan-widget/group-plan.tsx
+++ b/services/web/frontend/js/features/project-list/components/current-plan-widget/group-plan.tsx
@@ -15,21 +15,25 @@ function GroupPlan({
   remainingTrialDays,
 }: GroupPlanProps) {
   const { t } = useTranslation()
+  const planNameComponent = <strong translate="no" />
   const currentPlanLabel =
     remainingTrialDays >= 0 ? (
       remainingTrialDays === 1 ? (
-        <Trans i18nKey="trial_last_day" components={{ b: <strong /> }} />
+        <Trans i18nKey="trial_last_day" components={{ b: planNameComponent }} />
       ) : (
         <Trans
           i18nKey="trial_remaining_days"
-          components={{ b: <strong /> }}
+          components={{ b: planNameComponent }}
           values={{ days: remainingTrialDays }}
           shouldUnescape
           tOptions={{ interpolation: { escapeValue: true } }}
         />
       )
     ) : (
-      <Trans i18nKey="premium_plan_label" components={{ b: <strong /> }} />
+      <Trans
+        i18nKey="premium_plan_label"
+        components={{ b: planNameComponent }}
+      />
     )
 
   return (
diff --git a/services/web/frontend/js/features/project-list/components/current-plan-widget/individual-plan.tsx b/services/web/frontend/js/features/project-list/components/current-plan-widget/individual-plan.tsx
index f0870ac12a..e4723cf718 100644
--- a/services/web/frontend/js/features/project-list/components/current-plan-widget/individual-plan.tsx
+++ b/services/web/frontend/js/features/project-list/components/current-plan-widget/individual-plan.tsx
@@ -14,21 +14,25 @@ function IndividualPlan({
   remainingTrialDays,
 }: IndividualPlanProps) {
   const { t } = useTranslation()
+  const planNameComponent = <strong translate="no" />
   const currentPlanLabel =
     remainingTrialDays >= 0 ? (
       remainingTrialDays === 1 ? (
-        <Trans i18nKey="trial_last_day" components={{ b: <strong /> }} />
+        <Trans i18nKey="trial_last_day" components={{ b: planNameComponent }} />
       ) : (
         <Trans
           i18nKey="trial_remaining_days"
-          components={{ b: <strong /> }}
+          components={{ b: planNameComponent }}
           values={{ days: remainingTrialDays }}
           shouldUnescape
           tOptions={{ interpolation: { escapeValue: true } }}
         />
       )
     ) : (
-      <Trans i18nKey="premium_plan_label" components={{ b: <strong /> }} />
+      <Trans
+        i18nKey="premium_plan_label"
+        components={{ b: planNameComponent }}
+      />
     )
 
   return (
diff --git a/services/web/frontend/js/features/project-list/components/current-plan-widget/paused-plan.tsx b/services/web/frontend/js/features/project-list/components/current-plan-widget/paused-plan.tsx
index a501731b18..f282800c61 100644
--- a/services/web/frontend/js/features/project-list/components/current-plan-widget/paused-plan.tsx
+++ b/services/web/frontend/js/features/project-list/components/current-plan-widget/paused-plan.tsx
@@ -13,7 +13,7 @@ function PausedPlan({ subscriptionPageUrl }: PausedPlanProps) {
       i18nKey="your_premium_plan_is_paused"
       components={[
         // eslint-disable-next-line react/jsx-key
-        <strong />,
+        <strong translate="no" />,
       ]}
     />
   )
diff --git a/services/web/frontend/js/features/project-list/components/dropdown/sort-by-dropdown.tsx b/services/web/frontend/js/features/project-list/components/dropdown/sort-by-dropdown.tsx
index 0d23aebf57..db92561728 100644
--- a/services/web/frontend/js/features/project-list/components/dropdown/sort-by-dropdown.tsx
+++ b/services/web/frontend/js/features/project-list/components/dropdown/sort-by-dropdown.tsx
@@ -12,7 +12,7 @@ import {
   DropdownToggle,
 } from '@/features/ui/components/bootstrap-5/dropdown-menu'
 
-function Item({ onClick, text, iconType, screenReaderText }: SortBtnProps) {
+function Item({ onClick, text, iconType }: SortBtnProps) {
   return (
     <DropdownItem
       as="button"
diff --git a/services/web/frontend/js/features/project-list/components/notifications/groups/group-invitation/hooks/use-group-invitation-notification.tsx b/services/web/frontend/js/features/project-list/components/notifications/groups/group-invitation/hooks/use-group-invitation-notification.tsx
index 6c25513124..f62571b722 100644
--- a/services/web/frontend/js/features/project-list/components/notifications/groups/group-invitation/hooks/use-group-invitation-notification.tsx
+++ b/services/web/frontend/js/features/project-list/components/notifications/groups/group-invitation/hooks/use-group-invitation-notification.tsx
@@ -9,6 +9,7 @@ import type { NotificationGroupInvitation } from '../../../../../../../../../typ
 import useAsync from '../../../../../../../shared/hooks/use-async'
 import {
   FetchError,
+  getJSON,
   postJSON,
   putJSON,
 } from '../../../../../../../infrastructure/fetch-json'
@@ -43,60 +44,65 @@ type UseGroupInvitationNotificationReturnType = {
 export function useGroupInvitationNotification(
   notification: NotificationGroupInvitation
 ): UseGroupInvitationNotificationReturnType {
-  const {
-    _id: notificationId,
-    messageOpts: { token, managedUsersEnabled },
-  } = notification
-
+  const { _id: notificationId } = notification
   const [groupInvitationStatus, setGroupInvitationStatus] =
     useState<GroupInvitationStatus>(GroupInvitationStatus.Idle)
-  const { runAsync, isLoading: isAcceptingInvitation } = useAsync<
-    never,
-    FetchError
-  >()
+  const { runAsync, isLoading } = useAsync<void, FetchError>()
+  const { runAsync: runAsyncNotification, isLoading: isLoadingNotification } =
+    useAsync<NotificationGroupInvitation, FetchError>()
   const location = useLocation()
   const { handleDismiss } = useAsyncDismiss()
 
-  const hasIndividualRecurlySubscription = getMeta(
-    'ol-hasIndividualRecurlySubscription'
+  const hasIndividualPaidSubscription = getMeta(
+    'ol-hasIndividualPaidSubscription'
   )
 
   useEffect(() => {
-    if (hasIndividualRecurlySubscription) {
+    if (hasIndividualPaidSubscription) {
       setGroupInvitationStatus(
         GroupInvitationStatus.CancelIndividualSubscription
       )
     } else {
       setGroupInvitationStatus(GroupInvitationStatus.AskToJoin)
     }
-  }, [hasIndividualRecurlySubscription])
+  }, [hasIndividualPaidSubscription])
 
   const acceptGroupInvite = useCallback(() => {
-    if (managedUsersEnabled) {
-      location.assign(`/subscription/invites/${token}/`)
-    } else {
-      runAsync(
-        putJSON(`/subscription/invites/${token}/`, {
-          body: {
-            _csrf: getMeta('ol-csrfToken'),
-          },
-        })
-      )
-        .then(() => {
-          setGroupInvitationStatus(GroupInvitationStatus.SuccessfullyJoined)
-        })
-        .catch(err => {
-          debugConsole.error(err)
-          setGroupInvitationStatus(GroupInvitationStatus.Error)
-        })
-        .finally(() => {
-          // remove notification automatically in the browser
-          window.setTimeout(() => {
-            setGroupInvitationStatus(GroupInvitationStatus.NotificationIsHidden)
-          }, SUCCESSFUL_NOTIF_TIME_BEFORE_HIDDEN)
-        })
-    }
-  }, [runAsync, token, location, managedUsersEnabled])
+    // Fetch the latest notification data to ensure it's up-to-date
+    runAsyncNotification(getJSON(`/user/notification/${notificationId}`))
+      .then(notification => {
+        const {
+          messageOpts: { token, managedUsersEnabled },
+        } = notification
+        if (managedUsersEnabled) {
+          location.assign(`/subscription/invites/${token}/`)
+        } else {
+          runAsync(
+            putJSON(`/subscription/invites/${token}/`, {
+              body: {
+                _csrf: getMeta('ol-csrfToken'),
+              },
+            })
+          )
+            .then(() => {
+              setGroupInvitationStatus(GroupInvitationStatus.SuccessfullyJoined)
+            })
+            .catch(err => {
+              debugConsole.error(err)
+              setGroupInvitationStatus(GroupInvitationStatus.Error)
+            })
+            .finally(() => {
+              // remove notification automatically in the browser
+              window.setTimeout(() => {
+                setGroupInvitationStatus(
+                  GroupInvitationStatus.NotificationIsHidden
+                )
+              }, SUCCESSFUL_NOTIF_TIME_BEFORE_HIDDEN)
+            })
+        }
+      })
+      .catch(debugConsole.error)
+  }, [runAsync, runAsyncNotification, notificationId, location])
 
   const cancelPersonalSubscription = useCallback(() => {
     setGroupInvitationStatus(GroupInvitationStatus.AskToJoin)
@@ -114,6 +120,8 @@ export function useGroupInvitationNotification(
     setGroupInvitationStatus(GroupInvitationStatus.NotificationIsHidden)
   }, [])
 
+  const isAcceptingInvitation = isLoadingNotification || isLoading
+
   return {
     isAcceptingInvitation,
     groupInvitationStatus,
diff --git a/services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx b/services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx
index 2aaed364a7..eba033ea76 100644
--- a/services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx
+++ b/services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx
@@ -154,7 +154,7 @@ function SidebarDsNav() {
             </>
           )}
         </div>
-        <div className="ds-nav-ds-name">
+        <div className="ds-nav-ds-name" translate="no">
           <span>Digital Science</span>
         </div>
       </div>
diff --git a/services/web/frontend/js/features/project-list/components/sidebar/tags-list.tsx b/services/web/frontend/js/features/project-list/components/sidebar/tags-list.tsx
index 452b003b2b..1c6298603c 100644
--- a/services/web/frontend/js/features/project-list/components/sidebar/tags-list.tsx
+++ b/services/web/frontend/js/features/project-list/components/sidebar/tags-list.tsx
@@ -57,6 +57,7 @@ export default function TagsList() {
             <button
               type="button"
               className="tag-name"
+              translate="no"
               onClick={e =>
                 handleSelectTag(e as unknown as React.MouseEvent, tag._id)
               }
diff --git a/services/web/frontend/js/features/project-list/components/table/cells/inline-tags.tsx b/services/web/frontend/js/features/project-list/components/table/cells/inline-tags.tsx
index b3b6fec9cb..26ca42bac3 100644
--- a/services/web/frontend/js/features/project-list/components/table/cells/inline-tags.tsx
+++ b/services/web/frontend/js/features/project-list/components/table/cells/inline-tags.tsx
@@ -57,6 +57,7 @@ function InlineTag({ tag, projectId }: InlineTagProps) {
         onClick: () => handleRemoveTag(tag._id, projectId),
       }}
       className="ms-2"
+      translate="no"
     >
       {tag.name}
     </Tag>
diff --git a/services/web/frontend/js/features/project-list/components/table/cells/last-updated-cell.tsx b/services/web/frontend/js/features/project-list/components/table/cells/last-updated-cell.tsx
index b6417e92d4..6e7ada6a28 100644
--- a/services/web/frontend/js/features/project-list/components/table/cells/last-updated-cell.tsx
+++ b/services/web/frontend/js/features/project-list/components/table/cells/last-updated-cell.tsx
@@ -19,7 +19,7 @@ export default function LastUpdatedCell({ project }: LastUpdatedCellProps) {
       overlayProps={{ placement: 'top', trigger: ['hover', 'focus'] }}
     >
       {project.lastUpdatedBy ? (
-        <span>
+        <span translate="no">
           <LastUpdatedBy
             lastUpdatedBy={project.lastUpdatedBy}
             lastUpdatedDate={lastUpdatedDate}
diff --git a/services/web/frontend/js/features/project-list/components/table/cells/owner-cell.tsx b/services/web/frontend/js/features/project-list/components/table/cells/owner-cell.tsx
index b72350cf14..4795c1da2f 100644
--- a/services/web/frontend/js/features/project-list/components/table/cells/owner-cell.tsx
+++ b/services/web/frontend/js/features/project-list/components/table/cells/owner-cell.tsx
@@ -47,7 +47,7 @@ export default function OwnerCell({ project }: OwnerCellProps) {
 
   return (
     <>
-      {ownerName === 'You' ? t('you') : ownerName}
+      <span translate="no">{ownerName === 'You' ? t('you') : ownerName}</span>
       {project.source === 'token' && (
         <LinkSharingIcon project={project} prependSpace={!!project.owner} />
       )}
diff --git a/services/web/frontend/js/features/project-list/components/table/project-list-owner-name.tsx b/services/web/frontend/js/features/project-list/components/table/project-list-owner-name.tsx
index 8f056249ab..faff041fa8 100644
--- a/services/web/frontend/js/features/project-list/components/table/project-list-owner-name.tsx
+++ b/services/web/frontend/js/features/project-list/components/table/project-list-owner-name.tsx
@@ -7,7 +7,7 @@ export const ProjectListOwnerName = memo<{ ownerName: string }>(
 
     const x = ownerName === 'You' ? t('you') : ownerName
 
-    return <> — {t('owned_by_x', { x })}</>
+    return <span translate="no"> — {t('owned_by_x', { x })}</span>
   }
 )
 ProjectListOwnerName.displayName = 'ProjectListOwnerName'
diff --git a/services/web/frontend/js/features/project-list/components/table/project-list-table-row.tsx b/services/web/frontend/js/features/project-list/components/table/project-list-table-row.tsx
index 70a13b4a8c..87e2880022 100644
--- a/services/web/frontend/js/features/project-list/components/table/project-list-table-row.tsx
+++ b/services/web/frontend/js/features/project-list/components/table/project-list-table-row.tsx
@@ -22,7 +22,9 @@ function ProjectListTableRow({ project, selected }: ProjectListTableRowProps) {
         <ProjectCheckbox projectId={project.id} projectName={project.name} />
       </td>
       <td className="dash-cell-name">
-        <a href={`/project/${project.id}`}>{project.name}</a>{' '}
+        <a href={`/project/${project.id}`} translate="no">
+          {project.name}
+        </a>{' '}
         <InlineTags className="d-none d-md-inline" projectId={project.id} />
       </td>
       <td className="dash-cell-date-owner pb-0 d-md-none">
diff --git a/services/web/frontend/js/features/project-list/components/table/project-tools/buttons/tags-dropdown.tsx b/services/web/frontend/js/features/project-list/components/table/project-tools/buttons/tags-dropdown.tsx
index 443962cc3c..19b4eb0a8a 100644
--- a/services/web/frontend/js/features/project-list/components/table/project-tools/buttons/tags-dropdown.tsx
+++ b/services/web/frontend/js/features/project-list/components/table/project-tools/buttons/tags-dropdown.tsx
@@ -91,7 +91,7 @@ function TagsDropdown() {
           data-testid="project-tools-more-dropdown-menu"
         >
           <DropdownHeader>{t('add_to_tag')}</DropdownHeader>
-          {sortBy(tags, tag => tag.name?.toLowerCase()).map((tag, index) => (
+          {sortBy(tags, tag => tag.name?.toLowerCase()).map(tag => (
             <li role="none" key={tag._id}>
               <DropdownItem
                 onClick={e =>
@@ -111,6 +111,7 @@ function TagsDropdown() {
                     <DropdownItem.EmptyLeadingIcon />
                   )
                 }
+                translate="no"
               >
                 <div className="badge-tag-content">
                   <span className="badge-prepend">
diff --git a/services/web/frontend/js/features/project-list/components/tags-list.tsx b/services/web/frontend/js/features/project-list/components/tags-list.tsx
index 8f20f15a83..923da2c115 100644
--- a/services/web/frontend/js/features/project-list/components/tags-list.tsx
+++ b/services/web/frontend/js/features/project-list/components/tags-list.tsx
@@ -12,10 +12,9 @@ import { DropdownItem } from '@/features/ui/components/bootstrap-5/dropdown-menu
 
 type TagsListProps = {
   onTagClick?: () => void
-  onEditClick?: () => void
 }
 
-function TagsList({ onTagClick, onEditClick }: TagsListProps) {
+function TagsList({ onTagClick }: TagsListProps) {
   const { t } = useTranslation()
   const { tags, untaggedProjectsCount, selectedTagId, selectTag } =
     useProjectListContext()
diff --git a/services/web/frontend/js/features/project-list/components/title/project-list-title.tsx b/services/web/frontend/js/features/project-list/components/title/project-list-title.tsx
index 97b4fdb457..c562831977 100644
--- a/services/web/frontend/js/features/project-list/components/title/project-list-title.tsx
+++ b/services/web/frontend/js/features/project-list/components/title/project-list-title.tsx
@@ -16,9 +16,11 @@ function ProjectListTitle({
 }) {
   const { t } = useTranslation()
   let message = t('projects')
+  let extraProps = {}
 
   if (selectedTag) {
     message = `${selectedTag.name}`
+    extraProps = { translate: 'no' }
   } else if (selectedTagId === UNCATEGORIZED_KEY) {
     message = t('uncategorized_projects')
   } else {
@@ -42,7 +44,12 @@ function ProjectListTitle({
   }
 
   return (
-    <div className={classnames('project-list-title', className)}>{message}</div>
+    <div
+      className={classnames('project-list-title', className)}
+      {...extraProps}
+    >
+      {message}
+    </div>
   )
 }
 
diff --git a/services/web/frontend/js/features/project-list/util/user.ts b/services/web/frontend/js/features/project-list/util/user.ts
index cb63ba3aee..cd2abe07d5 100644
--- a/services/web/frontend/js/features/project-list/util/user.ts
+++ b/services/web/frontend/js/features/project-list/util/user.ts
@@ -1,4 +1,5 @@
 import { UserRef } from '../../../../../types/project/dashboard/api'
+import { Subscription } from '../../../../../types/project/dashboard/subscription'
 import getMeta from '@/utils/meta'
 
 export function getUserName(user: UserRef) {
@@ -20,3 +21,16 @@ export function getUserName(user: UserRef) {
 
   return 'None'
 }
+
+export function getUserSubscriptionState(subscription: Subscription) {
+  if ('subscription' in subscription) {
+    if (subscription.subscription.recurlyStatus?.state) {
+      return subscription.subscription.recurlyStatus.state
+    }
+    if (subscription.subscription.paymentProvider) {
+      return subscription.subscription.paymentProvider.state
+    }
+  }
+
+  return null
+}
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx
index b79fc85f1c..8a700f090c 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx
@@ -33,6 +33,7 @@ import ReviewPanelMoreCommentsButton from './review-panel-more-comments-button'
 import useMoreCommments from '../hooks/use-more-comments'
 import { Decoration } from '@codemirror/view'
 import { debounce } from 'lodash'
+import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
 
 type AggregatedRanges = {
   changes: Change<EditOperation>[]
@@ -46,6 +47,7 @@ const ReviewPanelCurrentFile: FC = () => {
   const threads = useThreadsContext()
   const state = useCodeMirrorStateContext()
   const [hoveredEntry, setHoveredEntry] = useState<string | null>(null)
+  const newEditor = useIsNewEditorEnabled()
 
   const hoverTimeout = useRef<number>(0)
   const handleEntryEnter = useCallback((id: string) => {
@@ -242,7 +244,8 @@ const ReviewPanelCurrentFile: FC = () => {
       const positioningRes = positionItems(
         containerRef.current,
         previousFocusedItem.current.get(docId),
-        docId
+        docId,
+        newEditor
       )
 
       onEntriesPositioned()
@@ -254,7 +257,7 @@ const ReviewPanelCurrentFile: FC = () => {
         )
       }
     }
-  }, [ranges?.docId, onEntriesPositioned])
+  }, [ranges?.docId, onEntriesPositioned, newEditor])
 
   useEffect(() => {
     const timer = window.setTimeout(() => {
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel.tsx
index 7d8b694f68..74405ba276 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel.tsx
@@ -17,7 +17,7 @@ const ReviewPanel: FC<{ mini?: boolean }> = ({ mini = false }) => {
     [choosenSubView, mini]
   )
 
-  const style = useReviewPanelStyles(mini)
+  const style = useReviewPanelStyles()
 
   const className = classnames('review-panel-container', {
     'review-panel-mini': mini,
diff --git a/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx b/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx
index d5cf34ef93..0a5c737585 100644
--- a/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx
+++ b/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx
@@ -89,7 +89,7 @@ export const ThreadsProvider: FC<React.PropsWithChildren> = ({ children }) => {
       ) => {
         setData(value => {
           if (value) {
-            const { submitting, ...thread } = value[threadId] ?? {
+            const { submitting: _submitting, ...thread } = value[threadId] ?? {
               messages: [],
             }
 
diff --git a/services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-styles.ts b/services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-styles.ts
index 7e7dda1850..727701ccc3 100644
--- a/services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-styles.ts
+++ b/services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-styles.ts
@@ -1,7 +1,7 @@
 import { CSSProperties, useCallback, useEffect, useState } from 'react'
 import { useCodeMirrorViewContext } from '@/features/source-editor/components/codemirror-context'
 
-export const useReviewPanelStyles = (mini: boolean) => {
+export const useReviewPanelStyles = () => {
   const view = useCodeMirrorViewContext()
 
   const [styles, setStyles] = useState<CSSProperties>({
diff --git a/services/web/frontend/js/features/review-panel-new/utils/position-items.ts b/services/web/frontend/js/features/review-panel-new/utils/position-items.ts
index 54489310a9..e38e663ab0 100644
--- a/services/web/frontend/js/features/review-panel-new/utils/position-items.ts
+++ b/services/web/frontend/js/features/review-panel-new/utils/position-items.ts
@@ -8,7 +8,8 @@ export const positionItems = debounce(
   (
     element: HTMLDivElement,
     previousFocusedItemIndex: number | undefined,
-    docId: string
+    docId: string,
+    newEditor: boolean
   ) => {
     const items = Array.from(
       element.querySelectorAll<HTMLDivElement>('.review-panel-entry')
@@ -41,7 +42,11 @@ export const positionItems = debounce(
       return
     }
 
-    const activeItemTop = getTopPosition(activeItem, activeItemIndex === 0)
+    const activeItemTop = getTopPosition(
+      activeItem,
+      activeItemIndex === 0,
+      newEditor
+    )
 
     const positions: [HTMLElement, number][] = []
     positions.push([activeItem, activeItemTop])
@@ -51,7 +56,7 @@ export const positionItems = debounce(
     for (let i = activeItemIndex - 1; i >= 0; i--) {
       const item = items[i]
       const height = item.offsetHeight
-      let top = getTopPosition(item, i === 0)
+      let top = getTopPosition(item, i === 0, newEditor)
       const bottom = top + height
       if (bottom > topLimit) {
         top = topLimit - height - GAP_BETWEEN_ENTRIES
@@ -65,7 +70,7 @@ export const positionItems = debounce(
     for (let i = activeItemIndex + 1; i < items.length; i++) {
       const item = items[i]
       const height = item.offsetHeight
-      let top = getTopPosition(item, false)
+      let top = getTopPosition(item, false, newEditor)
       if (top < bottomLimit) {
         top = bottomLimit + GAP_BETWEEN_ENTRIES
       }
@@ -87,7 +92,16 @@ export const positionItems = debounce(
   { leading: false, trailing: true, maxWait: 1000 }
 )
 
-function getTopPosition(item: HTMLDivElement, isFirstEntry: boolean) {
+function getTopPosition(
+  item: HTMLDivElement,
+  isFirstEntry: boolean,
+  newEditor: boolean
+) {
   const offset = isFirstEntry ? 0 : OFFSET_FOR_ENTRIES_ABOVE
+
+  if (newEditor) {
+    return Math.max(offset, Number(item.dataset.top))
+  }
+
   return Math.max(COLLAPSED_HEADER_HEIGHT + offset, Number(item.dataset.top))
 }
diff --git a/services/web/frontend/js/features/settings/components/emails/add-email/country-input.tsx b/services/web/frontend/js/features/settings/components/emails/add-email/country-input.tsx
index f55344a2f2..e94b39c935 100644
--- a/services/web/frontend/js/features/settings/components/emails/add-email/country-input.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/add-email/country-input.tsx
@@ -60,9 +60,9 @@ function Downshift({ setValue, inputRef }: CountryInputProps) {
             },
             ref: inputRef,
           })}
+          append={<i className="caret" aria-hidden />}
           placeholder={t('country')}
         />
-        <i className="caret" />
       </div>
       <ul
         {...getMenuProps()}
diff --git a/services/web/frontend/js/features/settings/components/linking-section.tsx b/services/web/frontend/js/features/settings/components/linking-section.tsx
index 0b9001927e..a198cb1328 100644
--- a/services/web/frontend/js/features/settings/components/linking-section.tsx
+++ b/services/web/frontend/js/features/settings/components/linking-section.tsx
@@ -115,7 +115,7 @@ function LinkingSection() {
           ) : null}
           <div className="settings-widgets-container">
             {allIntegrationLinkingWidgets.map(
-              ({ import: importObject, path }, widgetIndex) => (
+              ({ import: importObject }, widgetIndex) => (
                 <ModuleLinkingWidget
                   key={Object.keys(importObject)[0]}
                   ModuleComponent={Object.values(importObject)[0]}
@@ -133,7 +133,7 @@ function LinkingSection() {
           <h3 id="references">{t('reference_managers')}</h3>
           <div className="settings-widgets-container">
             {referenceLinkingWidgets.map(
-              ({ import: importObject, path }, widgetIndex) => (
+              ({ import: importObject }, widgetIndex) => (
                 <ModuleLinkingWidget
                   key={Object.keys(importObject)[0]}
                   ModuleComponent={Object.values(importObject)[0]}
diff --git a/services/web/frontend/js/features/share-project-modal/components/link-sharing.tsx b/services/web/frontend/js/features/share-project-modal/components/link-sharing.tsx
index d235bd248b..a2d17734b0 100644
--- a/services/web/frontend/js/features/share-project-modal/components/link-sharing.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/link-sharing.tsx
@@ -1,7 +1,7 @@
 import { useCallback, useState, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useShareProjectContext } from './share-project-modal'
-import { setProjectAccessLevel } from '../utils/api'
+import { setPublicAccessLevel } from '../utils/api'
 import { CopyToClipboard } from '@/shared/components/copy-to-clipboard'
 import { useProjectContext } from '@/shared/context/project-context'
 import * as eventTracking from '../../../infrastructure/event-tracking'
@@ -43,7 +43,7 @@ export default function LinkSharing() {
         project_id: projectId,
       })
       monitorRequest(() =>
-        setProjectAccessLevel(projectId, newPublicAccessLevel)
+        setPublicAccessLevel(projectId, newPublicAccessLevel)
       )
         .then(() => {
           // NOTE: not calling `updateProject` here as it receives data via
diff --git a/services/web/frontend/js/features/share-project-modal/components/select-collaborators.tsx b/services/web/frontend/js/features/share-project-modal/components/select-collaborators.tsx
index 464c5b5368..40c17c44f3 100644
--- a/services/web/frontend/js/features/share-project-modal/components/select-collaborators.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/select-collaborators.tsx
@@ -116,7 +116,7 @@ export default function SelectCollaborators({
     items: filteredOptions,
     itemToString: item => (item && item.name) || '',
     stateReducer,
-    onStateChange: ({ inputValue, type, selectedItem }) => {
+    onStateChange: ({ type, selectedItem }) => {
       switch (type) {
         // add a selected item on Enter (keypress), click or blur
         case useCombobox.stateChangeTypes.InputKeyDownEnter:
diff --git a/services/web/frontend/js/features/share-project-modal/utils/api.js b/services/web/frontend/js/features/share-project-modal/utils/api.js
index d52b6a4857..38b2040f2b 100644
--- a/services/web/frontend/js/features/share-project-modal/utils/api.js
+++ b/services/web/frontend/js/features/share-project-modal/utils/api.js
@@ -47,7 +47,7 @@ export function transferProjectOwnership(projectId, member) {
   })
 }
 
-export function setProjectAccessLevel(projectId, publicAccessLevel) {
+export function setPublicAccessLevel(projectId, publicAccessLevel) {
   return postJSON(`/project/${projectId}/settings/admin`, {
     body: { publicAccessLevel },
   })
diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-search-form.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-search-form.tsx
index 90a968add6..a65232f94d 100644
--- a/services/web/frontend/js/features/source-editor/components/codemirror-search-form.tsx
+++ b/services/web/frontend/js/features/source-editor/components/codemirror-search-form.tsx
@@ -36,7 +36,6 @@ import { getStoredSelection, setStoredSelection } from '../extensions/search'
 import { debounce } from 'lodash'
 import { EditorSelection, EditorState } from '@codemirror/state'
 import { sendSearchEvent } from '@/features/event-tracking/search-events'
-import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
 import { FullProjectSearchButton } from './full-project-search-button'
 
 const MATCH_COUNT_DEBOUNCE_WAIT = 100 // the amount of ms to wait before counting matches
@@ -82,8 +81,6 @@ const CodeMirrorSearchForm: FC<React.PropsWithChildren> = () => {
   const inputRef = useRef<HTMLInputElement | null>(null)
   const replaceRef = useRef<HTMLInputElement | null>(null)
 
-  const newEditor = useIsNewEditorEnabled()
-
   const handleInputRef = useCallback((node: HTMLInputElement) => {
     inputRef.current = node
 
@@ -443,7 +440,7 @@ const CodeMirrorSearchForm: FC<React.PropsWithChildren> = () => {
             </OLButton>
           </OLButtonGroup>
 
-          {!newEditor && <FullProjectSearchButton query={query} />}
+          <FullProjectSearchButton query={query} />
 
           {position !== null && (
             <div className="ol-cm-search-form-position">
diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
index 026c1be078..5cf95763f4 100644
--- a/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
+++ b/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
@@ -25,6 +25,7 @@ import useReviewPanelLayout from '@/features/review-panel-new/hooks/use-review-p
 import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
 import Breadcrumbs from '@/features/ide-redesign/components/breadcrumbs'
 import classNames from 'classnames'
+import { useUserSettingsContext } from '@/shared/context/user-settings-context'
 
 export const CodeMirrorToolbar = () => {
   const view = useCodeMirrorViewContext()
@@ -41,6 +42,9 @@ const Toolbar = memo(function Toolbar() {
   const { t } = useTranslation()
   const state = useCodeMirrorStateContext()
   const view = useCodeMirrorViewContext()
+  const {
+    userSettings: { breadcrumbs },
+  } = useUserSettingsContext()
 
   const [overflowed, setOverflowed] = useState(false)
 
@@ -192,7 +196,7 @@ const Toolbar = memo(function Toolbar() {
             <DetachCompileButtonWrapper />
           </div>
         </div>
-        {newEditor && <Breadcrumbs />}
+        {newEditor && breadcrumbs && <Breadcrumbs />}
       </div>
     </>
   )
diff --git a/services/web/frontend/js/features/source-editor/components/full-project-search-button.tsx b/services/web/frontend/js/features/source-editor/components/full-project-search-button.tsx
index 698204d89c..be02fdbe3c 100644
--- a/services/web/frontend/js/features/source-editor/components/full-project-search-button.tsx
+++ b/services/web/frontend/js/features/source-editor/components/full-project-search-button.tsx
@@ -12,6 +12,8 @@ import Close from '@/shared/components/close'
 import useTutorial from '@/shared/hooks/promotions/use-tutorial'
 import { useEditorContext } from '@/shared/context/editor-context'
 import getMeta from '@/utils/meta'
+import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
+import { useRailContext } from '@/features/ide-redesign/contexts/rail-context'
 
 const PROMOTION_SIGNUP_CUT_OFF_DATE = new Date('2025-04-22T00:00:00Z')
 
@@ -19,6 +21,8 @@ export const FullProjectSearchButton = ({ query }: { query: SearchQuery }) => {
   const view = useCodeMirrorViewContext()
   const { t } = useTranslation()
   const { setProjectSearchIsOpen } = useLayoutContext()
+  const newEditor = useIsNewEditorEnabled()
+  const { openTab } = useRailContext()
   const ref = useRef<HTMLButtonElement>(null)
 
   const { inactiveTutorials } = useEditorContext()
@@ -44,14 +48,18 @@ export const FullProjectSearchButton = ({ query }: { query: SearchQuery }) => {
   }
 
   const openFullProjectSearch = useCallback(() => {
-    setProjectSearchIsOpen(true)
+    if (newEditor) {
+      openTab('full-project-search')
+    } else {
+      setProjectSearchIsOpen(true)
+    }
     closeSearchPanel(view)
     window.setTimeout(() => {
       window.dispatchEvent(
         new CustomEvent('editor:full-project-search', { detail: query })
       )
     }, 200)
-  }, [setProjectSearchIsOpen, query, view])
+  }, [setProjectSearchIsOpen, query, view, newEditor, openTab])
 
   const onClick = useCallback(() => {
     sendSearchEvent('search-open', {
diff --git a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/commands.ts b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/commands.ts
index 2645e853bd..ab58179586 100644
--- a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/commands.ts
+++ b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/commands.ts
@@ -45,16 +45,16 @@ const themeGenerators: Record<BorderTheme, ThemeGenerator> = {
       left: true,
       right: number === numColumns - 1,
     }),
-    row: (number: number, numRows: number) => '\\hline',
+    row: () => '\\hline',
     multicolumn: () => ({ left: true, right: true }),
     lastRow: () => '\\hline',
   },
   [BorderTheme.BOOKTABS]: {
-    column: (number: number, numColumns: number) => ({
+    column: () => ({
       left: false,
       right: false,
     }),
-    row: (number: number, numRows: number) => {
+    row: (number: number) => {
       if (number === 0) {
         return '\\toprule'
       }
diff --git a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/toolbar-button-menu.tsx b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/toolbar-button-menu.tsx
index 51c68872f6..d63ed7b706 100644
--- a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/toolbar-button-menu.tsx
+++ b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/toolbar-button-menu.tsx
@@ -36,7 +36,7 @@ export const ToolbarButtonMenu: FC<
         event.preventDefault()
         event.stopPropagation()
       }}
-      onClick={event => {
+      onClick={() => {
         onToggle(!open)
       }}
       disabled={disabled}
diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/math-dropdown.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/math-dropdown.tsx
index b34a61c69d..748a04d7cb 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/math-dropdown.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/math-dropdown.tsx
@@ -34,7 +34,7 @@ export const MathDropdown = memo(function MathDropdown() {
           </DropdownHeader>
           <OLListGroupItem
             aria-label={t('toolbar_generate_math')}
-            onClick={event => {
+            onClick={() => {
               writefullInstance?.openEquationGenerator()
             }}
           >
diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/table-dropdown.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/table-dropdown.tsx
index 190d2e7c7d..a191b63600 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/table-dropdown.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/table-dropdown.tsx
@@ -46,7 +46,7 @@ export const TableDropdown = memo(function TableDropdown() {
           </DropdownHeader>
           <OLListGroupItem
             aria-label={t('toolbar_generate_table')}
-            onClick={event => {
+            onClick={() => {
               writefullInstance?.openTableGenerator()
             }}
           >
diff --git a/services/web/frontend/js/features/source-editor/extensions/cursor-highlights.ts b/services/web/frontend/js/features/source-editor/extensions/cursor-highlights.ts
index 78d2903825..ccdc8b90e7 100644
--- a/services/web/frontend/js/features/source-editor/extensions/cursor-highlights.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/cursor-highlights.ts
@@ -187,7 +187,7 @@ class CursorMarker extends RectangleMarker {
 const cursorHighlightsLayer = layer({
   above: true,
   class: 'ol-cm-cursorHighlightsLayer',
-  update: (update, layer) => {
+  update: update => {
     return (
       update.docChanged ||
       update.selectionSet ||
diff --git a/services/web/frontend/js/features/source-editor/extensions/cursor-position.ts b/services/web/frontend/js/features/source-editor/extensions/cursor-position.ts
index efde64f40e..0cd69d8b1f 100644
--- a/services/web/frontend/js/features/source-editor/extensions/cursor-position.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/cursor-position.ts
@@ -42,7 +42,7 @@ export const cursorPosition = ({
     // Asynchronously dispatch cursor position when the selection changes and
     // provide a little debouncing. Using requestAnimationFrame postpones it
     // until the next CM6 DOM update.
-    ViewPlugin.define(view => {
+    ViewPlugin.define(() => {
       let animationFrameRequest: number | null = null
 
       return {
diff --git a/services/web/frontend/js/features/source-editor/extensions/draw-selection.ts b/services/web/frontend/js/features/source-editor/extensions/draw-selection.ts
index af31353a23..413317ec0a 100644
--- a/services/web/frontend/js/features/source-editor/extensions/draw-selection.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/draw-selection.ts
@@ -71,7 +71,7 @@ const cursorLayer = layer({
       updateHasMouseDownEffect(update)
     )
   },
-  mount(dom, view) {
+  mount(dom) {
     dom.style.animationDuration = '1200ms'
   },
   class: 'cm-cursorLayer',
@@ -90,7 +90,7 @@ const selectionLayer = layer({
     }
     return markers
   },
-  update(update, dom) {
+  update(update) {
     return (
       update.docChanged ||
       update.selectionSet ||
diff --git a/services/web/frontend/js/features/source-editor/extensions/empty-line-filler.ts b/services/web/frontend/js/features/source-editor/extensions/empty-line-filler.ts
index 647463d608..49d9b195b9 100644
--- a/services/web/frontend/js/features/source-editor/extensions/empty-line-filler.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/empty-line-filler.ts
@@ -9,13 +9,13 @@ import {
 import browser from './browser'
 
 class EmptyLineWidget extends WidgetType {
-  toDOM(view: EditorView): HTMLElement {
+  toDOM(): HTMLElement {
     const element = document.createElement('span')
     element.className = 'ol-cm-filler'
     return element
   }
 
-  eq(widget: EmptyLineWidget) {
+  eq() {
     return true
   }
 }
diff --git a/services/web/frontend/js/features/source-editor/extensions/history-ot.ts b/services/web/frontend/js/features/source-editor/extensions/history-ot.ts
new file mode 100644
index 0000000000..91a58599fb
--- /dev/null
+++ b/services/web/frontend/js/features/source-editor/extensions/history-ot.ts
@@ -0,0 +1,449 @@
+import { Decoration, EditorView, WidgetType } from '@codemirror/view'
+import {
+  EditorState,
+  StateEffect,
+  StateField,
+  Transaction,
+} from '@codemirror/state'
+import {
+  CommentList,
+  EditOperation,
+  TextOperation,
+  TrackingProps,
+  TrackedChangeList,
+} from 'overleaf-editor-core'
+import { DocumentContainer } from '@/features/ide-react/editor/document-container'
+import { HistoryOTShareDoc } from '../../../../../types/share-doc'
+
+export const historyOT = (currentDoc: DocumentContainer) => {
+  const trackedChanges =
+    currentDoc.doc?.getTrackedChanges() ?? new TrackedChangeList([])
+  const positionMapper = new PositionMapper(trackedChanges)
+  return [
+    updateSender,
+    trackChangesUserIdState,
+    shareDocState.init(() => currentDoc?.doc?._doc ?? null),
+    commentsState,
+    trackedChangesState.init(() => ({
+      decorations: buildTrackedChangesDecorations(
+        trackedChanges,
+        positionMapper
+      ),
+      positionMapper,
+    })),
+    trackedChangesTheme,
+  ]
+}
+
+export const shareDocState = StateField.define<HistoryOTShareDoc | null>({
+  create() {
+    return null
+  },
+
+  update(value) {
+    // this state is constant
+    return value
+  },
+})
+
+const trackedChangesTheme = EditorView.baseTheme({
+  '.ol-cm-change-i, .ol-cm-change-highlight-i, .ol-cm-change-focus-i': {
+    backgroundColor: 'rgba(44, 142, 48, 0.30)',
+  },
+  '&light .ol-cm-change-c, &light .ol-cm-change-highlight-c, &light .ol-cm-change-focus-c':
+    {
+      backgroundColor: 'rgba(243, 177, 17, 0.30)',
+    },
+  '&dark .ol-cm-change-c, &dark .ol-cm-change-highlight-c, &dark .ol-cm-change-focus-c':
+    {
+      backgroundColor: 'rgba(194, 93, 11, 0.15)',
+    },
+  '.ol-cm-change': {
+    padding: 'var(--half-leading, 0) 0',
+  },
+  '.ol-cm-change-highlight': {
+    padding: 'var(--half-leading, 0) 0',
+  },
+  '.ol-cm-change-focus': {
+    padding: 'var(--half-leading, 0) 0',
+  },
+  '&light .ol-cm-change-d': {
+    borderLeft: '2px dotted #c5060b',
+    marginLeft: '-1px',
+  },
+  '&dark .ol-cm-change-d': {
+    borderLeft: '2px dotted #c5060b',
+    marginLeft: '-1px',
+  },
+  '&light .ol-cm-change-d-highlight': {
+    borderLeft: '3px solid #c5060b',
+    marginLeft: '-2px',
+  },
+  '&dark .ol-cm-change-d-highlight': {
+    borderLeft: '3px solid #c5060b',
+    marginLeft: '-2px',
+  },
+  '&light .ol-cm-change-d-focus': {
+    borderLeft: '3px solid #B83A33',
+    marginLeft: '-2px',
+  },
+  '&dark .ol-cm-change-d-focus': {
+    borderLeft: '3px solid #B83A33',
+    marginLeft: '-2px',
+  },
+})
+
+export const updateTrackedChangesEffect =
+  StateEffect.define<TrackedChangeList>()
+
+const buildTrackedChangesDecorations = (
+  trackedChanges: TrackedChangeList,
+  positionMapper: PositionMapper
+) => {
+  const decorations = []
+  for (const change of trackedChanges.asSorted()) {
+    if (change.tracking.type === 'insert') {
+      decorations.push(
+        Decoration.mark({
+          class: 'ol-cm-change ol-cm-change-i',
+          tracking: change.tracking,
+        }).range(
+          positionMapper.toCM6(change.range.pos),
+          positionMapper.toCM6(change.range.end)
+        )
+      )
+    } else {
+      decorations.push(
+        Decoration.widget({
+          widget: new ChangeDeletedWidget(),
+          side: 1,
+        }).range(positionMapper.toCM6(change.range.pos))
+      )
+    }
+  }
+
+  return Decoration.set(decorations, true)
+}
+
+class ChangeDeletedWidget extends WidgetType {
+  toDOM() {
+    const widget = document.createElement('span')
+    widget.classList.add('ol-cm-change')
+    widget.classList.add('ol-cm-change-d')
+    return widget
+  }
+
+  eq() {
+    return true
+  }
+}
+
+export const trackedChangesState = StateField.define({
+  create() {
+    return {
+      decorations: Decoration.none,
+      positionMapper: new PositionMapper(new TrackedChangeList([])),
+    }
+  },
+
+  update(value, transaction) {
+    if (
+      (transaction.docChanged && !transaction.annotation(Transaction.remote)) ||
+      transaction.effects.some(effect => effect.is(updateTrackedChangesEffect))
+    ) {
+      const shareDoc = transaction.startState.field(shareDocState)
+      if (shareDoc != null) {
+        const trackedChanges = shareDoc.snapshot.getTrackedChanges()
+        const positionMapper = new PositionMapper(trackedChanges)
+        value = {
+          decorations: buildTrackedChangesDecorations(
+            trackedChanges,
+            positionMapper
+          ),
+          positionMapper,
+        }
+      }
+    }
+
+    return value
+  },
+
+  provide(field) {
+    return EditorView.decorations.from(field, value => value.decorations)
+  },
+})
+
+const setTrackChangesUserIdEffect = StateEffect.define<string | null>()
+
+export const setTrackChangesUserId = (userId: string | null) => {
+  return {
+    effects: setTrackChangesUserIdEffect.of(userId),
+  }
+}
+
+const trackChangesUserIdState = StateField.define<string | null>({
+  create() {
+    return null
+  },
+
+  update(value, transaction) {
+    for (const effect of transaction.effects) {
+      if (effect.is(setTrackChangesUserIdEffect)) {
+        value = effect.value
+      }
+    }
+    return value
+  },
+})
+
+const updateCommentsEffect = StateEffect.define<CommentList>()
+
+export const updateComments = (comments: CommentList) => {
+  return {
+    effects: updateCommentsEffect.of(comments),
+  }
+}
+
+const buildCommentsDecorations = (comments: CommentList) =>
+  Decoration.set(
+    comments.toArray().flatMap(comment =>
+      comment.ranges.map(range =>
+        Decoration.mark({
+          class: 'tracked-change-comment',
+          id: comment.id,
+          resolved: comment.resolved,
+        }).range(range.pos, range.end)
+      )
+    ),
+    true
+  )
+
+const commentsState = StateField.define({
+  create() {
+    return Decoration.none // TODO: init from snapshot
+  },
+
+  update(value, transaction) {
+    if (transaction.docChanged) {
+      value = value.map(transaction.changes)
+    }
+
+    for (const effect of transaction.effects) {
+      if (effect.is(updateCommentsEffect)) {
+        value = buildCommentsDecorations(effect.value)
+      }
+    }
+
+    return value
+  },
+
+  provide(field) {
+    return EditorView.decorations.from(field)
+  },
+})
+
+export const historyOTOperationEffect = StateEffect.define<EditOperation[]>()
+
+const updateSender = EditorState.transactionExtender.of(tr => {
+  if (!tr.docChanged || tr.annotation(Transaction.remote)) {
+    return {}
+  }
+
+  const trackingUserId = tr.startState.field(trackChangesUserIdState)
+  const positionMapper = tr.startState.field(trackedChangesState).positionMapper
+  const startDoc = tr.startState.doc
+  const opBuilder = new OperationBuilder(
+    positionMapper.toSnapshot(startDoc.length)
+  )
+
+  if (trackingUserId == null) {
+    // Not tracking changes
+    tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => {
+      // insert
+      if (inserted.length > 0) {
+        const pos = positionMapper.toSnapshot(fromA)
+        opBuilder.insert(pos, inserted.toString())
+      }
+
+      // deletion
+      if (toA > fromA) {
+        const start = positionMapper.toSnapshot(fromA)
+        const end = positionMapper.toSnapshot(toA)
+        opBuilder.delete(start, end - start)
+      }
+    })
+  } else {
+    // Tracking changes
+    const timestamp = new Date()
+    tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => {
+      // insertion
+      if (inserted.length > 0) {
+        const pos = positionMapper.toSnapshot(fromA)
+        opBuilder.trackedInsert(
+          pos,
+          inserted.toString(),
+          trackingUserId,
+          timestamp
+        )
+      }
+
+      // deletion
+      if (toA > fromA) {
+        const start = positionMapper.toSnapshot(fromA)
+        const end = positionMapper.toSnapshot(toA)
+        opBuilder.trackedDelete(start, end - start, trackingUserId, timestamp)
+      }
+    })
+  }
+
+  const op = opBuilder.finish()
+  const shareDoc = tr.startState.field(shareDocState)
+  if (shareDoc != null) {
+    shareDoc.submitOp([op])
+  }
+
+  return {}
+})
+
+/**
+ * Incrementally builds a TextOperation from a series of inserts and deletes.
+ *
+ * This relies on inserts and deletes being ordered by document position. This
+ * is not clear in the documentation, but has been confirmed by Marijn in
+ * https://discuss.codemirror.net/t/iterators-can-be-hard-to-work-with-for-beginners/3533/10
+ */
+class OperationBuilder {
+  /**
+   * Source document length
+   */
+  private docLength: number
+
+  /**
+   * Position in the source document
+   */
+  private pos: number
+
+  /**
+   * Operation built
+   */
+  private op: TextOperation
+
+  constructor(docLength: number) {
+    this.docLength = docLength
+    this.op = new TextOperation()
+    this.pos = 0
+  }
+
+  insert(pos: number, text: string) {
+    this.retainUntil(pos)
+    this.op.insert(text)
+  }
+
+  delete(pos: number, length: number) {
+    this.retainUntil(pos)
+    this.op.remove(length)
+    this.pos += length
+  }
+
+  trackedInsert(pos: number, text: string, userId: string, timestamp: Date) {
+    this.retainUntil(pos)
+    this.op.insert(text, {
+      tracking: new TrackingProps('insert', userId, timestamp),
+    })
+  }
+
+  trackedDelete(pos: number, length: number, userId: string, timestamp: Date) {
+    this.retainUntil(pos)
+    this.op.retain(length, {
+      tracking: new TrackingProps('delete', userId, timestamp),
+    })
+    this.pos += length
+  }
+
+  retainUntil(pos: number) {
+    if (pos > this.pos) {
+      this.op.retain(pos - this.pos)
+      this.pos = pos
+    } else if (pos < this.pos) {
+      throw Error(
+        `Out of order: position ${pos} comes before current position: ${this.pos}`
+      )
+    }
+  }
+
+  finish() {
+    this.retainUntil(this.docLength)
+    return this.op
+  }
+}
+
+type OffsetTable = { pos: number; map: (pos: number) => number }[]
+
+class PositionMapper {
+  private offsets: {
+    toCM6: OffsetTable
+    toSnapshot: OffsetTable
+  }
+
+  constructor(trackedChanges: TrackedChangeList) {
+    this.offsets = {
+      toCM6: [{ pos: 0, map: pos => pos }],
+      toSnapshot: [{ pos: 0, map: pos => pos }],
+    }
+
+    // Offset of the snapshot pos relative to the CM6 pos
+    let offset = 0
+    for (const change of trackedChanges.asSorted()) {
+      if (change.tracking.type === 'delete') {
+        const deleteLength = change.range.length
+        const deletePos = change.range.pos
+        const oldOffset = offset
+        const newOffset = offset + deleteLength
+        this.offsets.toSnapshot.push({
+          pos: change.range.pos - offset + 1,
+          map: pos => pos + newOffset,
+        })
+        this.offsets.toCM6.push({
+          pos: change.range.pos,
+          map: () => deletePos - oldOffset,
+        })
+        this.offsets.toCM6.push({
+          pos: change.range.pos + deleteLength,
+          map: pos => pos - newOffset,
+        })
+        offset = newOffset
+      }
+    }
+  }
+
+  toCM6(snapshotPos: number) {
+    return this.mapPos(snapshotPos, this.offsets.toCM6)
+  }
+
+  toSnapshot(cm6Pos: number) {
+    return this.mapPos(cm6Pos, this.offsets.toSnapshot)
+  }
+
+  mapPos(pos: number, offsets: OffsetTable) {
+    // Binary search for the offset at the last position before pos
+    let low = 0
+    let high = offsets.length - 1
+    while (low < high) {
+      const middle = Math.ceil((low + high) / 2)
+      const entry = offsets[middle]
+      if (entry.pos < pos) {
+        // This entry could be the right offset, but lower entries are too low
+        // Because we used Math.ceil(), middle is higher than low and the
+        // algorithm progresses.
+        low = middle
+      } else if (entry.pos > pos) {
+        // This entry is too high
+        high = middle - 1
+      } else {
+        // This is the right entry
+        return entry.map(pos)
+      }
+    }
+    return offsets[low].map(pos)
+  }
+}
diff --git a/services/web/frontend/js/features/source-editor/extensions/index.ts b/services/web/frontend/js/features/source-editor/extensions/index.ts
index 0a65739c55..0e19d42fc1 100644
--- a/services/web/frontend/js/features/source-editor/extensions/index.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/index.ts
@@ -50,6 +50,7 @@ import { docName } from './doc-name'
 import { fileTreeItemDrop } from './file-tree-item-drop'
 import { mathPreview } from './math-preview'
 import { ranges } from './ranges'
+import { historyOT } from './history-ot'
 import { trackDetachedComments } from './track-detached-comments'
 import { reviewTooltip } from './review-tooltip'
 
@@ -142,7 +143,9 @@ export const createExtensions = (options: Record<string, any>): Extension[] => [
   // NOTE: `emptyLineFiller` needs to be before `trackChanges`,
   // so the decorations are added in the correct order.
   emptyLineFiller(),
-  ranges(),
+  options.currentDoc.currentDocument.getType() === 'history-ot'
+    ? historyOT(options.currentDoc.currentDocument)
+    : ranges(),
   trackDetachedComments(options.currentDoc),
   visual(options.visual),
   mathPreview(options.settings.mathPreview),
diff --git a/services/web/frontend/js/features/source-editor/extensions/keybindings.ts b/services/web/frontend/js/features/source-editor/extensions/keybindings.ts
index 3e67b4b753..01c39d67ba 100644
--- a/services/web/frontend/js/features/source-editor/extensions/keybindings.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/keybindings.ts
@@ -34,17 +34,14 @@ const customiseVimOnce = (_Vim: typeof Vim, _CodeMirror: typeof CodeMirror) => {
   // Allow copy via Ctrl-C in insert mode
   _Vim.unmap('<C-c>', 'insert')
 
-  _Vim.defineAction(
-    'insertModeCtrlC',
-    (cm: CodeMirror, actionArgs: object, state: any) => {
-      if (hasNonEmptySelection(cm)) {
-        navigator.clipboard.writeText(cm.getSelection())
-        cm.setSelection(cm.getCursor(), cm.getCursor())
-      } else {
-        _Vim.exitInsertMode(cm)
-      }
+  _Vim.defineAction('insertModeCtrlC', (cm: CodeMirror) => {
+    if (hasNonEmptySelection(cm)) {
+      navigator.clipboard.writeText(cm.getSelection())
+      cm.setSelection(cm.getCursor(), cm.getCursor())
+    } else {
+      _Vim.exitInsertMode(cm)
     }
-  )
+  })
 
   // Overwrite the moveByCharacters command with a decoration-aware version
   _Vim.defineMotion(
diff --git a/services/web/frontend/js/features/source-editor/extensions/ranges.ts b/services/web/frontend/js/features/source-editor/extensions/ranges.ts
index 8dc4489d57..7bde7a4adb 100644
--- a/services/web/frontend/js/features/source-editor/extensions/ranges.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/ranges.ts
@@ -68,7 +68,7 @@ export const rangesDataField = StateField.define<RangesData | null>({
 export const ranges = () => [
   rangesDataField,
   // handle viewportChanged updates
-  ViewPlugin.define(view => {
+  ViewPlugin.define(() => {
     let timer: number
 
     return {
diff --git a/services/web/frontend/js/features/source-editor/extensions/realtime.ts b/services/web/frontend/js/features/source-editor/extensions/realtime.ts
index 36d9956a76..58cfa8712a 100644
--- a/services/web/frontend/js/features/source-editor/extensions/realtime.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/realtime.ts
@@ -1,10 +1,34 @@
-import { Prec, Transaction, Annotation, ChangeSpec } from '@codemirror/state'
+import {
+  Prec,
+  Transaction,
+  Annotation,
+  ChangeSpec,
+  Text,
+  StateEffect,
+} from '@codemirror/state'
 import { EditorView, ViewPlugin } from '@codemirror/view'
 import { EventEmitter } from 'events'
 import RangesTracker from '@overleaf/ranges-tracker'
-import { ShareDoc } from '../../../../../types/share-doc'
+import {
+  ShareDoc,
+  ShareLatexOTShareDoc,
+  HistoryOTShareDoc,
+} from '../../../../../types/share-doc'
 import { debugConsole } from '@/utils/debugging'
 import { DocumentContainer } from '@/features/ide-react/editor/document-container'
+import {
+  EditOperation,
+  TextOperation,
+  InsertOp,
+  RemoveOp,
+  RetainOp,
+} from 'overleaf-editor-core'
+import {
+  updateTrackedChangesEffect,
+  setTrackChangesUserId,
+  trackedChangesState,
+  shareDocState,
+} from './history-ot'
 
 /*
  * Integrate CodeMirror 6 with the real-time system, via ShareJS.
@@ -25,8 +49,10 @@ import { DocumentContainer } from '@/features/ide-react/editor/document-containe
  *   - frontend/js/features/ide-react/connection/editor-watchdog-manager.js
  */
 
+type Origin = 'remote' | 'undo' | 'reject' | undefined
+
 export type ChangeDescription = {
-  origin: 'remote' | 'undo' | 'reject' | undefined
+  origin: Origin
   inserted: boolean
   removed: boolean
 }
@@ -76,15 +102,22 @@ export const realtime = (
   return Prec.highest([realtimePlugin, ensureRealtimePlugin])
 }
 
+type OTAdapter = {
+  handleUpdateFromCM(
+    transactions: readonly Transaction[],
+    ranges?: RangesTracker
+  ): void
+  attachShareJs(): void
+}
+
 export class EditorFacade extends EventEmitter {
-  public shareDoc: ShareDoc | null
+  private otAdapter: OTAdapter | null
   public events: EventEmitter
-  private maxDocLength?: number
 
   constructor(public view: EditorView) {
     super()
     this.view = view
-    this.shareDoc = null
+    this.otAdapter = null
     this.events = new EventEmitter()
   }
 
@@ -118,23 +151,62 @@ export class EditorFacade extends EventEmitter {
     this.cmChange({ from: position, to: position + text.length }, origin)
   }
 
+  attachShareJs(shareDoc: ShareDoc, maxDocLength?: number) {
+    this.otAdapter =
+      shareDoc.otType === 'history-ot'
+        ? new HistoryOTAdapter(this, shareDoc, maxDocLength)
+        : new ShareLatexOTAdapter(this, shareDoc, maxDocLength)
+    this.otAdapter.attachShareJs()
+  }
+
+  detachShareJs() {
+    this.otAdapter = null
+  }
+
+  handleUpdateFromCM(
+    transactions: readonly Transaction[],
+    ranges?: RangesTracker
+  ) {
+    if (this.otAdapter == null) {
+      throw new Error('Trying to process updates with no otAdapter')
+    }
+
+    this.otAdapter.handleUpdateFromCM(transactions, ranges)
+  }
+
+  setTrackChangesUserId(userId: string | null) {
+    if (this.otAdapter instanceof HistoryOTAdapter) {
+      this.view.dispatch(setTrackChangesUserId(userId))
+    }
+  }
+}
+
+class ShareLatexOTAdapter {
+  constructor(
+    public editor: EditorFacade,
+    private shareDoc: ShareLatexOTShareDoc,
+    private maxDocLength?: number
+  ) {
+    this.editor = editor
+    this.shareDoc = shareDoc
+    this.maxDocLength = maxDocLength
+  }
+
   // Connect to ShareJS, passing changes to the CodeMirror view
   // as new transactions.
   // This is a broad immitation of helper functions supplied in
   // the sharejs library. (See vendor/libs/sharejs, in particular
   // the 'attach_ace' helper)
-  attachShareJs(shareDoc: ShareDoc, maxDocLength?: number) {
-    this.shareDoc = shareDoc
-    this.maxDocLength = maxDocLength
-
+  attachShareJs() {
+    const shareDoc = this.shareDoc
     const check = () => {
       // run in a timeout so it checks the editor content once this update has been applied
       window.setTimeout(() => {
-        const editorText = this.getValue()
+        const editorText = this.editor.getValue()
         const otText = shareDoc.getText()
 
         if (editorText !== otText) {
-          shareDoc.emit('error', 'Text does not match in CodeMirror 6')
+          this.shareDoc.emit('error', 'Text does not match in CodeMirror 6')
           debugConsole.error('Text does not match!')
           debugConsole.error('editor: ' + editorText)
           debugConsole.error('ot:     ' + otText)
@@ -143,12 +215,12 @@ export class EditorFacade extends EventEmitter {
     }
 
     const onInsert = (pos: number, text: string) => {
-      this.cmInsert(pos, text, 'remote')
+      this.editor.cmInsert(pos, text, 'remote')
       check()
     }
 
     const onDelete = (pos: number, text: string) => {
-      this.cmDelete(pos, text, 'remote')
+      this.editor.cmDelete(pos, text, 'remote')
       check()
     }
 
@@ -161,7 +233,7 @@ export class EditorFacade extends EventEmitter {
       shareDoc.removeListener('insert', onInsert)
       shareDoc.removeListener('delete', onDelete)
       delete shareDoc.detach_cm6
-      this.shareDoc = null
+      this.editor.detachShareJs()
     }
   }
 
@@ -175,10 +247,6 @@ export class EditorFacade extends EventEmitter {
     const trackedDeletesLength =
       ranges != null ? ranges.getTrackedDeletesLength() : 0
 
-    if (!shareDoc) {
-      throw new Error('Trying to process updates with no shareDoc')
-    }
-
     for (const transaction of transactions) {
       if (transaction.docChanged) {
         const origin = chooseOrigin(transaction)
@@ -234,7 +302,7 @@ export class EditorFacade extends EventEmitter {
               removed,
             }
 
-            this.emit('change', this, changeDescription)
+            this.editor.emit('change', this.editor, changeDescription)
           }
         )
       }
@@ -242,6 +310,154 @@ export class EditorFacade extends EventEmitter {
   }
 }
 
+class HistoryOTAdapter {
+  constructor(
+    public editor: EditorFacade,
+    private shareDoc: HistoryOTShareDoc,
+    private maxDocLength?: number
+  ) {
+    this.editor = editor
+    this.shareDoc = shareDoc
+    this.maxDocLength = maxDocLength
+  }
+
+  attachShareJs() {
+    this.checkContent()
+
+    const onRemoteOp = this.onRemoteOp.bind(this)
+    this.shareDoc.on('remoteop', onRemoteOp)
+
+    this.shareDoc.detach_cm6 = () => {
+      this.shareDoc.removeListener('remoteop', onRemoteOp)
+      delete this.shareDoc.detach_cm6
+      this.editor.detachShareJs()
+    }
+  }
+
+  handleUpdateFromCM(transactions: readonly Transaction[]) {
+    for (const transaction of transactions) {
+      if (
+        this.maxDocLength &&
+        transaction.changes.newLength >= this.maxDocLength
+      ) {
+        this.shareDoc.emit(
+          'error',
+          new Error('document length is greater than maxDocLength')
+        )
+        return
+      }
+
+      const origin = chooseOrigin(transaction)
+      transaction.changes.iterChanges((fromA, toA, fromB, toB, inserted) => {
+        this.onCodeMirrorChange(fromA, toA, fromB, toB, inserted, origin)
+      })
+    }
+  }
+
+  onRemoteOp(operations: EditOperation[]) {
+    const positionMapper =
+      this.editor.view.state.field(trackedChangesState).positionMapper
+    const changes: ChangeSpec[] = []
+    let trackedChangesUpdated = false
+    for (const operation of operations) {
+      if (operation instanceof TextOperation) {
+        let cursor = 0
+        for (const op of operation.ops) {
+          if (op instanceof InsertOp) {
+            if (op.tracking?.type !== 'delete') {
+              changes.push({
+                from: positionMapper.toCM6(cursor),
+                insert: op.insertion,
+              })
+            }
+            trackedChangesUpdated = true
+          } else if (op instanceof RemoveOp) {
+            changes.push({
+              from: positionMapper.toCM6(cursor),
+              to: positionMapper.toCM6(cursor + op.length),
+            })
+            cursor += op.length
+            trackedChangesUpdated = true
+          } else if (op instanceof RetainOp) {
+            if (op.tracking != null) {
+              if (op.tracking.type === 'delete') {
+                changes.push({
+                  from: positionMapper.toCM6(cursor),
+                  to: positionMapper.toCM6(cursor + op.length),
+                })
+              }
+              trackedChangesUpdated = true
+            }
+            cursor += op.length
+          }
+        }
+      }
+
+      const view = this.editor.view
+      const effects: StateEffect<any>[] = []
+      const scrollEffect = view
+        .scrollSnapshot()
+        .map(view.state.changes(changes))
+      if (scrollEffect != null) {
+        effects.push(scrollEffect)
+      }
+      if (trackedChangesUpdated) {
+        const shareDoc = this.editor.view.state.field(shareDocState)
+        if (shareDoc != null) {
+          const trackedChanges = shareDoc.snapshot.getTrackedChanges()
+          effects.push(updateTrackedChangesEffect.of(trackedChanges))
+        }
+      }
+
+      view.dispatch({
+        changes,
+        effects,
+        annotations: [
+          Transaction.remote.of(true),
+          Transaction.addToHistory.of(false),
+        ],
+      })
+    }
+  }
+
+  onCodeMirrorChange(
+    fromA: number,
+    toA: number,
+    fromB: number,
+    toB: number,
+    insertedText: Text,
+    origin: Origin
+  ) {
+    const insertedLength = insertedText.length
+    const removedLength = toA - fromA
+    const inserted = insertedLength > 0
+    const removed = removedLength > 0
+
+    const changeDescription: ChangeDescription = {
+      origin,
+      inserted,
+      removed,
+    }
+
+    this.editor.emit('change', this.editor, changeDescription)
+  }
+
+  checkContent() {
+    // run in a timeout so it checks the editor content once this update has been applied
+    window.setTimeout(() => {
+      const editorText = this.editor.getValue()
+      const otText = this.shareDoc.getText()
+
+      if (editorText !== otText) {
+        this.shareDoc.emit('error', 'Text does not match in CodeMirror 6')
+        debugConsole.error('Text does not match!')
+        debugConsole.error('editor: ' + editorText)
+        debugConsole.error('ot:     ' + otText)
+      }
+    }, 0)
+  }
+}
+
 export const trackChangesAnnotation = Annotation.define()
 
 const chooseOrigin = (transaction: Transaction) => {
diff --git a/services/web/frontend/js/features/source-editor/extensions/vertical-overflow.ts b/services/web/frontend/js/features/source-editor/extensions/vertical-overflow.ts
index 20505ed95d..873343c2bc 100644
--- a/services/web/frontend/js/features/source-editor/extensions/vertical-overflow.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/vertical-overflow.ts
@@ -188,7 +188,7 @@ class TopPaddingWidget extends WidgetType {
     this.height = height
   }
 
-  toDOM(view: EditorView): HTMLElement {
+  toDOM(): HTMLElement {
     const element = document.createElement('div')
     element.style.height = this.height + 'px'
     return element
diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/begin.ts b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/begin.ts
index 70e508d93e..1826b48719 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/begin.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/begin.ts
@@ -45,6 +45,7 @@ export class BeginWidget extends WidgetType {
     return element.getBoundingClientRect()
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   buildName(name: HTMLSpanElement, view: EditorView) {
     name.textContent = this.environment
   }
diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/end.ts b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/end.ts
index 232399de3b..3ca2439ae1 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/end.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/end.ts
@@ -7,7 +7,7 @@ export class EndWidget extends WidgetType {
     return element
   }
 
-  eq(widget: EndWidget) {
+  eq() {
     return true
   }
 
diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/environment-line.ts b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/environment-line.ts
index d6ab42503e..d506ac2c38 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/environment-line.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/environment-line.ts
@@ -1,4 +1,4 @@
-import { EditorView, WidgetType } from '@codemirror/view'
+import { WidgetType } from '@codemirror/view'
 
 export class EnvironmentLineWidget extends WidgetType {
   constructor(
@@ -8,7 +8,7 @@ export class EnvironmentLineWidget extends WidgetType {
     super()
   }
 
-  toDOM(view: EditorView) {
+  toDOM() {
     const element = document.createElement('div')
     element.classList.add(`ol-cm-environment-${this.environment}`)
     element.classList.add('ol-cm-environment-edge')
diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/table-rendering-error.ts b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/table-rendering-error.ts
index 63ad0a297a..68da3ab058 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/table-rendering-error.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/table-rendering-error.ts
@@ -17,6 +17,7 @@ export class TableRenderingErrorWidget extends WidgetType {
     const iconType = document.createElement('span')
     iconType.classList.add('material-symbols')
     iconType.setAttribute('aria-hidden', 'true')
+    iconType.setAttribute('translate', 'no')
     iconType.textContent = 'info'
     icon.appendChild(iconType)
     warning.appendChild(icon)
diff --git a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
index a4e2862e1f..2504afdd0c 100644
--- a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
+++ b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
@@ -185,9 +185,9 @@ function useCodeMirrorScope(view: EditorView) {
 
     if (currentDocument) {
       if (trackChanges) {
-        currentDocument.track_changes_as = userId || 'anonymous'
+        currentDocument.setTrackChangesUserId(userId ?? 'anonymous')
       } else {
-        currentDocument.track_changes_as = null
+        currentDocument.setTrackChangesUserId(null)
       }
     }
   }, [userId, currentDocument, trackChanges])
diff --git a/services/web/frontend/js/features/source-editor/languages/latex/latex-indent-service.ts b/services/web/frontend/js/features/source-editor/languages/latex/latex-indent-service.ts
index 08c1798032..d1e8e84bc4 100644
--- a/services/web/frontend/js/features/source-editor/languages/latex/latex-indent-service.ts
+++ b/services/web/frontend/js/features/source-editor/languages/latex/latex-indent-service.ts
@@ -1,7 +1,7 @@
 import { indentService } from '@codemirror/language'
 
 export const latexIndentService = () =>
-  indentService.of((indentContext, pos) => {
+  indentService.of(indentContext => {
     // only use this for insertNewLineAndIndent
     if (indentContext.simulatedBreak) {
       // match the indentation of the previous line (if present)
diff --git a/services/web/frontend/js/features/source-editor/languages/latex/linter/latex-linter.worker.js b/services/web/frontend/js/features/source-editor/languages/latex/linter/latex-linter.worker.js
index 0bfaf94d62..c496ce767f 100644
--- a/services/web/frontend/js/features/source-editor/languages/latex/linter/latex-linter.worker.js
+++ b/services/web/frontend/js/features/source-editor/languages/latex/linter/latex-linter.worker.js
@@ -2087,7 +2087,10 @@ if (typeof onmessage !== 'undefined') {
 }
 // export dummy class for testing
 export default class LintWorker {
+  // unused vars kept to document the interface
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   postMessage(message) {}
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   addEventListener(eventName, listener) {}
   Parse(text) {
     return Parse(text)
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/free-plan.tsx b/services/web/frontend/js/features/subscription/components/dashboard/free-plan.tsx
index a8cf7dcf7b..1f9583dd8b 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/free-plan.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/free-plan.tsx
@@ -1,6 +1,5 @@
 import { useTranslation, Trans } from 'react-i18next'
 import WritefullManagedBundleAddOn from '@/features/subscription/components/dashboard/states/active/change-plan/modals/writefull-bundle-management-modal'
-import RedirectAlerts from './redirect-alerts'
 import getMeta from '@/utils/meta'
 
 function FreePlan() {
@@ -9,7 +8,6 @@ function FreePlan() {
 
   return (
     <>
-      <RedirectAlerts />
       <Trans
         i18nKey="on_free_plan_upgrade_to_access_features"
         components={[
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/personal-subscription-recurly-sync-email.tsx b/services/web/frontend/js/features/subscription/components/dashboard/personal-subscription-sync-email.tsx
similarity index 87%
rename from services/web/frontend/js/features/subscription/components/dashboard/personal-subscription-recurly-sync-email.tsx
rename to services/web/frontend/js/features/subscription/components/dashboard/personal-subscription-sync-email.tsx
index c518b3ca8c..5f38a6be9e 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/personal-subscription-recurly-sync-email.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/personal-subscription-sync-email.tsx
@@ -7,23 +7,23 @@ import OLNotification from '@/features/ui/components/ol/ol-notification'
 import OLButton from '@/features/ui/components/ol/ol-button'
 import OLFormGroup from '@/features/ui/components/ol/ol-form-group'
 
-function PersonalSubscriptionRecurlySyncEmail() {
+function PersonalSubscriptionSyncEmail() {
   const { t } = useTranslation()
   const { personalSubscription } = useSubscriptionDashboardContext()
   const userEmail = getMeta('ol-usersEmail')
   const { isLoading, isSuccess, runAsync } = useAsync()
 
+  if (!personalSubscription || !('payment' in personalSubscription)) return null
+
+  const accountEmail = personalSubscription.payment.accountEmail
+
+  if (!userEmail || accountEmail === userEmail) return null
+
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault()
     runAsync(postJSON('/user/subscription/account/email'))
   }
 
-  if (!personalSubscription || !('payment' in personalSubscription)) return null
-
-  const recurlyEmail = personalSubscription.payment.accountEmail
-
-  if (!userEmail || recurlyEmail === userEmail) return null
-
   return (
     <>
       <form onSubmit={handleSubmit}>
@@ -39,7 +39,7 @@ function PersonalSubscriptionRecurlySyncEmail() {
                 <Trans
                   i18nKey="recurly_email_update_needed"
                   components={[<em />, <em />]} // eslint-disable-line react/jsx-key
-                  values={{ recurlyEmail, userEmail }}
+                  values={{ recurlyEmail: accountEmail, userEmail }}
                   shouldUnescape
                   tOptions={{ interpolation: { escapeValue: true } }}
                 />
@@ -64,4 +64,4 @@ function PersonalSubscriptionRecurlySyncEmail() {
   )
 }
 
-export default PersonalSubscriptionRecurlySyncEmail
+export default PersonalSubscriptionSyncEmail
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/personal-subscription.tsx b/services/web/frontend/js/features/subscription/components/dashboard/personal-subscription.tsx
index 2173ea45d3..b174751528 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/personal-subscription.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/personal-subscription.tsx
@@ -5,9 +5,8 @@ import { ActiveSubscriptionNew } from '@/features/subscription/components/dashbo
 import { CanceledSubscription } from './states/canceled'
 import { ExpiredSubscription } from './states/expired'
 import { useSubscriptionDashboardContext } from '../../context/subscription-dashboard-context'
-import PersonalSubscriptionRecurlySyncEmail from './personal-subscription-recurly-sync-email'
+import PersonalSubscriptionSyncEmail from './personal-subscription-sync-email'
 import OLNotification from '@/features/ui/components/ol/ol-notification'
-import RedirectAlerts from './redirect-alerts'
 
 function PastDueSubscriptionAlert({
   subscription,
@@ -76,7 +75,6 @@ function PersonalSubscription() {
 
   return (
     <>
-      <RedirectAlerts />
       {personalSubscription.payment.hasPastDueInvoice && (
         <PastDueSubscriptionAlert subscription={personalSubscription} />
       )}
@@ -90,7 +88,7 @@ function PersonalSubscription() {
         />
       )}
       <hr />
-      <PersonalSubscriptionRecurlySyncEmail />
+      <PersonalSubscriptionSyncEmail />
     </>
   )
 }
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/redirect-alerts.tsx b/services/web/frontend/js/features/subscription/components/dashboard/redirect-alerts.tsx
index be5bab484e..9dea4e1e46 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/redirect-alerts.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/redirect-alerts.tsx
@@ -15,6 +15,8 @@ export function RedirectAlerts() {
     warning = t('good_news_you_are_already_receiving_this_add_on_via_writefull')
   } else if (redirectReason === 'double-buy') {
     warning = t('good_news_you_already_purchased_this_add_on')
+  } else if (redirectReason === 'ai-assist-unavailable') {
+    warning = t('ai_assist_unavailable_due_to_subscription_type')
   } else {
     return null
   }
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/individual-plans-table.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/individual-plans-table.tsx
index a6ede01715..d8c98fc56b 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/individual-plans-table.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/individual-plans-table.tsx
@@ -20,7 +20,7 @@ function ChangeToPlanButton({ planCode }: { planCode: string }) {
   )
 }
 
-function KeepCurrentPlanButton({ plan }: { plan: Plan }) {
+function KeepCurrentPlanButton() {
   const { t } = useTranslation()
   const { handleOpenModal } = useSubscriptionDashboardContext()
 
@@ -43,7 +43,7 @@ function ChangePlanButton({ plan }: { plan: Plan }) {
     plan.planCode === personalSubscription.planCode.split('_')[0]
 
   if (isCurrentPlanForUser && personalSubscription.pendingPlan) {
-    return <KeepCurrentPlanButton plan={plan} />
+    return <KeepCurrentPlanButton />
   } else if (isCurrentPlanForUser && !personalSubscription.pendingPlan) {
     return (
       <b>
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/confirm-change-plan-modal.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/confirm-change-plan-modal.tsx
index 08cbf1743f..a964009dcc 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/confirm-change-plan-modal.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/confirm-change-plan-modal.tsx
@@ -1,7 +1,10 @@
 import { useState } from 'react'
 import { useTranslation, Trans } from 'react-i18next'
 import { SubscriptionDashModalIds } from '../../../../../../../../../../types/subscription/dashboard/modal-ids'
-import { postJSON } from '../../../../../../../../infrastructure/fetch-json'
+import {
+  postJSON,
+  FetchError,
+} from '../../../../../../../../infrastructure/fetch-json'
 import getMeta from '../../../../../../../../utils/meta'
 import { useSubscriptionDashboardContext } from '../../../../../../context/subscription-dashboard-context'
 import { subscriptionUpdateUrl } from '../../../../../../data/subscription-url'
@@ -14,6 +17,7 @@ import OLModal, {
 } from '@/features/ui/components/ol/ol-modal'
 import OLButton from '@/features/ui/components/ol/ol-button'
 import OLNotification from '@/features/ui/components/ol/ol-notification'
+import handleStripePaymentAction from '@/features/subscription/util/handle-stripe-payment-action'
 
 export function ConfirmChangePlanModal() {
   const modalId: SubscriptionDashModalIds = 'change-to-plan'
@@ -37,8 +41,13 @@ export function ConfirmChangePlanModal() {
       })
       location.reload()
     } catch (e) {
-      setError(true)
-      setInflight(false)
+      const { handled } = await handleStripePaymentAction(e as FetchError)
+      if (handled) {
+        location.reload()
+      } else {
+        setError(true)
+        setInflight(false)
+      }
     }
   }
 
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/subscription-dashboard.tsx b/services/web/frontend/js/features/subscription/components/dashboard/subscription-dashboard.tsx
index 8cb07181cf..b0f1b4122c 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/subscription-dashboard.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/subscription-dashboard.tsx
@@ -15,6 +15,7 @@ import OLRow from '@/features/ui/components/ol/ol-row'
 import OLCol from '@/features/ui/components/ol/ol-col'
 import OLNotification from '@/features/ui/components/ol/ol-notification'
 import WritefullManagedBundleAddOn from './states/active/change-plan/modals/writefull-bundle-management-modal'
+import RedirectAlerts from './redirect-alerts'
 
 function SubscriptionDashboard() {
   const { t } = useTranslation()
@@ -40,6 +41,7 @@ function SubscriptionDashboard() {
               type="warning"
             />
           )}
+          <RedirectAlerts />
           <OLPageContentCard>
             <div className="page-header">
               <h1>{t('your_subscription')}</h1>
diff --git a/services/web/frontend/js/features/subscription/components/group-invite/group-invite.tsx b/services/web/frontend/js/features/subscription/components/group-invite/group-invite.tsx
index a4e8fb2da8..66b6288388 100644
--- a/services/web/frontend/js/features/subscription/components/group-invite/group-invite.tsx
+++ b/services/web/frontend/js/features/subscription/components/group-invite/group-invite.tsx
@@ -19,20 +19,20 @@ export type InviteViewTypes =
   | undefined
 
 function GroupInviteViews() {
-  const hasIndividualRecurlySubscription = getMeta(
-    'ol-hasIndividualRecurlySubscription'
+  const hasIndividualPaidSubscription = getMeta(
+    'ol-hasIndividualPaidSubscription'
   )
   const cannotJoinSubscription = getMeta('ol-cannot-join-subscription')
 
   useEffect(() => {
     if (cannotJoinSubscription) {
       setView('managed-user-cannot-join')
-    } else if (hasIndividualRecurlySubscription) {
+    } else if (hasIndividualPaidSubscription) {
       setView('cancel-personal-subscription')
     } else {
       setView('invite')
     }
-  }, [cannotJoinSubscription, hasIndividualRecurlySubscription])
+  }, [cannotJoinSubscription, hasIndividualPaidSubscription])
   const [view, setView] = useState<InviteViewTypes>(undefined)
 
   if (!view) {
diff --git a/services/web/frontend/js/features/subscription/components/preview-subscription-change/root.tsx b/services/web/frontend/js/features/subscription/components/preview-subscription-change/root.tsx
index 367a5e35a9..112d15d7e3 100644
--- a/services/web/frontend/js/features/subscription/components/preview-subscription-change/root.tsx
+++ b/services/web/frontend/js/features/subscription/components/preview-subscription-change/root.tsx
@@ -11,7 +11,7 @@ import { formatCurrency } from '@/shared/utils/currency'
 import useAsync from '@/shared/hooks/use-async'
 import { useLocation } from '@/shared/hooks/use-location'
 import { debugConsole } from '@/utils/debugging'
-import { postJSON } from '@/infrastructure/fetch-json'
+import { FetchError, postJSON } from '@/infrastructure/fetch-json'
 import Notification from '@/shared/components/notification'
 import OLCard from '@/features/ui/components/ol/ol-card'
 import OLRow from '@/features/ui/components/ol/ol-row'
@@ -21,6 +21,7 @@ import { subscriptionUpdateUrl } from '@/features/subscription/data/subscription
 import * as eventTracking from '@/infrastructure/event-tracking'
 import sparkleText from '@/shared/svgs/ai-sparkle-text.svg'
 import { useFeatureFlag } from '@/shared/context/split-test-context'
+import handleStripePaymentAction from '../../util/handle-stripe-payment-action'
 
 function PreviewSubscriptionChange() {
   const preview = getMeta(
@@ -279,16 +280,25 @@ function PreviewSubscriptionChange() {
 }
 
 async function payNow(preview: SubscriptionChangePreview) {
-  if (preview.change.type === 'add-on-purchase') {
-    await postJSON(`/user/subscription/addon/${preview.change.addOn.code}/add`)
-  } else if (preview.change.type === 'premium-subscription') {
-    await postJSON(subscriptionUpdateUrl, {
-      body: { plan_code: preview.change.plan.code },
-    })
-  } else {
-    throw new Error(
-      `Unknown subscription change preview type: ${preview.change}`
-    )
+  try {
+    if (preview.change.type === 'add-on-purchase') {
+      await postJSON(
+        `/user/subscription/addon/${preview.change.addOn.code}/add`
+      )
+    } else if (preview.change.type === 'premium-subscription') {
+      await postJSON(subscriptionUpdateUrl, {
+        body: { plan_code: preview.change.plan.code },
+      })
+    } else {
+      throw new Error(
+        `Unknown subscription change preview type: ${preview.change}`
+      )
+    }
+  } catch (e) {
+    const { handled } = await handleStripePaymentAction(e as FetchError)
+    if (!handled) {
+      throw e
+    }
   }
 }
 
diff --git a/services/web/frontend/js/features/subscription/util/handle-stripe-payment-action.ts b/services/web/frontend/js/features/subscription/util/handle-stripe-payment-action.ts
new file mode 100644
index 0000000000..f533cba730
--- /dev/null
+++ b/services/web/frontend/js/features/subscription/util/handle-stripe-payment-action.ts
@@ -0,0 +1,29 @@
+import { FetchError, postJSON } from '@/infrastructure/fetch-json'
+import getMeta from '../../../utils/meta'
+import { loadStripe } from '@stripe/stripe-js/pure'
+
+export default async function handleStripePaymentAction(
+  error: FetchError
+): Promise<{ handled: boolean }> {
+  const clientSecret = error?.data?.clientSecret
+
+  if (clientSecret) {
+    // TODO: support both US and UK Stripe accounts
+    const stripeUKPublicKey = getMeta('ol-stripeUKApiKey')
+    const stripe = await loadStripe(stripeUKPublicKey)
+    if (stripe) {
+      const manualConfirmationFlow =
+        await stripe.confirmCardPayment(clientSecret)
+      if (!manualConfirmationFlow.error) {
+        try {
+          await postJSON(`/user/subscription/sync`)
+        } catch (error) {
+          // if the sync fails, there may be stale data until the webhook is
+          // processed but we can't do any special handling for that in here
+        }
+        return { handled: true }
+      }
+    }
+  }
+  return { handled: false }
+}
diff --git a/services/web/frontend/js/features/template-gallery/components/gallery-header-all.tsx b/services/web/frontend/js/features/template-gallery/components/gallery-header-all.tsx
new file mode 100644
index 0000000000..aed7c311f9
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/components/gallery-header-all.tsx
@@ -0,0 +1,29 @@
+import { useTranslation } from 'react-i18next'
+import OLCol from '@/features/ui/components/ol/ol-col'
+import OLRow from '@/features/ui/components/ol/ol-row'
+
+export default function GalleryHeaderAll() {
+  const { t } = useTranslation()
+  return (
+    <div className="gallery-header">
+      <OLRow>
+        <OLCol md={12}>
+          <h1 className="gallery-title">
+            <span className="eyebrow-text">
+              <span aria-hidden="true">&#123;</span>
+              <span>{t('overleaf_template_gallery')}</span>
+              <span aria-hidden="true">&#125;</span>
+            </span>
+            {t('latex_templates')}
+          </h1>
+        </OLCol>
+      </OLRow>
+      <div className="row">
+        <div className="col-md-12">
+          <p className="gallery-summary">{t('latex_templates_for_journal_articles')}
+          </p>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/services/web/frontend/js/features/template-gallery/components/gallery-header-tagged.tsx b/services/web/frontend/js/features/template-gallery/components/gallery-header-tagged.tsx
new file mode 100644
index 0000000000..ca2f37dbb5
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/components/gallery-header-tagged.tsx
@@ -0,0 +1,33 @@
+import getMeta from '@/utils/meta'
+import OLCol from '@/features/ui/components/ol/ol-col'
+import OLRow from '@/features/ui/components/ol/ol-row'
+import GallerySearchSortHeader from './gallery-search-sort-header'
+
+export default function GalleryHeaderTagged({ category }) {
+  const title = getMeta('og:title')
+  const { templateLinks } = getMeta('ol-ExposedSettings') || []
+
+  const description = templateLinks?.find(link => link.url.split("/").pop() === category)?.description
+  const gotoAllLink = (category !== 'all')
+  return (
+    <div className="tagged-header-container">
+      <GallerySearchSortHeader
+        gotoAllLink={gotoAllLink}
+      />
+      { category && (
+        <>
+          <OLRow>
+            <OLCol xs={12}>
+              <h1 className="gallery-title">{title}</h1>
+            </OLCol>
+          </OLRow>
+          <OLRow>
+            <OLCol lg={8}>
+              <p className="gallery-summary">{description}</p>
+            </OLCol>
+          </OLRow>
+        </>
+      )}
+    </div>
+  )
+}
diff --git a/services/web/frontend/js/features/template-gallery/components/gallery-popular-tags.tsx b/services/web/frontend/js/features/template-gallery/components/gallery-popular-tags.tsx
new file mode 100644
index 0000000000..2e5d847d23
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/components/gallery-popular-tags.tsx
@@ -0,0 +1,31 @@
+import { useTranslation } from 'react-i18next'
+import getMeta from '@/utils/meta'
+
+export default function GalleryPopularTags() {
+  const { t } = useTranslation()
+  const { templateLinks } = getMeta('ol-ExposedSettings') || []
+
+  if(!templateLinks || templateLinks.length < 2) return null
+
+  return (
+    <div className="popular-tags">
+      <h1>{t('categories')}</h1>
+      <div className="row popular-tags-list">
+        {templateLinks?.filter(link => link.url.split("/").pop() !== "all").map((link, index) => (
+          <div key={index} className="gallery-thumbnail col-12 col-md-6 col-lg-4">
+            <a href={link.url}>
+              <div className="thumbnail-tag">
+                <img
+                  src={`/img/website-redesign/gallery/${link.url.split("/").pop()}.svg`}
+                  alt={link.name}
+                />
+              </div>
+              <span className="caption-title">{link.name}</span>
+            </a>
+            <p>{link.description}</p>
+          </div>
+        ))}
+      </div>
+    </div>
+  )
+}
diff --git a/services/web/frontend/js/features/template-gallery/components/gallery-search-sort-header.tsx b/services/web/frontend/js/features/template-gallery/components/gallery-search-sort-header.tsx
new file mode 100644
index 0000000000..128d379684
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/components/gallery-search-sort-header.tsx
@@ -0,0 +1,78 @@
+import { useTemplateGalleryContext } from '../context/template-gallery-context'
+import { useTranslation } from 'react-i18next'
+import SearchForm from './search-form'
+import OLCol from '@/features/ui/components/ol/ol-col'
+import OLRow from '@/features/ui/components/ol/ol-row'
+import useSort from '../hooks/use-sort'
+import withContent, { SortBtnProps } from './sort/with-content'
+import MaterialIcon from '@/shared/components/material-icon'
+
+function SortBtn({ onClick, text, iconType, screenReaderText }: SortBtnProps) {
+  return (
+    <button
+      className="gallery-header-sort-btn inline-block"
+      onClick={onClick}
+      aria-label={screenReaderText}
+    >
+      <span>{text}</span>
+        {iconType ? (
+          <MaterialIcon type={iconType} />
+        ) : (
+          <MaterialIcon type="arrow_upward" style={{ visibility: 'hidden' }} />
+        )}
+    </button>
+  )
+}
+
+const SortByButton = withContent(SortBtn)
+
+export default function GallerySearchSortHeader( { gotoAllLink }: { boolean } ) {
+  const { t } = useTranslation()
+  const {
+    searchText,
+    setSearchText,
+    sort,
+  } = useTemplateGalleryContext()
+
+  const { handleSort } = useSort()
+  return (
+    <OLRow className="align-items-center">
+      {gotoAllLink ? (
+      <OLCol className="col-auto">
+          <a className="previous-page-link" href="/templates/all">
+            <i className="material-symbols material-symbols-rounded" aria-hidden="true">arrow_left_alt</i>
+            {t('all_templates')}
+          </a>
+        </OLCol>
+      ) : (
+      <OLCol className="col-auto">
+          <a className="previous-page-link" href="/templates">
+            <i className="material-symbols material-symbols-rounded" aria-hidden="true">arrow_left_alt</i>
+            {t('template_gallery')}
+          </a>
+        </OLCol>
+      )}
+      <OLCol className="d-flex justify-content-center gap-2">
+        <SortByButton
+          column="lastUpdated"
+          text={t('last_updated')}
+          sort={sort}
+          onClick={() => handleSort('lastUpdated')}
+        />
+
+        <SortByButton
+          column="name"
+          text={t('title')}
+          sort={sort}
+          onClick={() => handleSort('name')}
+        />
+      </OLCol>
+      <OLCol xs={3} className="ms-auto" >
+        <SearchForm
+          inputValue={searchText}
+          setInputValue={setSearchText}
+        />
+      </OLCol>
+    </OLRow>
+  )
+}
diff --git a/services/web/frontend/js/features/template-gallery/components/pagination.tsx b/services/web/frontend/js/features/template-gallery/components/pagination.tsx
new file mode 100644
index 0000000000..a55f96a6a4
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/components/pagination.tsx
@@ -0,0 +1,80 @@
+import { useTranslation } from 'react-i18next'
+
+export default function Pagination({ currentPage, totalPages, onPageChange }) {
+  const { t } = useTranslation()
+  if (totalPages <= 1) return null
+
+  const pageNumbers = []
+  let startPage = Math.max(1, currentPage - 4)
+  let endPage = Math.min(totalPages, currentPage + 4)
+
+  if (startPage > 1) {
+    pageNumbers.push(1)
+    if (startPage > 2) {
+      pageNumbers.push("...")
+    }
+  }
+
+  for (let i = startPage; i <= endPage; i++) {
+    pageNumbers.push(i)
+  }
+
+  if (endPage < totalPages) {
+    if (endPage < totalPages - 1) {
+      pageNumbers.push("...")
+    }
+    pageNumbers.push(totalPages)
+  }
+
+  return (
+    <nav role="navigation" aria-label={t('pagination_navigation')}>
+      <ul className="pagination">
+{/*
+        {currentPage > 1 && (
+          <li>
+            <button aria-label={t('go_to_first_page')} onClick={() => onPageChange(1)}>
+              &lt;&lt; {t('first')}
+            </button>
+          </li>
+        )}
+*/}
+        {currentPage > 1 && (
+          <li>
+            <button aria-label={t('go_prev_page')} onClick={() => onPageChange(currentPage - 1)}>
+              &lt; {t('prev')}
+            </button>
+          </li>
+        )}
+        {pageNumbers.map((page, index) => (
+          <li key={index} className={page === currentPage ? "active" : ""}>
+            {page === "..." ? (
+              <span aria-hidden="true">{page}</span>
+            ) : page === currentPage ? (
+              <span aria-label={t('page_current', { page })} aria-current="true">{page}</span>
+            ) : (
+              <button aria-label={t('go_page', { page })} onClick={() => onPageChange(page)}>
+                {page}
+              </button>
+            )}
+          </li>
+        ))}
+        {currentPage < totalPages && (
+          <li>
+            <button aria-label={t('go_next_page')} onClick={() => onPageChange(currentPage + 1)}>
+              {t('next')} &gt;
+            </button>
+          </li>
+        )}
+{/*
+        {currentPage < totalPages && (
+          <li>
+            <button aria-label={t('go_to_last_page')} onClick={() => onPageChange(totalPages)}>
+              {t('last')} &gt;&gt;
+            </button>
+          </li>
+        )}
+*/}
+      </ul>
+    </nav>
+  )
+}
diff --git a/services/web/frontend/js/features/template-gallery/components/search-form.tsx b/services/web/frontend/js/features/template-gallery/components/search-form.tsx
new file mode 100644
index 0000000000..75c9a8a313
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/components/search-form.tsx
@@ -0,0 +1,61 @@
+import { useTranslation } from 'react-i18next'
+import { MergeAndOverride } from '../../../../../types/utils'
+import OLForm from '@/features/ui/components/ol/ol-form'
+import OLFormControl from '@/features/ui/components/ol/ol-form-control'
+import MaterialIcon from '@/shared/components/material-icon'
+
+type SearchFormOwnProps = {
+  inputValue: string
+  setInputValue: (input: string) => void
+}
+
+type SearchFormProps = MergeAndOverride<
+  React.ComponentProps<typeof OLForm>,
+  SearchFormOwnProps
+>
+
+export default function SearchForm({
+  inputValue,
+  setInputValue,
+}: SearchFormProps) {
+  const { t } = useTranslation()
+  let placeholderMessage = t('search')
+  const placeholder = `${placeholderMessage}…`
+
+  const handleChange: React.ComponentProps<typeof OLFormControl
+  >['onChange'] = e => {
+    setInputValue(e.target.value)
+  }
+
+  const handleClear = () => setInputValue('')
+
+  return (
+    <OLForm
+      role="search"
+      onSubmit={e => e.preventDefault()}
+    >
+      <OLFormControl
+        className="gallery-search-form-control"
+        id="gallery-search-form-control"
+        type="text"
+        value={inputValue}
+        onChange={handleChange}
+        placeholder={placeholder}
+        aria-label={placeholder}
+        prepend={<MaterialIcon type="search" />}
+        append={
+          inputValue.length > 0 && (
+            <button
+              type="button"
+              className="form-control-search-clear-btn"
+              aria-label={t('clear_search')}
+              onClick={handleClear}
+            >
+              <MaterialIcon type="clear" />
+            </button>
+          )
+        }
+      />
+    </OLForm>
+  )
+}
diff --git a/services/web/frontend/js/features/template-gallery/components/sort/with-content.tsx b/services/web/frontend/js/features/template-gallery/components/sort/with-content.tsx
new file mode 100644
index 0000000000..8c77484fdf
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/components/sort/with-content.tsx
@@ -0,0 +1,46 @@
+import { useTranslation } from 'react-i18next'
+import { Sort } from '../../types/api'
+
+type SortBtnOwnProps = {
+  column: string
+  sort: Sort
+  text: string
+  onClick: () => void
+}
+
+type WithContentProps = {
+  iconType?: string
+  screenReaderText: string
+}
+
+export type SortBtnProps = SortBtnOwnProps & WithContentProps
+
+function withContent<T extends SortBtnOwnProps>(
+  WrappedComponent: React.ComponentType<T & WithContentProps>
+) {
+  function WithContent(hocProps: T) {
+    const { t } = useTranslation()
+    const { column, text, sort } = hocProps
+    let iconType
+
+    let screenReaderText = t('sort_by_x', { x: text })
+
+    if (column === sort.by) {
+      iconType =
+        sort.order === 'asc' ? 'arrow_upward_alt' : 'arrow_downward_alt'
+      screenReaderText = t('reverse_x_sort_order', { x: text })
+    }
+
+    return (
+      <WrappedComponent
+        {...hocProps}
+        iconType={iconType}
+        screenReaderText={screenReaderText}
+      />
+    )
+  }
+
+  return WithContent
+}
+
+export default withContent
diff --git a/services/web/frontend/js/features/template-gallery/components/template-gallery-entry.tsx b/services/web/frontend/js/features/template-gallery/components/template-gallery-entry.tsx
new file mode 100644
index 0000000000..479b306b51
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/components/template-gallery-entry.tsx
@@ -0,0 +1,29 @@
+import { memo } from 'react'
+import { cleanHtml } from '../../../../../modules/template-gallery/app/src/CleanHtml.mjs'
+
+function TemplateGalleryEntry({ template }) {
+  return (
+    <div className={"gallery-thumbnail col-12 col-md-6 col-lg-4"}>
+      <a href={`/template/${template.id}`} className="thumbnail-link">
+        <div className="thumbnail">
+          <img
+            src={`/template/${template.id}/preview?version=${template.version}&style=thumbnail`}
+            alt={template.name}
+          />
+        </div>
+        <span className="gallery-list-item-title">
+          <span className="caption-title">{template.name}</span>
+          <span className="badge-container"></span>
+        </span>
+      </a>
+      <div className="caption">
+        <p className="caption-description" dangerouslySetInnerHTML={{ __html: cleanHtml(template.description, 'plainText') }} />
+      </div>
+      <div className="author-name">
+        <div dangerouslySetInnerHTML={{ __html: cleanHtml(template.author, 'plainText') }} />
+      </div>
+    </div>
+  )
+}
+
+export default memo(TemplateGalleryEntry)
diff --git a/services/web/frontend/js/features/template-gallery/components/template-gallery-root.tsx b/services/web/frontend/js/features/template-gallery/components/template-gallery-root.tsx
new file mode 100644
index 0000000000..d17250f33a
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/components/template-gallery-root.tsx
@@ -0,0 +1,64 @@
+import { TemplateGalleryProvider } from '../context/template-gallery-context'
+import { useTranslation } from 'react-i18next'
+import useWaitForI18n from '../../../shared/hooks/use-wait-for-i18n'
+import withErrorBoundary from '../../../infrastructure/error-boundary'
+import { GenericErrorBoundaryFallback } from '@/shared/components/generic-error-boundary-fallback'
+import getMeta from '@/utils/meta'
+import DefaultNavbar from '@/features/ui/components/bootstrap-5/navbar/default-navbar'
+import Footer from '@/features/ui/components/bootstrap-5/footer/footer'
+import GalleryHeaderTagged from './gallery-header-tagged'
+import GalleryHeaderAll from './gallery-header-all'
+import TemplateGallery from './template-gallery'
+import GallerySearchSortHeader from './gallery-search-sort-header'
+import GalleryPopularTags from './gallery-popular-tags'
+
+function TemplateGalleryRoot() {
+  const { isReady } = useWaitForI18n()
+  if (!isReady) {
+    return null
+  }
+  return (
+    <TemplateGalleryProvider>
+      <TemplateGalleryPageContent />
+    </TemplateGalleryProvider>
+  )
+}
+
+function TemplateGalleryPageContent() {
+  const { t } = useTranslation()
+  const navbarProps = getMeta('ol-navbar')
+  const footerProps = getMeta('ol-footer')
+  const category = getMeta('ol-templateCategory')
+
+  return (
+    <>
+      <DefaultNavbar {...navbarProps} />
+      <main id="main-content"
+        className={`content content-page gallery ${category ? 'gallery-tagged' : ''}`}
+      >
+        <div className="container">
+          {category ? (
+            <>
+              <GalleryHeaderTagged category={category} />
+              <TemplateGallery />
+            </>
+          ) : (
+            <>
+              <GalleryHeaderAll />
+              <GalleryPopularTags />
+              <hr className="w-full border-muted mb-5" />
+              <div className="recent-docs">
+                <GallerySearchSortHeader />
+                <h2>{t('all_templates')}</h2>
+                <TemplateGallery />
+              </div>
+            </>
+          )}
+        </div>
+      </main>
+      <Footer {...footerProps} />
+    </>
+  )
+}
+
+export default withErrorBoundary(TemplateGalleryRoot, GenericErrorBoundaryFallback)
diff --git a/services/web/frontend/js/features/template-gallery/components/template-gallery.tsx b/services/web/frontend/js/features/template-gallery/components/template-gallery.tsx
new file mode 100644
index 0000000000..174fa2900e
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/components/template-gallery.tsx
@@ -0,0 +1,65 @@
+import { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import OLRow from '@/features/ui/components/ol/ol-row'
+import { useTemplateGalleryContext } from '../context/template-gallery-context'
+import TemplateGalleryEntry from './template-gallery-entry'
+import Pagination from './pagination'
+
+export default function TemplateGallery() {
+  const { t } = useTranslation()
+  const {
+    searchText,
+    sort,
+    visibleTemplates,
+  } = useTemplateGalleryContext()
+
+  const templatesPerPage = 6
+  const totalPages = Math.ceil(visibleTemplates.length / templatesPerPage)
+
+  const [currentPage, setCurrentPage] = useState(1)
+
+  useEffect(() => {
+    setCurrentPage(1)
+  }, [sort])
+
+  const [lastNonSearchPage, setLastNonSearchPage] = useState(1)
+  const [isSearching, setIsSearching] = useState(false)
+  useEffect(() => {
+    if (searchText.length > 0) {
+      if (!isSearching) {
+        setLastNonSearchPage(currentPage)
+        setIsSearching(true)
+      }
+      setCurrentPage(1)
+    } else {
+      if (isSearching) {
+        setCurrentPage(lastNonSearchPage)
+        setIsSearching(false)
+      }
+    }
+  }, [searchText])
+
+  const startIndex = (currentPage - 1) * templatesPerPage
+  const currentTemplates = visibleTemplates.slice(startIndex, startIndex + templatesPerPage)
+
+  return (
+    <>
+      <OLRow className="gallery-container">
+        {currentTemplates.length > 0 ? (
+          currentTemplates.map(p => (
+            <TemplateGalleryEntry
+              className="gallery-thumbnail col-12 col-md-6 col-lg-4"
+              key={p.id}
+              template={p}
+            />
+          ))
+        ) : (
+          <OLRow>
+            <p className="text-center">{t('no_templates_found')}</p>
+          </OLRow>
+        )}
+      </OLRow>
+      <Pagination currentPage={currentPage} totalPages={totalPages} onPageChange={setCurrentPage} />
+    </>
+  )
+}
diff --git a/services/web/frontend/js/features/template-gallery/context/template-gallery-context.tsx b/services/web/frontend/js/features/template-gallery/context/template-gallery-context.tsx
new file mode 100644
index 0000000000..af67af534f
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/context/template-gallery-context.tsx
@@ -0,0 +1,129 @@
+import {
+  createContext,
+  ReactNode,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
+import { Template } from '../../../../../types/template'
+import { GetTemplatesResponseBody, Sort } from '../types/api'
+import getMeta from '../../../utils/meta'
+import useAsync from '../../../shared/hooks/use-async'
+import { getTemplates } from '../util/api'
+import sortTemplates from '../util/sort-templates'
+import { debugConsole } from '@/utils/debugging'
+
+export type TemplateGalleryContextValue = {
+  visibleTemplates: Template[]
+  totalTemplatesCount: number
+  error: Error | null
+  sort: Sort
+  setSort: React.Dispatch<React.SetStateAction<Sort>>
+  searchText: string
+  setSearchText: React.Dispatch<React.SetStateAction<string>>
+}
+
+export const TemplateGalleryContext = createContext<
+  TemplateGalleryContextValue | undefined
+>(undefined)
+
+type TemplateGalleryProviderProps = {
+  children: ReactNode
+}
+
+export function TemplateGalleryProvider({ children }: TemplateGalleryProviderProps) {
+  const [loadedTemplates, setLoadedTemplates] = useState<Template[]>([])
+  const [visibleTemplates, setVisibleTemplates] = useState<Template[]>([])
+  const [totalTemplatesCount, setTotalTemplatesCount] = useState<number>(0)
+  const [sort, setSort] = useState<Sort>({
+    by: 'lastUpdated',
+    order: 'desc',
+  })
+  const prevSortRef = useRef<Sort>(sort)
+
+  const [searchText, setSearchText] = useState('')
+
+  const {
+    error,
+    runAsync,
+  } = useAsync<GetTemplatesResponseBody>()
+
+  const category = getMeta('ol-templateCategory') || 'all'
+
+  useEffect(() => {
+    runAsync(getTemplates(sort, category))
+      .then(data => {
+        setLoadedTemplates(data.templates)
+        setTotalTemplatesCount(data.totalSize)
+      })
+      .catch(debugConsole.error)
+      .finally(() => {
+      })
+  }, [runAsync])
+
+  useEffect(() => {
+    let filteredTemplates = [...loadedTemplates]
+
+    if (searchText.length) {
+      filteredTemplates = filteredTemplates.filter(template =>
+        template.name.toLowerCase().includes(searchText.toLowerCase()) ||
+        template.description.toLowerCase().includes(searchText.toLowerCase())
+      )
+    }
+
+    if (prevSortRef.current !== sort) {
+      filteredTemplates = sortTemplates(filteredTemplates, sort)
+      const loadedTemplatesSorted = sortTemplates(loadedTemplates, sort)
+      setLoadedTemplates(loadedTemplatesSorted)
+    }
+      setVisibleTemplates(filteredTemplates)
+  }, [
+    loadedTemplates,
+    searchText,
+    sort,
+  ])
+
+  useEffect(() => {
+    prevSortRef.current = sort
+  }, [sort])
+
+
+  const value = useMemo<TemplateGalleryContextValue>(
+    () => ({
+      error,
+      searchText,
+      setSearchText,
+      setSort,
+      sort,
+      totalTemplatesCount,
+      visibleTemplates,
+    }),
+    [
+      error,
+      searchText,
+      setSearchText,
+      setSort,
+      sort,
+      totalTemplatesCount,
+      visibleTemplates,
+    ]
+  )
+
+  return (
+    <TemplateGalleryContext.Provider value={value}>
+      {children}
+    </TemplateGalleryContext.Provider>
+  )
+}
+
+export function useTemplateGalleryContext() {
+  const context = useContext(TemplateGalleryContext)
+  if (!context) {
+    throw new Error(
+      'TemplateGalleryContext is only available inside TemplateGalleryProvider'
+    )
+  }
+  return context
+}
diff --git a/services/web/frontend/js/features/template-gallery/hooks/use-sort.ts b/services/web/frontend/js/features/template-gallery/hooks/use-sort.ts
new file mode 100644
index 0000000000..675f052425
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/hooks/use-sort.ts
@@ -0,0 +1,20 @@
+import { useTemplateGalleryContext } from '../context/template-gallery-context'
+import { Sort } from '../types/api'
+import { SortingOrder } from '../../../../../types/sorting-order'
+
+const toggleSort = (order: SortingOrder): SortingOrder => {
+  return order === 'asc' ? 'desc' : 'asc'
+}
+
+function useSort() {
+  const { sort, setSort } = useTemplateGalleryContext()
+  const handleSort = (by: Sort['by']) => {
+    setSort(prev => ({
+      by,
+      order: prev.by === by ? toggleSort(sort.order) : by === 'lastUpdated' ? 'desc' : 'asc',
+    }))
+  }
+  return { handleSort }
+}
+
+export default useSort
diff --git a/services/web/frontend/js/features/template-gallery/types/api.ts b/services/web/frontend/js/features/template-gallery/types/api.ts
new file mode 100644
index 0000000000..d2b19807a9
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/types/api.ts
@@ -0,0 +1,12 @@
+import { SortingOrder } from '../../../../../types/sorting-order'
+import { Template } from '../../../../../types/template'
+
+export type Sort = {
+  by: 'lastUpdated' | 'name'
+  order: SortingOrder
+}
+
+export type GetTemplatesResponseBody = {
+  totalSize: number
+  templates: Template[]
+}
diff --git a/services/web/frontend/js/features/template-gallery/util/api.ts b/services/web/frontend/js/features/template-gallery/util/api.ts
new file mode 100644
index 0000000000..54704f187d
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/util/api.ts
@@ -0,0 +1,12 @@
+import { GetTemplatesResponseBody, Sort } from '../types/api'
+import { getJSON } from '../../../infrastructure/fetch-json'
+
+export function getTemplates(sortBy: Sort, category: string): Promise<GetTemplatesResponseBody> {
+  const queryParams = new URLSearchParams({
+    by: sortBy.by,
+    order: sortBy.order,
+    category,
+  }).toString()
+
+  return getJSON(`/api/templates?${queryParams}`)
+}
diff --git a/services/web/frontend/js/features/template-gallery/util/sort-templates.ts b/services/web/frontend/js/features/template-gallery/util/sort-templates.ts
new file mode 100644
index 0000000000..2315606514
--- /dev/null
+++ b/services/web/frontend/js/features/template-gallery/util/sort-templates.ts
@@ -0,0 +1,40 @@
+import { Sort } from '../types/api'
+import { Template } from '../../../../../types/template'
+import { SortingOrder } from '../../../../../types/sorting-order'
+import { Compare } from '../../../../../types/helpers/array/sort'
+
+const order = (order: SortingOrder, templates: Template[]) => {
+  return order === 'asc' ? [...templates] : templates.reverse()
+}
+
+export const defaultComparator = (
+  v1: Template,
+  v2: Template,
+  key: 'name' | 'lastUpdated'
+) => {
+  const value1 = v1[key].toLowerCase()
+  const value2 = v2[key].toLowerCase()
+
+  if (value1 !== value2) {
+    return value1 < value2 ? Compare.SORT_A_BEFORE_B : Compare.SORT_A_AFTER_B
+  }
+
+  return Compare.SORT_KEEP_ORDER
+}
+
+export default function sortTemplates(templates: Template[], sort: Sort) {
+  let sorted = [...templates]
+  if (sort.by === 'name') {
+    sorted = sorted.sort((...args) => {
+      return defaultComparator(...args, 'name')
+    })
+  }
+
+  if (sort.by === 'lastUpdated') {
+    sorted = sorted.sort((...args) => {
+      return defaultComparator(...args, 'lastUpdated')
+    })
+  }
+
+  return order(sort.order, sorted)
+}
diff --git a/services/web/frontend/js/features/template/components/delete-template-button.tsx b/services/web/frontend/js/features/template/components/delete-template-button.tsx
new file mode 100644
index 0000000000..f4a17043d8
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/delete-template-button.tsx
@@ -0,0 +1,48 @@
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import useIsMounted from '@/shared/hooks/use-is-mounted'
+import OLButton from '@/features/ui/components/ol/ol-button'
+import DeleteTemplateModal from './modals/delete-template-modal'
+import { useTemplateContext } from '../context/template-context'
+import { deleteTemplate } from '../util/api'
+import type { Template } from '../../../../../types/template'
+
+function DeleteTemplateButton() {
+  const { t } = useTranslation()
+  const [showModal, setShowModal] = useState(false)
+  const isMounted = useIsMounted()
+  const { template, setTemplate } = useTemplateContext()
+
+  const handleOpenModal = () => {
+    setShowModal(true)
+  }
+
+  const handleCloseModal = () => {
+    if (isMounted.current) {
+      setShowModal(false)
+    }
+  }
+
+  const handleDeleteTemplate = async (template: Template) => {
+    await deleteTemplate(template)
+    handleCloseModal()
+    const previousPage = document.referrer || '/templates'
+    window.location.href = previousPage
+  }
+
+  return (
+    <>
+      <OLButton variant="danger" onClick={handleOpenModal}>
+        {t('delete')}
+      </OLButton>
+      <DeleteTemplateModal
+        template={template}
+        actionHandler={handleDeleteTemplate}
+        showModal={showModal}
+        handleCloseModal={handleCloseModal}
+      />
+    </>
+  )
+}
+
+export default DeleteTemplateButton
diff --git a/services/web/frontend/js/features/template/components/edit-template-button.tsx b/services/web/frontend/js/features/template/components/edit-template-button.tsx
new file mode 100644
index 0000000000..ee1bd92df9
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/edit-template-button.tsx
@@ -0,0 +1,46 @@
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import useIsMounted from '@/shared/hooks/use-is-mounted'
+import OLButton from '@/features/ui/components/ol/ol-button'
+import EditTemplateModal from './modals/edit-template-modal'
+import { useTemplateContext } from '../context/template-context'
+import { updateTemplate } from '../util/api'
+import type { Template } from '../../../../../types/template'
+
+export default function EditTemplateButton() {
+  const { t } = useTranslation()
+  const [showModal, setShowModal] = useState(false)
+  const isMounted = useIsMounted()
+  const { template, setTemplate } = useTemplateContext()
+
+  const handleOpenModal = () => {
+    setShowModal(true)
+  }
+
+  const handleCloseModal = () => {
+    if (isMounted.current) {
+      setShowModal(false)
+    }
+  }
+
+  const handleEditTemplate = async (editedTemplate: Template) => {
+    const updated = await updateTemplate({ editedTemplate, template })
+    if (updated) {
+      setTemplate(prev => ({ ...prev, ...updated }))
+    }
+  }
+
+  return (
+    <>
+      <OLButton variant="secondary" onClick={handleOpenModal}>
+        {t('edit')}
+      </OLButton>
+
+      <EditTemplateModal
+        showModal={showModal}
+        handleCloseModal={handleCloseModal}
+        actionHandler={handleEditTemplate}
+      />
+    </>
+  )
+}
diff --git a/services/web/frontend/js/features/template/components/form/form-field-input.tsx b/services/web/frontend/js/features/template/components/form/form-field-input.tsx
new file mode 100644
index 0000000000..d99a19ff8c
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/form/form-field-input.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import OLFormControl from '@/features/ui/components/ol/ol-form-control'
+
+interface FormFieldInputProps extends React.ComponentProps<typeof OLFormControl> {
+  value: string
+  placeholder?: string
+  onChange: React.ChangeEventHandler<HTMLInputElement | HTMLTextAreaElement>
+}
+
+const FormFieldInput: React.FC<FormFieldInputProps> = ({
+  type = 'text',
+  ...props
+}) => (
+  <OLFormControl type={type} {...props} />
+)
+
+export default FormFieldInput
diff --git a/services/web/frontend/js/features/template/components/form/labeled-row-form-group.tsx b/services/web/frontend/js/features/template/components/form/labeled-row-form-group.tsx
new file mode 100644
index 0000000000..49eea6eeab
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/form/labeled-row-form-group.tsx
@@ -0,0 +1,26 @@
+import React from 'react'
+import OLFormGroup from '@/features/ui/components/ol/ol-form-group'
+import OLFormLabel from '@/features/ui/components/ol/ol-form-label'
+
+interface LabeledRowFormGroupProps {
+  controlId: string
+  label: string
+  children: React.ReactNode
+}
+
+const LabeledRowFormGroup: React.FC<LabeledRowFormGroupProps> = ({
+  controlId,
+  label,
+  children,
+}) => (
+  <OLFormGroup controlId={controlId} className="row">
+    <div className="col-2">
+      <OLFormLabel className="col-form-label col">{label}</OLFormLabel>
+    </div>
+    <div className="col-10">
+      {children}
+    </div>
+  </OLFormGroup>
+)
+
+export default React.memo(LabeledRowFormGroup)
diff --git a/services/web/frontend/js/features/template/components/form/template-form-fields.tsx b/services/web/frontend/js/features/template/components/form/template-form-fields.tsx
new file mode 100644
index 0000000000..f7d110e53f
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/form/template-form-fields.tsx
@@ -0,0 +1,96 @@
+import React, { useCallback } from 'react'
+import LabeledRowFormGroup from '../form/labeled-row-form-group'
+import FormFieldInput from '../form/form-field-input'
+import SettingsTemplateCategory from '../settings/settings-template-category'
+import SettingsLicense from '../settings/settings-license'
+import SettingsLanguage from '../settings/settings-language'
+import { useTranslation } from 'react-i18next'
+import type { Template } from '../../../../../../types/template'
+
+interface TemplateFormFieldsProps {
+  template: Partial<Template>
+  includeLanguage?: boolean
+  onChange: (changes: Partial<Template>) => void
+  onEnterKey?: () => void
+}
+
+function TemplateFormFields({
+  template,
+  includeLanguage = false,
+  onChange,
+  onEnterKey,
+}: TemplateFormFieldsProps) {
+  const { t } = useTranslation()
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === 'Enter') {
+        e.preventDefault()
+        onEnterKey?.()
+      }
+    },
+    [onEnterKey]
+  )
+
+  return (
+    <>
+      <LabeledRowFormGroup controlId="form-title" label={t('title') + ':'}>
+        <FormFieldInput
+          required
+          maxLength="255"
+          value={template.name ?? ''}
+          placeholder={t('title')}
+          onChange={e => onChange({ name: e.target.value })}
+          onKeyDown={handleKeyDown}
+        />
+      </LabeledRowFormGroup>
+
+      <LabeledRowFormGroup controlId="form-author" label={t('author') + ':'}>
+        <FormFieldInput
+          maxLength="255"
+          value={template.authorMD ?? ''}
+          placeholder={t('author')}
+          onChange={e => onChange({ authorMD: e.target.value })}
+          onKeyDown={handleKeyDown}
+        />
+      </LabeledRowFormGroup>
+
+      <LabeledRowFormGroup controlId="form-category" label={t('category') + ':'}>
+        <SettingsTemplateCategory
+          value={template.category}
+          onChange={val => onChange({ category: val })}
+        />
+      </LabeledRowFormGroup>
+
+      <LabeledRowFormGroup controlId="form-description" label={t('description') + ':'}>
+        <FormFieldInput
+          as="textarea"
+          rows={8}
+          maxLength="5000"
+          value={template.descriptionMD ?? ''}
+          placeholder={t('description')}
+          onChange={e => onChange({ descriptionMD: e.target.value })}
+          autoFocus
+        />
+      </LabeledRowFormGroup>
+
+      <LabeledRowFormGroup controlId="form-license" label={t('license') + ':'}>
+        <SettingsLicense
+          value={template.license}
+          onChange={val => onChange({ license: val })}
+        />
+      </LabeledRowFormGroup>
+
+      {includeLanguage && (
+        <LabeledRowFormGroup controlId="form-language" label={t('language') + ':'}>
+          <SettingsLanguage
+            value={template.language}
+            onChange={val => onChange({ language: val })}
+          />
+        </LabeledRowFormGroup>
+      )}
+    </>
+  )
+}
+
+export default React.memo(TemplateFormFields)
diff --git a/services/web/frontend/js/features/template/components/manage-template-modal/editor-manage-template-modal-wrapper.tsx b/services/web/frontend/js/features/template/components/manage-template-modal/editor-manage-template-modal-wrapper.tsx
new file mode 100644
index 0000000000..bb40b64f51
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/manage-template-modal/editor-manage-template-modal-wrapper.tsx
@@ -0,0 +1,40 @@
+import React from 'react'
+import withErrorBoundary from '@/infrastructure/error-boundary'
+import { useProjectContext } from '@/shared/context/project-context'
+import ManageTemplateModal from './manage-template-modal'
+import type { Template } from '../../../../../../types/template'
+
+interface EditorManageTemplateModalWrapperProps {
+  show: boolean
+  handleHide: () => void
+  openTemplate: (data: Template) => void
+}
+
+const EditorManageTemplateModalWrapper = React.memo(
+  function EditorManageTemplateModalWrapper({ 
+    show,
+    handleHide,
+    openTemplate,
+  }: EditorManageTemplateModalWrapperProps) {
+    const {
+      _id: projectId,
+      name: projectName,
+    } = useProjectContext()
+
+    if (!projectName) {
+      // wait for useProjectContext
+      return null
+    }
+    return (
+      <ManageTemplateModal
+        handleHide={handleHide}
+        show={show}
+        handleAfterPublished={openTemplate}
+        projectId={projectId}
+        projectName={projectName}
+      />
+    )
+  }
+)
+
+export default withErrorBoundary(EditorManageTemplateModalWrapper)
diff --git a/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal-content.tsx b/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal-content.tsx
new file mode 100644
index 0000000000..46bc7fcf46
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal-content.tsx
@@ -0,0 +1,169 @@
+import React, { useEffect, useState, useRef } from 'react'
+import { useTranslation } from 'react-i18next'
+import { debugConsole } from '@/utils/debugging'
+import { getJSON, postJSON } from '@/infrastructure/fetch-json'
+import Notification from '@/shared/components/notification'
+import {
+  OLModalBody,
+  OLModalFooter,
+  OLModalHeader,
+  OLModalTitle,
+} from '@/features/ui/components/ol/ol-modal'
+import OLForm from '@/features/ui/components/ol/ol-form'
+import OLButton from '@/features/ui/components/ol/ol-button'
+import { useDetachCompileContext } from '@/shared/context/detach-compile-context'
+import { useUserContext } from '@/shared/context/user-context'
+import { useFocusTrap } from '../../hooks/use-focus-trap'
+import TemplateFormFields from '../form/template-form-fields'
+import type { Template } from '../../../../../../types/template'
+
+
+interface ManageTemplateModalContentProps {
+  handleHide: () => void
+  inFlight: boolean
+  setInFlight: (inFlight: boolean) => void
+  handleAfterPublished: (data: Template) => void
+  projectId: string
+  projectName: string
+}
+
+export default function ManageTemplateModalContent({
+  handleHide,
+  inFlight,
+  setInFlight,
+  handleAfterPublished,
+  projectId,
+  projectName,
+}: ManageTemplateModalContentProps) {
+  const { t } = useTranslation()
+  const { pdfFile } = useDetachCompileContext()
+  const user = useUserContext()
+
+  const [template, setTemplate] = useState<Partial<Template>>({
+    name: projectName,
+    authorMD: `${user.first_name} ${user.last_name}`.trim(),
+  })
+  const [override, setOverride] = useState(false)
+  const [titleConflict, setTitleConflict] = useState(false)
+  const [error, setError] = useState<string | false>(false)
+  const [notificationType, setNotificationType] = useState<'error' | 'warning'>('error')
+  const [disablePublish, setDisablePublish] = useState(false)
+
+  // Only the trimmed name gates submission
+  const valid = (template.name ?? '').trim()
+
+  useEffect(() => {
+    const queryParams = new URLSearchParams({ key: 'name', val: projectName })
+    getJSON(`/api/template?${queryParams}`)
+      .then((data) => {
+        if (!data) return
+        setTemplate(prev => ({
+          ...prev,
+          descriptionMD: data.descriptionMD,
+          authorMD: data.authorMD,
+          license: data.license,
+          category: data.category,
+        }))
+      })
+      .catch(debugConsole.error)
+  }, [])
+
+  const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault()
+
+    if (!valid) return
+
+    setError(false)
+    setInFlight(true)
+
+    postJSON(`/template/new/${projectId}`, {
+      body: {
+        category: template.category,
+        name: valid,
+        authorMD: (template.authorMD ?? '').trim(),
+        license: template.license,
+        descriptionMD: (template.descriptionMD ?? '').trim(),
+        build: pdfFile.build,
+        override,
+      },
+    })
+      .then(data => {
+        handleHide()
+        handleAfterPublished(data)
+      })
+      .catch(({ response, data }) => {
+        if (response?.status === 409 && data.canOverride) {
+          setNotificationType('warning')
+          setOverride(true)
+        } else {
+          setNotificationType('error')
+          setDisablePublish(true)
+        }
+        setError(data.message)
+        if (response?.status === 409) setTitleConflict(true)
+      })
+      .finally(() => {
+        setInFlight(false)
+      })
+  }
+
+  const handleChange = (changes: Partial<Template>) => {
+    if ('name' in changes && titleConflict) {
+      setError(false)
+      setOverride(false)
+      if (disablePublish) setDisablePublish(false)
+    }
+    setTemplate(prev => ({ ...prev, ...changes }))
+  }
+
+  const handleEnterKey = () => {
+    document.getElementById('submit-publish-template')?.click()
+  }
+
+  const modalRef = useRef<HTMLDivElement>(null)
+  useFocusTrap(modalRef)
+
+  return (
+    <div ref={modalRef}>
+      <OLModalHeader closeButton>
+        <OLModalTitle>{t('publish_as_template')}</OLModalTitle>
+      </OLModalHeader>
+
+      <OLModalBody>
+        <div className="modal-body-publish">
+          <div className="content-as-table">
+            <OLForm id="publish-template-form" onSubmit={handleSubmit}>
+              <TemplateFormFields
+                template={template}
+                includeLanguage={false}
+                onChange={handleChange}
+                onEnterKey={handleEnterKey}
+              />
+            </OLForm>
+          </div>
+        </div>
+        {error && (
+          <Notification
+            content={error.length ? error : t('generic_something_went_wrong')}
+            type={notificationType}
+          />
+        )}
+      </OLModalBody>
+
+      <OLModalFooter>
+        <OLButton variant="secondary" disabled={inFlight} onClick={handleHide}>
+          {t('cancel')}
+        </OLButton>
+        <OLButton
+          id="submit-publish-template"
+          variant={override ? 'danger' : 'primary'}
+          disabled={inFlight || !valid || disablePublish}
+          form="publish-template-form"
+          type="submit"
+        >
+          {inFlight ? <>{t('publishing')}…</> : override ? t('overwrite') : t('publish')}
+        </OLButton>
+      </OLModalFooter>
+    </div>
+  )
+}
diff --git a/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal.tsx b/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal.tsx
new file mode 100644
index 0000000000..c48980c598
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/manage-template-modal/manage-template-modal.tsx
@@ -0,0 +1,52 @@
+import React, { memo, useCallback, useState } from 'react'
+import OLModal from '@/features/ui/components/ol/ol-modal'
+import ManageTemplateModalContent from './manage-template-modal-content'
+import type { Template } from '../../../../../../types/template'
+
+interface ManageTemplateModalProps {
+  show: boolean
+  handleHide: () => void
+  handleAfterPublished: (data: Template) => void
+  projectId: string
+  projectName: string
+}
+
+function ManageTemplateModal({
+  show,
+  handleHide,
+  handleAfterPublished,
+  projectId,
+  projectName,
+}: ManageTemplateModalProps) {
+  const [inFlight, setInFlight] = useState(false)
+
+  const onHide = useCallback(() => {
+    if (!inFlight) {
+      handleHide()
+    }
+  }, [handleHide, inFlight])
+
+  return (
+    <OLModal
+      size="lg"
+      animation
+      show={show}
+      onHide={onHide}
+      id="publish-template-modal"
+      // backdrop="static" will disable closing the modal by clicking
+      // outside of the modal element
+      backdrop='static'
+    >
+      <ManageTemplateModalContent
+        handleHide={onHide}
+        inFlight={inFlight}
+        setInFlight={setInFlight}
+        handleAfterPublished={handleAfterPublished}
+        projectId={projectId}
+        projectName={projectName}
+      />
+    </OLModal>
+  )
+}
+
+export default memo(ManageTemplateModal)
diff --git a/services/web/frontend/js/features/template/components/modals/delete-template-modal.tsx b/services/web/frontend/js/features/template/components/modals/delete-template-modal.tsx
new file mode 100644
index 0000000000..8588703c30
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/modals/delete-template-modal.tsx
@@ -0,0 +1,43 @@
+import { useTranslation } from 'react-i18next'
+import withErrorBoundary from '@/infrastructure/error-boundary'
+import Notification from '@/shared/components/notification'
+import TemplateActionModal from './template-action-modal'
+
+type DeleteTemplateModalProps = Pick<
+  React.ComponentProps<typeof TemplateActionModal>,
+  'template' | 'actionHandler' | 'showModal' | 'handleCloseModal'
+>
+
+function DeleteTemplateModal({
+  template,
+  actionHandler,
+  showModal,
+  handleCloseModal,
+}: DeleteTemplateModalProps) {
+  const { t } = useTranslation()
+
+  return (
+    <TemplateActionModal
+      action="delete"
+      actionHandler={actionHandler}
+      title={t('delete_template')}
+      showModal={showModal}
+      handleCloseModal={handleCloseModal}
+      template={template}
+    >
+      <p>{t('about_to_delete_template')}</p>
+      <ul>
+        <li key={`template-action-list-${template.id}`}>
+          <b>{template.name}</b>
+        </li>
+      </ul>
+
+      <Notification
+        content={t('this_action_cannot_be_undone')}
+        type="warning"
+      />
+    </TemplateActionModal>
+  )
+}
+
+export default withErrorBoundary(DeleteTemplateModal)
diff --git a/services/web/frontend/js/features/template/components/modals/edit-template-modal.tsx b/services/web/frontend/js/features/template/components/modals/edit-template-modal.tsx
new file mode 100644
index 0000000000..3c7e8d274a
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/modals/edit-template-modal.tsx
@@ -0,0 +1,139 @@
+import React, { useReducer, useState, useEffect, useRef, useCallback, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import OLForm from '@/features/ui/components/ol/ol-form'
+import OLButton from '@/features/ui/components/ol/ol-button'
+import withErrorBoundary from '@/infrastructure/error-boundary'
+//import { useFocusTrap } from '../../hooks/use-focus-trap'
+import TemplateActionModal from './template-action-modal'
+import { useTemplateContext } from '../../context/template-context'
+import TemplateFormFields from '../form/template-form-fields'
+import type { Template } from '../../../../../../types/template'
+
+type EditTemplateModalProps = {
+  showModal: boolean
+  handleCloseModal: () => void
+  actionHandler: (editedTemplate: Template) => void | Promise<void>
+}
+
+type ActionError = {
+  info?: {
+    statusCode?: number
+  }
+}
+
+type TemplateFormAction =
+  | { type: 'UPDATE'; payload: Partial<Template> }
+  | { type: 'RESET'; payload: Template }
+  | { type: 'CLEAR_FIELD'; field: keyof Template }
+
+function templateFormReducer(state: Template, action: TemplateFormAction): Template {
+  switch (action.type) {
+    case 'UPDATE':
+      return { ...state, ...action.payload }
+    case 'RESET':
+      return { ...action.payload }
+    case 'CLEAR_FIELD':
+      return { ...state, [action.field]: '' }
+    default:
+      return state
+  }
+}
+
+function EditTemplateModal({
+  showModal,
+  handleCloseModal,
+  actionHandler,
+}: EditTemplateModalProps) {
+  const { t } = useTranslation()
+  const { template } = useTemplateContext()
+
+  const [editedTemplate, dispatch] = useReducer(templateFormReducer, template)
+  const [actionError, setActionError] = useState<ActionError | null>(null)
+  const clearModalErrorRef = useRef<() => void>(() => {})
+
+  useEffect(() => {
+    if (showModal) {
+      dispatch({ type: 'RESET', payload: template })
+      setActionError(null)
+    }
+  }, [showModal, template])
+
+  const isConflictError = useMemo(
+    () => actionError?.info?.statusCode === 409,
+    [actionError]
+  )
+
+  const valid = useMemo(
+    () => editedTemplate.name.trim().length > 0,
+    [editedTemplate.name]
+  )
+
+  const handleChange = useCallback(
+    (changes: Partial<Template>) => {
+      dispatch({ type: 'UPDATE', payload: changes })
+      if ('name' in changes && isConflictError) {
+        setActionError(null)
+        clearModalErrorRef.current?.()
+      }
+    },
+    [isConflictError]
+  )
+
+  const handleEnterKey = useCallback(() => {
+    document.getElementById('submit-edit-template')?.click()
+  }, [])
+
+  const handleAction = useCallback(() => {
+    return Promise.resolve(actionHandler(editedTemplate)).catch(err => {
+      setActionError(err)
+      throw err
+    })
+  }, [actionHandler, editedTemplate])
+
+  const submitButtonDisabled = !valid || isConflictError
+
+  return (
+    <TemplateActionModal
+      action="edit"
+      title={t('edit_template')}
+      template={editedTemplate}
+      showModal={showModal}
+      handleCloseModal={handleCloseModal}
+      size="lg"
+      actionHandler={handleAction}
+      renderFooterButtons={({ onConfirm, onCancel, isProcessing }) => (
+        <>
+          <OLButton variant="secondary" onClick={onCancel}>
+            {t('cancel')}
+          </OLButton>
+          <OLButton
+            id="submit-edit-template"
+            onClick={onConfirm}
+            variant="primary"
+            disabled={submitButtonDisabled || isProcessing}
+          >
+            {t('save')}
+          </OLButton>
+        </>
+      )}
+      onClearError={fn => {
+        clearModalErrorRef.current = fn
+      }}
+    >
+      <div className="modal-body-publish">
+        <div className="content-as-table">
+          <OLForm onSubmit={e => e.preventDefault()}>
+            <TemplateFormFields
+              template={editedTemplate}
+              includeLanguage
+              onChange={handleChange}
+              onEnterKey={handleEnterKey}
+            />
+          </OLForm>
+        </div>
+      </div>
+    </TemplateActionModal>
+  )
+}
+
+export default withErrorBoundary(React.memo(EditTemplateModal))
diff --git a/services/web/frontend/js/features/template/components/modals/template-action-modal.tsx b/services/web/frontend/js/features/template/components/modals/template-action-modal.tsx
new file mode 100644
index 0000000000..24c78a0e29
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/modals/template-action-modal.tsx
@@ -0,0 +1,145 @@
+import { memo, useEffect, useState, useRef } from 'react'
+import { useTranslation } from 'react-i18next'
+import { getUserFacingMessage } from '@/infrastructure/fetch-json'
+import * as eventTracking from '@/infrastructure/event-tracking'
+import { isSmallDevice } from '@/infrastructure/event-tracking'
+import useIsMounted from '@/shared/hooks/use-is-mounted'
+import Notification from '@/shared/components/notification'
+import OLButton from '@/features/ui/components/ol/ol-button'
+import OLModal, {
+  OLModalBody,
+  OLModalFooter,
+  OLModalHeader,
+  OLModalTitle,
+} from '@/features/ui/components/ol/ol-modal'
+import type { Template } from '../../../../../../types/template'
+import { useFocusTrap } from '../../hooks/use-focus-trap'
+
+type TemplateActionModalProps = {
+  title: string
+  size?: string
+  action: 'delete' | 'edit'
+  actionHandler: (template: Template) => Promise<void>
+  handleCloseModal: () => void
+  template: Template
+  showModal: boolean
+  children?: React.ReactNode
+  renderFooterButtons?: (props: {
+    onConfirm: () => void
+    onCancel: () => void
+    isProcessing: boolean
+  }) => React.ReactNode
+  onClearError?: (clear: () => void) => void
+}
+
+function TemplateActionModal({
+  title,
+  size,
+  action,
+  actionHandler,
+  handleCloseModal,
+  showModal,
+  template,
+  children,
+  renderFooterButtons,
+  onClearError,
+}: TemplateActionModalProps) {
+  const { t } = useTranslation()
+  const [error, setError] = useState<false | { name: string; error: unknown }>(false)
+  const [isProcessing, setIsProcessing] = useState(false)
+  const isMounted = useIsMounted()
+  const modalRef = useRef<HTMLDivElement>(null)
+
+  useFocusTrap(modalRef, showModal)
+
+  useEffect(() => {
+    if (onClearError) {
+      onClearError(() => setError(false))
+    }
+  }, [onClearError])
+
+  async function handleActionForTemplate(template: Template) {
+    let errored
+    setIsProcessing(true)
+    setError(false)
+
+    try {
+      await actionHandler(template)
+    } catch (e) {
+      errored = { name: template.name, error: e }
+    }
+
+    if (isMounted.current) {
+      setIsProcessing(false)
+    }
+
+    if (!errored) {
+      handleCloseModal()
+    } else {
+      setError(errored)
+    }
+  }
+
+  useEffect(() => {
+    if (showModal) {
+      eventTracking.sendMB('template-info-page-interaction', {
+        action,
+        isSmallDevice,
+      })
+    } else {
+      setError(false)
+    }
+  }, [action, showModal])
+
+  return (
+    <OLModal
+      size={size}
+      show={showModal}
+      onHide={handleCloseModal}
+      id="action-tempate-modal"
+      backdrop="static"
+    >
+      <div ref={modalRef}>
+        <OLModalHeader closeButton>
+          <OLModalTitle>{title}</OLModalTitle>
+        </OLModalHeader>
+
+        <OLModalBody>
+          {children}
+          {!isProcessing && error && (
+            <Notification
+              type="error"
+              title={error.name}
+              content={getUserFacingMessage(error.error) as string}
+            />
+          )}
+        </OLModalBody>
+
+        <OLModalFooter>
+          {renderFooterButtons ? (
+            renderFooterButtons({
+              onConfirm: () => handleActionForTemplate(template),
+              onCancel: handleCloseModal,
+              isProcessing,
+            })
+          ) : (
+            <>
+              <OLButton variant="secondary" onClick={handleCloseModal}>
+                {t('cancel')}
+              </OLButton>
+              <OLButton
+                variant="danger"
+                onClick={() => handleActionForTemplate(template)}
+                disabled={isProcessing}
+              >
+                {t('confirm')}
+              </OLButton>
+            </>
+          )}
+        </OLModalFooter>
+      </div>
+    </OLModal>
+  )
+}
+
+export default memo(TemplateActionModal)
diff --git a/services/web/frontend/js/features/template/components/settings/settings-language.tsx b/services/web/frontend/js/features/template/components/settings/settings-language.tsx
new file mode 100644
index 0000000000..e9b7929617
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/settings/settings-language.tsx
@@ -0,0 +1,42 @@
+import { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import getMeta from '../../../../utils/meta'
+import SettingsMenuSelect from './settings-menu-select'
+import type { Optgroup } from './settings-menu-select'
+
+interface SettingsLanguageProps {
+  value: string
+  onChange: (value: string) => void
+}
+
+export default function SettingsLanguage({
+  value,
+  onChange,
+}: SettingsLanguageProps) {
+  const { t } = useTranslation()
+
+  const optgroup: Optgroup = useMemo(() => {
+    const options = (getMeta('ol-languages') ?? [])
+      // only include spell-check languages that are available in the client
+      .filter(language => language.dic !== undefined)
+
+    return {
+      label: 'Language',
+      options: options.map(language => ({
+        value: language.code,
+        label: language.name,
+      })),
+    }
+  }, [])
+
+  return (
+    <SettingsMenuSelect
+      onChange={onChange}
+      value={value}
+      options={[{ value: '', label: t('off') }]}
+      optgroup={optgroup}
+      label={t('spell_check')}
+      name="spellCheckLanguage"
+    />
+  )
+}
diff --git a/services/web/frontend/js/features/template/components/settings/settings-license.tsx b/services/web/frontend/js/features/template/components/settings/settings-license.tsx
new file mode 100644
index 0000000000..5b72d81b93
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/settings/settings-license.tsx
@@ -0,0 +1,33 @@
+import { useTranslation } from 'react-i18next'
+import SettingsMenuSelect from './settings-menu-select'
+import type { Option } from './settings-menu-select'
+
+export const licensesMap = {
+  'cc_by_4.0': 'Creative Commons CC BY 4.0',
+  'lppl_1.3c': 'LaTeX Project Public License 1.3c',
+  'other': 'Other (as stated in the work)',
+}
+
+interface SettingsLicenseProps {
+  value: string
+  onChange: (value: string) => void
+}
+
+export default function SettingsLicense({
+  value,
+  onChange,
+}: SettingsLicenseProps) {
+  const { t } = useTranslation()
+
+  const options = Object.entries(licensesMap).map(([value, label]) => ({ value, label }))
+
+  return (
+    <SettingsMenuSelect
+      name="license"
+      label={t('license')}
+      value={value}
+      onChange={onChange}
+      options={options}
+    />
+  )
+}
diff --git a/services/web/frontend/js/features/template/components/settings/settings-menu-select.tsx b/services/web/frontend/js/features/template/components/settings/settings-menu-select.tsx
new file mode 100644
index 0000000000..b1fa62226c
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/settings/settings-menu-select.tsx
@@ -0,0 +1,91 @@
+import { ChangeEventHandler, useCallback, useRef, useEffect } from 'react'
+import OLFormGroup from '@/features/ui/components/ol/ol-form-group'
+import OLFormLabel from '@/features/ui/components/ol/ol-form-label'
+import OLFormSelect from '@/features/ui/components/ol/ol-form-select'
+
+type PossibleValue = string | number | boolean
+
+export type Option<T extends PossibleValue = string> = {
+  value: T
+  label: string
+  ariaHidden?: 'true' | 'false'
+  disabled?: boolean
+}
+
+export type Optgroup<T extends PossibleValue = string> = {
+  label: string
+  options: Array<Option<T>>
+}
+
+type SettingsMenuSelectProps<T extends PossibleValue = string> = {
+  name: string
+  options: Array<Option<T>>
+  optgroup?: Optgroup<T>
+  onChange: (val: T) => void
+  value?: T
+  disabled?: boolean
+}
+
+export default function SettingsMenuSelect<T extends PossibleValue = string>(
+  props: SettingsMenuSelectProps<T>
+) {
+
+ const { name, options, optgroup, onChange, value, disabled = false } = props
+ const defaultApplied = useRef(false)
+
+  useEffect(() => {
+    if (value === undefined || value === null) {
+      onChange(options?.[0]?.value || optgroup?.options?.[0]?.value)
+    }
+  }, [value, options, onChange])
+
+  const handleChange: ChangeEventHandler<HTMLSelectElement> = useCallback(
+    event => {
+      const selectedValue = event.target.value
+      let onChangeValue: PossibleValue = selectedValue
+      if (typeof value === 'boolean') {
+        onChangeValue = selectedValue === 'true'
+      } else if (typeof value === 'number') {
+        onChangeValue = parseInt(selectedValue, 10)
+      }
+      onChange(onChangeValue as T)
+    },
+    [onChange, value]
+  )
+  const selectRef = useRef<HTMLSelectElement | null>(null)
+
+  return (
+    <>
+
+        <OLFormSelect
+          onChange={handleChange}
+          value={value?.toString()}
+          disabled={disabled}
+          ref={selectRef}
+        >
+          {options.map(option => (
+            <option
+              key={`${name}-${option.value}`}
+              value={option.value.toString()}
+              aria-hidden={option.ariaHidden}
+              disabled={option.disabled}
+            >
+              {option.label}
+            </option>
+          ))}
+          {optgroup ? (
+            <optgroup label={optgroup.label}>
+              {optgroup.options.map(option => (
+                <option
+                  value={option.value.toString()}
+                  key={option.value.toString()}
+                >
+                  {option.label}
+                </option>
+              ))}
+            </optgroup>
+          ) : null}
+        </OLFormSelect>
+    </>
+  )
+}
diff --git a/services/web/frontend/js/features/template/components/settings/settings-template-category.tsx b/services/web/frontend/js/features/template/components/settings/settings-template-category.tsx
new file mode 100644
index 0000000000..d886ce61e3
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/settings/settings-template-category.tsx
@@ -0,0 +1,44 @@
+import React, { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import getMeta from '@/utils/meta'
+import SettingsMenuSelect from './settings-menu-select'
+import type { Option } from './settings-menu-select'
+
+interface SettingsTemplateCategoryProps {
+  value: string
+  onChange: (value: string) => void
+}
+
+const SettingsTemplateCategory: React.FC<SettingsTemplateCategoryProps> = ({
+  value,
+  onChange,
+}) => {
+  const { t } = useTranslation()
+
+  const options: Option[] = useMemo(() => {
+    const { templateLinks = [] } = getMeta('ol-ExposedSettings') as {
+      templateLinks?: Array<{ name: string; url: string; description: string }>
+    }
+
+    return templateLinks.map(({ name, url }) => ({
+      value: url,
+      label: name,
+    }))
+  }, [])
+
+  if (options.length === 0) {
+    return null
+  }
+
+  return (
+    <SettingsMenuSelect
+      name="category"
+      label={`${t('category')}:`}
+      value={value}
+      onChange={onChange}
+      options={options}
+    />
+  )
+}
+
+export default React.memo(SettingsTemplateCategory)
diff --git a/services/web/frontend/js/features/template/components/template-details.tsx b/services/web/frontend/js/features/template/components/template-details.tsx
new file mode 100644
index 0000000000..6c1a9b1059
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/template-details.tsx
@@ -0,0 +1,104 @@
+import { useTranslation } from 'react-i18next'
+import getMeta from '@/utils/meta'
+import OLCol from '@/features/ui/components/ol/ol-col'
+import OLRow from '@/features/ui/components/ol/ol-row'
+import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import { formatDate, fromNowDate } from '../../../utils/dates'
+import { cleanHtml } from '../../../../../modules/template-gallery/app/src/CleanHtml.mjs'
+import { useTemplateContext } from '../context/template-context'
+import DeleteTemplateButton from './delete-template-button'
+import EditTemplateButton from './edit-template-button'
+import { licensesMap } from './settings/settings-license'
+
+function TemplateDetails() {
+  const { t } = useTranslation()
+  const {template, setTemplate} = useTemplateContext()
+  const lastUpdatedDate = fromNowDate(template.lastUpdated)
+  const tooltipText = formatDate(template.lastUpdated)
+  const loggedInUserId = getMeta('ol-user_id')
+  const loggedInUserIsAdmin = getMeta('ol-userIsAdmin')
+
+  const openAsTemplateParams = new URLSearchParams({
+    version: template.version,
+    ...(template.brandVariationId && { brandVariationId: template.brandVariationId }),
+    name: template.name,
+    compiler: template.compiler,
+    mainFile: template.mainFile,
+    language: template.language,
+    ...(template.imageName && { imageName: template.imageName })
+  }).toString()
+
+  const sanitizedAuthor = cleanHtml(template.author, 'linksOnly') || t('anonymous')
+  const sanitizedDescription = cleanHtml(template.description, 'reachText')
+
+  return (
+    <>
+    <OLRow>
+      <OLCol md={12}>
+        <div className={"gallery-item-title"}>
+          <h1 className="h2">{template.name}</h1>
+        </div>
+      </OLCol>
+    </OLRow>
+    <OLRow className="cta-links-container">
+      <OLCol md={12} className="cta-links">
+        <a className="btn btn-primary cta-link" href={`/project/new/template/${template.id}?${openAsTemplateParams}`}>{t('open_as_template')}</a>
+        <a className="btn btn-secondary cta-link" href={`/template/${template.id}/preview?version=${template.version}`}>{t('view_pdf')}</a>
+      </OLCol>
+    </OLRow>
+    <div className="template-details-container">
+      <div className="template-detail">
+        <div>
+          <b>{t('author')}:</b>
+        </div>
+        <div dangerouslySetInnerHTML={{ __html: sanitizedAuthor }} />
+      </div>
+      <div className="template-detail">
+        <div>
+          <b>{t('last_updated')}:</b>
+        </div>
+        <div>
+          <OLTooltip
+            id={`${template.id}`}
+            description={tooltipText}
+            overlayProps={{ placement: 'bottom', trigger: ['hover', 'focus'] }}
+          >
+            <span>
+              {lastUpdatedDate.trim()}
+            </span>
+          </OLTooltip>
+        </div>
+      </div>
+      <div className="template-detail">
+        <div>
+          <b>{t('license')}:</b>
+        </div>
+        <div>
+          {licensesMap[template.license]}
+        </div>
+      </div>
+        {sanitizedDescription && (
+          <div className="template-detail">
+            <div>
+              <b>{t('abstract')}:</b>
+            </div>
+            <div
+              className="gallery-abstract"
+              data-ol-mathjax=""
+              dangerouslySetInnerHTML={{ __html: sanitizedDescription }}>
+            </div>
+          </div>
+        )}
+    </div>
+    {loggedInUserId && (loggedInUserId === template.owner || loggedInUserIsAdmin) && (
+      <OLRow className="cta-links-container">
+        <OLCol md={12} className="text-end">
+          <EditTemplateButton />
+          <DeleteTemplateButton />
+        </OLCol>
+      </OLRow>
+    )}
+    </>
+  )
+}
+export default TemplateDetails
diff --git a/services/web/frontend/js/features/template/components/template-preview.tsx b/services/web/frontend/js/features/template/components/template-preview.tsx
new file mode 100644
index 0000000000..547c86159d
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/template-preview.tsx
@@ -0,0 +1,23 @@
+import OLCol from '@/features/ui/components/ol/ol-col'
+import OLRow from '@/features/ui/components/ol/ol-row'
+import { useTemplateContext } from '../context/template-context'
+
+
+function TemplatePreview() {
+  const { template, setTemplate } = useTemplateContext()
+  return (
+    <div className="entry">
+      <OLRow>
+        <OLCol md={12}>
+          <div className="gallery-large-pdf-preview">
+            <img
+              src={`/template/${template.id}/preview?version=${template.version}&style=preview`}
+              alt={template.name}
+            />
+          </div>
+        </OLCol>
+      </OLRow>
+    </div>
+  )
+}
+export default TemplatePreview
diff --git a/services/web/frontend/js/features/template/components/template-root.tsx b/services/web/frontend/js/features/template/components/template-root.tsx
new file mode 100644
index 0000000000..ff15511202
--- /dev/null
+++ b/services/web/frontend/js/features/template/components/template-root.tsx
@@ -0,0 +1,70 @@
+import { useTranslation } from 'react-i18next'
+import useWaitForI18n from '../../../shared/hooks/use-wait-for-i18n'
+import withErrorBoundary from '../../../infrastructure/error-boundary'
+import { GenericErrorBoundaryFallback } from '@/shared/components/generic-error-boundary-fallback'
+import DefaultNavbar from '@/features/ui/components/bootstrap-5/navbar/default-navbar'
+import Footer from '@/features/ui/components/bootstrap-5/footer/footer'
+import getMeta from '@/utils/meta'
+import OLCol from '@/features/ui/components/ol/ol-col'
+import OLRow from '@/features/ui/components/ol/ol-row'
+import TemplateDetails from './template-details'
+import TemplatePreview from './template-preview'
+import { useTemplateContext, TemplateProvider } from '../context/template-context'
+
+function TemplateRoot() {
+  const { isReady } = useWaitForI18n()
+  if (!isReady) {
+    return null
+  }
+  return (
+    <TemplateProvider>
+      <TemplatePageContent />
+    </TemplateProvider>
+  )
+}
+
+function TemplatePageContent() {
+  const { t } = useTranslation()
+  const navbarProps = getMeta('ol-navbar')
+  const footerProps = getMeta('ol-footer')
+  const { template } = useTemplateContext()
+  const { templateLinks } = getMeta('ol-ExposedSettings') || []
+  const categoryName = templateLinks?.find(link => link.url === template.category)?.name
+
+  return (
+    <>
+      <DefaultNavbar {...navbarProps} />
+      <main id="main-content" className="gallery content content-page">
+        <div className="container">
+          <OLRow className="previous-page-link-container">
+            <OLCol lg={6}>
+              <a className="previous-page-link" href={'/templates/all'}>
+                <i className="material-symbols material-symbols-rounded" aria-hidden="true">arrow_left_alt</i>
+                {t('all_templates')}
+              </a>
+              {categoryName && template.category !== '/templates/all' && (
+                <>
+                  <span className="mx-2">/</span>
+                  <a className="previous-page-link" href={template.category}>
+                    {categoryName}
+                  </a>
+                </>
+              )}
+            </OLCol>
+          </OLRow>
+          <OLRow>
+            <OLCol className="template-item-left-section" md={6}>
+              <TemplateDetails />
+            </OLCol>
+            <OLCol className="template-item-right-section" md={6}>
+              <TemplatePreview />
+            </OLCol>
+          </OLRow>
+        </div>
+      </main>
+      <Footer {...footerProps} />
+    </>
+  )
+}
+
+export default withErrorBoundary(TemplateRoot, GenericErrorBoundaryFallback)
diff --git a/services/web/frontend/js/features/template/context/template-context.tsx b/services/web/frontend/js/features/template/context/template-context.tsx
new file mode 100644
index 0000000000..06c28604a8
--- /dev/null
+++ b/services/web/frontend/js/features/template/context/template-context.tsx
@@ -0,0 +1,53 @@
+import {
+  createContext,
+  FC,
+  useCallback,
+  useContext,
+  useState,
+  useMemo,
+} from 'react'
+import useEventListener from '@/shared/hooks/use-event-listener'
+import getMeta from '@/utils/meta'
+import { Template } from '../../../../../types/template'
+
+type TemplateContextType = {
+  template: Template
+  setTemplate: (template: Template) => void
+}
+
+export const TemplateContext = createContext<TemplateContextType | undefined>(
+  undefined
+)
+
+type TemplateProviderProps = {
+  loadedTemplate: Template
+}
+
+export const TemplateProvider: FC<TemplateProviderProps> = ({ children }) => {
+  const loadedTemplate = useMemo(() => getMeta('ol-template'), [])
+  const [template, setTemplate] = useState(loadedTemplate)
+
+  const value = useMemo(
+    () => ({
+      template,
+      setTemplate,
+    }),
+    [template, setTemplate]
+  )
+
+  return (
+    <TemplateContext.Provider value={value}>
+      {children}
+    </TemplateContext.Provider>
+  )
+}
+
+export const useTemplateContext = () => {
+  const context = useContext(TemplateContext)
+  if (!context) {
+    throw new Error(
+      `useTemplateContext must be used within a TemplateProvider`
+    )
+  }
+  return context
+}
diff --git a/services/web/frontend/js/features/template/hooks/use-focus-trap.ts b/services/web/frontend/js/features/template/hooks/use-focus-trap.ts
new file mode 100644
index 0000000000..fa4e78570e
--- /dev/null
+++ b/services/web/frontend/js/features/template/hooks/use-focus-trap.ts
@@ -0,0 +1,46 @@
+import { useEffect } from 'react'
+
+export function useFocusTrap(ref: React.RefObject<HTMLElement>, enabled = true) {
+  useEffect(() => {
+    if (!enabled || !ref.current) return
+
+    const element = ref.current
+    const previouslyFocusedElement = document.activeElement as HTMLElement
+    const focusableElements = element.querySelectorAll<HTMLElement>(
+      'a[href], button, textarea, input, select, [tabindex]:not([tabindex="-1"])'
+    )
+
+    const firstElement = focusableElements[0]
+    const lastElement = focusableElements[focusableElements.length - 1]
+
+    // Don't override if something inside already received focus
+    const isAlreadyFocusedInside = element.contains(document.activeElement)
+
+    function handleKeyDown(e: KeyboardEvent) {
+      if (e.key !== 'Tab') return
+
+      if (e.shiftKey) {
+        if (document.activeElement === firstElement) {
+          e.preventDefault()
+          lastElement?.focus()
+        }
+      } else {
+        if (document.activeElement === lastElement) {
+          e.preventDefault()
+          firstElement?.focus()
+        }
+      }
+    }
+
+    element.addEventListener('keydown', handleKeyDown)
+
+    if (!isAlreadyFocusedInside) {
+      firstElement?.focus()
+    }
+
+    return () => {
+      element.removeEventListener('keydown', handleKeyDown)
+      previouslyFocusedElement?.focus()
+    }
+  }, [ref, enabled])
+}
diff --git a/services/web/frontend/js/features/template/util/api.ts b/services/web/frontend/js/features/template/util/api.ts
new file mode 100644
index 0000000000..bdf4f57174
--- /dev/null
+++ b/services/web/frontend/js/features/template/util/api.ts
@@ -0,0 +1,47 @@
+import { deleteJSON, postJSON } from '@/infrastructure/fetch-json'
+import { Template } from '../../../../../types/template'
+
+export function deleteTemplate(template: Template) {
+  return deleteJSON(`/template/${template.id}/delete`, {
+    body: {
+      version: template.version,
+    },
+  })
+}
+
+type UpdateTemplateOptions = {
+  template: Template
+  initialTemplate: Template
+  descriptionEdited: boolean
+}
+
+export function updateTemplate({
+  editedTemplate,
+  template
+}: UpdateTemplateOptions): Promise<Template | null> {
+  const updatedFields: Partial<Template> = {
+    name: editedTemplate.name.trim(),
+    license: editedTemplate.license.trim(),
+    category: editedTemplate.category,
+    language: editedTemplate.language,
+    authorMD: editedTemplate.authorMD.trim(),
+    descriptionMD: editedTemplate.descriptionMD.trim(),
+  }
+
+  const changedFields = Object.entries(updatedFields).reduce((diff, [key, value]) => {
+    if (value !== undefined && template[key as keyof Template] !== value) {
+      diff[key] = value
+    }
+    return diff
+  }, {} as Partial<Template>)
+
+  if (Object.keys(changedFields).length === 0) {
+    return null
+  }
+
+  const updated = postJSON(`/template/${editedTemplate.id}/edit`, {
+    body: changedFields
+  })
+
+  return updated
+}
diff --git a/services/web/frontend/js/features/tooltip/index-bs5.ts b/services/web/frontend/js/features/tooltip/index-bs5.ts
index 62c199e2e6..43d6bc015f 100644
--- a/services/web/frontend/js/features/tooltip/index-bs5.ts
+++ b/services/web/frontend/js/features/tooltip/index-bs5.ts
@@ -21,8 +21,8 @@ if (footerLanguageElement) {
 
 const allTooltips = document.querySelectorAll('[data-bs-toggle="tooltip"]')
 allTooltips.forEach(element => {
-  // eslint-disable-next-line no-unused-vars
-  const tooltip = new Tooltip(element)
+  // eslint-disable-next-line no-new
+  new Tooltip(element)
 })
 
 const possibleBadgeTooltips = document.querySelectorAll('[data-badge-tooltip]')
@@ -36,8 +36,8 @@ possibleBadgeTooltips.forEach(element => {
   if (element.parentElement) {
     const parentWidth = getElementWidth(element.parentElement)
     if (element.scrollWidth > parentWidth) {
-      // eslint-disable-next-line no-unused-vars
-      const tooltip = new Tooltip(element)
+      // eslint-disable-next-line no-new
+      new Tooltip(element)
     } else {
       element.parentElement.style.maxWidth = 'none'
     }
diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/dropdown-toggle-with-tooltip.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/dropdown-toggle-with-tooltip.tsx
deleted file mode 100644
index cdf20e3dd3..0000000000
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/dropdown-toggle-with-tooltip.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { ReactNode, forwardRef } from 'react'
-import { BsPrefixRefForwardingComponent } from 'react-bootstrap/helpers'
-import type { DropdownToggleProps } from '@/features/ui/components/types/dropdown-menu-props'
-import {
-  DropdownToggle as BS5DropdownToggle,
-  OverlayTrigger,
-  OverlayTriggerProps,
-  Tooltip,
-} from 'react-bootstrap'
-import type { MergeAndOverride } from '../../../../../../types/utils'
-
-type DropdownToggleWithTooltipProps = MergeAndOverride<
-  DropdownToggleProps,
-  {
-    children: ReactNode
-    overlayTriggerProps?: Omit<OverlayTriggerProps, 'overlay' | 'children'>
-    toolTipDescription: string
-    tooltipProps?: Omit<React.ComponentProps<typeof Tooltip>, 'children'>
-    'aria-label'?: string
-  }
->
-const DropdownToggleWithTooltip = forwardRef<
-  BsPrefixRefForwardingComponent<'button', DropdownToggleProps>,
-  DropdownToggleWithTooltipProps
->(
-  (
-    {
-      children,
-      toolTipDescription,
-      overlayTriggerProps,
-      tooltipProps,
-      id,
-      ...toggleProps
-    },
-    ref
-  ) => {
-    return (
-      <OverlayTrigger
-        overlay={<Tooltip {...tooltipProps}>{toolTipDescription}</Tooltip>}
-        {...overlayTriggerProps}
-      >
-        <BS5DropdownToggle {...toggleProps} ref={ref}>
-          {children}
-        </BS5DropdownToggle>
-      </OverlayTrigger>
-    )
-  }
-)
-
-DropdownToggleWithTooltip.displayName = 'DropdownToggleWithTooltip'
-
-export default DropdownToggleWithTooltip
diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer-base.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer-base.tsx
index dd85660ffd..f2fd7e3a82 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer-base.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer-base.tsx
@@ -26,7 +26,7 @@ function FatFooterBase() {
     <footer className="fat-footer-base">
       <div className="fat-footer-base-section fat-footer-base-meta">
         <div className="fat-footer-base-item">
-          <div className="fat-footer-base-copyright">
+          <div className="fat-footer-base-copyright" translate="no">
             © {currentYear} Overleaf
           </div>
           <FooterBaseLink href="/legal">
diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/language-picker.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/language-picker.tsx
index 0ae53c807c..ccda7abc6f 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/language-picker.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/language-picker.tsx
@@ -49,7 +49,7 @@ function LanguagePicker({ showHeader } = { showHeader: false }) {
               return null
             const isActive = subdomainDetails.lngCode === currentLangCode
             return (
-              <li role="none" key={subdomain}>
+              <li role="none" key={subdomain} translate="no">
                 <DropdownItem
                   href={`${subdomainDetails.url}${currentUrlWithQueryParams}`}
                   active={isActive}
diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/logged-in-items.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/logged-in-items.tsx
index 5273eb8e98..7df9da710e 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/logged-in-items.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/logged-in-items.tsx
@@ -4,6 +4,7 @@ import type { NavbarSessionUser } from '@/features/ui/components/types/navbar'
 import NavLinkItem from '@/features/ui/components/bootstrap-5/navbar/nav-link-item'
 import { AccountMenuItems } from './account-menu-items'
 import { useSendProjectListMB } from '@/features/project-list/components/project-list-events'
+import getMeta from '@/utils/meta'
 
 export default function LoggedInItems({
   sessionUser,
@@ -14,11 +15,18 @@ export default function LoggedInItems({
 }) {
   const { t } = useTranslation()
   const sendProjectListMB = useSendProjectListMB()
+  const { templatesEnabled } = getMeta('ol-ExposedSettings')
+
   return (
     <>
       <NavLinkItem href="/project" className="nav-item-projects">
         {t('projects')}
       </NavLinkItem>
+      {templatesEnabled && (
+        <NavLinkItem href="/templates" className="nav-item-templates">
+          {t('templates')}
+        </NavLinkItem>
+      )}
       <NavDropdownMenu
         title={t('Account')}
         className="nav-item-account"
diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/logged-out-items.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/logged-out-items.tsx
index 13a0875c92..e59aeec2bd 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/logged-out-items.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/logged-out-items.tsx
@@ -1,6 +1,7 @@
 import { useTranslation } from 'react-i18next'
 import NavLinkItem from '@/features/ui/components/bootstrap-5/navbar/nav-link-item'
 import { useSendProjectListMB } from '@/features/project-list/components/project-list-events'
+import getMeta from '@/utils/meta'
 
 export default function LoggedOutItems({
   showSignUpLink,
@@ -9,9 +10,15 @@ export default function LoggedOutItems({
 }) {
   const { t } = useTranslation()
   const sendMB = useSendProjectListMB()
+  const { templatesEnabled } = getMeta('ol-ExposedSettings')
 
   return (
     <>
+      {templatesEnabled && (
+        <NavLinkItem href="/templates" className="nav-item-templates">
+          {t('templates')}
+        </NavLinkItem>
+      )}
       {showSignUpLink ? (
         <NavLinkItem
           href="/register"
diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/tooltip.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/tooltip.tsx
index f16bcb5425..39a45e96e0 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/tooltip.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/tooltip.tsx
@@ -1,4 +1,10 @@
-import { cloneElement, useEffect, forwardRef } from 'react'
+import {
+  cloneElement,
+  useEffect,
+  forwardRef,
+  useState,
+  useCallback,
+} from 'react'
 import {
   OverlayTrigger,
   OverlayTriggerProps,
@@ -41,6 +47,30 @@ function Tooltip({
   overlayProps,
   hidden,
 }: TooltipProps) {
+  const [show, setShow] = useState(false)
+
+  const handleKeyDown = useCallback(
+    (e: KeyboardEvent) => {
+      if (show && e.key === 'Escape') {
+        setShow(false)
+        e.stopPropagation()
+      }
+    },
+    [show, setShow]
+  )
+
+  useEffect(() => {
+    document.addEventListener('keydown', handleKeyDown, true)
+    return () => document.removeEventListener('keydown', handleKeyDown, true)
+  }, [handleKeyDown])
+
+  const hideTooltip = (e: React.MouseEvent) => {
+    if (e.currentTarget instanceof HTMLElement) {
+      e.currentTarget.blur()
+    }
+    setShow(false)
+  }
+
   const delay = overlayProps?.delay
   let delayShow = 300
   let delayHide = 300
@@ -49,12 +79,6 @@ function Tooltip({
     delayHide = typeof delay === 'number' ? delay : delay.hide
   }
 
-  const hideTooltip = (e: React.MouseEvent) => {
-    if (e.currentTarget instanceof HTMLElement) {
-      e.currentTarget.blur()
-    }
-  }
-
   return (
     <OverlayTrigger
       overlay={
@@ -69,6 +93,8 @@ function Tooltip({
       {...overlayProps}
       delay={{ show: delayShow, hide: delayHide }}
       placement={overlayProps?.placement || 'top'}
+      show={show}
+      onToggle={setShow}
     >
       {cloneElement(children, {
         onClick: callFnsInSequence(children.props.onClick, hideTooltip),
diff --git a/services/web/frontend/js/features/ui/components/types/dropdown-menu-props.ts b/services/web/frontend/js/features/ui/components/types/dropdown-menu-props.ts
index bd7db127b7..0cdbe4fba6 100644
--- a/services/web/frontend/js/features/ui/components/types/dropdown-menu-props.ts
+++ b/services/web/frontend/js/features/ui/components/types/dropdown-menu-props.ts
@@ -46,6 +46,7 @@ export type DropdownItemProps = PropsWithChildren<{
   target?: string
   download?: boolean | string
   rel?: string
+  translate?: React.HTMLAttributes<HTMLElement>['translate']
 }>
 
 export type DropdownToggleProps = PropsWithChildren<{
diff --git a/services/web/frontend/js/ide/connection/SocketIoShim.js b/services/web/frontend/js/ide/connection/SocketIoShim.js
index 9fb57ef1f1..6d9effd442 100644
--- a/services/web/frontend/js/ide/connection/SocketIoShim.js
+++ b/services/web/frontend/js/ide/connection/SocketIoShim.js
@@ -4,6 +4,8 @@ import { debugConsole } from '@/utils/debugging'
 import EventEmitter from '@/utils/EventEmitter'
 
 class SocketShimBase {
+  // unused vars kept to document the interface
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   static connect(url, options) {
     return new SocketShimBase()
   }
@@ -46,11 +48,15 @@ class SocketShimNoop extends SocketShimBase {
       },
 
       connect() {},
+      // unused vars kept to document the interface
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
       disconnect(reason) {},
     }
   }
 
   connect() {}
+  // unused vars kept to document the interface
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   disconnect(reason) {}
   emit() {}
   on() {}
@@ -295,6 +301,8 @@ export class SocketIOMock extends SocketShimBase {
       },
 
       connect() {},
+      // unused vars kept to document the interface
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
       disconnect(reason) {},
     }
   }
diff --git a/services/web/frontend/js/main/account-upgrade.ts b/services/web/frontend/js/main/account-upgrade.ts
index 9aa2490768..79155e5c0d 100644
--- a/services/web/frontend/js/main/account-upgrade.ts
+++ b/services/web/frontend/js/main/account-upgrade.ts
@@ -1,7 +1,14 @@
 import * as eventTracking from '../infrastructure/event-tracking'
 
-export function startFreeTrial(source: string, variant?: string) {
-  const eventSegmentation: Record<string, string> = { 'paywall-type': source }
+export function startFreeTrial(
+  source: string,
+  variant?: string,
+  segmentation?: eventTracking.Segmentation
+) {
+  const eventSegmentation: Record<string, string> = {
+    'paywall-type': source,
+    ...segmentation,
+  }
   if (variant) {
     eventSegmentation.variant = variant
   }
diff --git a/services/web/frontend/js/marketing.ts b/services/web/frontend/js/marketing.ts
index ad32a0d29b..5e360b2dd7 100644
--- a/services/web/frontend/js/marketing.ts
+++ b/services/web/frontend/js/marketing.ts
@@ -9,4 +9,3 @@ import './features/multi-submit'
 import './features/cookie-banner'
 import './features/autoplay-video'
 import './features/mathjax'
-import './features/header-footer-react'
diff --git a/services/web/frontend/js/pages/compromised-password.tsx b/services/web/frontend/js/pages/compromised-password.tsx
index 5c1303dc07..b163cfeb9e 100644
--- a/services/web/frontend/js/pages/compromised-password.tsx
+++ b/services/web/frontend/js/pages/compromised-password.tsx
@@ -1,13 +1,5 @@
-import '../marketing'
+import { renderInReactLayout } from '@/react'
 
-import { createRoot } from 'react-dom/client'
-import { CompromisedPasswordCard } from '../features/compromised-password/components/compromised-password-root'
+import { CompromisedPasswordCard } from '@/features/compromised-password/components/compromised-password-root'
 
-const compromisedPasswordContainer = document.getElementById(
-  'compromised-password'
-)
-
-if (compromisedPasswordContainer) {
-  const root = createRoot(compromisedPasswordContainer)
-  root.render(<CompromisedPasswordCard />)
-}
+renderInReactLayout('compromised-password', () => <CompromisedPasswordCard />)
diff --git a/services/web/frontend/js/pages/socket-diagnostics.tsx b/services/web/frontend/js/pages/socket-diagnostics.tsx
index bd4f2e522a..5219e82a23 100644
--- a/services/web/frontend/js/pages/socket-diagnostics.tsx
+++ b/services/web/frontend/js/pages/socket-diagnostics.tsx
@@ -1,11 +1,5 @@
-import '../marketing'
+import { renderInReactLayout } from '@/react'
 
-import { createRoot } from 'react-dom/client'
 import { SocketDiagnostics } from '@/features/socket-diagnostics/components/socket-diagnostics'
 
-const socketDiagnosticsContainer = document.getElementById('socket-diagnostics')
-
-if (socketDiagnosticsContainer) {
-  const root = createRoot(socketDiagnosticsContainer)
-  root.render(<SocketDiagnostics />)
-}
+renderInReactLayout('socket-diagnostics', () => <SocketDiagnostics />)
diff --git a/services/web/frontend/js/pages/template-gallery.tsx b/services/web/frontend/js/pages/template-gallery.tsx
new file mode 100644
index 0000000000..58a63be1ad
--- /dev/null
+++ b/services/web/frontend/js/pages/template-gallery.tsx
@@ -0,0 +1,15 @@
+import './../utils/meta'
+import '../utils/webpack-public-path'
+import './../infrastructure/error-reporter'
+import '@/i18n'
+import '../features/event-tracking'
+import '../features/cookie-banner'
+import '../features/link-helpers/slow-link'
+import ReactDOM from 'react-dom/client'
+import TemplateGalleryRoot from '../features/template-gallery/components/template-gallery-root'
+
+const element = document.getElementById('template-gallery-root')
+if (element) {
+  const root = ReactDOM.createRoot(element)
+  root.render(<TemplateGalleryRoot />)
+}
diff --git a/services/web/frontend/js/pages/template.tsx b/services/web/frontend/js/pages/template.tsx
new file mode 100644
index 0000000000..02d29d04da
--- /dev/null
+++ b/services/web/frontend/js/pages/template.tsx
@@ -0,0 +1,15 @@
+import './../utils/meta'
+import '../utils/webpack-public-path'
+import './../infrastructure/error-reporter'
+import '@/i18n'
+import '../features/event-tracking'
+import '../features/cookie-banner'
+import '../features/link-helpers/slow-link'
+import ReactDOM from 'react-dom/client'
+import TemplateRoot from '../features/template/components/template-root'
+
+const element = document.getElementById('template-root')
+if (element) {
+  const root = ReactDOM.createRoot(element)
+  root.render(<TemplateRoot />)
+}
diff --git a/services/web/frontend/js/pages/user/add-secondary-email.tsx b/services/web/frontend/js/pages/user/add-secondary-email.tsx
index 7c9d5bced9..987031dd61 100644
--- a/services/web/frontend/js/pages/user/add-secondary-email.tsx
+++ b/services/web/frontend/js/pages/user/add-secondary-email.tsx
@@ -1,13 +1,5 @@
-import '../../marketing'
+import { renderInReactLayout } from '@/react'
 
-import { createRoot } from 'react-dom/client'
-import { AddSecondaryEmailPrompt } from '../../features/settings/components/emails/add-secondary-email-prompt'
+import { AddSecondaryEmailPrompt } from '@/features/settings/components/emails/add-secondary-email-prompt'
 
-const addSecondaryEmailContainer = document.getElementById(
-  'add-secondary-email'
-)
-
-if (addSecondaryEmailContainer) {
-  const root = createRoot(addSecondaryEmailContainer)
-  root.render(<AddSecondaryEmailPrompt />)
-}
+renderInReactLayout('add-secondary-email', () => <AddSecondaryEmailPrompt />)
diff --git a/services/web/frontend/js/pages/user/confirm-secondary-email.tsx b/services/web/frontend/js/pages/user/confirm-secondary-email.tsx
index f30203a08d..d4be9364b5 100644
--- a/services/web/frontend/js/pages/user/confirm-secondary-email.tsx
+++ b/services/web/frontend/js/pages/user/confirm-secondary-email.tsx
@@ -1,11 +1,7 @@
-import '../../marketing'
+import { renderInReactLayout } from '@/react'
 
-import { createRoot } from 'react-dom/client'
-import ConfirmSecondaryEmailForm from '../../features/settings/components/emails/confirm-secondary-email-form'
+import ConfirmSecondaryEmailForm from '@/features/settings/components/emails/confirm-secondary-email-form'
 
-const confirmEmailContainer = document.getElementById('confirm-secondary-email')
-
-if (confirmEmailContainer) {
-  const root = createRoot(confirmEmailContainer)
-  root.render(<ConfirmSecondaryEmailForm />)
-}
+renderInReactLayout('confirm-secondary-email', () => (
+  <ConfirmSecondaryEmailForm />
+))
diff --git a/services/web/frontend/js/pages/user/settings.jsx b/services/web/frontend/js/pages/user/settings.jsx
deleted file mode 100644
index 189799fe7c..0000000000
--- a/services/web/frontend/js/pages/user/settings.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import '../../marketing'
-import './../../utils/meta'
-import '../../utils/webpack-public-path'
-import './../../infrastructure/error-reporter'
-import '@/i18n'
-import '../../features/settings/components/root'
-import { createRoot } from 'react-dom/client'
-import SettingsPageRoot from '../../features/settings/components/root.tsx'
-
-const element = document.getElementById('settings-page-root')
-// For react-google-recaptcha
-window.recaptchaOptions = {
-  enterprise: true,
-  useRecaptchaNet: true,
-}
-if (element) {
-  const root = createRoot(element)
-  root.render(<SettingsPageRoot />)
-}
diff --git a/services/web/frontend/js/pages/user/settings.tsx b/services/web/frontend/js/pages/user/settings.tsx
new file mode 100644
index 0000000000..a425877180
--- /dev/null
+++ b/services/web/frontend/js/pages/user/settings.tsx
@@ -0,0 +1,13 @@
+import { renderInReactLayout } from '@/react'
+import '@/utils/meta'
+import '@/utils/webpack-public-path'
+import '@/infrastructure/error-reporter'
+import '@/i18n'
+import SettingsPageRoot from '@/features/settings/components/root'
+
+// For react-google-recaptcha
+window.recaptchaOptions = {
+  enterprise: true,
+  useRecaptchaNet: true,
+}
+renderInReactLayout('settings-page-root', () => <SettingsPageRoot />)
diff --git a/services/web/frontend/js/pages/user/subscription/preview-change.tsx b/services/web/frontend/js/pages/user/subscription/preview-change.tsx
index 9ff5f14d45..6d7d0b175f 100644
--- a/services/web/frontend/js/pages/user/subscription/preview-change.tsx
+++ b/services/web/frontend/js/pages/user/subscription/preview-change.tsx
@@ -1,14 +1,9 @@
-import '@/marketing'
-import { createRoot } from 'react-dom/client'
+import { renderInReactLayout } from '@/react'
 import PreviewSubscriptionChange from '@/features/subscription/components/preview-subscription-change/root'
 import { SplitTestProvider } from '@/shared/context/split-test-context'
 
-const element = document.getElementById('subscription-preview-change')
-if (element) {
-  const root = createRoot(element)
-  root.render(
-    <SplitTestProvider>
-      <PreviewSubscriptionChange />
-    </SplitTestProvider>
-  )
-}
+renderInReactLayout('subscription-preview-change', () => (
+  <SplitTestProvider>
+    <PreviewSubscriptionChange />
+  </SplitTestProvider>
+))
diff --git a/services/web/frontend/js/react.ts b/services/web/frontend/js/react.ts
new file mode 100644
index 0000000000..fa940e0bf4
--- /dev/null
+++ b/services/web/frontend/js/react.ts
@@ -0,0 +1,15 @@
+import './marketing'
+import './features/header-footer-react'
+import { createRoot } from 'react-dom/client'
+import { ReactNode } from 'react'
+
+export function renderInReactLayout(
+  parentId: string,
+  createChildren: () => ReactNode
+) {
+  const parentElement = document.getElementById(parentId)
+  if (parentElement) {
+    const root = createRoot(parentElement)
+    root.render(createChildren())
+  }
+}
diff --git a/services/web/frontend/js/shared/components/material-icon.tsx b/services/web/frontend/js/shared/components/material-icon.tsx
index 43a789b498..be351d16bb 100644
--- a/services/web/frontend/js/shared/components/material-icon.tsx
+++ b/services/web/frontend/js/shared/components/material-icon.tsx
@@ -38,7 +38,12 @@ function MaterialIcon({
 
   return (
     <>
-      <span className={iconClassName} aria-hidden="true" {...rest}>
+      <span
+        className={iconClassName}
+        aria-hidden="true"
+        translate="no"
+        {...rest}
+      >
         {type}
       </span>
       {accessibilityLabel && (
diff --git a/services/web/frontend/js/shared/components/start-free-trial-button.tsx b/services/web/frontend/js/shared/components/start-free-trial-button.tsx
index 2a6ea73dee..3a5d7bf467 100644
--- a/services/web/frontend/js/shared/components/start-free-trial-button.tsx
+++ b/services/web/frontend/js/shared/components/start-free-trial-button.tsx
@@ -10,6 +10,7 @@ type StartFreeTrialButtonProps = {
   buttonProps?: React.ComponentProps<typeof OLButton>
   children?: React.ReactNode
   handleClick?: React.ComponentProps<typeof OLButton>['onClick']
+  segmentation?: eventTracking.Segmentation
 }
 
 export default function StartFreeTrialButton({
@@ -20,18 +21,20 @@ export default function StartFreeTrialButton({
   handleClick,
   source,
   variant,
+  segmentation,
 }: StartFreeTrialButtonProps) {
   const { t } = useTranslation()
 
   useEffect(() => {
     const eventSegmentation: { [key: string]: unknown } = {
       'paywall-type': source,
+      ...segmentation,
     }
     if (variant) {
       eventSegmentation.variant = variant
     }
     eventTracking.sendMB('paywall-prompt', eventSegmentation)
-  }, [source, variant])
+  }, [source, variant, segmentation])
 
   const onClick = useCallback(
     (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
@@ -41,9 +44,9 @@ export default function StartFreeTrialButton({
         handleClick(event)
       }
 
-      startFreeTrial(source, variant)
+      startFreeTrial(source, variant, segmentation)
     },
-    [handleClick, source, variant]
+    [handleClick, source, variant, segmentation]
   )
 
   return (
diff --git a/services/web/frontend/js/shared/components/upgrade-prompt.tsx b/services/web/frontend/js/shared/components/upgrade-prompt.tsx
index 1469d0d42b..8f556a182c 100644
--- a/services/web/frontend/js/shared/components/upgrade-prompt.tsx
+++ b/services/web/frontend/js/shared/components/upgrade-prompt.tsx
@@ -104,7 +104,7 @@ export function UpgradePrompt({
             <OLRow>
               <ul className="upgrade-prompt-list">
                 <IconListItem icon="hourglass_top">
-                  {t('12x_more_compile_time')}
+                  {t('24x_more_compile_time')}
                 </IconListItem>
                 <IconListItem icon="group_add">
                   {t('collabs_per_proj', { collabcount: isStudent ? 6 : 10 })}
diff --git a/services/web/frontend/js/shared/context/ide-context.tsx b/services/web/frontend/js/shared/context/ide-context.tsx
index 3eef2bbdbb..1b4d83d56c 100644
--- a/services/web/frontend/js/shared/context/ide-context.tsx
+++ b/services/web/frontend/js/shared/context/ide-context.tsx
@@ -4,7 +4,6 @@ import { ScopeEventEmitter } from '../../../../types/ide/scope-event-emitter'
 import { Socket } from '@/features/ide-react/connection/types/socket'
 
 export type Ide = {
-  $scope: Record<string, any>
   socket: Socket
 }
 
diff --git a/services/web/frontend/js/shared/context/layout-context.tsx b/services/web/frontend/js/shared/context/layout-context.tsx
index e82dcbc350..050e679de7 100644
--- a/services/web/frontend/js/shared/context/layout-context.tsx
+++ b/services/web/frontend/js/shared/context/layout-context.tsx
@@ -145,6 +145,7 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
     )
   )
 
+  // TODO ide-redesign-cleanup: remove this listener as we have an equivalent in rail-context
   useEventListener(
     'ui.toggle-review-panel',
     useCallback(() => {
@@ -152,6 +153,7 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
     }, [setReviewPanelOpen])
   )
 
+  // TODO ide-redesign-cleanup: remove this listener as we have an equivalent in rail-context
   useEventListener(
     'keydown',
     useCallback((event: KeyboardEvent) => {
diff --git a/services/web/frontend/js/shared/context/local-compile-context.tsx b/services/web/frontend/js/shared/context/local-compile-context.tsx
index 4ac3654a45..3e4dd7a91f 100644
--- a/services/web/frontend/js/shared/context/local-compile-context.tsx
+++ b/services/web/frontend/js/shared/context/local-compile-context.tsx
@@ -45,7 +45,7 @@ import {
   PdfScrollPosition,
   usePdfScrollPosition,
 } from '@/shared/hooks/use-pdf-scroll-position'
-import { PdfFileDataList } from '@/features/pdf-preview/util/types'
+import { LogEntry, PdfFileDataList } from '@/features/pdf-preview/util/types'
 import { isSplitTestEnabled } from '@/utils/splitTestUtils'
 import { captureException } from '@/infrastructure/error-reporter'
 import OError from '@overleaf/o-error'
@@ -69,7 +69,12 @@ export type CompileContext = {
   hasShortCompileTimeout: boolean
   highlights?: Record<string, any>[]
   isProjectOwner: boolean
-  logEntries?: Record<string, any>
+  logEntries?: {
+    all: LogEntry[]
+    errors: LogEntry[]
+    warnings: LogEntry[]
+    typesetting: LogEntry[]
+  }
   logEntryAnnotations?: Record<string, any>
   outputFilesArchive?: string
   pdfDownloadUrl?: string
diff --git a/services/web/frontend/js/shared/context/mock/mock-ide.js b/services/web/frontend/js/shared/context/mock/mock-ide.js
deleted file mode 100644
index 822d3b165c..0000000000
--- a/services/web/frontend/js/shared/context/mock/mock-ide.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import getMeta from '../../../utils/meta'
-
-// When rendered without Angular, ide isn't defined. In that case we use
-// a mock object that only has the required properties to pass proptypes
-// checks and the values needed for the app. In the longer term, the mock
-// object will replace ide completely.
-export const getMockIde = () => {
-  return {
-    _id: getMeta('ol-project_id'),
-    $scope: {
-      $on: () => {},
-      $watch: () => {},
-      $applyAsync: () => {},
-      user: {},
-      project: {
-        _id: getMeta('ol-project_id'),
-        name: getMeta('ol-projectName'),
-        rootDocId: '',
-        members: [],
-        invites: [],
-        features: {
-          collaborators: 0,
-          compileGroup: 'standard',
-          trackChangesVisible: false,
-          references: false,
-          mendeley: false,
-          zotero: false,
-        },
-        publicAccessLevel: '',
-        owner: {
-          _id: '',
-          email: '',
-        },
-      },
-      permissionsLevel: 'readOnly',
-      editor: {
-        sharejs_doc: null,
-        showSymbolPalette: false,
-        toggleSymbolPalette: () => {},
-      },
-      ui: {
-        view: 'pdf',
-        chatOpen: false,
-        reviewPanelOpen: false,
-        leftMenuShown: false,
-        pdfLayout: 'flat',
-      },
-      pdf: {
-        uncompiled: true,
-        logEntryAnnotations: {},
-      },
-      settings: { syntaxValidation: false, pdfViewer: 'pdfjs' },
-      hasLintingError: false,
-    },
-  }
-}
diff --git a/services/web/frontend/js/shared/context/project-context.tsx b/services/web/frontend/js/shared/context/project-context.tsx
index bd9ee12fdb..f294a88021 100644
--- a/services/web/frontend/js/shared/context/project-context.tsx
+++ b/services/web/frontend/js/shared/context/project-context.tsx
@@ -36,7 +36,7 @@ export const ProjectProvider: FC<React.PropsWithChildren> = ({ children }) => {
     compiler,
     imageName,
     name,
-    rootDoc_id: rootDocId,
+    rootDocId,
     members,
     invites,
     features,
diff --git a/services/web/frontend/js/shared/context/types/writefull-instance.ts b/services/web/frontend/js/shared/context/types/writefull-instance.ts
index 18b6d08616..120590e668 100644
--- a/services/web/frontend/js/shared/context/types/writefull-instance.ts
+++ b/services/web/frontend/js/shared/context/types/writefull-instance.ts
@@ -42,5 +42,4 @@ export interface WritefullAPI {
   ): void
   openTableGenerator(): void
   openEquationGenerator(): void
-  refreshSession(): void
 }
diff --git a/services/web/frontend/js/shared/context/user-settings-context.tsx b/services/web/frontend/js/shared/context/user-settings-context.tsx
index b0bce5bf5c..b368371013 100644
--- a/services/web/frontend/js/shared/context/user-settings-context.tsx
+++ b/services/web/frontend/js/shared/context/user-settings-context.tsx
@@ -29,6 +29,7 @@ const defaultSettings: UserSettings = {
   mathPreview: true,
   referencesSearchMode: 'advanced',
   enableNewEditor: true,
+  breadcrumbs: true,
 }
 
 type UserSettingsContextValue = {
diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index 9461635625..041633c929 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -24,6 +24,7 @@ import {
 } from '../../../types/project/dashboard/notification'
 import { Survey } from '../../../types/project/dashboard/survey'
 import { GetProjectsResponseBody } from '../../../types/project/dashboard/api'
+import { GetTemplatesResponseBody } from '../../../types/template/dashboard/api'
 import { Tag } from '../../../app/src/Features/Tags/types'
 import { Institution } from '../../../types/institution'
 import {
@@ -34,6 +35,7 @@ import {
 import { SplitTestInfo } from '../../../types/split-test'
 import { ValidationStatus } from '../../../types/group-management/validation'
 import { ManagedInstitution } from '../../../types/subscription/dashboard/managed-institution'
+import { OnboardingFormData } from '../../../types/onboarding'
 import { GroupSSOTestResult } from '../../../modules/group-settings/frontend/js/utils/types'
 import {
   AccessToken,
@@ -53,12 +55,15 @@ import { DefaultNavbarMetadata } from '@/features/ui/components/types/default-na
 import { FooterMetadata } from '@/features/ui/components/types/footer-metadata'
 import type { ScriptLogType } from '../../../modules/admin-panel/frontend/js/features/script-logs/script-log'
 import { ActiveExperiment } from './labs-utils'
+import { Subscription as AdminSubscription } from '../../../types/admin/subscription'
+
 export interface Meta {
   'ol-ExposedSettings': ExposedSettings
   'ol-addonPrices': Record<
     string,
     { annual: string; monthly: string; annualDividedByTwelve: string }
   >
+  'ol-adminSubscription': AdminSubscription
   'ol-aiAssistViaWritefullSource': string
   'ol-allInReconfirmNotificationPeriods': UserEmailData[]
   'ol-allowedExperiments': string[]
@@ -81,8 +86,11 @@ export interface Meta {
   'ol-cannot-link-other-third-party-sso': boolean
   'ol-cannot-reactivate-subscription': boolean
   'ol-cannot-use-ai': boolean
-  'ol-chatEnabled': boolean
-
+  'ol-capabilities': Array<'dropbox' | 'chat'>
+  'ol-compileSettings': {
+    reducedTimeoutWarning: string
+    compileTimeout: number
+  }
   'ol-compilesUserContentDomain': string
   'ol-countryCode': PricingFormState['country']
   'ol-couponCode': PricingFormState['coupon']
@@ -123,9 +131,10 @@ export interface Meta {
   'ol-groupsAndEnterpriseBannerVariant': GroupsAndEnterpriseBannerVariant
   'ol-hasAiAssistViaWritefull': boolean
   'ol-hasGroupSSOFeature': boolean
-  'ol-hasIndividualRecurlySubscription': boolean
+  'ol-hasIndividualPaidSubscription': boolean
   'ol-hasManagedUsersFeature': boolean
   'ol-hasPassword': boolean
+  'ol-hasSplitTestWriteAccess': boolean
   'ol-hasSubscription': boolean
   'ol-hasTrackChangesFeature': boolean
   'ol-hideLinkingWidgets': boolean // CI only
@@ -143,6 +152,7 @@ export interface Meta {
   'ol-isRegisteredViaGoogle': boolean
   'ol-isRestrictedTokenMember': boolean
   'ol-isSaas': boolean
+  'ol-isUserGroupManager': boolean
   'ol-itm_campaign': string
   'ol-itm_content': string
   'ol-itm_referrer': string
@@ -170,6 +180,7 @@ export interface Meta {
   'ol-notifications': NotificationType[]
   'ol-notificationsInstitution': InstitutionType[]
   'ol-oauthProviders': OAuthProviders
+  'ol-odcData': OnboardingFormData
   'ol-odcRole': string
   'ol-overallThemes': OverallThemeMeta[]
   'ol-pages': number
@@ -184,9 +195,11 @@ export interface Meta {
   'ol-postCheckoutRedirect': string
   'ol-postUrl': string
   'ol-prefetchedProjectsBlob': GetProjectsResponseBody | undefined
+  'ol-prefetchedTemplatesBlob': GetTemplatesResponseBody | undefined
   'ol-preventCompileOnLoad'?: boolean
   'ol-primaryEmail': { email: string; confirmed: boolean }
   'ol-project': any // TODO
+  'ol-projectEntityCounts'?: { files: number; docs: number }
   'ol-projectHistoryBlobsEnabled': boolean
   'ol-projectName': string
   'ol-projectOwnerHasPremiumOnPageLoad': boolean
@@ -197,6 +210,16 @@ export interface Meta {
   'ol-recommendedCurrency': CurrencyCode
   'ol-reconfirmationRemoveEmail': string
   'ol-reconfirmedViaSAML': string
+  'ol-recurlyAccount':
+    | {
+        code: string
+        error?: undefined
+      }
+    | {
+        error: boolean
+        code?: undefined
+      }
+    | undefined
   'ol-recurlyApiKey': string
   'ol-recurlySubdomain': string
   'ol-ro-mirror-on-client-no-local-storage': boolean
@@ -221,9 +244,12 @@ export interface Meta {
   'ol-showUpgradePrompt': boolean
   'ol-skipUrl': string
   'ol-splitTestInfo': { [name: string]: SplitTestInfo }
+  'ol-splitTestName': string
   'ol-splitTestVariants': { [name: string]: string }
   'ol-ssoDisabled': boolean
   'ol-ssoErrorMessage': string
+  'ol-stripeCustomerId': string
+  'ol-stripeUKApiKey': string
   'ol-subscription': any // TODO: mixed types, split into two fields
   'ol-subscriptionChangePreview': SubscriptionChangePreview
   'ol-subscriptionId': string
@@ -250,6 +276,7 @@ export interface Meta {
   'ol-users': ManagedUser[]
   'ol-usersBestSubscription': ProjectDashboardSubscription | undefined
   'ol-usersEmail': string | undefined
+  'ol-usersSubscription': { personal: boolean; group: boolean }
   'ol-validationStatus': ValidationStatus
   'ol-wikiEnabled': boolean
   'ol-writefullCssUrl': string
diff --git a/services/web/frontend/js/vendor/libs/sharejs.js b/services/web/frontend/js/vendor/libs/sharejs.js
index accc2b5b04..e3bec4804e 100644
--- a/services/web/frontend/js/vendor/libs/sharejs.js
+++ b/services/web/frontend/js/vendor/libs/sharejs.js
@@ -680,6 +680,7 @@ export const { Doc } = (() => {
   // Text document API for text
 
   text.api = {
+    otType: "sharejs-text-ot",
     provides: { text: true },
 
     // The number of characters in the string
@@ -1008,8 +1009,8 @@ export const { Doc } = (() => {
 
         this.type = type;
         if (type.api) {
-          for (const k of ['insert', 'del', 'getText', 'getLength', '_register']) {
-            this[k] = type.api[k]
+          for (var k in type.api) {
+            var v = type.api[k];this[k] = v;
           }
           return typeof this._register === 'function' ? this._register() : undefined;
         } else {
@@ -1095,14 +1096,7 @@ export const { Doc } = (() => {
           if (!msg.error) {
             if (msg.op === undefined && msg.v !== undefined) {
               if (msg.v < this.version) {
-                postJSON('/error/client', {
-                  body: {
-                    error: {
-                      message: 'out-of-order-ack-ignored'
-                    },
-                    meta: { msg, version: this.version }
-                  }
-                })
+                debugConsole.warn('Received an ack for an op with an outdated version.')
                 return
               }
             } else {
diff --git a/services/web/frontend/stories/contact-us-modal.stories.tsx b/services/web/frontend/stories/contact-us-modal.stories.tsx
index b1c0e2c431..24c671ce10 100644
--- a/services/web/frontend/stories/contact-us-modal.stories.tsx
+++ b/services/web/frontend/stories/contact-us-modal.stories.tsx
@@ -69,7 +69,7 @@ const ContactUsModalWithAcknowledgement = (
 }
 
 export const WithAcknowledgement = (args: ContactUsModalProps) => {
-  const { show, handleHide, ...rest } = args
+  const { show: _show, handleHide: _handleHide, ...rest } = args
   return <ContactUsModalWithAcknowledgement {...rest} />
 }
 
diff --git a/services/web/frontend/stories/decorators/scope.tsx b/services/web/frontend/stories/decorators/scope.tsx
index e69ebd8d21..31f38c79f4 100644
--- a/services/web/frontend/stories/decorators/scope.tsx
+++ b/services/web/frontend/stories/decorators/scope.tsx
@@ -1,5 +1,4 @@
 import React, { FC, useEffect, useState } from 'react'
-import { get } from 'lodash'
 import { User, UserId } from '../../../types/user'
 import { Project } from '../../../types/project'
 import {
@@ -24,86 +23,68 @@ import { ReactContextRoot } from '@/features/ide-react/context/react-context-roo
 
 const scopeWatchers: [string, (value: any) => void][] = []
 
-const initialize = () => {
-  const user: User = {
-    id: 'story-user' as UserId,
-    email: 'story-user@example.com',
-    allowedFreeTrial: true,
-    features: { dropbox: true, symbolPalette: true },
-  }
+const user: User = {
+  id: 'story-user' as UserId,
+  email: 'story-user@example.com',
+  allowedFreeTrial: true,
+  features: { dropbox: true, symbolPalette: true },
+}
 
-  const project: Project = {
-    _id: '63e21c07946dd8c76505f85a',
-    name: 'A Project',
-    features: { mendeley: true, zotero: true, referencesSearch: true },
-    tokens: {},
-    owner: {
-      _id: 'a-user',
-      email: 'stories@overleaf.com',
+const project: Project = {
+  _id: '63e21c07946dd8c76505f85a',
+  name: 'A Project',
+  features: { mendeley: true, zotero: true, referencesSearch: true },
+  tokens: {},
+  owner: {
+    _id: 'a-user',
+    email: 'stories@overleaf.com',
+  },
+  members: [],
+  invites: [],
+  rootDocId: '5e74f1a7ce17ae0041dfd056',
+  rootFolder: [
+    {
+      _id: 'root-folder-id',
+      name: 'rootFolder',
+      docs: [
+        { _id: 'test-file-id', name: 'testfile.tex' },
+        { _id: 'test-bib-file-id', name: 'testsources.bib' },
+      ],
+      fileRefs: [{ _id: 'test-image-id', name: 'frog.jpg', hash: '42' }],
+      folders: [],
     },
-    members: [],
-    invites: [],
-    rootDoc_id: '5e74f1a7ce17ae0041dfd056',
-    rootFolder: [
-      {
-        _id: 'root-folder-id',
-        name: 'rootFolder',
-        docs: [
-          { _id: 'test-file-id', name: 'testfile.tex' },
-          { _id: 'test-bib-file-id', name: 'testsources.bib' },
-        ],
-        fileRefs: [{ _id: 'test-image-id', name: 'frog.jpg', hash: '42' }],
-        folders: [],
-      },
-    ],
-  }
+  ],
+}
 
-  const scope = {
-    user,
-    project,
-    $watch: (key: string, callback: () => void) => {
-      scopeWatchers.push([key, callback])
+const initialScope = {
+  user,
+  project,
+  ui: {
+    chatOpen: true,
+    pdfLayout: 'flat',
+  },
+  settings: {
+    pdfViewer: 'js',
+    syntaxValidation: true,
+  },
+  editor: {
+    richText: false,
+    sharejs_doc: {
+      doc_id: 'test-doc',
+      getSnapshot: () => 'some doc content',
+      hasBufferedOps: () => false,
     },
-    $applyAsync: (callback: () => void) => {
-      window.setTimeout(() => {
-        callback()
-        for (const [key, watcher] of scopeWatchers) {
-          watcher(get(ide.$scope, key))
-        }
-      }, 0)
-    },
-    $on: (eventName: string, callback: () => void) => {
-      //
-    },
-    $broadcast: () => {},
-    ui: {
-      chatOpen: true,
-      pdfLayout: 'flat',
-    },
-    settings: {
-      pdfViewer: 'js',
-      syntaxValidation: true,
-    },
-    editor: {
-      richText: false,
-      sharejs_doc: {
-        doc_id: 'test-doc',
-        getSnapshot: () => 'some doc content',
-        hasBufferedOps: () => false,
-      },
-      open_doc_name: 'testfile.tex',
-    },
-    hasLintingError: false,
-    permissionsLevel: 'owner',
-  }
+    open_doc_name: 'testfile.tex',
+  },
+  hasLintingError: false,
+  permissionsLevel: 'owner',
+}
 
-  const ide = {
-    $scope: scope,
-    socket: new SocketIOShim.SocketShimNoop(
-      new SocketIOMock()
-    ) as unknown as Socket,
-  }
+const socket = new SocketIOShim.SocketShimNoop(
+  new SocketIOMock()
+) as unknown as Socket
 
+const initializeMetaTags = () => {
   // window.metaAttributesCache is reset in preview.tsx
   window.metaAttributesCache.set('ol-user', user)
   window.metaAttributesCache.set('ol-project_id', project._id)
@@ -111,8 +92,6 @@ const initialize = () => {
     'ol-gitBridgePublicBaseUrl',
     'https://git.stories.com'
   )
-
-  window._ide = ide
 }
 
 type ScopeDecoratorOptions = {
@@ -125,7 +104,7 @@ export const ScopeDecorator = (
   opts: ScopeDecoratorOptions = { mockCompileOnLoad: true },
   meta: Record<string, any> = {}
 ) => {
-  initialize()
+  initializeMetaTags()
 
   // mock compile on load
   useFetchMock(fetchMock => {
@@ -171,7 +150,7 @@ const ConnectionProvider: FC<React.PropsWithChildren> = ({ children }) => {
       error: '',
     }
     return {
-      socket: window._ide.socket as Socket,
+      socket,
       connectionState,
       isConnected: true,
       isStillReconnecting: false,
@@ -215,9 +194,8 @@ const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
   }))
 
   const [ideContextValue] = useState(() => {
-    const ide = window._ide
     const scopeStore = createReactScopeValueStore(projectId)
-    for (const [key, value] of Object.entries(ide.$scope)) {
+    for (const [key, value] of Object.entries(initialScope)) {
       scopeStore.set(key, value)
     }
     const scopeEventEmitter = new ReactScopeEventEmitter(new IdeEventEmitter())
@@ -231,7 +209,7 @@ const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
     }
 
     return {
-      ...ide,
+      socket,
       scopeStore,
       scopeEventEmitter,
     }
diff --git a/services/web/frontend/stories/fixtures/compile.js b/services/web/frontend/stories/fixtures/compile.js
index 9471ff04ff..bc7ebfae8b 100644
--- a/services/web/frontend/stories/fixtures/compile.js
+++ b/services/web/frontend/stories/fixtures/compile.js
@@ -100,7 +100,7 @@ export const mockClearCache = fetchMock =>
   })
 
 export const mockBuildFile = fetchMock =>
-  fetchMock.get('express:/build/:file', (url, options, request) => {
+  fetchMock.get('express:/build/:file', url => {
     const { pathname } = new URL(url, 'https://example.com')
 
     switch (pathname) {
@@ -190,7 +190,7 @@ export const mockEventTracking = fetchMock =>
   fetchMock.get('express:/event/:event', 204)
 
 export const mockValidPdf = fetchMock =>
-  fetchMock.get('express:/build/output.pdf', (url, options, request) => {
+  fetchMock.get('express:/build/output.pdf', () => {
     return new Promise(resolve => {
       const xhr = new XMLHttpRequest()
       xhr.addEventListener('load', () => {
diff --git a/services/web/frontend/stories/pdf-log-entry.stories.tsx b/services/web/frontend/stories/pdf-log-entry.stories.tsx
index d0a1e7d870..6b60bdff03 100644
--- a/services/web/frontend/stories/pdf-log-entry.stories.tsx
+++ b/services/web/frontend/stories/pdf-log-entry.stories.tsx
@@ -34,7 +34,6 @@ const fakeArgs = {
   formattedContent: 'This is a log entry',
   level: 'error' as const,
   extraInfoURL: 'https://example.com',
-  showCloseButton: true,
   showSourceLocationLink: true,
   rawContent: 'This is a raw log entry',
   contentDetails: ['detail 1', 'detail 2'],
diff --git a/services/web/frontend/stories/project-list/notifications.stories.tsx b/services/web/frontend/stories/project-list/notifications.stories.tsx
index 90fa82bfa5..ea00f84681 100644
--- a/services/web/frontend/stories/project-list/notifications.stories.tsx
+++ b/services/web/frontend/stories/project-list/notifications.stories.tsx
@@ -186,7 +186,7 @@ export const NotificationGroupInvitationCancelSubscription = (args: any) => {
     },
   })
 
-  window.metaAttributesCache.set('ol-hasIndividualRecurlySubscription', true)
+  window.metaAttributesCache.set('ol-hasIndividualPaidSubscription', true)
 
   return (
     <ProjectListProvider>
diff --git a/services/web/frontend/stories/source-editor/source-editor.stories.tsx b/services/web/frontend/stories/source-editor/source-editor.stories.tsx
index d87179b65f..3cc6b1c95f 100644
--- a/services/web/frontend/stories/source-editor/source-editor.stories.tsx
+++ b/services/web/frontend/stories/source-editor/source-editor.stories.tsx
@@ -198,7 +198,7 @@ const mockDoc = (content: string, changes: Array<Record<string, any>> = []) => {
     setTrackChangesIdSeeds: () => {
       // Do nothing
     },
-    setTrackingChanges: () => {
+    setTrackChangesUserId: () => {
       // Do nothing
     },
     getTrackingChanges: () => {
diff --git a/services/web/frontend/stories/split-test-badge.stories.jsx b/services/web/frontend/stories/split-test-badge.stories.jsx
index ecb74b71d1..331263e0cb 100644
--- a/services/web/frontend/stories/split-test-badge.stories.jsx
+++ b/services/web/frontend/stories/split-test-badge.stories.jsx
@@ -127,7 +127,7 @@ export default {
     displayOnVariants: ['active'],
   },
   decorators: [
-    (Story, context) => (
+    Story => (
       <SplitTestContext.Provider value={splitTestContextValue}>
         <Story />
       </SplitTestContext.Provider>
diff --git a/services/web/frontend/stories/ui/dropdown-menu.stories.tsx b/services/web/frontend/stories/ui/dropdown-menu.stories.tsx
index 5d1ac376bb..5758640ebc 100644
--- a/services/web/frontend/stories/ui/dropdown-menu.stories.tsx
+++ b/services/web/frontend/stories/ui/dropdown-menu.stories.tsx
@@ -60,7 +60,7 @@ export const Active = (args: Args) => {
   )
 }
 
-export const MultipleSelection = (args: Args) => {
+export const MultipleSelection = () => {
   return (
     <DropdownMenu show>
       <DropdownHeader>Header</DropdownHeader>
@@ -191,7 +191,7 @@ export const LeadingIcon = (args: Args) => {
   )
 }
 
-export const TrailingIcon = (args: Args) => {
+export const TrailingIcon = () => {
   return (
     <DropdownMenu show>
       <OLDropdownMenuItem eventKey="1" href="#/action-1" trailingIcon="check">
diff --git a/services/web/frontend/stories/ui/split-button.stories.tsx b/services/web/frontend/stories/ui/split-button.stories.tsx
index 674d2e796b..01cbab9ea4 100644
--- a/services/web/frontend/stories/ui/split-button.stories.tsx
+++ b/services/web/frontend/stories/ui/split-button.stories.tsx
@@ -11,9 +11,7 @@ import {
 import Button from '@/features/ui/components/bootstrap-5/button'
 import { ButtonGroup } from 'react-bootstrap'
 
-type Args = React.ComponentProps<typeof Dropdown>
-
-export const Sizes = (args: Args) => {
+export const Sizes = () => {
   const { t } = useTranslation()
   const sizes = {
     Large: 'lg',
diff --git a/services/web/frontend/stylesheets/app/admin-hub.less b/services/web/frontend/stylesheets/app/admin-hub.less
deleted file mode 100644
index bae3312447..0000000000
--- a/services/web/frontend/stylesheets/app/admin-hub.less
+++ /dev/null
@@ -1,156 +0,0 @@
-.hub-header {
-  h2 {
-    display: inline-block;
-  }
-  a {
-    color: @ol-dark-green;
-  }
-  i {
-    font-size: 30px;
-  }
-  .dropdown {
-    margin-right: 10px;
-  }
-}
-.admin-item {
-  position: relative;
-  margin-bottom: 60px;
-  .section-title {
-    text-transform: capitalize;
-  }
-  .alert-danger {
-    color: @ol-red;
-  }
-}
-.hidden-chart-section {
-  display: none;
-}
-.hub-circle {
-  display: inline-block;
-  background-color: @accent-color-secondary;
-  border-radius: 50%;
-  width: 160px;
-  height: 160px;
-  text-align: center;
-  //padding-top: 160px / 6.4;
-  img {
-    height: 160px - 160px / 3.2;
-  }
-  padding-top: 50px;
-  color: white;
-}
-.hub-circle-number {
-  display: block;
-  font-size: 36px;
-  font-weight: 900;
-  line-height: 1;
-}
-.hub-big-number {
-  float: left;
-  font-size: 32px;
-  font-weight: 900;
-  line-height: 40px;
-  color: @accent-color-secondary;
-}
-.hub-big-number,
-.hub-number-label {
-  display: block;
-}
-.hub-metric-link {
-  position: absolute;
-  top: 9px;
-  right: 0;
-  a {
-    color: @accent-color-secondary;
-  }
-  i {
-    margin-right: 5px;
-  }
-}
-.custom-donut-container {
-  svg {
-    max-width: 700px;
-    margin: auto;
-  }
-  .chart-center-text {
-    font-family: @font-family-sans-serif;
-    font-size: 40px;
-    font-weight: bold;
-    fill: @accent-color-secondary;
-    text-anchor: middle;
-  }
-
-  .nv-legend-text {
-    font-family: @font-family-sans-serif;
-    font-size: 14px;
-  }
-}
-.chart-no-center-text {
-  .chart-center-text {
-    display: none;
-  }
-}
-
-.superscript {
-  font-size: @font-size-large;
-}
-
-.admin-page {
-  summary {
-    // firefox does not show markers for block items
-    display: list-item;
-  }
-}
-
-.material-switch {
-  input[type='checkbox'] {
-    display: none;
-
-    &:checked + label::before {
-      background: inherit;
-      opacity: 0.5;
-    }
-    &:checked + label::after {
-      background: inherit;
-      left: 20px;
-    }
-    &:disabled + label {
-      opacity: 0.5;
-      cursor: not-allowed;
-    }
-  }
-
-  label {
-    cursor: pointer;
-    height: 0;
-    position: relative;
-    width: 40px;
-
-    &:before {
-      background: rgb(0, 0, 0);
-      box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.5);
-      border-radius: 8px;
-      content: '';
-      height: 16px;
-      margin-top: -2px;
-      position: absolute;
-      opacity: 0.3;
-      transition: all 0.2s ease-in-out;
-      width: 40px;
-    }
-
-    &:after {
-      background: rgb(255, 255, 255);
-      border-radius: 16px;
-      box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-      content: '';
-      height: 24px;
-      left: -4px;
-      margin-top: -2px;
-      position: absolute;
-      top: -4px;
-      transition: all 0.2s ease-in-out;
-      width: 24px;
-    }
-  }
-}
diff --git a/services/web/frontend/stylesheets/app/editor/history-react.less b/services/web/frontend/stylesheets/app/editor/history-react.less
index c9a8ef9bb9..9ceb5ae3fc 100644
--- a/services/web/frontend/stylesheets/app/editor/history-react.less
+++ b/services/web/frontend/stylesheets/app/editor/history-react.less
@@ -390,7 +390,7 @@ history-root {
       background-color: @neutral-10;
     }
 
-    span.material-symbols {
+    .material-symbols {
       vertical-align: middle;
       font-size: inherit;
     }
diff --git a/services/web/frontend/stylesheets/app/plans.less b/services/web/frontend/stylesheets/app/plans.less
index 1870b77636..127f102b6e 100644
--- a/services/web/frontend/stylesheets/app/plans.less
+++ b/services/web/frontend/stylesheets/app/plans.less
@@ -747,6 +747,236 @@
     border-left: var(--border-width-base) solid var(--green-50);
   }
 
+  .ai-assist {
+    color: var(--neutral-90);
+
+    @media (min-width: @screen-sm-min) {
+      padding-left: 0 !important;
+      padding-right: 0 !important;
+    }
+
+    .ai-assist-heading {
+      margin-top: var(--spacing-12);
+      margin-bottom: var(--spacing-12);
+      text-align: center;
+    }
+
+    .ai-assist-container {
+      padding: var(--spacing-10);
+      border: 4px solid var(--neutral-10);
+      border-radius: var(--border-radius-large-new);
+      background:
+        linear-gradient(270deg, var(--blue-10), #fff) 0.13%,
+        #fff 63.21%;
+
+      @media (max-width: @screen-sm-max) {
+        background: #fff;
+        border-width: 2px;
+        border-radius: var(--border-radius-medium-new);
+        border-color: var(--premium-gradient);
+        padding: var(--spacing-09);
+      }
+
+      .ai-assist-content {
+        display: flex;
+        justify-content: space-between;
+        gap: var(--spacing-07);
+
+        @media (max-width: @screen-sm-max) {
+          flex-direction: column;
+        }
+        .ai-assist-left {
+          display: flex;
+          gap: var(--spacing-07);
+          flex-direction: column;
+          max-width: @screen-xs;
+
+          @media (max-width: @screen-sm-max) {
+            max-width: 100%;
+          }
+
+          .ai-assist-price {
+            font-weight: 600;
+            font-size: var(--font-size-03);
+
+            @media (max-width: @screen-sm-max) {
+              font-weight: normal;
+              font-size: var(--font-size-02);
+              .price {
+                font-size: var(--font-size-08);
+                font-weight: 600;
+              }
+            }
+          }
+          .ai-assist-annually-price {
+            display: block;
+          }
+          .ai-assist-monthly-price {
+            display: none;
+          }
+          .ai-assist-header-switch {
+            display: none;
+          }
+
+          .ai-assist-header {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .ai-assist-header-content {
+              display: flex;
+              gap: var(--spacing-06);
+              align-items: center;
+
+              h3 {
+                font-size: var(--font-size-07);
+                margin: 0;
+                padding: 0;
+
+                @media (max-width: @screen-sm-max) {
+                  font-size: var(--font-size-05);
+                }
+              }
+
+              img {
+                @media (max-width: @screen-sm-max) {
+                  width: 24px;
+                }
+              }
+            }
+
+            .ai-assist-header-switch {
+              align-items: center;
+              gap: var(--spacing-03);
+              user-select: none;
+
+              input {
+                margin: 0;
+              }
+
+              label {
+                margin: 0;
+                font-weight: normal;
+              }
+            }
+          }
+        }
+        .ai-assist-right {
+          display: flex;
+          align-items: center;
+          gap: var(--spacing-06);
+
+          .ai-assist-features {
+            list-style: none;
+            display: flex;
+            flex-direction: column;
+            gap: var(--spacing-04);
+            min-width: 210px;
+            margin-bottom: 0;
+
+            .feature-item {
+              display: flex;
+              align-items: center;
+              font-size: var(--font-size-03);
+              cursor: default;
+
+              .feature-icon {
+                margin-right: var(--spacing-05);
+                color: var(--neutral-70);
+                width: 16px;
+                height: 16px;
+              }
+
+              .feature-text {
+                color: var(--neutral-90);
+              }
+            }
+
+            @media (min-width: @screen-sm-min) {
+              .feature-item-selected {
+                .feature-text {
+                  color: var(--blue-50);
+                  font-weight: 600;
+                }
+
+                .feature-icon {
+                  content: url(../../../public/img/check-circle-blue-filled.svg);
+                }
+              }
+            }
+          }
+
+          .ai-assist-images {
+            display: flex;
+            align-items: flex-start;
+            width: 280px;
+            justify-content: center;
+
+            @media (max-width: @screen-sm-max) {
+              display: none;
+            }
+          }
+        }
+      }
+    }
+
+    .ai-assist-header-switch {
+      display: flex !important;
+    }
+
+    .ai-assist-button-container {
+      display: flex;
+      gap: var(--spacing-05);
+
+      &.mobile {
+        display: none;
+        margin-top: var(--spacing-06);
+        flex-direction: column;
+      }
+
+      @media (max-width: @screen-sm-max) {
+        &.mobile {
+          display: flex;
+        }
+        &.desktop {
+          display: none;
+        }
+      }
+
+      .btn.monthly {
+        display: none;
+      }
+    }
+
+    .overleaf-assist-screenshot {
+      height: auto;
+      max-width: 280px;
+      max-height: 200px;
+      border-radius: var(--border-radius-base-new);
+      display: none;
+
+      &.selected {
+        display: block;
+        -webkit-animation: fade-in 1s;
+        animation: fade-in 1s;
+      }
+    }
+  }
+  .ai-assist.monthly-period {
+    .ai-assist-annually-price {
+      display: none !important;
+    }
+    .ai-assist-monthly-price {
+      display: block !important;
+    }
+    .ai-assist-button-container .btn.annual {
+      display: none !important;
+    }
+    .ai-assist-button-container .btn.monthly {
+      display: block !important;
+    }
+  }
+
   .plans-new-organizations {
     padding: var(--spacing-13) var(--spacing-08);
 
diff --git a/services/web/frontend/stylesheets/app/portals.less b/services/web/frontend/stylesheets/app/portals.less
index 9dfd4a57b7..b69176b05f 100644
--- a/services/web/frontend/stylesheets/app/portals.less
+++ b/services/web/frontend/stylesheets/app/portals.less
@@ -141,4 +141,38 @@
       }
     }
   }
+  .hub-circle {
+    display: inline-block;
+    background-color: @green-70;
+    border-radius: 50%;
+    width: 160px;
+    height: 160px;
+    text-align: center;
+    padding-top: 50px;
+    color: white;
+  }
+  .hub-circle-number {
+    display: block;
+    font-size: 36px;
+    font-weight: 900;
+    line-height: 1;
+  }
+  .custom-donut-container {
+    svg {
+      max-width: 700px;
+      margin: auto;
+    }
+    .chart-center-text {
+      font-family: @font-family-sans-serif;
+      font-size: 40px;
+      font-weight: bold;
+      fill: @green-70;
+      text-anchor: middle;
+    }
+
+    .nv-legend-text {
+      font-family: @font-family-sans-serif;
+      font-size: 14px;
+    }
+  }
 }
diff --git a/services/web/frontend/stylesheets/app/website-redesign.less b/services/web/frontend/stylesheets/app/website-redesign.less
index f66bd83d13..6c5bf9b582 100644
--- a/services/web/frontend/stylesheets/app/website-redesign.less
+++ b/services/web/frontend/stylesheets/app/website-redesign.less
@@ -169,7 +169,7 @@
           }
         }
 
-        i.material-symbols {
+        .material-symbols {
           color: var(--sapphire-blue);
         }
       }
@@ -627,7 +627,7 @@
           }
         }
 
-        i.material-symbols {
+        .material-symbols {
           vertical-align: middle;
           text-decoration: none;
         }
@@ -949,7 +949,7 @@
     font-weight: 500;
     color: var(--green-50);
 
-    i.material-symbols {
+    .material-symbols {
       vertical-align: middle;
       padding-bottom: 3px;
       font-size: 24px;
@@ -1023,7 +1023,7 @@
       .box-shadow-button-input();
     }
 
-    i {
+    .material-symbols {
       vertical-align: middle;
       margin-left: var(--spacing-02);
       padding-bottom: 3px;
diff --git a/services/web/frontend/stylesheets/bootstrap-5/abstracts/themes-common-variables.scss b/services/web/frontend/stylesheets/bootstrap-5/abstracts/themes-common-variables.scss
index 562dfb3efd..ce99b88f33 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/abstracts/themes-common-variables.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/abstracts/themes-common-variables.scss
@@ -12,6 +12,7 @@
   --content-danger-themed: var(--content-danger-dark);
   --content-warning-themed: var(--content-warning-dark);
   --content-positive-themed: var(--content-positive-dark);
+  --content-info-themed: var(--content-info-dark);
   --border-primary-themed: var(--border-primary-dark);
   --border-hover-themed: var(--border-hover-dark);
   --border-disabled-themed: var(--border-disabled-dark);
@@ -24,6 +25,7 @@
   --link-ui-themed: var(--link-ui-dark);
   --link-ui-hover-themed: var(--link-ui-hover-dark);
   --link-ui-visited-themed: var(--link-ui-visited-dark);
+  --premium-gradient-themed: var(--premium-gradient-dark);
 }
 
 @include theme('light') {
@@ -39,6 +41,7 @@
   --content-danger-themed: var(--content-danger);
   --content-warning-themed: var(--content-warning);
   --content-positive-themed: var(--content-positive);
+  --content-info-themed: var(--content-info);
   --border-primary-themed: var(--border-primary);
   --border-hover-themed: var(--border-hover);
   --border-disabled-themed: var(--border-disabled);
@@ -52,4 +55,5 @@
   --link-ui-themed: var(--link-ui);
   --link-ui-hover-themed: var(--link-ui-hover);
   --link-ui-visited-themed: var(--link-ui-visited);
+  --premium-gradient-themed: var(--premium-gradient);
 }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/base/layout.scss b/services/web/frontend/stylesheets/bootstrap-5/base/layout.scss
index 650bdc727f..d27fb59ad7 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/base/layout.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/base/layout.scss
@@ -79,11 +79,14 @@ hr {
   margin-top: calc(var(--line-height-03) * 4);
 }
 
-.inline-material-symbols {
-  display: inline-flex;
-  align-items: center;
-
-  a.material-symbols {
-    text-decoration: none;
-  }
+.inline-material-symbols .material-symbols {
+  vertical-align: middle;
+}
+
+.container-custom-sm {
+  max-width: 400px;
+}
+
+.full-height {
+  height: 100%;
 }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/all.scss b/services/web/frontend/stylesheets/bootstrap-5/components/all.scss
index c2aeb28516..639f6b4ff5 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/all.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/all.scss
@@ -1,6 +1,7 @@
 @import 'accordion';
 @import 'button';
 @import 'button-group';
+@import 'caret';
 @import 'dropdown-menu';
 @import 'image';
 @import 'notifications';
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/caret.scss b/services/web/frontend/stylesheets/bootstrap-5/components/caret.scss
new file mode 100644
index 0000000000..5f4deb3296
--- /dev/null
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/caret.scss
@@ -0,0 +1,15 @@
+:root {
+  --caret-width-base: 4px;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  margin-left: 2px;
+  vertical-align: middle;
+  border-top: var(--caret-width-base) solid;
+  border-right: var(--caret-width-base) solid transparent;
+  border-left: var(--caret-width-base) solid transparent;
+  margin-top: calc(-1 * var(--caret-width-base) / 2);
+}
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/form.scss b/services/web/frontend/stylesheets/bootstrap-5/components/form.scss
index 31b685de8a..3b86f5e51d 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/form.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/form.scss
@@ -151,6 +151,11 @@
     height: 100%;
     display: flex;
     align-items: center;
+
+    &:has(> i),
+    &:has(> .material-symbols) {
+      pointer-events: none;
+    }
   }
 
   .form-control-start-icon {
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/link.scss b/services/web/frontend/stylesheets/bootstrap-5/components/link.scss
index 7a6b96b597..66174eedc5 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/link.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/link.scss
@@ -9,5 +9,6 @@
   i {
     margin-right: var(--spacing-02);
     padding-bottom: 3px;
+    vertical-align: middle;
   }
 }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/foundations/colors.scss b/services/web/frontend/stylesheets/bootstrap-5/foundations/colors.scss
index 73e93273c4..ac196b900e 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/foundations/colors.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/foundations/colors.scss
@@ -83,6 +83,7 @@ $content-placeholder: $neutral-60;
 $content-danger: $red-50;
 $content-warning: $yellow-50;
 $content-positive: $green-50;
+$content-info: $blue-50;
 $border-primary: $neutral-60;
 $border-hover: $neutral-70;
 $border-disabled: $neutral-20;
@@ -102,6 +103,7 @@ $content-placeholder-dark: $neutral-50;
 $content-danger-dark: $red-40;
 $content-warning-dark: $yellow-40;
 $content-positive-dark: $green-40;
+$content-info-dark: $blue-30;
 $border-primary-dark: $neutral-30;
 $border-hover-dark: $neutral-20;
 $border-disabled-dark: $neutral-80;
@@ -193,6 +195,7 @@ $link-ui-visited-dark: $blue-40;
   --content-danger: var(--red-50);
   --content-warning: var(--yellow-50);
   --content-positive: var(--green-50);
+  --content-info: var(--blue-50);
   --border-primary: var(--neutral-60);
   --border-hover: var(--neutral-70);
   --border-disabled: var(--neutral-20);
@@ -213,6 +216,7 @@ $link-ui-visited-dark: $blue-40;
   --content-danger-dark: var(--red-40);
   --content-warning-dark: var(--yellow-40);
   --content-positive-dark: var(--green-40);
+  --content-info-dark: var(--blue-30);
   --border-primary-dark: var(--neutral-30);
   --border-hover-dark: var(--neutral-20);
   --border-disabled-dark: var(--neutral-80);
@@ -233,4 +237,10 @@ $link-ui-visited-dark: $blue-40;
     #254c84 29%,
     var(--blue-40) 97%
   );
+  --premium-gradient-dark: linear-gradient(
+    246deg,
+    #6f8bcd 0%,
+    #8ea3d7 29%,
+    #ccdcff 97%
+  );
 }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/modules/all.scss b/services/web/frontend/stylesheets/bootstrap-5/modules/all.scss
index b92eb80551..01d58c8c20 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/modules/all.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/modules/all.scss
@@ -1,3 +1,10 @@
+@import 'metrics/admin-hub';
+@import 'metrics/daterange-picker';
+@import 'metrics/institution-hub';
+@import 'metrics/metrics';
+@import 'metrics/nvd3';
+@import 'metrics/nvd3_override';
+@import 'metrics/publisher-hub';
 @import 'third-party-references';
 @import 'symbol-palette';
 @import 'writefull';
diff --git a/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/admin-hub.scss b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/admin-hub.scss
new file mode 100644
index 0000000000..3e6576cf92
--- /dev/null
+++ b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/admin-hub.scss
@@ -0,0 +1,93 @@
+.hub-header {
+  h2 {
+    display: inline-block;
+  }
+
+  .dropdown {
+    margin-right: var(--spacing-04);
+  }
+}
+
+.admin-item {
+  position: relative;
+  margin-bottom: var(--spacing-12);
+
+  .section-title {
+    text-transform: capitalize;
+  }
+
+  .alert-danger {
+    color: var(--content-danger);
+  }
+}
+
+.hidden-chart-section {
+  display: none;
+}
+
+.hub-circle {
+  display: inline-block;
+  background-color: var(--green-70);
+  border-radius: 50%;
+  width: 160px;
+  height: 160px;
+  text-align: center;
+  padding-top: 50px;
+  color: white;
+}
+
+.hub-circle-number {
+  display: block;
+  font-size: 36px;
+  font-weight: 900;
+  line-height: 1;
+}
+
+.hub-big-number {
+  float: left;
+  font-size: 32px;
+  font-weight: 900;
+  line-height: 40px;
+  color: var(--green-70);
+}
+
+.hub-big-number,
+.hub-number-label {
+  display: block;
+}
+
+.hub-metric-link {
+  position: absolute;
+  top: 9px;
+  right: 0;
+
+  i {
+    margin-right: 5px;
+  }
+}
+
+.custom-donut-container {
+  svg {
+    max-width: 700px;
+    margin: auto;
+  }
+
+  .chart-center-text {
+    font-family: $font-family-sans-serif;
+    font-size: 40px;
+    font-weight: bold;
+    fill: var(--green-70);
+    text-anchor: middle;
+  }
+
+  .nv-legend-text {
+    font-family: $font-family-sans-serif;
+    font-size: 14px;
+  }
+}
+
+.chart-no-center-text {
+  .chart-center-text {
+    display: none;
+  }
+}
diff --git a/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/daterange-picker.scss b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/daterange-picker.scss
new file mode 100644
index 0000000000..33e466bd91
--- /dev/null
+++ b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/daterange-picker.scss
@@ -0,0 +1,617 @@
+// A stylesheet for use with Bootstrap 3.x
+// @author: Dan Grossman http://www.dangrossman.info/
+// @copyright: Copyright (c) 2012-2015 Dan Grossman. All rights reserved.
+// @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
+// @website: https://www.improvely.com/
+
+/* stylelint-disable selector-class-pattern */
+
+// VARIABLES
+
+// Settings
+
+// The class name to contain everything within.
+$arrow-size: 7px;
+
+// Colors
+$daterangepicker-color: $green-50;
+$daterangepicker-bg-color: #fff;
+$daterangepicker-cell-color: $daterangepicker-color;
+$daterangepicker-cell-border-color: transparent;
+$daterangepicker-cell-bg-color: $daterangepicker-bg-color;
+$daterangepicker-cell-hover-color: $daterangepicker-color;
+$daterangepicker-cell-hover-border-color: $daterangepicker-cell-border-color;
+$daterangepicker-cell-hover-bg-color: #eee;
+$daterangepicker-in-range-color: #000;
+$daterangepicker-in-range-border-color: transparent;
+$daterangepicker-in-range-bg-color: #ebf4f8;
+$daterangepicker-active-color: #fff;
+$daterangepicker-active-bg-color: #138a07;
+$daterangepicker-active-border-color: transparent;
+$daterangepicker-unselected-color: #999;
+$daterangepicker-unselected-border-color: transparent;
+$daterangepicker-unselected-bg-color: #fff;
+
+// daterangepicker
+$daterangepicker-width: 278px;
+$daterangepicker-padding: 4px;
+$daterangepicker-z-index: 3000;
+$daterangepicker-border-size: 1px;
+$daterangepicker-border-color: #ccc;
+$daterangepicker-border-radius: 4px;
+
+// Calendar
+$daterangepicker-calendar-margin: $daterangepicker-padding;
+$daterangepicker-calendar-bg-color: $daterangepicker-bg-color;
+$daterangepicker-calendar-border-size: 1px;
+$daterangepicker-calendar-border-color: $daterangepicker-bg-color;
+$daterangepicker-calendar-border-radius: $daterangepicker-border-radius;
+
+// Calendar Cells
+$daterangepicker-cell-size: 20px;
+$daterangepicker-cell-width: $daterangepicker-cell-size;
+$daterangepicker-cell-height: $daterangepicker-cell-size;
+$daterangepicker-cell-border-radius: $daterangepicker-calendar-border-radius;
+$daterangepicker-cell-border-size: 1px;
+
+// Dropdowns
+$daterangepicker-dropdown-z-index: $daterangepicker-z-index + 1;
+
+// Controls
+$daterangepicker-control-height: 30px;
+$daterangepicker-control-line-height: $daterangepicker-control-height;
+$daterangepicker-control-color: #555;
+$daterangepicker-control-border-size: 1px;
+$daterangepicker-control-border-color: #ccc;
+$daterangepicker-control-border-radius: 4px;
+$daterangepicker-control-active-border-size: 1px;
+$daterangepicker-control-active-border-color: $green-50;
+$daterangepicker-control-active-border-radius: $daterangepicker-control-border-radius;
+$daterangepicker-control-disabled-color: #ccc;
+
+// Ranges
+$daterangepicker-ranges-color: $green-50;
+$daterangepicker-ranges-bg-color: daterangepicker-ranges-color;
+$daterangepicker-ranges-border-size: 1px;
+$daterangepicker-ranges-border-color: $daterangepicker-ranges-bg-color;
+$daterangepicker-ranges-border-radius: $daterangepicker-border-radius;
+$daterangepicker-ranges-hover-color: #fff;
+$daterangepicker-ranges-hover-bg-color: $daterangepicker-ranges-color;
+$daterangepicker-ranges-hover-border-size: $daterangepicker-ranges-border-size;
+$daterangepicker-ranges-hover-border-color: $daterangepicker-ranges-hover-bg-color;
+$daterangepicker-ranges-hover-border-radius: $daterangepicker-border-radius;
+$daterangepicker-ranges-active-border-size: $daterangepicker-ranges-border-size;
+$daterangepicker-ranges-active-border-color: $daterangepicker-ranges-bg-color;
+$daterangepicker-ranges-active-border-radius: $daterangepicker-border-radius;
+
+// STYLESHEETS
+.daterangepicker {
+  position: absolute;
+  color: $daterangepicker-color;
+  background-color: $daterangepicker-bg-color;
+  border-radius: $daterangepicker-border-radius;
+  width: $daterangepicker-width;
+  padding: $daterangepicker-padding;
+  margin-top: $daterangepicker-border-size;
+
+  // TODO: Should these be parameterized??
+  // top: 100px;
+  // left: 20px;
+
+  $arrow-prefix-size: $arrow-size;
+  $arrow-suffix-size: ($arrow-size - $daterangepicker-border-size);
+
+  &::before,
+  &::after {
+    position: absolute;
+    display: inline-block;
+    border-bottom-color: rgb(0 0 0 / 20%);
+    content: '';
+  }
+
+  &::before {
+    top: -$arrow-prefix-size;
+    border-right: $arrow-prefix-size solid transparent;
+    border-left: $arrow-prefix-size solid transparent;
+    border-bottom: $arrow-prefix-size solid $daterangepicker-border-color;
+  }
+
+  &::after {
+    top: -$arrow-suffix-size;
+    border-right: $arrow-suffix-size solid transparent;
+    border-bottom: $arrow-suffix-size solid $daterangepicker-bg-color;
+    border-left: $arrow-suffix-size solid transparent;
+  }
+
+  &.opensleft {
+    &::before {
+      // TODO: Make this relative to prefix size.
+      right: $arrow-prefix-size + 2px;
+    }
+
+    &::after {
+      // TODO: Make this relative to suffix size.
+      right: $arrow-suffix-size + 4px;
+    }
+  }
+
+  &.openscenter {
+    &::before {
+      left: 0;
+      right: 0;
+      width: 0;
+      margin-left: auto;
+      margin-right: auto;
+    }
+
+    &::after {
+      left: 0;
+      right: 0;
+      width: 0;
+      margin-left: auto;
+      margin-right: auto;
+    }
+  }
+
+  &.opensright {
+    &::before {
+      // TODO: Make this relative to prefix size.
+      left: $arrow-prefix-size + 2px;
+    }
+
+    &::after {
+      // TODO: Make this relative to suffix size.
+      left: $arrow-suffix-size + 4px;
+    }
+  }
+
+  &.dropup {
+    margin-top: -5px;
+
+    // NOTE: Note sure why these are special-cased.
+    &::before {
+      top: initial;
+      bottom: -$arrow-prefix-size;
+      border-bottom: initial;
+      border-top: $arrow-prefix-size solid $daterangepicker-border-color;
+    }
+
+    &::after {
+      top: initial;
+      bottom: -$arrow-suffix-size;
+      border-bottom: initial;
+      border-top: $arrow-suffix-size solid $daterangepicker-bg-color;
+    }
+  }
+
+  &.dropdown-menu {
+    max-width: none;
+    z-index: $daterangepicker-dropdown-z-index;
+  }
+
+  &.single {
+    .ranges,
+    .calendar {
+      float: none;
+    }
+  }
+
+  /* Calendars */
+  &.show-calendar {
+    .calendar {
+      display: block;
+    }
+  }
+
+  .calendar {
+    display: none;
+    max-width: $daterangepicker-width - ($daterangepicker-calendar-margin * 2);
+    margin: $daterangepicker-calendar-margin;
+
+    &.single {
+      .calendar-table {
+        border: none;
+      }
+    }
+
+    th,
+    td {
+      white-space: nowrap;
+      text-align: center;
+
+      // TODO: Should this actually be hard-coded?
+      min-width: 32px;
+    }
+  }
+
+  .calendar-table {
+    border: $daterangepicker-calendar-border-size solid
+      $daterangepicker-calendar-border-color;
+    padding: $daterangepicker-calendar-margin;
+    border-radius: $daterangepicker-calendar-border-radius;
+    background-color: $daterangepicker-calendar-bg-color;
+  }
+
+  table {
+    width: 100%;
+    margin: 0;
+  }
+
+  td,
+  th {
+    text-align: center;
+    width: $daterangepicker-cell-width;
+    height: $daterangepicker-cell-height;
+    border-radius: $daterangepicker-cell-border-radius;
+    border: $daterangepicker-cell-border-size solid
+      $daterangepicker-cell-border-color;
+    white-space: nowrap;
+    cursor: pointer;
+
+    &.available {
+      &:hover {
+        background-color: $daterangepicker-cell-hover-bg-color;
+        border-color: $daterangepicker-cell-hover-border-color;
+        color: $daterangepicker-cell-hover-color;
+      }
+    }
+
+    &.week {
+      font-size: 80%;
+      color: #ccc;
+    }
+  }
+
+  td {
+    &.off {
+      &,
+      &.in-range,
+      &.start-date,
+      &.end-date {
+        background-color: $daterangepicker-unselected-bg-color;
+        border-color: $daterangepicker-unselected-border-color;
+        color: $daterangepicker-unselected-color;
+      }
+    }
+
+    // Date Range
+    &.in-range {
+      background-color: $daterangepicker-in-range-bg-color;
+      border-color: $daterangepicker-in-range-border-color;
+      color: $daterangepicker-in-range-color;
+
+      // TODO: Should this be static or should it be parameterized?
+      border-radius: 0;
+    }
+
+    &.start-date {
+      border-radius: $daterangepicker-cell-border-radius 0 0
+        $daterangepicker-cell-border-radius;
+    }
+
+    &.end-date {
+      border-radius: 0 $daterangepicker-cell-border-radius
+        $daterangepicker-cell-border-radius 0;
+    }
+
+    &.start-date.end-date {
+      border-radius: $daterangepicker-cell-border-radius;
+    }
+
+    &.active {
+      &,
+      &:hover {
+        background-color: $daterangepicker-active-bg-color;
+        border-color: $daterangepicker-active-border-color;
+        color: $daterangepicker-active-color;
+      }
+    }
+  }
+
+  th {
+    &.month {
+      width: auto;
+    }
+  }
+
+  // Disabled Controls
+  td,
+  option {
+    &.disabled {
+      color: #999;
+      cursor: not-allowed;
+      text-decoration: line-through;
+    }
+  }
+
+  select {
+    &.monthselect,
+    &.yearselect {
+      font-size: 12px;
+      padding: 1px;
+      height: auto;
+      margin: 0;
+      cursor: default;
+    }
+
+    &.monthselect {
+      margin-right: 2%;
+      width: 56%;
+    }
+
+    &.yearselect {
+      width: 40%;
+    }
+
+    &.hourselect,
+    &.minuteselect,
+    &.secondselect,
+    &.ampmselect {
+      width: 50px;
+      margin-bottom: 0;
+    }
+  }
+
+  // Text Input Controls (above calendar)
+  .input-mini {
+    border: $daterangepicker-control-border-size solid
+      $daterangepicker-control-border-color;
+    border-radius: $daterangepicker-control-border-radius;
+    color: $daterangepicker-control-color;
+    height: $daterangepicker-control-line-height;
+    line-height: $daterangepicker-control-height;
+    display: block;
+    vertical-align: middle;
+
+    // TODO: Should these all be static, too??
+    margin: 0 0 5px;
+    padding: 0 6px 0 28px;
+    width: 100%;
+
+    &.active {
+      border: $daterangepicker-control-active-border-size solid
+        $daterangepicker-control-active-border-color;
+      border-radius: $daterangepicker-control-active-border-radius;
+    }
+  }
+
+  .daterangepicker_input {
+    position: relative;
+    padding-left: 0;
+
+    i {
+      position: absolute;
+
+      // NOTE: These appear to be eyeballed to me...
+      left: 8px;
+      top: var(--spacing-04);
+    }
+  }
+
+  &.rtl {
+    .input-mini {
+      padding-right: 28px;
+      padding-left: 6px;
+    }
+
+    .daterangepicker_input i {
+      left: auto;
+      right: 8px;
+    }
+  }
+
+  // Time Picker
+  .calendar-time {
+    text-align: center;
+    margin: 5px auto;
+    line-height: $daterangepicker-control-line-height;
+    position: relative;
+    padding-left: 28px;
+
+    select {
+      &.disabled {
+        color: $daterangepicker-control-disabled-color;
+        cursor: not-allowed;
+      }
+    }
+  }
+}
+
+// Predefined Ranges
+.ranges {
+  font-size: 11px;
+  float: none;
+  margin: 4px;
+  text-align: left;
+
+  ul {
+    list-style: none;
+    margin: 0 auto;
+    padding: 0;
+    width: 100%;
+  }
+
+  li {
+    font-size: 13px;
+    background-color: $daterangepicker-ranges-bg-color;
+    border: $daterangepicker-ranges-border-size solid
+      $daterangepicker-ranges-border-color;
+    border-radius: $daterangepicker-ranges-border-radius;
+    color: $daterangepicker-ranges-color;
+    padding: 3px 12px;
+    margin-bottom: 8px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: $daterangepicker-ranges-hover-bg-color;
+      color: $daterangepicker-ranges-hover-color;
+    }
+
+    &.active {
+      background-color: $daterangepicker-ranges-hover-bg-color;
+      border: $daterangepicker-ranges-hover-border-size solid
+        $daterangepicker-ranges-hover-border-color;
+      color: $daterangepicker-ranges-hover-color;
+    }
+  }
+}
+
+/*  Larger Screen Styling */
+@include media-breakpoint-up(sm) {
+  .daterangepicker {
+    .glyphicon {
+      /* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
+      font-family: FontAwesome;
+    }
+
+    .glyphicon-chevron-left::before {
+      content: '\f053';
+    }
+
+    .glyphicon-chevron-right::before {
+      content: '\f054';
+    }
+
+    .glyphicon-calendar::before {
+      content: '\f073';
+    }
+
+    width: auto;
+
+    .ranges {
+      ul {
+        width: 160px;
+      }
+    }
+
+    &.single {
+      .ranges {
+        ul {
+          width: 100%;
+        }
+      }
+
+      .calendar.left {
+        clear: none;
+      }
+
+      &.ltr {
+        .ranges,
+        .calendar {
+          float: left;
+        }
+      }
+
+      &.rtl {
+        .ranges,
+        .calendar {
+          float: right;
+        }
+      }
+    }
+
+    &.ltr {
+      direction: ltr;
+      text-align: left;
+
+      .calendar {
+        &.left {
+          clear: left;
+          margin-right: 0;
+
+          .calendar-table {
+            border-right: none;
+            border-top-right-radius: 0;
+            border-bottom-right-radius: 0;
+            padding-right: 12px;
+          }
+        }
+
+        &.right {
+          margin-left: 0;
+
+          .calendar-table {
+            border-left: none;
+            border-top-left-radius: 0;
+            border-bottom-left-radius: 0;
+          }
+        }
+      }
+
+      .left .daterangepicker_input {
+        padding-right: 12px;
+      }
+
+      .ranges,
+      .calendar {
+        float: left;
+      }
+    }
+
+    &.rtl {
+      direction: rtl;
+      text-align: right;
+
+      .calendar {
+        &.left {
+          clear: right;
+          margin-left: 0;
+
+          .calendar-table {
+            border-left: none;
+            border-top-left-radius: 0;
+            border-bottom-left-radius: 0;
+            padding-left: 12px;
+          }
+        }
+
+        &.right {
+          margin-right: 0;
+
+          .calendar-table {
+            border-right: none;
+            border-top-right-radius: 0;
+            border-bottom-right-radius: 0;
+          }
+        }
+      }
+
+      .ranges,
+      .calendar {
+        text-align: right;
+        float: right;
+      }
+    }
+  }
+}
+
+@include media-breakpoint-up(md) {
+  /* force the calendar to display on one row */
+  .show-calendar {
+    min-width: 658px; /* width of all contained elements, IE/Edge fallback */
+    width: max-content;
+  }
+
+  .daterangepicker {
+    .ranges {
+      width: auto;
+    }
+
+    &.ltr {
+      .ranges {
+        float: left;
+        clear: none !important;
+      }
+    }
+
+    &.rtl {
+      .ranges {
+        float: right;
+      }
+    }
+
+    .calendar {
+      clear: none !important;
+    }
+  }
+}
diff --git a/services/web/frontend/stylesheets/app/institution-hub.less b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/institution-hub.scss
similarity index 52%
rename from services/web/frontend/stylesheets/app/institution-hub.less
rename to services/web/frontend/stylesheets/bootstrap-5/modules/metrics/institution-hub.scss
index cb705e4b99..67cbe580e4 100644
--- a/services/web/frontend/stylesheets/app/institution-hub.less
+++ b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/institution-hub.scss
@@ -1,38 +1,54 @@
 #institution-hub {
-  .section_header {
+  .section-header {
     .dropdown {
-      margin-right: 10px;
+      margin-right: var(--spacing-04);
     }
   }
 
   #usage {
     .recent-activity {
       .overbox {
-        font-size: 16px;
+        @include body-base;
       }
+
       .hub-big-number,
       .hub-number-label,
       .worked-on {
         display: block;
         width: 50%;
       }
+
       .hub-big-number {
-        padding-right: 10px;
+        padding-right: var(--spacing-04);
         text-align: right;
       }
+
       .hub-number-label,
       .worked-on {
         float: right;
       }
+
       .hub-number-label {
         &:nth-child(odd) {
-          margin-top: 16px;
+          margin-top: var(--spacing-06);
         }
       }
+
       .worked-on {
-        color: @text-small-color;
+        color: var(--content-secondary);
         font-style: italic;
       }
     }
   }
+
+  .overbox {
+    margin: 0;
+    padding: var(--spacing-10) var(--spacing-07);
+    background: var(--white);
+    border: 1px solid var(--content-disabled);
+
+    &.overbox-small {
+      padding: var(--spacing-04);
+    }
+  }
 }
diff --git a/services/web/frontend/stylesheets/app/metrics.less b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/metrics.scss
similarity index 78%
rename from services/web/frontend/stylesheets/app/metrics.less
rename to services/web/frontend/stylesheets/bootstrap-5/modules/metrics/metrics.scss
index 5256b8a8bd..f6e6a3fd3e 100644
--- a/services/web/frontend/stylesheets/app/metrics.less
+++ b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/metrics.scss
@@ -1,6 +1,6 @@
 #metrics {
   max-width: none;
-  padding: 0 30px;
+  padding: 0 var(--spacing-09);
   width: auto;
 
   svg.nvd3-svg {
@@ -9,17 +9,18 @@
 
   .overbox {
     margin: 0;
-    padding: 40px 20px;
+    padding: var(--spacing-10) var(--spacing-07);
     background: #fff;
     border: 1px solid #dfdfdf;
+
     .box {
-      padding-bottom: 30px;
+      padding-bottom: var(--spacing-09);
       overflow: hidden;
-      margin-bottom: 40px;
-      border-bottom: 1px solid rgb(216, 216, 216);
+      margin-bottom: var(--spacing-10);
+      border-bottom: 1px solid rgb(216 216 216);
 
       .header {
-        margin-bottom: 20px;
+        margin-bottom: var(--spacing-07);
 
         h4 {
           font-size: 19px;
@@ -27,10 +28,14 @@
         }
       }
     }
+
+    &.overbox-small {
+      padding: var(--spacing-04);
+    }
   }
 
   .print-button {
-    margin-right: 10px;
+    margin-right: var(--spacing-04);
     font-size: 20px;
   }
 
@@ -40,21 +45,18 @@
   }
 
   .metric-col {
-    padding: 15px;
-  }
-
-  .metric-header-container {
-    h4 {
-      margin-bottom: 0;
-    }
+    position: relative;
+    padding: var(--spacing-06);
   }
 
   svg {
     display: block;
     height: 250px;
+
     text {
       font-family: 'Open Sans', sans-serif;
     }
+
     &:not(:root) {
       overflow: visible;
     }
@@ -79,6 +81,10 @@
 
   // BEGIN: Metrics header
   .metric-header-container {
+    h4 {
+      margin-bottom: 0;
+    }
+
     > h4 {
       margin-top: 0;
       margin-bottom: 0;
@@ -89,12 +95,14 @@
       font-size: 0.5em;
     }
   }
+
   // END: Metrics header
 
   // BEGIN: Metrics footer
   .metric-footer-container {
     text-align: center;
   }
+
   // END: Metrics footer
 
   // BEGIN: Metrics overlays
@@ -107,7 +115,7 @@
     height: 100%;
     width: 100%;
     padding: 16px; /* 15px of .metric-col padding + 1px border */
-    padding-top: 56px; /* Same as above + 30px for title + 10px overbox padding*/
+    padding-top: 56px; /* Same as above + 30px for title + 10px overbox padding */
   }
 
   .metric-overlay-loading {
@@ -129,19 +137,20 @@
     width: 100%;
     height: 100%;
   }
+
   // END: Metrics overlays
 }
 
 #metrics-header {
-  @media (min-width: 1200px) {
-    margin-bottom: 30px;
+  @include media-breakpoint-up(lg) {
+    margin-bottom: var(--spacing-09);
   }
 
   h3 {
     display: inline-block;
   }
 
-  .section_header {
+  .section-header {
     margin-bottom: 0;
   }
 
@@ -162,9 +171,11 @@
 
   #dates-container {
     display: inline-block;
+
     .daterangepicker {
-      margin-right: 15px;
+      margin-right: var(--spacing-06);
     }
+
     #metrics-dates {
       padding: 0;
     }
@@ -172,14 +183,10 @@
 }
 
 #metrics-footer {
-  margin-top: 30px;
+  margin-top: var(--spacing-09);
   text-align: center;
 }
 
-body.print-loading {
-  #metrics {
-    .metric-col {
-      opacity: 0.5;
-    }
-  }
+body.print-loading #metrics .metric-col {
+  opacity: 0.5;
 }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/nvd3.scss b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/nvd3.scss
new file mode 100755
index 0000000000..4983129a80
--- /dev/null
+++ b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/nvd3.scss
@@ -0,0 +1,677 @@
+/* stylelint-disable */
+
+/* nvd3 version 1.8.4 (https://github.com/novus/nvd3) 2016-07-03 */
+.nvd3 .nv-axis {
+  pointer-events: none;
+  opacity: 1;
+}
+
+.nvd3 .nv-axis path {
+  fill: none;
+  stroke: #000;
+  stroke-opacity: 0.75;
+  shape-rendering: crispedges;
+}
+
+.nvd3 .nv-axis path.domain {
+  stroke-opacity: 0.75;
+}
+
+.nvd3 .nv-axis.nv-x path.domain {
+  stroke-opacity: 0;
+}
+
+.nvd3 .nv-axis line {
+  fill: none;
+  stroke: #e5e5e5;
+  shape-rendering: crispedges;
+}
+
+.nvd3 .nv-axis .zero line,
+    /*this selector may not be necessary*/ .nvd3 .nv-axis line.zero {
+  stroke-opacity: 0.75;
+}
+
+.nvd3 .nv-axis .nv-axisMaxMin text {
+  font-weight: bold;
+}
+
+.nvd3 .x .nv-axis .nv-axisMaxMin text,
+.nvd3 .x2 .nv-axis .nv-axisMaxMin text,
+.nvd3 .x3 .nv-axis .nv-axisMaxMin text {
+  text-anchor: middle;
+}
+
+.nvd3 .nv-axis.nv-disabled {
+  opacity: 0;
+}
+
+.nvd3 .nv-bars rect {
+  fill-opacity: 0.75;
+  transition: fill-opacity 250ms linear;
+}
+
+.nvd3 .nv-bars rect.hover {
+  fill-opacity: 1;
+}
+
+.nvd3 .nv-bars .hover rect {
+  fill: lightblue;
+}
+
+.nvd3 .nv-bars text {
+  fill: rgb(0 0 0 / 0%);
+}
+
+.nvd3 .nv-bars .hover text {
+  fill: rgb(0 0 0 / 100%);
+}
+
+.nvd3 .nv-multibar .nv-groups rect,
+.nvd3 .nv-multibarHorizontal .nv-groups rect,
+.nvd3 .nv-discretebar .nv-groups rect {
+  stroke-opacity: 0;
+  transition: fill-opacity 250ms linear;
+}
+
+.nvd3 .nv-multibar .nv-groups rect:hover,
+.nvd3 .nv-multibarHorizontal .nv-groups rect:hover,
+.nvd3 .nv-candlestickBar .nv-ticks rect:hover,
+.nvd3 .nv-discretebar .nv-groups rect:hover {
+  fill-opacity: 1;
+}
+
+.nvd3 .nv-discretebar .nv-groups text,
+.nvd3 .nv-multibarHorizontal .nv-groups text {
+  font-weight: bold;
+  fill: rgb(0 0 0 / 100%);
+  stroke: rgb(0 0 0 / 0%);
+}
+
+/* boxplot CSS */
+.nvd3 .nv-boxplot circle {
+  fill-opacity: 0.5;
+}
+
+.nvd3 .nv-boxplot circle:hover {
+  fill-opacity: 1;
+}
+
+.nvd3 .nv-boxplot rect:hover {
+  fill-opacity: 1;
+}
+
+.nvd3 line.nv-boxplot-median {
+  stroke: black;
+}
+
+.nv-boxplot-tick:hover {
+  stroke-width: 2.5px;
+}
+
+/* bullet */
+.nvd3.nv-bullet {
+  font: 10px sans-serif;
+}
+
+.nvd3.nv-bullet .nv-measure {
+  fill-opacity: 0.8;
+}
+
+.nvd3.nv-bullet .nv-measure:hover {
+  fill-opacity: 1;
+}
+
+.nvd3.nv-bullet .nv-marker {
+  stroke: #000;
+  stroke-width: 2px;
+}
+
+.nvd3.nv-bullet .nv-markerTriangle {
+  stroke: #000;
+  fill: #fff;
+  stroke-width: 1.5px;
+}
+
+.nvd3.nv-bullet .nv-markerLine {
+  stroke: #000;
+  stroke-width: 1.5px;
+}
+
+.nvd3.nv-bullet .nv-tick line {
+  stroke: #666;
+  stroke-width: 0.5px;
+}
+
+.nvd3.nv-bullet .nv-range.nv-s0 {
+  fill: #eee;
+}
+
+.nvd3.nv-bullet .nv-range.nv-s1 {
+  fill: #ddd;
+}
+
+.nvd3.nv-bullet .nv-range.nv-s2 {
+  fill: #ccc;
+}
+
+.nvd3.nv-bullet .nv-title {
+  font-size: 14px;
+  font-weight: bold;
+}
+
+.nvd3.nv-bullet .nv-subtitle {
+  fill: #999;
+}
+
+.nvd3.nv-bullet .nv-range {
+  fill: #bababa;
+  fill-opacity: 0.4;
+}
+
+.nvd3.nv-bullet .nv-range:hover {
+  fill-opacity: 0.7;
+}
+
+.nvd3.nv-candlestickBar .nv-ticks .nv-tick {
+  stroke-width: 1px;
+}
+
+.nvd3.nv-candlestickBar .nv-ticks .nv-tick.hover {
+  stroke-width: 2px;
+}
+
+.nvd3.nv-candlestickBar .nv-ticks .nv-tick.positive rect {
+  stroke: #2ca02c;
+  fill: #2ca02c;
+}
+
+.nvd3.nv-candlestickBar .nv-ticks .nv-tick.negative rect {
+  stroke: #d62728;
+  fill: #d62728;
+}
+
+.with-transitions .nv-candlestickBar .nv-ticks .nv-tick {
+  transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
+}
+
+.nvd3.nv-candlestickBar .nv-ticks line {
+  stroke: #333;
+}
+
+.nv-force-node {
+  stroke: #fff;
+  stroke-width: 1.5px;
+}
+
+.nv-force-link {
+  stroke: #999;
+  stroke-opacity: 0.6;
+}
+
+.nv-force-node text {
+  stroke-width: 0;
+}
+
+.nvd3 .nv-legend .nv-disabled rect {
+  /* fill-opacity: 0; */
+}
+
+.nvd3 .nv-check-box .nv-box {
+  fill-opacity: 0;
+  stroke-width: 2;
+}
+
+.nvd3 .nv-check-box .nv-check {
+  fill-opacity: 0;
+  stroke-width: 4;
+}
+
+.nvd3 .nv-series.nv-disabled .nv-check-box .nv-check {
+  fill-opacity: 0;
+  stroke-opacity: 0;
+}
+
+.nvd3 .nv-controlsWrap .nv-legend .nv-check-box .nv-check {
+  opacity: 0;
+}
+
+/* line plus bar */
+.nvd3.nv-linePlusBar .nv-bar rect {
+  fill-opacity: 0.75;
+}
+
+.nvd3.nv-linePlusBar .nv-bar rect:hover {
+  fill-opacity: 1;
+}
+
+.nvd3 .nv-groups path.nv-line {
+  fill: none;
+}
+
+.nvd3 .nv-groups path.nv-area {
+  stroke: none;
+}
+
+.nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point {
+  fill-opacity: 0;
+  stroke-opacity: 0;
+}
+
+.nvd3.nv-scatter.nv-single-point .nv-groups .nv-point {
+  fill-opacity: 0.5 !important;
+  stroke-opacity: 0.5 !important;
+}
+
+.with-transitions .nvd3 .nv-groups .nv-point {
+  transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
+}
+
+.nvd3.nv-scatter .nv-groups .nv-point.hover,
+.nvd3 .nv-groups .nv-point.hover {
+  stroke-width: 7px;
+  fill-opacity: 0.95 !important;
+  stroke-opacity: 0.95 !important;
+}
+
+.nvd3 .nv-point-paths path {
+  stroke: #aaa;
+  stroke-opacity: 0;
+  fill: #eee;
+  fill-opacity: 0;
+}
+
+.nvd3 .nv-indexLine {
+  cursor: ew-resize;
+}
+
+/********************
+ * SVG CSS
+ */
+
+/********************
+  Default CSS for an svg element nvd3 used
+*/
+svg.nvd3-svg, svg.nvd3-iddle {
+  -webkit-touch-callout: none;
+  user-select: none;
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+
+/********************
+  Box shadow and border radius styling
+*/
+.nvtooltip.with-3d-shadow,
+.with-3d-shadow .nvtooltip {
+  box-shadow: 0 5px 10px rgb(0 0 0 / 20%);
+  border-radius: 5px;
+}
+
+.nvd3 text {
+  font: normal 12px Arial;
+}
+
+.nvd3 .title {
+  font: bold 14px Arial;
+}
+
+.nvd3 .nv-background {
+  fill: white;
+  fill-opacity: 0;
+}
+
+.nvd3.nv-noData {
+  font-size: 18px;
+  font-weight: bold;
+}
+
+/**********
+*  Brush
+*/
+
+.nv-brush .extent {
+  fill-opacity: 0.125;
+  shape-rendering: crispedges;
+}
+
+.nv-brush .resize path {
+  fill: #eee;
+  stroke: #666;
+}
+
+/**********
+*  Legend
+*/
+
+.nvd3 .nv-legend .nv-series {
+  cursor: pointer;
+}
+
+.nvd3 .nv-legend .nv-disabled circle {
+  fill-opacity: 0;
+}
+
+/* focus */
+.nvd3 .nv-brush .extent {
+  fill-opacity: 0 !important;
+}
+
+.nvd3 .nv-brushBackground rect {
+  stroke: #000;
+  stroke-width: 0.4;
+  fill: #fff;
+  fill-opacity: 0.7;
+}
+
+/**********
+*  Print
+*/
+
+@media print {
+  .nvd3 text {
+    stroke-width: 0;
+    fill-opacity: 1;
+  }
+}
+
+.nvd3.nv-ohlcBar .nv-ticks .nv-tick {
+  stroke-width: 1px;
+}
+
+.nvd3.nv-ohlcBar .nv-ticks .nv-tick.hover {
+  stroke-width: 2px;
+}
+
+.nvd3.nv-ohlcBar .nv-ticks .nv-tick.positive {
+  stroke: #2ca02c;
+}
+
+.nvd3.nv-ohlcBar .nv-ticks .nv-tick.negative {
+  stroke: #d62728;
+}
+
+.nvd3 .background path {
+  fill: none;
+  stroke: #eee;
+  stroke-opacity: 0.4;
+  shape-rendering: crispedges;
+}
+
+.nvd3 .foreground path {
+  fill: none;
+  stroke-opacity: 0.7;
+}
+
+.nvd3 .nv-parallelCoordinates-brush .extent {
+  fill: #fff;
+  fill-opacity: 0.6;
+  stroke: gray;
+  shape-rendering: crispedges;
+}
+
+.nvd3 .nv-parallelCoordinates .hover {
+  fill-opacity: 1;
+  stroke-width: 3px;
+}
+
+.nvd3 .missingValuesline line {
+  fill: none;
+  stroke: black;
+  stroke-width: 1;
+  stroke-opacity: 1;
+  stroke-dasharray: 5, 5;
+}
+
+.nvd3.nv-pie path {
+  stroke-opacity: 0;
+  transition: fill-opacity 250ms linear, stroke-width 250ms linear,
+    stroke-opacity 250ms linear;
+}
+
+.nvd3.nv-pie .nv-pie-title {
+  font-size: 24px;
+  fill: rgb(19 196 249 / 59%);
+}
+
+.nvd3.nv-pie .nv-slice text {
+  stroke: #000;
+  stroke-width: 0;
+}
+
+.nvd3.nv-pie path {
+  stroke: #fff;
+  stroke-width: 1px;
+  stroke-opacity: 1;
+}
+
+.nvd3.nv-pie path {
+  fill-opacity: 0.7;
+}
+
+.nvd3.nv-pie .hover path {
+  fill-opacity: 1;
+}
+
+.nvd3.nv-pie .nv-label {
+  pointer-events: none;
+}
+
+.nvd3.nv-pie .nv-label rect {
+  fill-opacity: 0;
+  stroke-opacity: 0;
+}
+
+/* scatter */
+.nvd3 .nv-groups .nv-point.hover {
+  stroke-width: 20px;
+  stroke-opacity: 0.5;
+}
+
+.nvd3 .nv-scatter .nv-point.hover {
+  fill-opacity: 1;
+}
+
+.nv-noninteractive {
+  pointer-events: none;
+}
+
+.nv-distx,
+.nv-disty {
+  pointer-events: none;
+}
+
+/* sparkline */
+.nvd3.nv-sparkline path {
+  fill: none;
+}
+
+.nvd3.nv-sparklineplus g.nv-hoverValue {
+  pointer-events: none;
+}
+
+.nvd3.nv-sparklineplus .nv-hoverValue line {
+  stroke: #333;
+  stroke-width: 1.5px;
+}
+
+.nvd3.nv-sparklineplus,
+.nvd3.nv-sparklineplus g {
+  pointer-events: all;
+}
+
+.nvd3 .nv-hoverArea {
+  fill-opacity: 0;
+  stroke-opacity: 0;
+}
+
+.nvd3.nv-sparklineplus .nv-xValue,
+.nvd3.nv-sparklineplus .nv-yValue {
+  stroke-width: 0;
+  font-size: 0.9em;
+  font-weight: normal;
+}
+
+.nvd3.nv-sparklineplus .nv-yValue {
+  stroke: #f66;
+}
+
+.nvd3.nv-sparklineplus .nv-maxValue {
+  stroke: #2ca02c;
+  fill: #2ca02c;
+}
+
+.nvd3.nv-sparklineplus .nv-minValue {
+  stroke: #d62728;
+  fill: #d62728;
+}
+
+.nvd3.nv-sparklineplus .nv-currentValue {
+  font-weight: bold;
+  font-size: 1.1em;
+}
+
+/* stacked area */
+.nvd3.nv-stackedarea path.nv-area {
+  fill-opacity: 0.7;
+  stroke-opacity: 0;
+  transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
+}
+
+.nvd3.nv-stackedarea path.nv-area.hover {
+  fill-opacity: 0.9;
+}
+
+.nvd3.nv-stackedarea .nv-groups .nv-point {
+  stroke-opacity: 0;
+  fill-opacity: 0;
+}
+
+.nvtooltip {
+  position: absolute;
+  background-color: rgb(255 255 255 / 100%);
+  color: rgb(0 0 0 / 100%);
+  padding: 1px;
+  border: 1px solid rgb(0 0 0 / 20%);
+  z-index: 10000;
+  display: block;
+  font-family: Arial;
+  font-size: 13px;
+  text-align: left;
+  pointer-events: none;
+  white-space: nowrap;
+  -webkit-touch-callout: none;
+  user-select: none;
+}
+
+.nvtooltip {
+  background: rgb(255 255 255 / 80%);
+  border: 1px solid rgb(0 0 0 / 50%);
+  border-radius: 4px;
+}
+
+/* Give tooltips that old fade in transition by
+    putting a "with-transitions" class on the container div.
+*/
+.nvtooltip.with-transitions,
+.with-transitions .nvtooltip {
+  transition: opacity 50ms linear;
+  transition-delay: 200ms;
+}
+
+.nvtooltip.x-nvtooltip,
+.nvtooltip.y-nvtooltip {
+  padding: 8px;
+}
+
+.nvtooltip h3 {
+  margin: 0;
+  padding: 4px 14px;
+  line-height: 18px;
+  font-weight: normal;
+  background-color: rgb(247 247 247 / 75%);
+  color: rgb(0 0 0 / 100%);
+  text-align: center;
+  border-bottom: 1px solid #ebebeb;
+  border-radius: 5px 5px 0 0;
+}
+
+.nvtooltip p {
+  margin: 0;
+  padding: 5px 14px;
+  text-align: center;
+}
+
+.nvtooltip span {
+  display: inline-block;
+  margin: 2px 0;
+}
+
+.nvtooltip table {
+  margin: 6px;
+  border-spacing: 0;
+}
+
+.nvtooltip table td {
+  padding: 2px 9px 2px 0;
+  vertical-align: middle;
+}
+
+.nvtooltip table td.key {
+  font-weight: normal;
+}
+
+.nvtooltip table td.key.total {
+  font-weight: bold;
+}
+
+.nvtooltip table td.value {
+  text-align: right;
+  font-weight: bold;
+}
+
+.nvtooltip table td.percent {
+  color: darkgray;
+}
+
+.nvtooltip table tr.highlight td {
+  padding: 1px 9px 1px 0;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+  border-top-style: solid;
+  border-top-width: 1px;
+}
+
+.nvtooltip table td.legend-color-guide div {
+  width: 8px;
+  height: 8px;
+  vertical-align: middle;
+}
+
+.nvtooltip table td.legend-color-guide div {
+  width: 12px;
+  height: 12px;
+  border: 1px solid #999;
+}
+
+.nvtooltip .footer {
+  padding: 3px;
+  text-align: center;
+}
+
+.nvtooltip-pending-removal {
+  pointer-events: none;
+  display: none;
+}
+
+/****
+Interactive Layer
+*/
+.nvd3 .nv-interactiveGuideLine {
+  pointer-events: none;
+}
+
+.nvd3 line.nv-guideline {
+  stroke: #ccc;
+}
diff --git a/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/nvd3_override.scss b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/nvd3_override.scss
new file mode 100644
index 0000000000..72c3e2f99a
--- /dev/null
+++ b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/nvd3_override.scss
@@ -0,0 +1,13 @@
+.nvd3 {
+  .nv-axis {
+    .tick {
+      line {
+        opacity: 0;
+      }
+    }
+
+    path.domain {
+      opacity: 0;
+    }
+  }
+}
diff --git a/services/web/frontend/stylesheets/app/publisher-hub.less b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/publisher-hub.scss
similarity index 52%
rename from services/web/frontend/stylesheets/app/publisher-hub.less
rename to services/web/frontend/stylesheets/bootstrap-5/modules/metrics/publisher-hub.scss
index 8d7e5ea7eb..f59b33e6ef 100644
--- a/services/web/frontend/stylesheets/app/publisher-hub.less
+++ b/services/web/frontend/stylesheets/bootstrap-5/modules/metrics/publisher-hub.scss
@@ -2,48 +2,66 @@
   .recent-activity {
     .hub-big-number {
       text-align: right;
-      padding-right: 15px;
+      padding-right: var(--spacing-06);
     }
   }
 
   #templates-container {
     width: 100%;
+
     tr {
-      border: 1px solid @ol-blue-gray-0;
+      border: 1px solid var(--bg-light-secondary);
     }
+
     td {
-      padding: 15px;
+      padding: var(--spacing-06);
     }
+
     td:last-child {
       text-align: right;
     }
+
     .title-cell {
       max-width: 300px;
     }
+
     .title-text {
       font-weight: bold;
     }
+
     .hub-big-number {
       width: 60%;
-      padding-right: 10px;
-      padding-top: 10px;
+      padding-right: var(--spacing-04);
+      padding-top: var(--spacing-04);
       text-align: right;
     }
+
     .hub-number-label,
     .since {
       width: 35%;
       float: right;
-      @media screen and (max-width: 940px) {
+
+      @include media-breakpoint-down(md) {
         float: none;
       }
     }
+
     .hub-long-big-number {
-      padding-right: 40px;
+      padding-right: var(--spacing-10);
     }
+
     .created-on {
-      color: @gray-light;
+      @include body-sm;
+
+      color: var(--content-disabled);
       font-style: italic;
-      font-size: 14px;
     }
   }
+
+  .overbox {
+    margin: 0;
+    padding: var(--spacing-10) var(--spacing-07);
+    background: var(--white);
+    border: 1px solid var(--content-disabled);
+  }
 }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/admin/admin.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/admin/admin.scss
index e2c807e928..a4bfa532e3 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/admin/admin.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/admin/admin.scss
@@ -91,3 +91,8 @@
     color: var(--yellow-50);
   }
 }
+
+.admin-page summary {
+  // firefox does not show markers for block items
+  display: list-item;
+}
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/all.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/all.scss
index a3adc98819..1efb360402 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/all.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/all.scss
@@ -37,6 +37,7 @@
 @import 'editor/math-preview';
 @import 'editor/references-search';
 @import 'editor/editor-survey';
+@import 'error-pages';
 @import 'website-redesign';
 @import 'group-settings';
 @import 'templates-v2';
@@ -52,3 +53,5 @@
 @import 'admin/admin';
 @import 'admin/project-url-lookup';
 @import 'add-secondary-email-prompt';
+@import 'try-premium';
+@import 'bonus';
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/auth.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/auth.scss
index cd23cadcee..9432892c1b 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/auth.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/auth.scss
@@ -35,6 +35,33 @@
   padding-bottom: var(--spacing-09);
 }
 
+.login-register-container {
+  max-width: 400px;
+  margin: 0 auto;
+  padding-bottom: 125px;
+}
+
+.login-register-error-container {
+  padding-bottom: var(--spacing-05);
+  text-align: left;
+}
+
+.login-register-card {
+  padding-top: 0;
+  padding-bottom: 0;
+  text-align: center;
+}
+
+.login-register-header {
+  padding-bottom: var(--spacing-07);
+  border-bottom: solid 1px var(--border-divider);
+}
+
+.login-register-header-heading {
+  margin: 0;
+  color: var(--content-secondary);
+}
+
 .login-register-hr-text-container {
   line-height: 1;
   position: relative;
@@ -58,6 +85,19 @@
   padding: 0 var(--spacing-05);
 }
 
+.login-register-text,
+.login-register-hr-text-container {
+  margin: 0;
+}
+
+.login-register-text {
+  padding-bottom: var(--spacing-08);
+
+  &:last-child {
+    padding-bottom: 0;
+  }
+}
+
 .sso-auth-login-container {
   max-width: 400px;
   margin: 0 auto;
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/bonus.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/bonus.scss
new file mode 100644
index 0000000000..2e6830bc8b
--- /dev/null
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/bonus.scss
@@ -0,0 +1,62 @@
+#bonus {
+  margin-top: var(--spacing-06);
+
+  p.thanks {
+    margin-top: var(--spacing-04);
+    text-align: center;
+  }
+
+  .number {
+    position: absolute;
+    margin-left: -13px;
+    width: 26px;
+    padding: var(--spacing-01) 0;
+    text-align: center;
+    background-color: #ddd;
+
+    &.active {
+      background-color: var(--bg-info-01);
+      color: var(--content-primary-dark);
+    }
+
+    border-radius: 3px;
+  }
+
+  .progress {
+    margin-top: var(--spacing-05);
+    margin-left: calc(var(--spacing-06) * -1);
+    margin-right: calc(var(--spacing-06) * -1);
+    height: 30px;
+  }
+
+  .perk {
+    position: absolute;
+    background-color: var(--bg-light-tertiary);
+    border-radius: var(--border-radius-base);
+    text-align: center;
+    padding: var(--spacing-02);
+    min-width: min-content;
+    width: 110px;
+    margin-left: calc(var(--spacing-11) * -1);
+    font-size: 14px;
+
+    &::before {
+      border-bottom: var(--spacing-04) solid var(--bg-light-tertiary);
+      border-left: var(--spacing-04) solid transparent;
+      border-right: var(--spacing-04) solid transparent;
+      content: '';
+      position: absolute;
+      left: var(--spacing-10);
+      top: calc(var(--spacing-04) * -1);
+    }
+
+    &.active {
+      color: white;
+      background-color: var(--bg-info-01);
+
+      &::before {
+        border-bottom: var(--spacing-04) solid var(--border-active);
+      }
+    }
+  }
+}
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/history.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/history.scss
index 1caeb22c1d..db59639cd1 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/history.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/history.scss
@@ -1,13 +1,104 @@
 :root {
+  --history-react-icon-color: var(--content-disabled);
   --history-react-header-bg: var(--bg-dark-secondary);
   --history-react-header-color: var(--content-primary-dark);
   --history-react-separator-color: var(--border-divider-dark);
+  --history-change-list-bg: var(--bg-light-primary);
+  --history-change-entry-color: var(--content-primary);
+  --history-change-entry-metadata-color: var(--content-secondary);
+  --history-change-list-divider: var(--border-divider);
+  --history-change-entry-hover-bg: var(--bg-light-secondary);
+  --history-loading-bg: var(--bg-light-secondary);
+  --history-change-entry-dropdown-button-bg: rgb(var(--bg-dark-primary) 0.08);
+  --history-change-entry-border-color: var(--green-50);
+  --history-change-entry-within-selected-bg: var(--bg-light-secondary);
+  --history-change-entry-within-selected-hover-bg: rgb($neutral-90, 8%);
+  --history-change-list-gradient: linear-gradient(black 35%, transparent);
+  --history-change-entry-selected-bg: var(--bg-accent-03);
+  --history-change-entry-selected-hover-bg: rgb($green-70, 16%);
 }
 
 @include theme('light') {
   --history-react-header-bg: var(--bg-light-primary);
   --history-react-header-color: var(--content-primary);
   --history-react-separator-color: var(--border-divider);
+
+  .ide-redesign-main {
+    --history-change-entry-within-selected-bg: var(--bg-light-secondary);
+    --history-change-entry-within-selected-hover-bg: rgb(var(--neutral-90) 8%);
+    --history-change-entry-selected-bg: var(--bg-accent-03);
+    --history-change-entry-selected-hover-bg: rgb(var(--green-70 0.16));
+  }
+}
+
+.ide-redesign-main {
+  --history-react-header-bg: var(--bg-primary-themed);
+  --history-react-header-color: var(--content-primary-themed);
+  --history-react-icon-color: var(--file-tree-item-color);
+  --history-loading-bg: var(--bg-secondary-themed);
+  --history-change-list-gradient: linear-gradient(black 35%, transparent);
+  --history-change-list-bg: var(--bg-primary-themed);
+  --history-change-list-divider: var(--border-divider-themed);
+  --history-change-entry-metadata-color: var(--content-secondary-themed);
+  --history-change-entry-color: var(--content-primary-themed);
+  --history-change-entry-hover-bg: var(--bg-secondary-themed);
+  --history-change-entry-border-color: var(--green-50);
+  --history-change-entry-dropdown-button-bg: rgb(var(--bg-dark-primary) 0.08);
+
+  // Dark mode specific variables
+  --history-change-entry-within-selected-bg: var(--neutral-80);
+  --history-change-entry-within-selected-hover-bg: rgb(var(--white) 0.08);
+  --history-change-entry-selected-bg: var(--green-70);
+  --history-change-entry-selected-hover-bg: rgb(var(--green-60) 0.08);
+
+  .history-file-tree {
+    ul.history-file-tree-list {
+      padding: var(--spacing-02);
+
+      .history-file-tree-item > ul,
+      ul[role='tree'] {
+        border-left: 1px solid
+          color-mix(in srgb, var(--border-primary-themed) 24%, transparent);
+        margin-left: 14px !important;
+        margin-top: 0;
+      }
+
+      li {
+        padding: var(--spacing-02);
+        padding-right: 0;
+        margin-left: 0;
+      }
+
+      .history-file-tree-item {
+        border-radius: var(--border-radius-base);
+
+        .history-file-tree-item-name-wrapper {
+          .history-file-tree-item-badge {
+            margin-right: var(--spacing-02);
+          }
+        }
+
+        &::before {
+          display: none;
+        }
+
+        .material-symbols {
+          &.file-tree-expand-icon {
+            margin-left: 0;
+            vertical-align: middle;
+          }
+
+          &.file-tree-icon {
+            margin-left: 0;
+          }
+        }
+      }
+    }
+  }
+
+  ul[role='tree'].history-file-tree-list-inner {
+    padding-left: 10px;
+  }
 }
 
 history-root {
@@ -27,7 +118,7 @@ history-root {
   display: flex;
   justify-content: center;
   height: 100%;
-  background-color: var(--bg-light-primary);
+  background-color: var(--history-change-list-bg);
 
   .history-header {
     @include body-sm;
@@ -107,7 +198,7 @@ history-root {
   }
 
   .history-version-day {
-    background-color: white;
+    background-color: var(--history-change-list-bg);
     position: sticky;
     z-index: 1;
     top: 0;
@@ -127,51 +218,56 @@ history-root {
       cursor: pointer;
 
       &:hover {
-        background-color: var(--bg-light-secondary);
+        background-color: var(--history-change-entry-hover-bg);
       }
     }
 
     &.history-version-selected {
-      background-color: var(--bg-accent-03);
-      border-left: var(--spacing-02) solid var(--green-50);
+      background-color: var(--history-change-entry-selected-bg);
+      border-left: var(--spacing-02) solid
+        var(--history-change-entry-border-color);
       padding-left: calc(
         var(--history-change-list-padding) - var(--spacing-02)
       );
     }
 
     &.history-version-selected.history-version-selectable:hover {
-      background-color: rgb($green-70, 16%);
-      border-left: var(--spacing-02) solid var(--green-50);
+      background-color: var(--history-change-entry-selected-hover-bg);
+      border-left: var(--spacing-02) solid
+        var(--history-change-entry-border-color);
     }
 
     &.history-version-within-selected {
-      background-color: var(--bg-light-secondary);
-      border-left: var(--spacing-02) solid var(--green-50);
+      background-color: var(--history-change-entry-within-selected-bg);
+      border-left: var(--spacing-02) solid
+        var(--history-change-entry-border-color);
     }
 
     &.history-version-within-selected:hover {
-      background-color: rgb($neutral-90, 8%);
+      background-color: var(--history-change-entry-within-selected-hover-bg);
     }
   }
 
   .history-version-main-details {
-    color: var(--content-primary);
+    color: var(--history-change-entry-color);
   }
 
   .version-element-within-selected {
-    background-color: var(--bg-light-secondary);
-    border-left: var(--spacing-02) solid var(--green-50);
+    background-color: var(--history-change-entry-within-selected-bg);
+    border-left: var(--spacing-02) solid
+      var(--history-change-entry-border-color);
   }
 
   .version-element-selected {
-    background-color: var(--bg-accent-03);
-    border-left: var(--spacing-02) solid var(--green-50);
+    background-color: var(--history-change-entry-selected-bg);
+    border-left: var(--spacing-02) solid
+      var(--history-change-entry-border-color);
   }
 
   .history-version-metadata-time {
     display: block;
     margin-bottom: var(--spacing-02);
-    color: var(--content-primary);
+    color: var(--history-change-entry-color);
 
     &:last-child {
       margin-bottom: initial;
@@ -226,7 +322,7 @@ history-root {
   .history-version-metadata-users,
   .history-version-origin,
   .history-version-saved-by {
-    color: var(--content-secondary);
+    color: var(--history-change-entry-metadata-color);
   }
 
   .history-version-change-action {
@@ -234,7 +330,7 @@ history-root {
   }
 
   .history-version-change-doc {
-    color: var(--content-primary);
+    color: var(--history-change-entry-color);
     overflow-wrap: anywhere;
     white-space: pre-wrap;
   }
@@ -245,7 +341,7 @@ history-root {
 
   .history-version-divider {
     margin: 0;
-    border-color: var(--border-divider);
+    border-color: var(--history-change-list-divider);
   }
 
   .history-version-badge {
@@ -276,7 +372,7 @@ history-root {
     position: sticky;
     bottom: 0;
     padding: var(--spacing-05) 0;
-    background-color: var(--bg-light-secondary);
+    background-color: var(--history-loading-bg);
     text-align: center;
   }
 
@@ -288,7 +384,7 @@ history-root {
 
   .dropdown.open {
     .history-version-dropdown-menu-btn {
-      background-color: rgb(var(--bg-dark-primary) 0.08);
+      background-color: var(--history-change-entry-dropdown-button-bg);
       box-shadow: initial;
     }
   }
@@ -298,6 +394,7 @@ history-root {
     @include reset-button;
     @include action-button;
 
+    color: var(--history-change-entry-color);
     padding: 0;
     width: 30px;
     height: 30px;
@@ -344,7 +441,7 @@ history-root {
   .history-version-faded .history-version-details {
     max-height: 6em;
 
-    @include mask-image(linear-gradient(black 35%, transparent));
+    @include mask-image(var(--history-change-list-gradient));
 
     overflow: hidden;
   }
@@ -414,7 +511,7 @@ history-root {
 }
 
 .history-dropdown-icon {
-  color: var(--content-primary);
+  color: var(--history-change-entry-color);
 }
 
 .history-dropdown-icon-inverted {
@@ -510,7 +607,7 @@ history-root {
       }
 
       .material-symbols {
-        color: var(--content-disabled);
+        color: var(--history-react-icon-color);
 
         &.file-tree-icon {
           margin-right: var(--spacing-02);
@@ -549,3 +646,7 @@ history-root {
 .history-error {
   padding: var(--spacing-06);
 }
+
+.doc-container {
+  background: var(--bg-light-primary);
+}
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/ide.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/ide.scss
index 7512424a4a..8fe5ced008 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/ide.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/ide.scss
@@ -61,6 +61,25 @@ $editor-toggler-bg-dark-color: color.adjust(
       display: none !important;
     }
   }
+
+  .synctex-controls {
+    background-color: var(--bg-primary-themed);
+    border-radius: var(--border-radius-full);
+    border: 1px solid var(--border-divider-themed);
+    top: 96px;
+  }
+
+  .synctex-control:not(.detach-synctex-control) {
+    margin-bottom: 0;
+    background-color: transparent;
+    color: var(--content-primary-themed);
+
+    &:hover,
+    &:active,
+    &:focus {
+      background-color: var(--bg-tertiary-themed);
+    }
+  }
 }
 
 .global-alerts {
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss
index 4e517f9818..912a8b86e5 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss
@@ -2,15 +2,191 @@
   --logs-pane-bg: var(--bg-dark-secondary);
 }
 
-.ide-redesign-main {
-  --logs-pane-bg: var(--bg-dark-primary);
-}
-
 @include theme('light') {
   --logs-pane-bg: var(--bg-light-secondary);
+}
 
-  .ide-redesign-main {
-    --logs-pane-bg: #fff;
+.ide-redesign-main {
+  --logs-pane-bg: var(--bg-primary-themed);
+
+  .error-logs-panel {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+
+  // TODO $ide-redesign-cleanup: Unnest everything from inside .error-logs
+  //  when we remove the styles for the old pane
+  .error-logs {
+    --logs-pane-bg: var(--bg-secondary-themed);
+
+    overflow-y: auto;
+    background-color: var(--logs-pane-bg);
+    flex: 1;
+
+    .logs-pane-content {
+      display: flex;
+      flex-direction: column;
+      padding: var(--spacing-02);
+      gap: var(--spacing-02);
+    }
+
+    .icon-button,
+    .icon-button-small {
+      @include ol-button-variant(
+        var(--content-secondary-themed),
+        transparent,
+        transparent,
+        var(--bg-secondary-themed),
+        transparent,
+        true
+      );
+    }
+
+    .log-entry-content {
+      --bs-code-color: var(--content-secondary-themed);
+
+      color: var(--content-primary-themed);
+      background-color: var(--bg-primary-themed);
+      padding: 0;
+    }
+
+    .log-entry-content-raw {
+      color: var(--content-primary-themed);
+      background-color: var(--bg-secondary-themed);
+    }
+
+    .log-entry-content-raw-container {
+      background-color: var(--bg-secondary-themed);
+    }
+
+    .log-entry {
+      background-color: var(--bg-primary-themed);
+      width: 100%;
+      border-radius: var(--border-radius-base);
+      padding: var(--spacing-04);
+
+      .horizontal-divider {
+        margin: var(--spacing-04) 0;
+        border-top: 1px solid var(--border-divider-themed);
+      }
+    }
+
+    .log-entry-header-card {
+      background-color: var(--bg-primary-themed);
+      width: 100%;
+      display: flex;
+      align-items: center;
+      border: none;
+    }
+
+    .log-entry-header-button {
+      all: unset;
+      display: flex;
+      gap: var(--spacing-03);
+      align-items: center;
+      flex: 1;
+      border-radius: var(--border-radius-base);
+      padding: var(--spacing-02) var(--spacing-03) var(--spacing-02) 0;
+
+      &:hover {
+        cursor: pointer;
+      }
+
+      &:hover,
+      :focus,
+      :active {
+        background-color: var(--bg-secondary-themed);
+      }
+    }
+
+    .log-entry-header-content {
+      display: flex;
+      flex-direction: column;
+      text-align: left;
+      gap: var(--spacing-02);
+      flex: 1;
+      overflow: hidden;
+      font-weight: normal;
+    }
+
+    .log-entry-header-text {
+      font-weight: 600;
+      font-size: var(--font-size-02);
+      line-height: var(--line-height-02);
+      margin-bottom: 0;
+    }
+
+    .log-entry-header-text-error {
+      color: var(--content-danger-themed);
+    }
+
+    .log-entry-header-text-warning {
+      color: var(--content-warning-themed);
+    }
+
+    .log-entry-header-text-info {
+      color: var(--content-info-themed);
+    }
+
+    .log-entry-header-text-success {
+      color: var(--content-positive-themed);
+    }
+
+    .log-entry-header-text-raw {
+      color: var(--content-primary-themed);
+    }
+
+    .log-entry-location {
+      white-space: nowrap;
+      direction: rtl;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      font-size: var(--font-size-01);
+      line-height: var(--line-height-01);
+      color: var(--content-secondary-themed);
+    }
+
+    .log-entry-header-actions {
+      display: flex;
+      gap: var(--spacing-03);
+    }
+
+    .log-entry-content-button-container {
+      background-image: linear-gradient(
+        0deg,
+        var(--bg-secondary-themed) 0%,
+        transparent 100%
+      );
+    }
+  }
+
+  .error-logs-tabs {
+    display: flex;
+  }
+
+  .error-logs-tab-header {
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-04);
+    color: var(--content-secondary-themed);
+    padding: var(--spacing-03) var(--spacing-04);
+    font-size: var(--font-size-02);
+    border-bottom: 3px solid transparent;
+
+    &[aria-selected='true'] {
+      color: var(--content-primary-themed);
+      border-bottom: 3px solid var(--bg-accent-01);
+    }
+  }
+
+  .error-logs-tab-count {
+    background-color: var(--bg-secondary-themed);
+    border-radius: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 var(--spacing-02);
   }
 }
 
@@ -148,53 +324,53 @@
     text-overflow: ellipsis;
     overflow: hidden;
   }
+}
 
-  .log-entry-content {
-    &:empty {
-      display: none;
-    }
-
-    background-color: var(--bg-light-primary);
-    color: var(--content-primary);
-    padding: var(--spacing-04);
+.log-entry-content {
+  &:empty {
+    display: none;
   }
 
-  .log-entry-content-raw {
-    @include body-xs;
+  background-color: var(--bg-light-primary);
+  color: var(--content-primary);
+  padding: var(--spacing-04);
+}
 
-    color: var(--content-secondary);
-    padding: var(--spacing-03);
-    margin: 0;
-    white-space: pre-wrap;
-  }
+.log-entry-content-raw {
+  @include body-xs;
 
-  .log-entry-content-button-container {
-    position: relative;
-    height: 40px;
-    margin-top: 0;
-    transition:
-      margin 0.15s ease-in-out,
-      opacity 0.15s ease-in-out;
-    padding-bottom: var(--spacing-04);
-    text-align: center;
-    background-image: linear-gradient(
-      0deg,
-      var(--bg-light-tertiary) 0%,
-      transparent 100%
-    );
-    border-radius: 0 0 var(--border-radius-base) var(--border-radius-base);
-  }
+  color: var(--content-secondary);
+  padding: var(--spacing-03);
+  margin: 0;
+  white-space: pre-wrap;
+}
 
-  .log-entry-content-button-container-collapsed {
-    margin-top: -40px;
-  }
+.log-entry-content-button-container {
+  position: relative;
+  height: 40px;
+  margin-top: 0;
+  transition:
+    margin 0.15s ease-in-out,
+    opacity 0.15s ease-in-out;
+  padding-bottom: var(--spacing-04);
+  text-align: center;
+  background-image: linear-gradient(
+    0deg,
+    var(--bg-light-tertiary) 0%,
+    transparent 100%
+  );
+  border-radius: 0 0 var(--border-radius-base) var(--border-radius-base);
+}
 
-  .log-entry-content-raw-container {
-    background-color: var(--bg-light-tertiary);
-    border-radius: var(--border-radius-base);
-    overflow: hidden;
-    margin-top: var(--spacing-03);
-  }
+.log-entry-content-button-container-collapsed {
+  margin-top: -40px;
+}
+
+.log-entry-content-raw-container {
+  background-color: var(--bg-light-tertiary);
+  border-radius: var(--border-radius-base);
+  overflow: hidden;
+  margin-top: var(--spacing-03);
 }
 
 .log-entry-formatted-content,
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/pdf-error-state.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/pdf-error-state.scss
index c1da6ab431..aee036f775 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/pdf-error-state.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/pdf-error-state.scss
@@ -33,9 +33,7 @@
   padding: 0 var(--spacing-09) var(--spacing-09) var(--spacing-09);
 }
 
-.pdf-error-state-warning-icon {
-  background-color: var(--bg-danger-03);
-  color: var(--content-danger);
+.pdf-error-state-icon {
   width: 80px;
   height: 80px;
   display: flex;
@@ -43,6 +41,15 @@
   justify-content: center;
   border-radius: 100%;
 
+  .material-symbols {
+    font-size: 80px;
+  }
+}
+
+.pdf-error-state-warning-icon {
+  background-color: var(--bg-danger-03);
+  color: var(--content-danger);
+
   .material-symbols {
     font-size: 32px;
   }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/pdf.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/pdf.scss
index 31000b0478..4c59352df3 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/pdf.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/pdf.scss
@@ -44,6 +44,30 @@
       padding: var(--spacing-01);
     }
   }
+
+  .pdf-code-check-failed-banner-container {
+    position: absolute;
+    top: calc(var(--toolbar-small-height) + var(--spacing-04));
+    left: 0;
+    right: 0;
+    z-index: 1;
+    display: flex;
+    justify-content: center;
+    padding: 0 var(--spacing-06);
+  }
+
+  .pdf-code-check-failed-banner {
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-02);
+    background-color: var(--bg-light-primary);
+    color: var(--content-primary);
+    border: 1px solid var(--border-divider);
+    padding: var(--spacing-02) var(--spacing-03) var(--spacing-02)
+      var(--spacing-02);
+    border-radius: var(--border-radius-full);
+    box-shadow: 0 2px 4px 0 #1e253029;
+  }
 }
 
 .pdf .toolbar.toolbar-pdf {
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/rail.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/rail.scss
index 2e6f3035f8..bc8e42daaa 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/rail.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/rail.scss
@@ -35,6 +35,12 @@ body {
   }
 }
 
+.rail-panel-header-actions {
+  display: flex;
+  align-items: center;
+  gap: var(--spacing-01);
+}
+
 .rail-panel-title {
   font-size: var(--font-size-02);
   color: var(--ide-rail-color);
@@ -127,12 +133,12 @@ body {
   .tab-pane {
     height: 100%;
   }
+}
 
-  .tab-content {
-    height: 100%;
-    width: 100%;
-    position: relative;
-  }
+.ide-rail-tab-content {
+  height: 100%;
+  width: 100%;
+  position: relative;
 }
 
 .ide-rail-tabs-nav {
@@ -150,3 +156,13 @@ body {
     display: none;
   }
 }
+
+.new-error-logs-promo {
+  display: flex;
+  gap: var(--spacing-04);
+  font-weight: bold;
+  font-size: var(--font-size-02);
+  line-height: var(--line-height-02);
+  background-color: black;
+  border-radius: var(--border-radius-base);
+}
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/error-pages.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/error-pages.scss
new file mode 100644
index 0000000000..ac21364f9d
--- /dev/null
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/error-pages.scss
@@ -0,0 +1,56 @@
+.error-container {
+  display: flex;
+  align-items: center;
+
+  &.full-height {
+    margin-top: calc(-1 * ($header-height + var(--spacing-08)) / 2);
+  }
+
+  .error-details {
+    flex: 1 1 50%;
+    padding: var(--spacing-08);
+    max-width: 90%;
+
+    @include media-breakpoint-up(sm) {
+      padding: var(--spacing-11);
+    }
+  }
+
+  .error-status {
+    @include heading-lg;
+
+    margin-bottom: var(--spacing-08);
+    color: var(--content-secondary);
+  }
+
+  .error-description {
+    @include heading-sm;
+
+    color: var(--content-disabled-dark);
+    margin-bottom: var(--spacing-08);
+  }
+
+  .error-box {
+    background-color: var(--bg-light-tertiary);
+    padding: var(--spacing-04);
+    font-family: $font-family-monospace;
+    margin-bottom: var(--spacing-08);
+  }
+
+  .error-actions {
+    margin-top: var(--spacing-11);
+    display: flex;
+    gap: var(--spacing-06);
+  }
+
+  .error-btn {
+    @extend .btn;
+    @extend .btn-primary;
+
+    display: block;
+
+    @include media-breakpoint-up(sm) {
+      display: inline-block;
+    }
+  }
+}
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/homepage.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/homepage.scss
index f6b30f143f..3f3ec3d900 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/homepage.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/homepage.scss
@@ -284,7 +284,7 @@
       margin-top: var(--spacing-06);
       margin-bottom: var(--spacing-04);
 
-      i.material-symbols {
+      .material-symbols {
         vertical-align: middle;
         text-decoration: none;
       }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/login-register.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/login-register.scss
index 25d3a42c4f..77771806a3 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/login-register.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/login-register.scss
@@ -22,9 +22,13 @@
   }
 }
 
-.login-register-error-container {
-  padding-bottom: var(--spacing-05);
-  text-align: left;
+.login-register-form {
+  padding: var(--spacing-08) var(--spacing-08) 0 var(--spacing-08);
+  border-bottom: solid 1px var(--border-divider);
+
+  &:last-child {
+    border-bottom-width: 0;
+  }
 }
 
 .form-group-password {
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss
index 84c72c7208..65b1e8b12c 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss
@@ -767,6 +767,247 @@ $z-index-group-member-picker-list: 1;
     border-left: var(--border-width-base) solid var(--green-50);
   }
 
+  .ai-assist {
+    color: var(--neutral-90);
+
+    @include media-breakpoint-up(lg) {
+      padding-left: 0 !important;
+      padding-right: 0 !important;
+    }
+
+    .ai-assist-heading {
+      margin-top: var(--spacing-12);
+      margin-bottom: var(--spacing-12);
+      text-align: center;
+    }
+
+    .ai-assist-container {
+      padding: var(--spacing-10);
+      border: var(--spacing-02) solid var(--neutral-10);
+      border-radius: var(--border-radius-large-new);
+      background:
+        linear-gradient(270deg, var(--blue-10), #fff) 0.13%,
+        #fff 63.21%;
+
+      @include media-breakpoint-down(lg) {
+        background: var(--bg-light-primary);
+        border-width: 2px;
+        border-radius: var(--border-radius-medium);
+        border-color: var(--premium-gradient);
+        padding: var(--spacing-09);
+      }
+
+      .ai-assist-content {
+        display: flex;
+        justify-content: space-between;
+        gap: var(--spacing-07);
+
+        @include media-breakpoint-down(lg) {
+          flex-direction: column;
+        }
+
+        .ai-assist-left {
+          display: flex;
+          gap: var(--spacing-07);
+          flex-direction: column;
+          max-width: 480px;
+
+          @include media-breakpoint-down(lg) {
+            max-width: 100%;
+          }
+
+          .ai-assist-price {
+            font-weight: 600;
+            font-size: var(--font-size-03);
+
+            @include media-breakpoint-down(lg) {
+              font-weight: normal;
+              font-size: var(--font-size-02);
+
+              .price {
+                font-size: var(--font-size-08);
+                font-weight: 600;
+              }
+            }
+          }
+
+          .ai-assist-annually-price {
+            display: block;
+          }
+
+          .ai-assist-monthly-price {
+            display: none;
+          }
+
+          .ai-assist-header-switch {
+            display: none;
+          }
+
+          .ai-assist-header {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .ai-assist-header-content {
+              display: flex;
+              gap: var(--spacing-06);
+              align-items: center;
+
+              h3 {
+                font-size: var(--font-size-07);
+                margin: 0;
+                padding: 0;
+
+                @include media-breakpoint-down(lg) {
+                  font-size: var(--font-size-05);
+                }
+              }
+
+              img {
+                @include media-breakpoint-down(lg) {
+                  width: 24px;
+                }
+              }
+            }
+
+            .ai-assist-header-switch {
+              align-items: center;
+              gap: var(--spacing-03);
+              user-select: none;
+
+              input {
+                margin: 0;
+              }
+
+              label {
+                margin: 0;
+                font-weight: normal;
+                font-size: var(--font-size-03);
+              }
+            }
+          }
+        }
+
+        .ai-assist-right {
+          display: flex;
+          align-items: center;
+          gap: var(--spacing-06);
+
+          .ai-assist-features {
+            list-style: none;
+            display: flex;
+            flex-direction: column;
+            gap: var(--spacing-04);
+            min-width: 210px;
+            margin-bottom: 0;
+
+            .feature-item {
+              display: flex;
+              align-items: center;
+              font-size: var(--font-size-03);
+              cursor: default;
+
+              .feature-icon {
+                margin-right: var(--spacing-05);
+                color: var(--neutral-70);
+                width: 16px;
+                height: 16px;
+              }
+
+              .feature-text {
+                color: var(--neutral-90);
+              }
+            }
+
+            @include media-breakpoint-up(lg) {
+              .feature-item-selected {
+                .feature-text {
+                  color: var(--blue-50);
+                  font-weight: 600;
+                }
+
+                .feature-icon {
+                  content: url(../../../../public/img/check-circle-blue-filled.svg);
+                }
+              }
+            }
+          }
+
+          .ai-assist-images {
+            display: flex;
+            align-items: flex-start;
+            width: 280px;
+            justify-content: center;
+
+            @include media-breakpoint-down(lg) {
+              display: none;
+            }
+          }
+        }
+      }
+    }
+
+    .ai-assist-header-switch {
+      display: flex !important;
+    }
+
+    .ai-assist-button-container {
+      display: flex;
+      gap: var(--spacing-05);
+
+      &.mobile {
+        display: none;
+        margin-top: var(--spacing-06);
+        flex-direction: column;
+      }
+
+      @include media-breakpoint-down(lg) {
+        &.mobile {
+          display: flex;
+        }
+
+        &.desktop {
+          display: none;
+        }
+      }
+
+      .btn.monthly {
+        display: none;
+      }
+    }
+
+    .overleaf-assist-screenshot {
+      height: auto;
+      max-width: 280px;
+      max-height: 200px;
+      border-radius: var(--border-radius-base-new);
+      display: none;
+
+      &.selected {
+        display: block;
+        animation: fade-in 1s;
+      }
+    }
+  }
+
+  .ai-assist.monthly-period {
+    .ai-assist-annually-price {
+      display: none !important;
+    }
+
+    .ai-assist-monthly-price {
+      display: block !important;
+    }
+
+    .ai-assist-button-container .btn.annual {
+      display: none !important;
+    }
+
+    .ai-assist-button-container .btn.monthly {
+      display: block !important;
+    }
+  }
+
   .plans-new-organizations {
     padding: var(--spacing-13) var(--spacing-08);
 
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/project-list.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/project-list.scss
index 83b6fbd28a..1bf487eeca 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/project-list.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/project-list.scss
@@ -85,7 +85,7 @@
       }
 
       &:hover {
-        background-color: $bg-light-secondary;
+        background-color: var(--bg-light-secondary);
       }
 
       .welcome-message-card-img {
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss
index a829bb80d5..3722922fb0 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss
@@ -23,6 +23,37 @@
 .gallery {
   padding-top: calc($header-height + var(--spacing-10)) !important;
 
+  .gallery-search-form-control {
+    padding-top: 0px;
+    padding-bottom: 0px;
+  }
+   
+
+  .gallery-header-sort-btn {
+    font-size: var(--font-size-02);
+    border: 0;
+    text-align: left;
+    color: var(--neutral-90);
+    background-color: transparent;
+    padding: 0;
+    font-weight: bold;
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    text-decoration: none;
+
+    &:hover {
+      color: var(--neutral-90);
+      text-decoration: underline;
+    }
+
+    .material-symbols {
+      vertical-align: top;
+      font-size: var(--font-size-05);
+    }
+  }
+
+
   .gallery-tagged-tags-container-spacing {
     padding: 0 var(--spacing-09);
     margin-bottom: var(--spacing-16);
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/try-premium.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/try-premium.scss
new file mode 100644
index 0000000000..339fb364bd
--- /dev/null
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/try-premium.scss
@@ -0,0 +1,42 @@
+.try-premium-page {
+  .try-premium-logo-container {
+    padding: 0 var(--spacing-08);
+    display: flex;
+    justify-content: space-evenly;
+  }
+
+  .try-premium-third-party-logo {
+    width: 36px;
+    height: 36px;
+  }
+
+  .try-premium-page-list-wrapper {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding-bottom: var(--spacing-06);
+  }
+
+  .try-premium-page-list {
+    padding-inline-start: 0;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+
+    @include media-breakpoint-up(sm) {
+      flex-direction: row;
+      justify-content: space-between;
+      width: 100%;
+      max-width: 500px;
+    }
+
+    ul {
+      margin-bottom: 0;
+      width: 300px;
+
+      @include media-breakpoint-up(sm) {
+        width: unset;
+      }
+    }
+  }
+}
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/website-redesign.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/website-redesign.scss
index 2e069d0599..8164f1eedd 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/website-redesign.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/website-redesign.scss
@@ -58,7 +58,7 @@
       @include box-shadow-button-input;
     }
 
-    i {
+    .material-symbols {
       vertical-align: middle;
       margin-left: var(--spacing-02);
       padding-bottom: 3px;
@@ -258,6 +258,7 @@
   .round-background {
     border-radius: 50%;
     vertical-align: middle;
+    margin-right: var(--spacing-04);
     width: 20px;
     height: 20px;
   }
@@ -292,11 +293,11 @@
     .resources-card {
       display: flex;
       flex-flow: column wrap;
-      margin-bottom: 48px;
+      margin-bottom: var(--spacing-11);
       align-content: flex-start;
 
       @include media-breakpoint-down(lg) {
-        margin-bottom: 16px;
+        margin-bottom: var(--spacing-06);
       }
 
       img {
@@ -377,7 +378,109 @@
           }
         }
 
-        i.material-symbols {
+        .material-symbols {
+          color: var(--sapphire-blue);
+        }
+      }
+    }
+  }
+
+  .inline-green-link {
+    color: var(--green-50);
+    padding: 0;
+    text-decoration: underline;
+
+    // text-decoration-skip-ink is for letters with descenders (like 'g' and 'y')
+    // this will force underline to not skip the descender
+    text-decoration-skip-ink: none;
+
+    &:hover {
+      color: var(--green-60);
+    }
+
+    // TODO: this is copied directly from the `.less` file, migrate this to scss
+    // &:focus {
+    //   @extend .input-focus-style;
+    // }
+  }
+
+  .customer-story-card-title {
+    @include heading-md;
+
+    margin-top: var(--spacing-08);
+    margin-bottom: var(--spacing-05);
+  }
+
+  .plans-bottom-text {
+    font-size: var(--font-size-04);
+  }
+
+  .plans-cards {
+    @include media-breakpoint-up(lg) {
+      display: flex;
+    }
+
+    .plans-card-container {
+      min-height: 348px;
+      padding-left: var(--spacing-05);
+      padding-right: var(--spacing-05);
+
+      @include media-breakpoint-down(lg) {
+        margin-bottom: var(--spacing-06);
+        min-height: unset;
+      }
+    }
+
+    .plans-card {
+      border-radius: 8px;
+      padding: 0;
+      height: 100%;
+
+      .plans-card-inner {
+        padding: var(--spacing-09);
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        font-size: var(--font-size-03);
+
+        .plans-card-inner-title {
+          font-size: var(--font-size-05);
+          line-height: var(--line-height-04);
+          font-weight: 600;
+          margin-top: 0;
+        }
+
+        ul {
+          list-style-type: none;
+          padding: 0;
+          margin: 0;
+
+          li {
+            margin-bottom: var(--spacing-04);
+          }
+        }
+
+        .plans-card-inner-footer {
+          margin-top: auto;
+          display: flex;
+          flex-direction: column;
+          gap: var(--spacing-05);
+
+          @include media-breakpoint-down(lg) {
+            margin-top: var(--spacing-06);
+          }
+        }
+      }
+
+      &.grey-border {
+        border: 2px solid var(--neutral-20);
+      }
+
+      &.blue-border {
+        border: solid 2px var(--sapphire-blue);
+        border-radius: 8px;
+
+        .plans-card-inner-title {
           color: var(--sapphire-blue);
         }
       }
@@ -385,6 +488,11 @@
   }
 
   .heading-section-md-align-left {
+    h2,
+    p {
+      text-align: center;
+    }
+
     @include media-breakpoint-down(lg) {
       display: flex;
       flex-direction: column;
@@ -410,7 +518,7 @@
     }
 
     &.align-left-button-sm {
-      @include media-breakpoint-down(md) {
+      @include media-breakpoint-down(lg) {
         justify-content: start;
       }
     }
@@ -421,11 +529,363 @@
     }
   }
 
+  .editor-pdf-video {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 585px;
+    padding: 0 var(--spacing-06);
+
+    @include media-breakpoint-down(lg) {
+      height: auto;
+    }
+
+    video {
+      box-shadow: 0 60px 25px -15px rgb(16 24 40 / 20%);
+      max-height: 100%;
+      width: auto;
+
+      @include media-breakpoint-down(lg) {
+        width: 100%;
+      }
+    }
+  }
+
+  .lime-color-text {
+    color: var(--green-bright);
+  }
+
+  .customer-story-content {
+    .table-of-contents-section {
+      padding-right: var(--spacing-13);
+
+      @include media-breakpoint-down(lg) {
+        display: none;
+      }
+
+      .table-of-contents {
+        border-top: 1px solid var(--neutral-30);
+        border-bottom: 1px solid var(--neutral-30);
+        padding: var(--spacing-09) 0;
+
+        .heading {
+          @include heading-xs;
+
+          font-weight: 600;
+          color: var(--green-60);
+        }
+
+        li {
+          list-style: none;
+          padding-top: var(--spacing-06);
+          font-weight: 500;
+
+          a {
+            text-decoration: none;
+            color: var(--neutral-70);
+          }
+        }
+      }
+    }
+
+    .customer-story-layout-card {
+      p {
+        @include heading-xs;
+      }
+    }
+
+    .story-details-section {
+      h3 {
+        @include heading-lg;
+
+        margin-top: 0;
+      }
+
+      .customer-story-list-padding {
+        padding-left: var(--spacing-10);
+      }
+
+      .card-gray {
+        padding: var(--spacing-08);
+      }
+
+      .at-glance-section {
+        padding-top: var(--spacing-08);
+
+        p {
+          margin-top: var(--spacing-06);
+        }
+      }
+
+      p {
+        font-size: var(--font-size-04);
+      }
+
+      .border-r-16 {
+        border-radius: 16px;
+      }
+
+      .introduction-image-caption {
+        padding-top: var(--spacing-06);
+      }
+
+      .stats-card {
+        display: flex;
+        flex-direction: row;
+        padding: var(--spacing-09);
+        border-radius: 16px;
+        background: var(--dark-jungle-green);
+        color: var(--white);
+
+        @include media-breakpoint-down(lg) {
+          flex-direction: column;
+        }
+
+        .stats {
+          h3 {
+            font-size: 2rem;
+            font-weight: 600;
+          }
+
+          p {
+            font-weight: 600;
+            height: 50px;
+          }
+        }
+      }
+    }
+
+    .customer-quote {
+      border-left: 2px solid var(--green-60);
+      padding-left: var(--spacing-06);
+
+      blockquote {
+        color: var(--neutral-90);
+
+        @include heading-md;
+      }
+
+      p {
+        margin-top: var(--spacing-06);
+        font-size: var(--font-size-04);
+      }
+    }
+  }
+
+  // most of these are here to replace rules from core/type.less
+  blockquote {
+    @include heading-lg;
+
+    border-left: none;
+    font-weight: 600;
+    quotes: '\201C' '\201D'; // override default quotes
+    padding: unset;
+    margin: unset;
+    font-family: 'Noto Sans', sans-serif;
+
+    &::after {
+      visibility: visible;
+      display: inline;
+      margin-left: 1px; // it's too tight to the text otherwise
+      content: close-quote;
+    }
+
+    &::before {
+      color: inherit;
+      margin-right: 0;
+      vertical-align: 0;
+      content: open-quote;
+    }
+
+    &::after,
+    &::before {
+      @include heading-lg;
+    }
+
+    @include media-breakpoint-down(lg) {
+      @include heading-md;
+
+      &::after,
+      &::before {
+        visibility: visible;
+
+        @include heading-md;
+      }
+    }
+  }
+
+  .cta-card-individual-customer {
+    display: flex;
+    justify-content: space-between;
+    padding: var(--spacing-13);
+    background-size: cover;
+    color: var(--white);
+    border-radius: 8px;
+
+    @include media-breakpoint-down(lg) {
+      padding: var(--spacing-11) var(--spacing-08);
+    }
+
+    h2 {
+      font-size: var(--font-size-07);
+      color: var(--white);
+    }
+
+    p {
+      font-size: 1.125rem;
+    }
+
+    .btn-container {
+      padding-top: 10px;
+      display: flex;
+      justify-content: center;
+      align-items: flex-start;
+    }
+  }
+
+  .customer-stories-hero-heading {
+    @include media-breakpoint-down(lg) {
+      @include heading-xl;
+    }
+  }
+
+  .customer-stories-logos-text {
+    font-size: var(--font-size-05);
+  }
+
+  .customer-stories-hero-text {
+    font-size: var(--font-size-05);
+  }
+
   .overleaf-sticker {
     width: unset;
 
     @include media-breakpoint-down(lg) {
-      width: 74px; // 70% of 106px
+      width: 106px;
+    }
+  }
+
+  .organization-logos-container {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+
+    @include media-breakpoint-down(xl) {
+      flex-wrap: wrap;
+      gap: 30px;
+    }
+
+    .organization-logo {
+      object-fit: contain;
+      max-height: 62px;
+
+      &.samsung-logo {
+        max-height: 110px;
+        height: 110px;
+      }
+
+      @include media-breakpoint-down(xl) {
+        max-height: 40px;
+        flex-basis: 34%;
+      }
+    }
+  }
+
+  .integrations-card {
+    display: flex;
+
+    /* for center align */
+    flex-wrap: wrap;
+    align-items: center;
+
+    .integrations-icons {
+      img {
+        width: 6rem; // 96px
+        height: 6rem; // 96px
+      }
+
+      .first-row,
+      .second-row {
+        display: flex;
+      }
+
+      .first-row {
+        justify-content: space-between;
+      }
+
+      .second-row {
+        margin-top: var(--spacing-10);
+        justify-content: space-evenly;
+      }
+    }
+  }
+
+  .security-info {
+    .security-info-first-row {
+      margin-bottom: var(--spacing-09);
+
+      @include media-breakpoint-down(lg) {
+        margin-bottom: 0;
+      }
+    }
+
+    .security-info-item {
+      @include media-breakpoint-down(lg) {
+        margin-bottom: var(--spacing-06);
+      }
+    }
+
+    h3 {
+      @include heading-sm;
+    }
+  }
+
+  .security-heading-section {
+    @include media-breakpoint-down(lg) {
+      p {
+        text-align: left;
+      }
+
+      h2 {
+        width: 100%;
+        text-align: left;
+      }
+    }
+
+    .heading-and-stickers-container {
+      display: flex;
+      justify-content: center;
+      position: relative;
+
+      .lock-sticker {
+        width: 70px;
+        position: absolute;
+        top: -95px;
+        right: -50px;
+
+        @include media-breakpoint-down(xl) {
+          right: -105px;
+        }
+
+        @include media-breakpoint-down(lg) {
+          display: none;
+        }
+      }
+
+      .arrow-sticker {
+        width: 140px;
+        position: absolute;
+        top: -50px;
+        right: -15px;
+
+        @include media-breakpoint-down(xl) {
+          right: -70px;
+        }
+
+        @include media-breakpoint-down(lg) {
+          display: none;
+        }
+      }
     }
   }
 
@@ -528,4 +988,139 @@
       }
     }
   }
+
+  .features-card-hero {
+    display: flex;
+
+    /* equal heights */
+    flex-wrap: wrap;
+    align-items: center;
+    position: relative;
+    height: 655px;
+
+    // padding-top: @line-height-computed * 2;
+
+    @include media-breakpoint-down(lg) {
+      height: unset;
+      padding-top: 0;
+    }
+
+    .features-card-description {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+
+      h1 {
+        &.features-card-hero-smaller-title {
+          @include media-breakpoint-up(xl) {
+            // 3rem is the default, this is a workaround for big screen
+            // since 6-width column on md screen size will wrap the text in three lines
+            font-size: var(--font-size-09);
+          }
+        }
+      }
+
+      p {
+        font-size: var(--font-size-05);
+        width: 90%;
+
+        @include media-breakpoint-down(lg) {
+          font-size: var(--font-size-04);
+          line-height: var(--line-height-03);
+          width: unset;
+        }
+      }
+    }
+
+    .features-card-image {
+      position: absolute;
+
+      // on wide screen, image will be fixed without any variable width translation
+      transform: translateX(600px);
+      top: 100px;
+      width: 720px;
+      height: auto;
+      padding: 0 15px;
+
+      // starting from 1500px, image will have a variable translation that depends on screen width
+      // this will make image "fixed" on a specific point on the screen
+      @media (width <= 1500px) {
+        transform: translateX(calc(50vw - 121px));
+      }
+
+      @media (width <= 1400px) {
+        width: 650px;
+        transform: translateX(calc(50vw - 52px));
+      }
+
+      // bootstrap layout changes on 1200px (@screen-lg), add a specific
+      // case for this exact width
+      @media (width >= 1200px) and (width <= 1200px) {
+        width: 600px;
+        transform: translateX(calc(50vw));
+      }
+
+      @media (width <= 1199px) {
+        width: 600px;
+        transform: translateX(calc(50vw - 106px));
+      }
+
+      @media (width <= 1100px) {
+        width: 550px;
+        transform: translateX(calc(50vw - 55px));
+      }
+
+      // 991px
+      @include media-breakpoint-down(lg) {
+        position: relative;
+        transform: none;
+        top: 0;
+        width: 100%;
+        margin-bottom: var(--spacing-11);
+        padding: var(--spacing-09) 0 0 0;
+      }
+
+      img.img-responsive {
+        width: 100%;
+      }
+    }
+
+    .sticky-tags {
+      position: absolute;
+      z-index: 2;
+      height: 160px;
+      bottom: -105px;
+      right: 55px;
+
+      @media (width <= 1400px) {
+        height: 150px;
+        bottom: -103px;
+        right: 47px;
+      }
+
+      @media (width <= 1200px) {
+        height: 130px;
+        bottom: -87px;
+      }
+
+      @media (width <= 1100px) {
+        height: 120px;
+        bottom: -81px;
+      }
+
+      // 991px
+      @include media-breakpoint-down(lg) {
+        height: 130px;
+        bottom: -75px;
+        right: 70px;
+      }
+
+      // 767px
+      @include media-breakpoint-down(md) {
+        height: 24%;
+        bottom: -10vw; // scale with width
+        right: 9.5vw; // scale with width
+      }
+    }
+  }
 }
diff --git a/services/web/frontend/stylesheets/components/daterange-picker.less b/services/web/frontend/stylesheets/components/daterange-picker.less
deleted file mode 100644
index 43e0e3ba55..0000000000
--- a/services/web/frontend/stylesheets/components/daterange-picker.less
+++ /dev/null
@@ -1,656 +0,0 @@
-//
-// A stylesheet for use with Bootstrap 3.x
-// @author: Dan Grossman http://www.dangrossman.info/
-// @copyright: Copyright (c) 2012-2015 Dan Grossman. All rights reserved.
-// @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
-// @website: https://www.improvely.com/
-//
-
-//
-// VARIABLES
-//
-
-//
-// Settings
-
-// The class name to contain everything within.
-@arrow-size: 7px;
-
-//
-// Colors
-@daterangepicker-color: @brand-primary;
-@daterangepicker-bg-color: #fff;
-
-@daterangepicker-cell-color: @daterangepicker-color;
-@daterangepicker-cell-border-color: transparent;
-@daterangepicker-cell-bg-color: @daterangepicker-bg-color;
-
-@daterangepicker-cell-hover-color: @daterangepicker-color;
-@daterangepicker-cell-hover-border-color: @daterangepicker-cell-border-color;
-@daterangepicker-cell-hover-bg-color: #eee;
-
-@daterangepicker-in-range-color: #000;
-@daterangepicker-in-range-border-color: transparent;
-@daterangepicker-in-range-bg-color: #ebf4f8;
-
-@daterangepicker-active-color: #fff;
-@daterangepicker-active-bg-color: #138a07;
-@daterangepicker-active-border-color: transparent;
-
-@daterangepicker-unselected-color: #999;
-@daterangepicker-unselected-border-color: transparent;
-@daterangepicker-unselected-bg-color: #fff;
-
-//
-// daterangepicker
-@daterangepicker-width: 278px;
-@daterangepicker-padding: 4px;
-@daterangepicker-z-index: 3000;
-
-@daterangepicker-border-size: 1px;
-@daterangepicker-border-color: #ccc;
-@daterangepicker-border-radius: 4px;
-
-//
-// Calendar
-@daterangepicker-calendar-margin: @daterangepicker-padding;
-@daterangepicker-calendar-bg-color: @daterangepicker-bg-color;
-
-@daterangepicker-calendar-border-size: 1px;
-@daterangepicker-calendar-border-color: @daterangepicker-bg-color;
-@daterangepicker-calendar-border-radius: @daterangepicker-border-radius;
-
-//
-// Calendar Cells
-@daterangepicker-cell-size: 20px;
-@daterangepicker-cell-width: @daterangepicker-cell-size;
-@daterangepicker-cell-height: @daterangepicker-cell-size;
-
-@daterangepicker-cell-border-radius: @daterangepicker-calendar-border-radius;
-@daterangepicker-cell-border-size: 1px;
-
-//
-// Dropdowns
-@daterangepicker-dropdown-z-index: @daterangepicker-z-index + 1;
-
-//
-// Controls
-@daterangepicker-control-height: 30px;
-@daterangepicker-control-line-height: @daterangepicker-control-height;
-@daterangepicker-control-color: #555;
-
-@daterangepicker-control-border-size: 1px;
-@daterangepicker-control-border-color: #ccc;
-@daterangepicker-control-border-radius: 4px;
-
-@daterangepicker-control-active-border-size: 1px;
-@daterangepicker-control-active-border-color: @brand-primary;
-@daterangepicker-control-active-border-radius: @daterangepicker-control-border-radius;
-
-@daterangepicker-control-disabled-color: #ccc;
-
-//
-// Ranges
-@daterangepicker-ranges-color: @brand-primary;
-@daterangepicker-ranges-bg-color: daterangepicker-ranges-color;
-
-@daterangepicker-ranges-border-size: 1px;
-@daterangepicker-ranges-border-color: @daterangepicker-ranges-bg-color;
-@daterangepicker-ranges-border-radius: @daterangepicker-border-radius;
-
-@daterangepicker-ranges-hover-color: #fff;
-@daterangepicker-ranges-hover-bg-color: @daterangepicker-ranges-color;
-@daterangepicker-ranges-hover-border-size: @daterangepicker-ranges-border-size;
-@daterangepicker-ranges-hover-border-color: @daterangepicker-ranges-hover-bg-color;
-@daterangepicker-ranges-hover-border-radius: @daterangepicker-border-radius;
-
-@daterangepicker-ranges-active-border-size: @daterangepicker-ranges-border-size;
-@daterangepicker-ranges-active-border-color: @daterangepicker-ranges-bg-color;
-@daterangepicker-ranges-active-border-radius: @daterangepicker-border-radius;
-
-//
-// STYLESHEETS
-//
-.daterangepicker {
-  position: absolute;
-  color: @daterangepicker-color;
-  background-color: @daterangepicker-bg-color;
-  border-radius: @daterangepicker-border-radius;
-  width: @daterangepicker-width;
-  padding: @daterangepicker-padding;
-  margin-top: @daterangepicker-border-size;
-
-  // TODO: Should these be parameterized??
-  // top: 100px;
-  // left: 20px;
-
-  @arrow-prefix-size: @arrow-size;
-  @arrow-suffix-size: (@arrow-size - @daterangepicker-border-size);
-
-  &:before,
-  &:after {
-    position: absolute;
-    display: inline-block;
-
-    border-bottom-color: rgba(0, 0, 0, 0.2);
-    content: '';
-  }
-
-  &:before {
-    top: -@arrow-prefix-size;
-
-    border-right: @arrow-prefix-size solid transparent;
-    border-left: @arrow-prefix-size solid transparent;
-    border-bottom: @arrow-prefix-size solid @daterangepicker-border-color;
-  }
-
-  &:after {
-    top: -@arrow-suffix-size;
-
-    border-right: @arrow-suffix-size solid transparent;
-    border-bottom: @arrow-suffix-size solid @daterangepicker-bg-color;
-    border-left: @arrow-suffix-size solid transparent;
-  }
-
-  &.opensleft {
-    &:before {
-      // TODO: Make this relative to prefix size.
-      right: @arrow-prefix-size + 2px;
-    }
-
-    &:after {
-      // TODO: Make this relative to suffix size.
-      right: @arrow-suffix-size + 4px;
-    }
-  }
-
-  &.openscenter {
-    &:before {
-      left: 0;
-      right: 0;
-      width: 0;
-      margin-left: auto;
-      margin-right: auto;
-    }
-
-    &:after {
-      left: 0;
-      right: 0;
-      width: 0;
-      margin-left: auto;
-      margin-right: auto;
-    }
-  }
-
-  &.opensright {
-    &:before {
-      // TODO: Make this relative to prefix size.
-      left: @arrow-prefix-size + 2px;
-    }
-
-    &:after {
-      // TODO: Make this relative to suffix size.
-      left: @arrow-suffix-size + 4px;
-    }
-  }
-
-  &.dropup {
-    margin-top: -5px;
-
-    // NOTE: Note sure why these are special-cased.
-    &:before {
-      top: initial;
-      bottom: -@arrow-prefix-size;
-      border-bottom: initial;
-      border-top: @arrow-prefix-size solid @daterangepicker-border-color;
-    }
-
-    &:after {
-      top: initial;
-      bottom: -@arrow-suffix-size;
-      border-bottom: initial;
-      border-top: @arrow-suffix-size solid @daterangepicker-bg-color;
-    }
-  }
-
-  &.dropdown-menu {
-    max-width: none;
-    z-index: @daterangepicker-dropdown-z-index;
-  }
-
-  &.single {
-    .ranges,
-    .calendar {
-      float: none;
-    }
-  }
-
-  /* Calendars */
-  &.show-calendar {
-    .calendar {
-      display: block;
-    }
-  }
-
-  .calendar {
-    display: none;
-    max-width: @daterangepicker-width - (@daterangepicker-calendar-margin * 2);
-    margin: @daterangepicker-calendar-margin;
-
-    &.single {
-      .calendar-table {
-        border: none;
-      }
-    }
-
-    th,
-    td {
-      white-space: nowrap;
-      text-align: center;
-
-      // TODO: Should this actually be hard-coded?
-      min-width: 32px;
-    }
-  }
-
-  .calendar-table {
-    border: @daterangepicker-calendar-border-size solid
-      @daterangepicker-calendar-border-color;
-    padding: @daterangepicker-calendar-margin;
-    border-radius: @daterangepicker-calendar-border-radius;
-    background-color: @daterangepicker-calendar-bg-color;
-  }
-
-  table {
-    width: 100%;
-    margin: 0;
-  }
-
-  td,
-  th {
-    text-align: center;
-    width: @daterangepicker-cell-width;
-    height: @daterangepicker-cell-height;
-    border-radius: @daterangepicker-cell-border-radius;
-    border: @daterangepicker-cell-border-size solid
-      @daterangepicker-cell-border-color;
-    white-space: nowrap;
-    cursor: pointer;
-
-    &.available {
-      &:hover {
-        background-color: @daterangepicker-cell-hover-bg-color;
-        border-color: @daterangepicker-cell-hover-border-color;
-        color: @daterangepicker-cell-hover-color;
-      }
-    }
-
-    &.week {
-      font-size: 80%;
-      color: #ccc;
-    }
-  }
-
-  td {
-    &.off {
-      &,
-      &.in-range,
-      &.start-date,
-      &.end-date {
-        background-color: @daterangepicker-unselected-bg-color;
-        border-color: @daterangepicker-unselected-border-color;
-        color: @daterangepicker-unselected-color;
-      }
-    }
-
-    //
-    // Date Range
-    &.in-range {
-      background-color: @daterangepicker-in-range-bg-color;
-      border-color: @daterangepicker-in-range-border-color;
-      color: @daterangepicker-in-range-color;
-
-      // TODO: Should this be static or should it be parameterized?
-      border-radius: 0;
-    }
-
-    &.start-date {
-      border-radius: @daterangepicker-cell-border-radius 0 0
-        @daterangepicker-cell-border-radius;
-    }
-
-    &.end-date {
-      border-radius: 0 @daterangepicker-cell-border-radius
-        @daterangepicker-cell-border-radius 0;
-    }
-
-    &.start-date.end-date {
-      border-radius: @daterangepicker-cell-border-radius;
-    }
-
-    &.active {
-      &,
-      &:hover {
-        background-color: @daterangepicker-active-bg-color;
-        border-color: @daterangepicker-active-border-color;
-        color: @daterangepicker-active-color;
-      }
-    }
-  }
-
-  th {
-    &.month {
-      width: auto;
-    }
-  }
-
-  //
-  // Disabled Controls
-  //
-  td,
-  option {
-    &.disabled {
-      color: #999;
-      cursor: not-allowed;
-      text-decoration: line-through;
-    }
-  }
-
-  select {
-    &.monthselect,
-    &.yearselect {
-      font-size: 12px;
-      padding: 1px;
-      height: auto;
-      margin: 0;
-      cursor: default;
-    }
-
-    &.monthselect {
-      margin-right: 2%;
-      width: 56%;
-    }
-
-    &.yearselect {
-      width: 40%;
-    }
-
-    &.hourselect,
-    &.minuteselect,
-    &.secondselect,
-    &.ampmselect {
-      width: 50px;
-      margin-bottom: 0;
-    }
-  }
-
-  //
-  // Text Input Controls (above calendar)
-  //
-  .input-mini {
-    border: @daterangepicker-control-border-size solid
-      @daterangepicker-control-border-color;
-    border-radius: @daterangepicker-control-border-radius;
-    color: @daterangepicker-control-color;
-    height: @daterangepicker-control-line-height;
-    line-height: @daterangepicker-control-height;
-    display: block;
-    vertical-align: middle;
-
-    // TODO: Should these all be static, too??
-    margin: 0 0 5px 0;
-    padding: 0 6px 0 28px;
-    width: 100%;
-
-    &.active {
-      border: @daterangepicker-control-active-border-size solid
-        @daterangepicker-control-active-border-color;
-      border-radius: @daterangepicker-control-active-border-radius;
-    }
-  }
-
-  .daterangepicker_input {
-    position: relative;
-    padding-left: 0;
-
-    i {
-      position: absolute;
-
-      // NOTE: These appear to be eyeballed to me...
-      left: 8px;
-      top: 10px;
-    }
-  }
-  &.rtl {
-    .input-mini {
-      padding-right: 28px;
-      padding-left: 6px;
-    }
-    .daterangepicker_input i {
-      left: auto;
-      right: 8px;
-    }
-  }
-
-  //
-  // Time Picker
-  //
-  .calendar-time {
-    text-align: center;
-    margin: 5px auto;
-    line-height: @daterangepicker-control-line-height;
-    position: relative;
-    padding-left: 28px;
-
-    select {
-      &.disabled {
-        color: @daterangepicker-control-disabled-color;
-        cursor: not-allowed;
-      }
-    }
-  }
-}
-
-//
-// Predefined Ranges
-//
-
-.ranges {
-  font-size: 11px;
-  float: none;
-  margin: 4px;
-  text-align: left;
-
-  ul {
-    list-style: none;
-    margin: 0 auto;
-    padding: 0;
-    width: 100%;
-  }
-
-  li {
-    font-size: 13px;
-    background-color: @daterangepicker-ranges-bg-color;
-    border: @daterangepicker-ranges-border-size solid
-      @daterangepicker-ranges-border-color;
-    border-radius: @daterangepicker-ranges-border-radius;
-    color: @daterangepicker-ranges-color;
-    padding: 3px 12px;
-    margin-bottom: 8px;
-    cursor: pointer;
-
-    &:hover {
-      background-color: @daterangepicker-ranges-hover-bg-color;
-      color: @daterangepicker-ranges-hover-color;
-    }
-
-    &.active {
-      background-color: @daterangepicker-ranges-hover-bg-color;
-      border: @daterangepicker-ranges-hover-border-size solid
-        @daterangepicker-ranges-hover-border-color;
-      color: @daterangepicker-ranges-hover-color;
-    }
-  }
-}
-
-/*  Larger Screen Styling */
-@media (min-width: 564px) {
-  .daterangepicker {
-    .glyphicon {
-      font-family: FontAwesome;
-    }
-    .glyphicon-chevron-left:before {
-      content: '\f053';
-    }
-    .glyphicon-chevron-right:before {
-      content: '\f054';
-    }
-    .glyphicon-calendar:before {
-      content: '\f073';
-    }
-
-    width: auto;
-
-    .ranges {
-      ul {
-        width: 160px;
-      }
-    }
-
-    &.single {
-      .ranges {
-        ul {
-          width: 100%;
-        }
-      }
-
-      .calendar.left {
-        clear: none;
-      }
-
-      &.ltr {
-        .ranges,
-        .calendar {
-          float: left;
-        }
-      }
-      &.rtl {
-        .ranges,
-        .calendar {
-          float: right;
-        }
-      }
-    }
-
-    &.ltr {
-      direction: ltr;
-      text-align: left;
-      .calendar {
-        &.left {
-          clear: left;
-          margin-right: 0;
-
-          .calendar-table {
-            border-right: none;
-            border-top-right-radius: 0;
-            border-bottom-right-radius: 0;
-          }
-        }
-
-        &.right {
-          margin-left: 0;
-
-          .calendar-table {
-            border-left: none;
-            border-top-left-radius: 0;
-            border-bottom-left-radius: 0;
-          }
-        }
-      }
-
-      .left .daterangepicker_input {
-        padding-right: 12px;
-      }
-
-      .calendar.left .calendar-table {
-        padding-right: 12px;
-      }
-
-      .ranges,
-      .calendar {
-        float: left;
-      }
-    }
-    &.rtl {
-      direction: rtl;
-      text-align: right;
-      .calendar {
-        &.left {
-          clear: right;
-          margin-left: 0;
-
-          .calendar-table {
-            border-left: none;
-            border-top-left-radius: 0;
-            border-bottom-left-radius: 0;
-          }
-        }
-
-        &.right {
-          margin-right: 0;
-
-          .calendar-table {
-            border-right: none;
-            border-top-right-radius: 0;
-            border-bottom-right-radius: 0;
-          }
-        }
-      }
-
-      .left .daterangepicker_input {
-        padding-left: 12px;
-      }
-
-      .calendar.left .calendar-table {
-        padding-left: 12px;
-      }
-
-      .ranges,
-      .calendar {
-        text-align: right;
-        float: right;
-      }
-    }
-  }
-}
-
-@media (min-width: 730px) {
-  /* force the calendar to display on one row */
-  &.show-calendar {
-    min-width: 658px; /* width of all contained elements, IE/Edge fallback */
-    width: -moz-max-content;
-    width: -webkit-max-content;
-    width: max-content;
-  }
-
-  .daterangepicker {
-    .ranges {
-      width: auto;
-    }
-    &.ltr {
-      .ranges {
-        float: left;
-        clear: none !important;
-      }
-    }
-    &.rtl {
-      .ranges {
-        float: right;
-      }
-    }
-
-    .calendar {
-      clear: none !important;
-    }
-  }
-}
diff --git a/services/web/frontend/stylesheets/components/nvd3.less b/services/web/frontend/stylesheets/components/nvd3.less
index f1fea65901..542231cfdc 100755
--- a/services/web/frontend/stylesheets/components/nvd3.less
+++ b/services/web/frontend/stylesheets/components/nvd3.less
@@ -1,691 +1,691 @@
-/* nvd3 version 1.8.4 (https://github.com/novus/nvd3) 2016-07-03 */
-.nvd3 .nv-axis {
-  pointer-events: none;
-  opacity: 1;
-}
-
-.nvd3 .nv-axis path {
-  fill: none;
-  stroke: #000;
-  stroke-opacity: 0.75;
-  shape-rendering: crispEdges;
-}
-
-.nvd3 .nv-axis path.domain {
-  stroke-opacity: 0.75;
-}
-
-.nvd3 .nv-axis.nv-x path.domain {
-  stroke-opacity: 0;
-}
-
-.nvd3 .nv-axis line {
-  fill: none;
-  stroke: #e5e5e5;
-  shape-rendering: crispEdges;
-}
-
-.nvd3 .nv-axis .zero line,
-    /*this selector may not be necessary*/ .nvd3 .nv-axis line.zero {
-  stroke-opacity: 0.75;
-}
-
-.nvd3 .nv-axis .nv-axisMaxMin text {
-  font-weight: bold;
-}
-
-.nvd3 .x .nv-axis .nv-axisMaxMin text,
-.nvd3 .x2 .nv-axis .nv-axisMaxMin text,
-.nvd3 .x3 .nv-axis .nv-axisMaxMin text {
-  text-anchor: middle;
-}
-
-.nvd3 .nv-axis.nv-disabled {
-  opacity: 0;
-}
-
-.nvd3 .nv-bars rect {
-  fill-opacity: 0.75;
-
-  transition: fill-opacity 250ms linear;
-  -moz-transition: fill-opacity 250ms linear;
-  -webkit-transition: fill-opacity 250ms linear;
-}
-
-.nvd3 .nv-bars rect.hover {
-  fill-opacity: 1;
-}
-
-.nvd3 .nv-bars .hover rect {
-  fill: lightblue;
-}
-
-.nvd3 .nv-bars text {
-  fill: rgba(0, 0, 0, 0);
-}
-
-.nvd3 .nv-bars .hover text {
-  fill: rgba(0, 0, 0, 1);
-}
-
-.nvd3 .nv-multibar .nv-groups rect,
-.nvd3 .nv-multibarHorizontal .nv-groups rect,
-.nvd3 .nv-discretebar .nv-groups rect {
-  stroke-opacity: 0;
-
-  transition: fill-opacity 250ms linear;
-  -moz-transition: fill-opacity 250ms linear;
-  -webkit-transition: fill-opacity 250ms linear;
-}
-
-.nvd3 .nv-multibar .nv-groups rect:hover,
-.nvd3 .nv-multibarHorizontal .nv-groups rect:hover,
-.nvd3 .nv-candlestickBar .nv-ticks rect:hover,
-.nvd3 .nv-discretebar .nv-groups rect:hover {
-  fill-opacity: 1;
-}
-
-.nvd3 .nv-discretebar .nv-groups text,
-.nvd3 .nv-multibarHorizontal .nv-groups text {
-  font-weight: bold;
-  fill: rgba(0, 0, 0, 1);
-  stroke: rgba(0, 0, 0, 0);
-}
-
-/* boxplot CSS */
-.nvd3 .nv-boxplot circle {
-  fill-opacity: 0.5;
-}
-
-.nvd3 .nv-boxplot circle:hover {
-  fill-opacity: 1;
-}
-
-.nvd3 .nv-boxplot rect:hover {
-  fill-opacity: 1;
-}
-
-.nvd3 line.nv-boxplot-median {
-  stroke: black;
-}
-
-.nv-boxplot-tick:hover {
-  stroke-width: 2.5px;
-}
-/* bullet */
-.nvd3.nv-bullet {
-  font: 10px sans-serif;
-}
-.nvd3.nv-bullet .nv-measure {
-  fill-opacity: 0.8;
-}
-.nvd3.nv-bullet .nv-measure:hover {
-  fill-opacity: 1;
-}
-.nvd3.nv-bullet .nv-marker {
-  stroke: #000;
-  stroke-width: 2px;
-}
-.nvd3.nv-bullet .nv-markerTriangle {
-  stroke: #000;
-  fill: #fff;
-  stroke-width: 1.5px;
-}
-.nvd3.nv-bullet .nv-markerLine {
-  stroke: #000;
-  stroke-width: 1.5px;
-}
-.nvd3.nv-bullet .nv-tick line {
-  stroke: #666;
-  stroke-width: 0.5px;
-}
-.nvd3.nv-bullet .nv-range.nv-s0 {
-  fill: #eee;
-}
-.nvd3.nv-bullet .nv-range.nv-s1 {
-  fill: #ddd;
-}
-.nvd3.nv-bullet .nv-range.nv-s2 {
-  fill: #ccc;
-}
-.nvd3.nv-bullet .nv-title {
-  font-size: 14px;
-  font-weight: bold;
-}
-.nvd3.nv-bullet .nv-subtitle {
-  fill: #999;
-}
-
-.nvd3.nv-bullet .nv-range {
-  fill: #bababa;
-  fill-opacity: 0.4;
-}
-.nvd3.nv-bullet .nv-range:hover {
-  fill-opacity: 0.7;
-}
-
-.nvd3.nv-candlestickBar .nv-ticks .nv-tick {
-  stroke-width: 1px;
-}
-
-.nvd3.nv-candlestickBar .nv-ticks .nv-tick.hover {
-  stroke-width: 2px;
-}
-
-.nvd3.nv-candlestickBar .nv-ticks .nv-tick.positive rect {
-  stroke: #2ca02c;
-  fill: #2ca02c;
-}
-
-.nvd3.nv-candlestickBar .nv-ticks .nv-tick.negative rect {
-  stroke: #d62728;
-  fill: #d62728;
-}
-
-.with-transitions .nv-candlestickBar .nv-ticks .nv-tick {
-  transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
-  -moz-transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
-  -webkit-transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
-}
-
-.nvd3.nv-candlestickBar .nv-ticks line {
-  stroke: #333;
-}
-
-.nv-force-node {
-  stroke: #fff;
-  stroke-width: 1.5px;
-}
-.nv-force-link {
-  stroke: #999;
-  stroke-opacity: 0.6;
-}
-.nv-force-node text {
-  stroke-width: 0px;
-}
-
-.nvd3 .nv-legend .nv-disabled rect {
-  /*fill-opacity: 0;*/
-}
-
-.nvd3 .nv-check-box .nv-box {
-  fill-opacity: 0;
-  stroke-width: 2;
-}
-
-.nvd3 .nv-check-box .nv-check {
-  fill-opacity: 0;
-  stroke-width: 4;
-}
-
-.nvd3 .nv-series.nv-disabled .nv-check-box .nv-check {
-  fill-opacity: 0;
-  stroke-opacity: 0;
-}
-
-.nvd3 .nv-controlsWrap .nv-legend .nv-check-box .nv-check {
-  opacity: 0;
-}
-
-/* line plus bar */
-.nvd3.nv-linePlusBar .nv-bar rect {
-  fill-opacity: 0.75;
-}
-
-.nvd3.nv-linePlusBar .nv-bar rect:hover {
-  fill-opacity: 1;
-}
-.nvd3 .nv-groups path.nv-line {
-  fill: none;
-}
-
-.nvd3 .nv-groups path.nv-area {
-  stroke: none;
-}
-
-.nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point {
-  fill-opacity: 0;
-  stroke-opacity: 0;
-}
-
-.nvd3.nv-scatter.nv-single-point .nv-groups .nv-point {
-  fill-opacity: 0.5 !important;
-  stroke-opacity: 0.5 !important;
-}
-
-.with-transitions .nvd3 .nv-groups .nv-point {
-  transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
-  -moz-transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
-  -webkit-transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
-}
-
-.nvd3.nv-scatter .nv-groups .nv-point.hover,
-.nvd3 .nv-groups .nv-point.hover {
-  stroke-width: 7px;
-  fill-opacity: 0.95 !important;
-  stroke-opacity: 0.95 !important;
-}
-
-.nvd3 .nv-point-paths path {
-  stroke: #aaa;
-  stroke-opacity: 0;
-  fill: #eee;
-  fill-opacity: 0;
-}
-
-.nvd3 .nv-indexLine {
-  cursor: ew-resize;
-}
-
-/********************
- * SVG CSS
- */
-
-/********************
-  Default CSS for an svg element nvd3 used
-*/
-svg.nvd3-svg {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -ms-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
-  display: block;
-  width: 100%;
-  height: 100%;
-}
-
-/********************
-  Box shadow and border radius styling
-*/
-.nvtooltip.with-3d-shadow,
-.with-3d-shadow .nvtooltip {
-  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-}
-
-.nvd3 text {
-  font: normal 12px Arial;
-}
-
-.nvd3 .title {
-  font: bold 14px Arial;
-}
-
-.nvd3 .nv-background {
-  fill: white;
-  fill-opacity: 0;
-}
-
-.nvd3.nv-noData {
-  font-size: 18px;
-  font-weight: bold;
-}
-
-/**********
-*  Brush
-*/
-
-.nv-brush .extent {
-  fill-opacity: 0.125;
-  shape-rendering: crispEdges;
-}
-
-.nv-brush .resize path {
-  fill: #eee;
-  stroke: #666;
-}
-
-/**********
-*  Legend
-*/
-
-.nvd3 .nv-legend .nv-series {
-  cursor: pointer;
-}
-
-.nvd3 .nv-legend .nv-disabled circle {
-  fill-opacity: 0;
-}
-
-/* focus */
-.nvd3 .nv-brush .extent {
-  fill-opacity: 0 !important;
-}
-
-.nvd3 .nv-brushBackground rect {
-  stroke: #000;
-  stroke-width: 0.4;
-  fill: #fff;
-  fill-opacity: 0.7;
-}
-
-/**********
-*  Print
-*/
-
-@media print {
-  .nvd3 text {
-    stroke-width: 0;
-    fill-opacity: 1;
-  }
-}
-
-.nvd3.nv-ohlcBar .nv-ticks .nv-tick {
-  stroke-width: 1px;
-}
-
-.nvd3.nv-ohlcBar .nv-ticks .nv-tick.hover {
-  stroke-width: 2px;
-}
-
-.nvd3.nv-ohlcBar .nv-ticks .nv-tick.positive {
-  stroke: #2ca02c;
-}
-
-.nvd3.nv-ohlcBar .nv-ticks .nv-tick.negative {
-  stroke: #d62728;
-}
-
-.nvd3 .background path {
-  fill: none;
-  stroke: #eee;
-  stroke-opacity: 0.4;
-  shape-rendering: crispEdges;
-}
-
-.nvd3 .foreground path {
-  fill: none;
-  stroke-opacity: 0.7;
-}
-
-.nvd3 .nv-parallelCoordinates-brush .extent {
-  fill: #fff;
-  fill-opacity: 0.6;
-  stroke: gray;
-  shape-rendering: crispEdges;
-}
-
-.nvd3 .nv-parallelCoordinates .hover {
-  fill-opacity: 1;
-  stroke-width: 3px;
-}
-
-.nvd3 .missingValuesline line {
-  fill: none;
-  stroke: black;
-  stroke-width: 1;
-  stroke-opacity: 1;
-  stroke-dasharray: 5, 5;
-}
-.nvd3.nv-pie path {
-  stroke-opacity: 0;
-  transition: fill-opacity 250ms linear, stroke-width 250ms linear,
-    stroke-opacity 250ms linear;
-  -moz-transition: fill-opacity 250ms linear, stroke-width 250ms linear,
-    stroke-opacity 250ms linear;
-  -webkit-transition: fill-opacity 250ms linear, stroke-width 250ms linear,
-    stroke-opacity 250ms linear;
-}
-
-.nvd3.nv-pie .nv-pie-title {
-  font-size: 24px;
-  fill: rgba(19, 196, 249, 0.59);
-}
-
-.nvd3.nv-pie .nv-slice text {
-  stroke: #000;
-  stroke-width: 0;
-}
-
-.nvd3.nv-pie path {
-  stroke: #fff;
-  stroke-width: 1px;
-  stroke-opacity: 1;
-}
-
-.nvd3.nv-pie path {
-  fill-opacity: 0.7;
-}
-.nvd3.nv-pie .hover path {
-  fill-opacity: 1;
-}
-.nvd3.nv-pie .nv-label {
-  pointer-events: none;
-}
-.nvd3.nv-pie .nv-label rect {
-  fill-opacity: 0;
-  stroke-opacity: 0;
-}
-
-/* scatter */
-.nvd3 .nv-groups .nv-point.hover {
-  stroke-width: 20px;
-  stroke-opacity: 0.5;
-}
-
-.nvd3 .nv-scatter .nv-point.hover {
-  fill-opacity: 1;
-}
-.nv-noninteractive {
-  pointer-events: none;
-}
-
-.nv-distx,
-.nv-disty {
-  pointer-events: none;
-}
-
-/* sparkline */
-.nvd3.nv-sparkline path {
-  fill: none;
-}
-
-.nvd3.nv-sparklineplus g.nv-hoverValue {
-  pointer-events: none;
-}
-
-.nvd3.nv-sparklineplus .nv-hoverValue line {
-  stroke: #333;
-  stroke-width: 1.5px;
-}
-
-.nvd3.nv-sparklineplus,
-.nvd3.nv-sparklineplus g {
-  pointer-events: all;
-}
-
-.nvd3 .nv-hoverArea {
-  fill-opacity: 0;
-  stroke-opacity: 0;
-}
-
-.nvd3.nv-sparklineplus .nv-xValue,
-.nvd3.nv-sparklineplus .nv-yValue {
-  stroke-width: 0;
-  font-size: 0.9em;
-  font-weight: normal;
-}
-
-.nvd3.nv-sparklineplus .nv-yValue {
-  stroke: #f66;
-}
-
-.nvd3.nv-sparklineplus .nv-maxValue {
-  stroke: #2ca02c;
-  fill: #2ca02c;
-}
-
-.nvd3.nv-sparklineplus .nv-minValue {
-  stroke: #d62728;
-  fill: #d62728;
-}
-
-.nvd3.nv-sparklineplus .nv-currentValue {
-  font-weight: bold;
-  font-size: 1.1em;
-}
-/* stacked area */
-.nvd3.nv-stackedarea path.nv-area {
-  fill-opacity: 0.7;
-  stroke-opacity: 0;
-  transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
-  -moz-transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
-  -webkit-transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
-}
-
-.nvd3.nv-stackedarea path.nv-area.hover {
-  fill-opacity: 0.9;
-}
-
-.nvd3.nv-stackedarea .nv-groups .nv-point {
-  stroke-opacity: 0;
-  fill-opacity: 0;
-}
-
-.nvtooltip {
-  position: absolute;
-  background-color: rgba(255, 255, 255, 1);
-  color: rgba(0, 0, 0, 1);
-  padding: 1px;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  z-index: 10000;
-  display: block;
-
-  font-family: Arial;
-  font-size: 13px;
-  text-align: left;
-  pointer-events: none;
-
-  white-space: nowrap;
-
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.nvtooltip {
-  background: rgba(255, 255, 255, 0.8);
-  border: 1px solid rgba(0, 0, 0, 0.5);
-  border-radius: 4px;
-}
-
-/*Give tooltips that old fade in transition by
-    putting a "with-transitions" class on the container div.
-*/
-.nvtooltip.with-transitions,
-.with-transitions .nvtooltip {
-  transition: opacity 50ms linear;
-  -moz-transition: opacity 50ms linear;
-  -webkit-transition: opacity 50ms linear;
-
-  transition-delay: 200ms;
-  -moz-transition-delay: 200ms;
-  -webkit-transition-delay: 200ms;
-}
-
-.nvtooltip.x-nvtooltip,
-.nvtooltip.y-nvtooltip {
-  padding: 8px;
-}
-
-.nvtooltip h3 {
-  margin: 0;
-  padding: 4px 14px;
-  line-height: 18px;
-  font-weight: normal;
-  background-color: rgba(247, 247, 247, 0.75);
-  color: rgba(0, 0, 0, 1);
-  text-align: center;
-
-  border-bottom: 1px solid #ebebeb;
-
-  -webkit-border-radius: 5px 5px 0 0;
-  -moz-border-radius: 5px 5px 0 0;
-  border-radius: 5px 5px 0 0;
-}
-
-.nvtooltip p {
-  margin: 0;
-  padding: 5px 14px;
-  text-align: center;
-}
-
-.nvtooltip span {
-  display: inline-block;
-  margin: 2px 0;
-}
-
-.nvtooltip table {
-  margin: 6px;
-  border-spacing: 0;
-}
-
-.nvtooltip table td {
-  padding: 2px 9px 2px 0;
-  vertical-align: middle;
-}
-
-.nvtooltip table td.key {
-  font-weight: normal;
-}
-.nvtooltip table td.key.total {
-  font-weight: bold;
-}
-.nvtooltip table td.value {
-  text-align: right;
-  font-weight: bold;
-}
-
-.nvtooltip table td.percent {
-  color: darkgray;
-}
-
-.nvtooltip table tr.highlight td {
-  padding: 1px 9px 1px 0;
-  border-bottom-style: solid;
-  border-bottom-width: 1px;
-  border-top-style: solid;
-  border-top-width: 1px;
-}
-
-.nvtooltip table td.legend-color-guide div {
-  width: 8px;
-  height: 8px;
-  vertical-align: middle;
-}
-
-.nvtooltip table td.legend-color-guide div {
-  width: 12px;
-  height: 12px;
-  border: 1px solid #999;
-}
-
-.nvtooltip .footer {
-  padding: 3px;
-  text-align: center;
-}
-
-.nvtooltip-pending-removal {
-  pointer-events: none;
-  display: none;
-}
-
-/****
-Interactive Layer
-*/
-.nvd3 .nv-interactiveGuideLine {
-  pointer-events: none;
-}
-.nvd3 line.nv-guideline {
-  stroke: #ccc;
-}
+/* nvd3 version 1.8.4 (https://github.com/novus/nvd3) 2016-07-03 */
+.nvd3 .nv-axis {
+  pointer-events: none;
+  opacity: 1;
+}
+
+.nvd3 .nv-axis path {
+  fill: none;
+  stroke: #000;
+  stroke-opacity: 0.75;
+  shape-rendering: crispEdges;
+}
+
+.nvd3 .nv-axis path.domain {
+  stroke-opacity: 0.75;
+}
+
+.nvd3 .nv-axis.nv-x path.domain {
+  stroke-opacity: 0;
+}
+
+.nvd3 .nv-axis line {
+  fill: none;
+  stroke: #e5e5e5;
+  shape-rendering: crispEdges;
+}
+
+.nvd3 .nv-axis .zero line,
+    /*this selector may not be necessary*/ .nvd3 .nv-axis line.zero {
+  stroke-opacity: 0.75;
+}
+
+.nvd3 .nv-axis .nv-axisMaxMin text {
+  font-weight: bold;
+}
+
+.nvd3 .x .nv-axis .nv-axisMaxMin text,
+.nvd3 .x2 .nv-axis .nv-axisMaxMin text,
+.nvd3 .x3 .nv-axis .nv-axisMaxMin text {
+  text-anchor: middle;
+}
+
+.nvd3 .nv-axis.nv-disabled {
+  opacity: 0;
+}
+
+.nvd3 .nv-bars rect {
+  fill-opacity: 0.75;
+
+  transition: fill-opacity 250ms linear;
+  -moz-transition: fill-opacity 250ms linear;
+  -webkit-transition: fill-opacity 250ms linear;
+}
+
+.nvd3 .nv-bars rect.hover {
+  fill-opacity: 1;
+}
+
+.nvd3 .nv-bars .hover rect {
+  fill: lightblue;
+}
+
+.nvd3 .nv-bars text {
+  fill: rgba(0, 0, 0, 0);
+}
+
+.nvd3 .nv-bars .hover text {
+  fill: rgba(0, 0, 0, 1);
+}
+
+.nvd3 .nv-multibar .nv-groups rect,
+.nvd3 .nv-multibarHorizontal .nv-groups rect,
+.nvd3 .nv-discretebar .nv-groups rect {
+  stroke-opacity: 0;
+
+  transition: fill-opacity 250ms linear;
+  -moz-transition: fill-opacity 250ms linear;
+  -webkit-transition: fill-opacity 250ms linear;
+}
+
+.nvd3 .nv-multibar .nv-groups rect:hover,
+.nvd3 .nv-multibarHorizontal .nv-groups rect:hover,
+.nvd3 .nv-candlestickBar .nv-ticks rect:hover,
+.nvd3 .nv-discretebar .nv-groups rect:hover {
+  fill-opacity: 1;
+}
+
+.nvd3 .nv-discretebar .nv-groups text,
+.nvd3 .nv-multibarHorizontal .nv-groups text {
+  font-weight: bold;
+  fill: rgba(0, 0, 0, 1);
+  stroke: rgba(0, 0, 0, 0);
+}
+
+/* boxplot CSS */
+.nvd3 .nv-boxplot circle {
+  fill-opacity: 0.5;
+}
+
+.nvd3 .nv-boxplot circle:hover {
+  fill-opacity: 1;
+}
+
+.nvd3 .nv-boxplot rect:hover {
+  fill-opacity: 1;
+}
+
+.nvd3 line.nv-boxplot-median {
+  stroke: black;
+}
+
+.nv-boxplot-tick:hover {
+  stroke-width: 2.5px;
+}
+/* bullet */
+.nvd3.nv-bullet {
+  font: 10px sans-serif;
+}
+.nvd3.nv-bullet .nv-measure {
+  fill-opacity: 0.8;
+}
+.nvd3.nv-bullet .nv-measure:hover {
+  fill-opacity: 1;
+}
+.nvd3.nv-bullet .nv-marker {
+  stroke: #000;
+  stroke-width: 2px;
+}
+.nvd3.nv-bullet .nv-markerTriangle {
+  stroke: #000;
+  fill: #fff;
+  stroke-width: 1.5px;
+}
+.nvd3.nv-bullet .nv-markerLine {
+  stroke: #000;
+  stroke-width: 1.5px;
+}
+.nvd3.nv-bullet .nv-tick line {
+  stroke: #666;
+  stroke-width: 0.5px;
+}
+.nvd3.nv-bullet .nv-range.nv-s0 {
+  fill: #eee;
+}
+.nvd3.nv-bullet .nv-range.nv-s1 {
+  fill: #ddd;
+}
+.nvd3.nv-bullet .nv-range.nv-s2 {
+  fill: #ccc;
+}
+.nvd3.nv-bullet .nv-title {
+  font-size: 14px;
+  font-weight: bold;
+}
+.nvd3.nv-bullet .nv-subtitle {
+  fill: #999;
+}
+
+.nvd3.nv-bullet .nv-range {
+  fill: #bababa;
+  fill-opacity: 0.4;
+}
+.nvd3.nv-bullet .nv-range:hover {
+  fill-opacity: 0.7;
+}
+
+.nvd3.nv-candlestickBar .nv-ticks .nv-tick {
+  stroke-width: 1px;
+}
+
+.nvd3.nv-candlestickBar .nv-ticks .nv-tick.hover {
+  stroke-width: 2px;
+}
+
+.nvd3.nv-candlestickBar .nv-ticks .nv-tick.positive rect {
+  stroke: #2ca02c;
+  fill: #2ca02c;
+}
+
+.nvd3.nv-candlestickBar .nv-ticks .nv-tick.negative rect {
+  stroke: #d62728;
+  fill: #d62728;
+}
+
+.with-transitions .nv-candlestickBar .nv-ticks .nv-tick {
+  transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
+  -moz-transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
+  -webkit-transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
+}
+
+.nvd3.nv-candlestickBar .nv-ticks line {
+  stroke: #333;
+}
+
+.nv-force-node {
+  stroke: #fff;
+  stroke-width: 1.5px;
+}
+.nv-force-link {
+  stroke: #999;
+  stroke-opacity: 0.6;
+}
+.nv-force-node text {
+  stroke-width: 0px;
+}
+
+.nvd3 .nv-legend .nv-disabled rect {
+  /*fill-opacity: 0;*/
+}
+
+.nvd3 .nv-check-box .nv-box {
+  fill-opacity: 0;
+  stroke-width: 2;
+}
+
+.nvd3 .nv-check-box .nv-check {
+  fill-opacity: 0;
+  stroke-width: 4;
+}
+
+.nvd3 .nv-series.nv-disabled .nv-check-box .nv-check {
+  fill-opacity: 0;
+  stroke-opacity: 0;
+}
+
+.nvd3 .nv-controlsWrap .nv-legend .nv-check-box .nv-check {
+  opacity: 0;
+}
+
+/* line plus bar */
+.nvd3.nv-linePlusBar .nv-bar rect {
+  fill-opacity: 0.75;
+}
+
+.nvd3.nv-linePlusBar .nv-bar rect:hover {
+  fill-opacity: 1;
+}
+.nvd3 .nv-groups path.nv-line {
+  fill: none;
+}
+
+.nvd3 .nv-groups path.nv-area {
+  stroke: none;
+}
+
+.nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point {
+  fill-opacity: 0;
+  stroke-opacity: 0;
+}
+
+.nvd3.nv-scatter.nv-single-point .nv-groups .nv-point {
+  fill-opacity: 0.5 !important;
+  stroke-opacity: 0.5 !important;
+}
+
+.with-transitions .nvd3 .nv-groups .nv-point {
+  transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
+  -moz-transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
+  -webkit-transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
+}
+
+.nvd3.nv-scatter .nv-groups .nv-point.hover,
+.nvd3 .nv-groups .nv-point.hover {
+  stroke-width: 7px;
+  fill-opacity: 0.95 !important;
+  stroke-opacity: 0.95 !important;
+}
+
+.nvd3 .nv-point-paths path {
+  stroke: #aaa;
+  stroke-opacity: 0;
+  fill: #eee;
+  fill-opacity: 0;
+}
+
+.nvd3 .nv-indexLine {
+  cursor: ew-resize;
+}
+
+/********************
+ * SVG CSS
+ */
+
+/********************
+  Default CSS for an svg element nvd3 used
+*/
+svg.nvd3-svg {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -ms-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+
+/********************
+  Box shadow and border radius styling
+*/
+.nvtooltip.with-3d-shadow,
+.with-3d-shadow .nvtooltip {
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+
+.nvd3 text {
+  font: normal 12px Arial;
+}
+
+.nvd3 .title {
+  font: bold 14px Arial;
+}
+
+.nvd3 .nv-background {
+  fill: white;
+  fill-opacity: 0;
+}
+
+.nvd3.nv-noData {
+  font-size: 18px;
+  font-weight: bold;
+}
+
+/**********
+*  Brush
+*/
+
+.nv-brush .extent {
+  fill-opacity: 0.125;
+  shape-rendering: crispEdges;
+}
+
+.nv-brush .resize path {
+  fill: #eee;
+  stroke: #666;
+}
+
+/**********
+*  Legend
+*/
+
+.nvd3 .nv-legend .nv-series {
+  cursor: pointer;
+}
+
+.nvd3 .nv-legend .nv-disabled circle {
+  fill-opacity: 0;
+}
+
+/* focus */
+.nvd3 .nv-brush .extent {
+  fill-opacity: 0 !important;
+}
+
+.nvd3 .nv-brushBackground rect {
+  stroke: #000;
+  stroke-width: 0.4;
+  fill: #fff;
+  fill-opacity: 0.7;
+}
+
+/**********
+*  Print
+*/
+
+@media print {
+  .nvd3 text {
+    stroke-width: 0;
+    fill-opacity: 1;
+  }
+}
+
+.nvd3.nv-ohlcBar .nv-ticks .nv-tick {
+  stroke-width: 1px;
+}
+
+.nvd3.nv-ohlcBar .nv-ticks .nv-tick.hover {
+  stroke-width: 2px;
+}
+
+.nvd3.nv-ohlcBar .nv-ticks .nv-tick.positive {
+  stroke: #2ca02c;
+}
+
+.nvd3.nv-ohlcBar .nv-ticks .nv-tick.negative {
+  stroke: #d62728;
+}
+
+.nvd3 .background path {
+  fill: none;
+  stroke: #eee;
+  stroke-opacity: 0.4;
+  shape-rendering: crispEdges;
+}
+
+.nvd3 .foreground path {
+  fill: none;
+  stroke-opacity: 0.7;
+}
+
+.nvd3 .nv-parallelCoordinates-brush .extent {
+  fill: #fff;
+  fill-opacity: 0.6;
+  stroke: gray;
+  shape-rendering: crispEdges;
+}
+
+.nvd3 .nv-parallelCoordinates .hover {
+  fill-opacity: 1;
+  stroke-width: 3px;
+}
+
+.nvd3 .missingValuesline line {
+  fill: none;
+  stroke: black;
+  stroke-width: 1;
+  stroke-opacity: 1;
+  stroke-dasharray: 5, 5;
+}
+.nvd3.nv-pie path {
+  stroke-opacity: 0;
+  transition: fill-opacity 250ms linear, stroke-width 250ms linear,
+    stroke-opacity 250ms linear;
+  -moz-transition: fill-opacity 250ms linear, stroke-width 250ms linear,
+    stroke-opacity 250ms linear;
+  -webkit-transition: fill-opacity 250ms linear, stroke-width 250ms linear,
+    stroke-opacity 250ms linear;
+}
+
+.nvd3.nv-pie .nv-pie-title {
+  font-size: 24px;
+  fill: rgba(19, 196, 249, 0.59);
+}
+
+.nvd3.nv-pie .nv-slice text {
+  stroke: #000;
+  stroke-width: 0;
+}
+
+.nvd3.nv-pie path {
+  stroke: #fff;
+  stroke-width: 1px;
+  stroke-opacity: 1;
+}
+
+.nvd3.nv-pie path {
+  fill-opacity: 0.7;
+}
+.nvd3.nv-pie .hover path {
+  fill-opacity: 1;
+}
+.nvd3.nv-pie .nv-label {
+  pointer-events: none;
+}
+.nvd3.nv-pie .nv-label rect {
+  fill-opacity: 0;
+  stroke-opacity: 0;
+}
+
+/* scatter */
+.nvd3 .nv-groups .nv-point.hover {
+  stroke-width: 20px;
+  stroke-opacity: 0.5;
+}
+
+.nvd3 .nv-scatter .nv-point.hover {
+  fill-opacity: 1;
+}
+.nv-noninteractive {
+  pointer-events: none;
+}
+
+.nv-distx,
+.nv-disty {
+  pointer-events: none;
+}
+
+/* sparkline */
+.nvd3.nv-sparkline path {
+  fill: none;
+}
+
+.nvd3.nv-sparklineplus g.nv-hoverValue {
+  pointer-events: none;
+}
+
+.nvd3.nv-sparklineplus .nv-hoverValue line {
+  stroke: #333;
+  stroke-width: 1.5px;
+}
+
+.nvd3.nv-sparklineplus,
+.nvd3.nv-sparklineplus g {
+  pointer-events: all;
+}
+
+.nvd3 .nv-hoverArea {
+  fill-opacity: 0;
+  stroke-opacity: 0;
+}
+
+.nvd3.nv-sparklineplus .nv-xValue,
+.nvd3.nv-sparklineplus .nv-yValue {
+  stroke-width: 0;
+  font-size: 0.9em;
+  font-weight: normal;
+}
+
+.nvd3.nv-sparklineplus .nv-yValue {
+  stroke: #f66;
+}
+
+.nvd3.nv-sparklineplus .nv-maxValue {
+  stroke: #2ca02c;
+  fill: #2ca02c;
+}
+
+.nvd3.nv-sparklineplus .nv-minValue {
+  stroke: #d62728;
+  fill: #d62728;
+}
+
+.nvd3.nv-sparklineplus .nv-currentValue {
+  font-weight: bold;
+  font-size: 1.1em;
+}
+/* stacked area */
+.nvd3.nv-stackedarea path.nv-area {
+  fill-opacity: 0.7;
+  stroke-opacity: 0;
+  transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
+  -moz-transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
+  -webkit-transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
+}
+
+.nvd3.nv-stackedarea path.nv-area.hover {
+  fill-opacity: 0.9;
+}
+
+.nvd3.nv-stackedarea .nv-groups .nv-point {
+  stroke-opacity: 0;
+  fill-opacity: 0;
+}
+
+.nvtooltip {
+  position: absolute;
+  background-color: rgba(255, 255, 255, 1);
+  color: rgba(0, 0, 0, 1);
+  padding: 1px;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  z-index: 10000;
+  display: block;
+
+  font-family: Arial;
+  font-size: 13px;
+  text-align: left;
+  pointer-events: none;
+
+  white-space: nowrap;
+
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.nvtooltip {
+  background: rgba(255, 255, 255, 0.8);
+  border: 1px solid rgba(0, 0, 0, 0.5);
+  border-radius: 4px;
+}
+
+/*Give tooltips that old fade in transition by
+    putting a "with-transitions" class on the container div.
+*/
+.nvtooltip.with-transitions,
+.with-transitions .nvtooltip {
+  transition: opacity 50ms linear;
+  -moz-transition: opacity 50ms linear;
+  -webkit-transition: opacity 50ms linear;
+
+  transition-delay: 200ms;
+  -moz-transition-delay: 200ms;
+  -webkit-transition-delay: 200ms;
+}
+
+.nvtooltip.x-nvtooltip,
+.nvtooltip.y-nvtooltip {
+  padding: 8px;
+}
+
+.nvtooltip h3 {
+  margin: 0;
+  padding: 4px 14px;
+  line-height: 18px;
+  font-weight: normal;
+  background-color: rgba(247, 247, 247, 0.75);
+  color: rgba(0, 0, 0, 1);
+  text-align: center;
+
+  border-bottom: 1px solid #ebebeb;
+
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+.nvtooltip p {
+  margin: 0;
+  padding: 5px 14px;
+  text-align: center;
+}
+
+.nvtooltip span {
+  display: inline-block;
+  margin: 2px 0;
+}
+
+.nvtooltip table {
+  margin: 6px;
+  border-spacing: 0;
+}
+
+.nvtooltip table td {
+  padding: 2px 9px 2px 0;
+  vertical-align: middle;
+}
+
+.nvtooltip table td.key {
+  font-weight: normal;
+}
+.nvtooltip table td.key.total {
+  font-weight: bold;
+}
+.nvtooltip table td.value {
+  text-align: right;
+  font-weight: bold;
+}
+
+.nvtooltip table td.percent {
+  color: darkgray;
+}
+
+.nvtooltip table tr.highlight td {
+  padding: 1px 9px 1px 0;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+  border-top-style: solid;
+  border-top-width: 1px;
+}
+
+.nvtooltip table td.legend-color-guide div {
+  width: 8px;
+  height: 8px;
+  vertical-align: middle;
+}
+
+.nvtooltip table td.legend-color-guide div {
+  width: 12px;
+  height: 12px;
+  border: 1px solid #999;
+}
+
+.nvtooltip .footer {
+  padding: 3px;
+  text-align: center;
+}
+
+.nvtooltip-pending-removal {
+  pointer-events: none;
+  display: none;
+}
+
+/****
+Interactive Layer
+*/
+.nvd3 .nv-interactiveGuideLine {
+  pointer-events: none;
+}
+.nvd3 line.nv-guideline {
+  stroke: #ccc;
+}
diff --git a/services/web/frontend/stylesheets/core/type.less b/services/web/frontend/stylesheets/core/type.less
index be3347b6eb..d19bfb48ae 100755
--- a/services/web/frontend/stylesheets/core/type.less
+++ b/services/web/frontend/stylesheets/core/type.less
@@ -185,9 +185,6 @@ cite {
 .text-sans-serif {
   font-family: @font-family-sans-serif;
 }
-.text-centered {
-  text-align: center;
-}
 
 // Transformations
 .text-lowercase {
diff --git a/services/web/frontend/stylesheets/main-style.less b/services/web/frontend/stylesheets/main-style.less
index d42a2ab502..040c6ac695 100644
--- a/services/web/frontend/stylesheets/main-style.less
+++ b/services/web/frontend/stylesheets/main-style.less
@@ -82,7 +82,6 @@
 @import 'components/modals.less';
 @import 'components/tooltip.less';
 @import 'components/popovers.less';
-@import 'components/daterange-picker';
 @import 'components/lists.less';
 @import 'components/overbox.less';
 @import 'components/embed-responsive.less';
@@ -118,7 +117,6 @@
 @import 'app/invite.less';
 @import 'app/error-pages.less';
 @import 'app/editor/history-v2.less';
-@import 'app/metrics.less';
 @import 'app/open-in-overleaf.less';
 @import 'app/primary-email-check';
 @import 'app/grammarly';
@@ -126,9 +124,6 @@
 @import 'app/ol-chat.less';
 @import 'app/templates-v2.less';
 @import 'app/login-register.less';
-@import 'app/institution-hub.less';
-@import 'app/publisher-hub.less';
-@import 'app/admin-hub.less';
 @import 'app/import.less';
 @import 'app/website-redesign.less';
 @import 'app/add-secondary-email-prompt.less';
diff --git a/services/web/locales/da.json b/services/web/locales/da.json
index e0c9b82938..9e90a5bce2 100644
--- a/services/web/locales/da.json
+++ b/services/web/locales/da.json
@@ -2,6 +2,7 @@
   "12x_basic": "12x basis",
   "1_2_width": "½ bredde",
   "1_4_width": "¼ bredde",
+  "24x_basic": "24x basis",
   "3_4_width": "¾ bredde",
   "About": "Om",
   "Account": "Konto",
@@ -432,7 +433,6 @@
   "disconnected": "Forbindelsen blev afbrudt",
   "discount_of": "Rabat på __amount__",
   "discover_latex_templates_and_examples": "Opdag LaTeX skabeloner og eksempler til at hjælpe med alt fra at skrive en artikel til at bruge en specifik LaTeX pakke.",
-  "dismiss_error_popup": "Afvis første fejlmeddelelse",
   "display_deleted_user": "Vis slettede brugere",
   "do_not_have_acct_or_do_not_want_to_link": "Hvis du ikke har en <b>__appName__</b>-konto, eller hvis du ikke vil kæde den sammen med din <b>__institutionName__</b>-konto, klik venligst <b>__clickText__</b>.",
   "do_not_link_accounts": "Kæd ikke kontoer sammen",
@@ -1523,7 +1523,6 @@
   "resend": "Gensend",
   "resend_confirmation_code": "Gensend bekræftelseskode",
   "resend_confirmation_email": "Gensend bekræftelsesmail",
-  "resend_email": "Gensend e-mail",
   "resend_group_invite": "Gensend gruppeinvitation",
   "resend_link_sso": "Gensend SSO invitation",
   "resend_managed_user_invite": "Gensend invitation til styrede brugere",
diff --git a/services/web/locales/de.json b/services/web/locales/de.json
index 11129073df..ba9828e6da 100644
--- a/services/web/locales/de.json
+++ b/services/web/locales/de.json
@@ -19,6 +19,7 @@
   "about_to_delete_cert": "Du bist dabei, das folgende Zertifikat zu löschen:",
   "about_to_delete_projects": "Du bist kurz davor folgende Projekte zu löschen:",
   "about_to_delete_tag": "Du bist dabei, das folgende Stichwort zu löschen (darin enthaltene Projekte werden nicht gelöscht):",
+  "about_to_delete_template": "Du bist dabei, die folgende Vorlage zu löschen:",
   "about_to_delete_the_following_project": "Du bist dabei, das folgende Projekt zu löschen",
   "about_to_delete_the_following_projects": "Du bist dabei, die folgenden Projekte zu löschen",
   "about_to_delete_user_preamble": "Du bist dabei, __userName__ (__userEmail__) zu löschen. Das bedeutet:",
@@ -161,6 +162,7 @@
   "card_must_be_authenticated_by_3dsecure": "Deine Karte muss mit 3D Secure authentifiziert werden, bevor du fortfahren kannst",
   "card_payment": "Kartenzahlung",
   "careers": "Karriere",
+  "category": "Kategorie",
   "category_arrows": "Pfeile",
   "category_greek": "Griechisch",
   "category_misc": "Sonstiges",
@@ -297,6 +299,7 @@
   "delete_figure": "Abbildung löschen",
   "delete_projects": "Projekte archivieren",
   "delete_tag": "Stichwort löschen",
+  "delete_template": "Vorlage löschen",
   "delete_token": "Token löschen",
   "delete_user": "Nutzer löschen",
   "delete_your_account": "Lösche dein Konto",
@@ -312,10 +315,10 @@
   "disable_stop_on_first_error": "„Anhalten beim ersten Fehler“ deaktivieren",
   "disconnected": "Nicht verbunden",
   "discount_of": "__amount__ Rabatt",
-  "dismiss_error_popup": "Erste Fehlermeldung schließen",
   "do_not_have_acct_or_do_not_want_to_link": "Wenn du kein <b>__appName__</b>-Konto hast oder nicht mit deinem <b>__institutionName__</b>-Konto verknüpfen möchtest, klicke auf <b>„__clickText__“</b>.",
   "do_not_link_accounts": "Konten nicht verknüpfen",
   "do_you_want_to_change_your_primary_email_address_to": "Willst Du deine primäre E-Mail-Adresse in <b>__email__</b> ändern?",
+  "do_you_want_to_overwrite_it": "Möchtest du es überschreiben?",
   "do_you_want_to_overwrite_them": "Willst Du sie überschreiben?",
   "documentation": "Dokumentation",
   "does_not_contain_or_significantly_match_your_email": "nicht mit Teilen deiner E-Mail-Adresse übereinstimmt",
@@ -364,6 +367,7 @@
   "edit_dictionary_remove": "Aus Wörterbuch entfernen",
   "edit_figure": "Abbildung bearbeiten",
   "edit_tag": "Schlagwort bearbeiten",
+  "edit_template": "Vorlage bearbeiten",
   "editing": "Bearbeitung",
   "editing_captions": "Beschriftungen bearbeiten",
   "editor_and_pdf": "Editor & PDF",
@@ -408,6 +412,7 @@
   "expiry": "Ablaufdatum",
   "export_csv": "CSV-Datei exportieren",
   "export_project_to_github": "Projekt nach GitHub exportieren",
+  "failed_to_publish_as_a_template": "Veröffentlichung als Vorlage fehlgeschlagen.",
   "failed_to_send_managed_user_invite_to_email": "Der Versand der Einladung für Verwaltete Benutzer an <0>__email__</0> hat nicht funktioniert. Bitte versuche es später noch einmal.",
   "faq_how_does_free_trial_works_answer": "Während deines __len__-tägigen Probe-Abonnements erhältst du vollen Zugriff auf die Funktionen des von dir gewählten __appName__-Abonnements. Es besteht keine Verpflichtung, über die Testperiode hinaus fortzufahren. Deine Karte wird am Ende des __len__-tägigen Testzeitraums belastet, sofern du nicht vorher gekündigt hast. Um zu kündigen, gehe zu deinen Abonnementeinstellungen in deinem Konto.",
   "fast": "Schnell",
@@ -856,6 +861,7 @@
   "no_search_results": "Keine Suchergebnisse",
   "no_selection_select_file": "Derzeit ist keine Datei ausgewählt. Bitte wähle eine Datei aus dem Dateibaum aus.",
   "no_symbols_found": "Keine Symbole gefunden",
+  "no_templates_found": "Keine Vorlagen gefunden.",
   "no_thanks_cancel_now": "Nein, danke - Ich möchte nach wie vor jetzt stornieren",
   "no_update_email": "Nein, E-Mail-Adresse aktualisieren",
   "normal": "Normal",
@@ -940,6 +946,7 @@
   "please_change_primary_to_remove": "Bitte ändere deine primäre E-Mail-Adresse, um sie zu entfernen",
   "please_check_your_inbox_to_confirm": "Bitte überprüfe deinen E-Mail-Postfach, um deine Zugehörigkeit zu <0>__institutionName__</0> zu bestätigen.",
   "please_compile_pdf_before_download": "Bitte kompiliere dein Projekt, bevor du das PDF herunterlädst",
+  "please_compile_pdf_before_publish_as_template": "Bitte kompiliere dein Projekt, bevor du es als Vorlage veröffentlichst.",
   "please_compile_pdf_before_word_count": "Bitte kompiliere dein Projekt, bevor du eine Wortzählung durchführst.",
   "please_confirm_email": "Bitte bestätige deine E-Mail-Adresse __emailAddress__, indem du auf den Link in der Bestätigungs-E-Mail klickst",
   "please_confirm_your_email_before_making_it_default": "Bitte bestätige deine E-Mail-Adresse, bevor du sie zur primären machst.",
@@ -1198,6 +1205,7 @@
   "template_not_found_description": "Diese Methode zum Erstellen von Projekten aus Vorlagen wurde entfernt. Besuche unsere Vorlagengalerie, um weitere Vorlagen zu finden.",
   "template_title_taken_from_project_title": "Der Vorlagentitel wird automatisch aus dem Projekttitel übernommen",
   "template_top_pick_by_overleaf": "Diese Vorlage wurde von Overleaf-Mitarbeitern aufgrund ihrer hohen Qualität ausgewählt",
+  "template_with_this_title_exists_and_owned_by_x": "Eine Vorlage mit diesem Namen existiert bereits, und der Besitzer ist: __x__.",
   "templates": "Vorlagen",
   "templates_admin_source_project": "Administration: Quellprojekt",
   "templates_page_title": "Vorlagen - Zeitschriften, Lebensläufe, Präsentationen, Berichte und mehr",
@@ -1267,6 +1275,7 @@
   "try_it_for_free": "Probiere es kostenlos aus",
   "try_now": "Jetzt versuchen",
   "try_premium_for_free": "Teste Premium kostenlos",
+  "try_recompile_project": "Versuche bitte, das Projekt von Grund auf neu zu kompilieren.",
   "try_recompile_project_or_troubleshoot": "Versuche bitte, das Projekt von Grund auf neu zu kompilieren. Wenn das Problem weiterhin besteht, findest Du im <0>Troubleshooting Guide</0> weitere Hilfe",
   "try_to_compile_despite_errors": "Versuche, trotz Fehler zu kompilieren",
   "turn_off_link_sharing": "Deaktiviere die Linkfreigabe",
@@ -1279,6 +1288,7 @@
   "unconfirmed": "Unbestätigt",
   "unfold_line": "Zeile ausklappen",
   "university": "Universität",
+  "unknown": "Unbekannt",
   "unlimited": "Unbegrenzt",
   "unlimited_collabs": "Unbeschränkt viele Mitarbeiter",
   "unlimited_projects": "Unbegrenzte Projekte",
@@ -1352,8 +1362,10 @@
   "x_price_per_year": "__price__ pro Jahr",
   "year": "Jahr",
   "yes_that_is_correct": "Ja, das ist richtig",
+  "you": "Du",
   "you_can_now_log_in_sso": "Du kannst dich jetzt über deine Institution anmelden und möglicherweise <0>kostenlose __appName__ „Professionell“-Funktionen</0> erhalten!",
   "you_can_opt_in_and_out_of_the_program_at_any_time_on_this_page": "Du kannst dich jederzeit auf dieser Seite für das Beta-Programm an- und abmelden",
+  "you_cant_overwrite_it": "Überschreiben ist nicht möglich.",
   "you_have_added_x_of_group_size_y": "Du hast <0>__addedUsersSize__</0> von <1>__groupSize__</1> verfügbaren Mitgliedern hinzugefügt",
   "you_will_be_able_to_contact_us_any_time_to_share_your_feedback": "Du kannst uns jederzeit kontaktieren, um uns dein Feedback mitzuteilen",
   "your_affiliation_is_confirmed": "Deine Zugehörigkeit zu <0>__institutionName__</0> ist bestätigt.",
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 910621f51a..d8f8c5622a 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1,8 +1,10 @@
 {
-  "12x_basic": "12x Basic",
-  "12x_more_compile_time": "12x more compile time on our fastest servers",
+  "0_free_suggestions": "0 free suggestions",
   "1_2_width": "½ width",
   "1_4_width": "¼ width",
+  "1_free_suggestion": "1 free suggestion",
+  "24x_basic": "24x Basic",
+  "24x_more_compile_time": "24x more compile time on our fastest servers",
   "3_4_width": "¾ width",
   "About": "About",
   "Account": "Account",
@@ -26,12 +28,14 @@
   "about_to_delete_cert": "You are about to delete the following certificate:",
   "about_to_delete_projects": "You are about to delete the following projects:",
   "about_to_delete_tag": "You are about to delete the following tag (any projects in them will not be deleted):",
+  "about_to_delete_template": "You are about to delete the following template:",
   "about_to_delete_the_following_project": "You are about to delete the following project",
   "about_to_delete_the_following_projects": "You are about to delete the following projects",
   "about_to_delete_user_preamble": "You’re about to delete __userName__ (__userEmail__). Doing this will mean:",
   "about_to_enable_managed_users": "By enabling the Managed Users feature, all existing members of your group subscription will be invited to become managed. This will give you admin rights over their account. You will also have the option to invite new members to join the subscription and become managed.",
   "about_to_leave_project": "You are about to leave this project.",
   "about_to_leave_projects": "You are about to leave the following projects:",
+  "about_to_remove_user_preamble": "You’re about to remove __userName__ (__userEmail__). Doing this will mean:",
   "about_to_trash_projects": "You are about to trash the following projects:",
   "abstract": "Abstract",
   "accept": "Accept",
@@ -96,6 +100,8 @@
   "add_new_email": "Add new email",
   "add_on": "Add-on",
   "add_ons": "Add-ons",
+  "add_ons_for_any_plan": "Add-ons for any plan",
+  "add_ons_for_any_plan_subheading": "Buy add-ons for any Overleaf plan (including the free plan) to unlock additional features.",
   "add_or_remove_project_from_tag": "Add or remove project from tag __tagName__",
   "add_people": "Add people",
   "add_role_and_department": "Add role and department",
@@ -125,8 +131,11 @@
   "aggregate_to": "to",
   "agree": "Agree",
   "agree_with_the_terms": "I agree with the Overleaf terms",
+  "ai_assist": "AI Assist",
+  "ai_assist_description": "AI Assist combines AI tools from Overleaf and Writefull to help you write faster, smarter and with confidence.",
   "ai_assist_in_overleaf_is_included_via_writefull_groups": "AI Assist in Overleaf is included as part of your group or organization’s Writefull subscription. To make changes you’ll need to speak to your subscription admin",
   "ai_assist_in_overleaf_is_included_via_writefull_individual": "AI Assist in Overleaf is included as part of your Writefull subscription. You can cancel or manage your access to AI Assist in your Writefull subscription settings.",
+  "ai_assist_unavailable_due_to_subscription_type": "We’re sorry—it looks like AI Assist isn’t available to you just yet due to your current subscription type.",
   "ai_assistance_to_help_you": "AI assistance to help you fix LaTeX errors",
   "ai_based_language_tools": "AI-based language tools tailored to research writing",
   "ai_can_make_mistakes": "AI can make mistakes. Review fixes before you apply them.",
@@ -160,6 +169,7 @@
   "an_error_occured_while_restoring_project": "An error occured while restoring the project",
   "an_error_occurred_when_verifying_the_coupon_code": "An error occurred when verifying the coupon code",
   "and": "and",
+  "and_upgrade_for_compile_time": "And you can <strong>upgrade to get more compile time</strong>.",
   "annual": "Annual",
   "annual_discount": "Annual discount",
   "anonymous": "Anonymous",
@@ -240,10 +250,12 @@
   "blog": "Blog",
   "bold": "Bold",
   "booktabs": "Booktabs",
+  "breadcrumbs": "Breadcrumbs",
   "brl_discount_offer_plans_page_banner": "__flag__ <b>Great news!</b> We’ve applied a 50% discount to premium plans on this page for our users in Brazil. Check out the new lower prices.",
   "browser": "Browser",
   "built_in": "Built-In",
   "bullet_list": "Bullet list",
+  "buy_add_on": "Buy add-on",
   "buy_licenses": "Buy licenses",
   "buy_more_licenses": "Buy more licenses",
   "buy_now_no_exclamation_mark": "Buy now",
@@ -259,7 +271,9 @@
   "can_view_content": "Can view content",
   "cancel": "Cancel",
   "cancel_add_on": "Cancel add-on",
-  "cancel_anytime": "We’re confident that you’ll love __appName__, but if not you can cancel anytime. We’ll give you your money back, no questions asked, if you let us know within 30 days.",
+  "cancel_any_existing_subscriptions": "Cancel any existing subscriptions. <0>This can be managed from the Subscription page.</0>",
+  "cancel_any_existing_subscriptions_and_leave_any_group_subscriptions": "Cancel any existing subscriptions, and leave any group subscriptions other than the one managing your account. <0>This can be managed from the Subscription page.</0>",
+  "cancel_anytime": "We’re confident that you’ll love __appName__, but if not, you can cancel anytime and request your money back, hassle free, within 30 days.",
   "cancel_my_account": "Cancel my subscription",
   "cancel_my_subscription": "Cancel my subscription",
   "cancel_personal_subscription_first": "You already have an individual subscription, would you like us to cancel this first before joining the group licence?",
@@ -280,6 +294,7 @@
   "card_payment": "Card payment",
   "careers": "Careers",
   "categories": "Categories",
+  "category": "Category",
   "category_arrows": "Arrows",
   "category_greek": "Greek",
   "category_misc": "Misc",
@@ -369,6 +384,8 @@
   "compile_error_entry_description": "An error which prevented this project from compiling",
   "compile_error_handling": "Compile error handling",
   "compile_larger_projects": "Compile larger projects",
+  "compile_limit_reached": "Compile limit reached",
+  "compile_limit_upgrade_prompt": "Your document took longer than the free plan’s compile window. Upgrade to Overleaf Premium for extended compile durations, priority build servers, and uninterrupted LaTeX processing—so you can focus on writing, not waiting.",
   "compile_mode": "Compile mode",
   "compile_servers": "Compile servers",
   "compile_servers_info_new": "The servers used to compile your project. Compiles for users on paid plans always run on the fastest available servers.",
@@ -394,6 +411,7 @@
   "confirm_reject_selected_changes": "Are you sure you want to reject the selected change?",
   "confirm_reject_selected_changes_plural": "Are you sure you want to reject the selected __count__ changes?",
   "confirm_remove_sso_config_enter_email": "To confirm you want to remove your SSO configuration, enter your email address:",
+  "confirm_remove_user_type_email_address": "To confirm you want to remove __userName__ please type the email address associated with their account.",
   "confirm_secondary_email": "Confirm secondary email",
   "confirm_your_email": "Confirm your email address",
   "confirmation_link_broken": "Sorry, something is wrong with your confirmation link. Please try copy and pasting the link from the bottom of your confirmation email.",
@@ -499,6 +517,7 @@
   "delete_sso_config": "Delete SSO configuration",
   "delete_table": "Delete table",
   "delete_tag": "Delete Tag",
+  "delete_template": "Delete template",
   "delete_token": "Delete token",
   "delete_user": "Delete user",
   "delete_your_account": "Delete your account",
@@ -535,7 +554,6 @@
   "discover_latex_templates_and_examples": "Discover LaTeX templates and examples to help with everything from writing a journal article to using a specific LaTeX package.",
   "discover_the_fastest_way_to_search_and_cite": "Discover the fastest way to search and cite",
   "discover_why_over_people_worldwide_trust_overleaf": "Discover why over __count__ million people worldwide trust Overleaf with their work.",
-  "dismiss_error_popup": "Dismiss first error alert",
   "display": "Display",
   "display_deleted_user": "Display deleted users",
   "display_math": "Display math",
@@ -615,6 +633,7 @@
   "edit_figure": "Edit figure",
   "edit_sso_configuration": "Edit SSO Configuration",
   "edit_tag": "Edit Tag",
+  "edit_template": "Edit template",
   "edit_your_custom_dictionary": "Edit your custom dictionary",
   "editing": "Editing",
   "editing_and_collaboration": "Editing and collaboration",
@@ -682,6 +701,7 @@
   "error": "Error",
   "error_assist": "Error Assist",
   "error_log": "Error log",
+  "error_logs_have_had_an_update": "Error logs have had an update",
   "error_opening_document": "Error opening document",
   "error_opening_document_detail": "Sorry, something went wrong opening this document. Please try again.",
   "error_performing_request": "An error has occurred while performing your request.",
@@ -711,6 +731,7 @@
   "explore_all_plans": "Explore all plans",
   "export_csv": "Export CSV",
   "export_project_to_github": "Export Project to GitHub",
+  "failed_to_publish_as_a_template": "Failed to publish as a template.",
   "failed_to_send_group_invite_to_email": "Failed to send Group invite to <0>__email__</0>. Please try again later.",
   "failed_to_send_managed_user_invite_to_email": "Failed to send Managed User invite to <0>__email__</0>. Please try again later.",
   "failed_to_send_sso_link_invite_to_email": "Failed to send SSO invite reminder to <0>__email__</0>. Please try again later.",
@@ -822,6 +843,7 @@
   "generic_if_problem_continues_contact_us": "If the problem continues please contact us",
   "generic_linked_file_compile_error": "This project’s output files are not available because it failed to compile. Please open the project to see the compilation error details.",
   "generic_something_went_wrong": "Sorry, something went wrong",
+  "get_ai_assist": "Get AI Assist",
   "get_collaborative_benefits": "Get the collaborative benefits from __appName__, even if you prefer to work offline",
   "get_discounted_plan": "Get discounted plan",
   "get_error_assist": "Get Error Assist",
@@ -887,7 +909,8 @@
   "go_next_page": "Go to Next Page",
   "go_page": "Go to page __page__",
   "go_prev_page": "Go to Previous Page",
-  "go_to_account_settings": "Go to Account settings",
+  "go_to_account_settings": "Go to account settings",
+  "go_to_code_location": "Go to code location",
   "go_to_code_location_in_pdf": "Go to code location in PDF",
   "go_to_first_page": "Go to first page",
   "go_to_last_page": "Go to last page",
@@ -1075,6 +1098,7 @@
   "integrations": "Integrations",
   "integrations_like_github": "Integrations like GitHub Sync",
   "interested_in_cheaper_personal_plan": "Would you be interested in the cheaper <0>__price__</0> Personal plan?",
+  "introducing_shorter_compile_timeout": "We’re <0>introducing a shorter compile timeout limit</0>. This project currently exceeds the new limit, so it might not compile from 16th July 2025.",
   "invalid_certificate": "Invalid certificate. Please check the certificate and try again.",
   "invalid_confirmation_code": "That didn’t work. Please check the code and try again.",
   "invalid_email": "An email address is invalid",
@@ -1272,6 +1296,7 @@
   "login_to_overleaf": "Log in to Overleaf",
   "login_with_service": "Log in with __service__",
   "login_with_sso": "Log in to Overleaf with SSO",
+  "logs": "Logs",
   "logs_and_output_files": "Logs and output files",
   "longer_compile_timeout": "Longer <0>compile timeout</0>",
   "longer_compile_timeout_on_faster_servers": "Longer compile timeout on faster servers",
@@ -1345,7 +1370,7 @@
   "missing_field_for_entry": "Missing field for",
   "missing_fields_for_entry": "Missing fields for",
   "missing_payment_details": "Missing payment details",
-  "money_back_guarantee": "30-day money back guarantee, no questions asked",
+  "money_back_guarantee": "30-day money back guarantee, hassle free",
   "month": "month",
   "month_plural": "months",
   "monthly": "Monthly",
@@ -1356,6 +1381,7 @@
   "more_compile_time": "More compile time",
   "more_editor_toolbar_item": "More editor toolbar items",
   "more_info": "More Info",
+  "more_logs_and_files": "More logs and files",
   "more_options": "More options",
   "more_project_collaborators": "<0>More</0> project <0>collaborators</0>",
   "more_than_one_kind_of_snippet_was_requested": "The link to open this content on Overleaf included some invalid parameters. If this keeps happening for links on a particular site, please report this to them.",
@@ -1388,6 +1414,7 @@
   "neither_agree_nor_disagree": "Neither agree nor disagree",
   "new_compile_domain_notice": "We’ve recently migrated PDF downloads to a new domain. Something might be blocking your browser from accessing that new domain, <0>__compilesUserContentDomain__</0>. This could be caused by network blocking or a strict browser plugin rule. Please follow our <1>troubleshooting guide</1>.",
   "new_create_tables_and_equations": "NEW! <sparkle/> Create tables and equations in seconds",
+  "new_error_logs_panel": "New error logs panel. Added ‘Go to location in code’ and ‘Go to location in PDF’ buttons (17 June 2025)",
   "new_file": "New file",
   "new_folder": "New folder",
   "new_font_open_dyslexic": "New font: OpenDyslexic Mono is designed to improve readability for those with dyslexia.",
@@ -1444,6 +1471,7 @@
   "no_search_results": "No Search Results",
   "no_selection_select_file": "Currently, no file is selected. Please select a file from the file tree.",
   "no_symbols_found": "No symbols found",
+  "no_templates_found": "No templates found.",
   "no_thanks_cancel_now": "No thanks, I still want to cancel",
   "no_update_email": "No, update email",
   "non_deletable_entity": "The specified entity may not be deleted",
@@ -1485,10 +1513,11 @@
   "ongoing_experiments": "Ongoing experiments",
   "online_latex_editor": "Online LaTeX Editor",
   "only_group_admin_or_managers_can_delete_your_account_1": "By becoming a managed user, your organization will have admin rights over your account and control over your stuff, including the right to close your account and access, delete and share your stuff. As a result:",
-  "only_group_admin_or_managers_can_delete_your_account_2": "Only your group admin or group managers will be able to delete your account.",
   "only_group_admin_or_managers_can_delete_your_account_3": "Your group admin and group managers will be able to reassign ownership of your projects to another group member.",
-  "only_group_admin_or_managers_can_delete_your_account_4": "Once you have become a managed user, you cannot change back. <0>Learn more about managed Overleaf accounts.</0>",
-  "only_group_admin_or_managers_can_delete_your_account_5": "For more information, see the \"Managed Accounts\" section in our terms of use, which you agree to by clicking Accept invitation",
+  "only_group_admin_or_managers_can_delete_your_account_6": "Only your group admin or group managers will be able to delete your account or change your account back into an unmanaged account.",
+  "only_group_admin_or_managers_can_delete_your_account_7": "Only your group admin or group managers will be able to delete your account or change your account into an unmanaged account.",
+  "only_group_admin_or_managers_can_delete_your_account_8": "We’ll cancel the renewal of your subscription, reach out to Support to request a pro-rata refund. Your individual subscription will be terminated when your account becomes managed.",
+  "only_group_admin_or_managers_can_delete_your_account_9": "Once you have become a managed user, <0>you yourself cannot change it back to an unmanaged account</0>. <1>Learn more about managed Overleaf accounts.</1>",
   "only_importer_can_refresh": "Only the person who originally imported this __provider__ file can refresh it.",
   "open_action_menu": "Open __name__ action menu",
   "open_advanced_reference_search": "Open advanced reference search",
@@ -1511,7 +1540,6 @@
   "original_price": "Original price",
   "other": "Other",
   "other_actions": "Other Actions",
-  "other_causes_of_compile_timeouts": "Other causes of compile timeouts",
   "other_logs_and_files": "Other logs and files",
   "other_output_files": "Download other output files",
   "other_sessions": "Other Sessions",
@@ -1532,7 +1560,7 @@
   "overleaf_labs": "Overleaf Labs",
   "overleaf_logo": "Overleaf logo",
   "overleaf_plans_and_pricing": "overleaf plans and pricing",
-  "overleaf_template_gallery": "overleaf template gallery",
+  "overleaf_template_gallery": "overleaf ce template gallery",
   "overleafs_functionality_meets_my_needs": "Overleaf’s functionality meets my needs.",
   "overview": "Overview",
   "overwrite": "Overwrite",
@@ -1624,6 +1652,7 @@
   "please_change_primary_to_remove": "Please change your primary email in order to remove",
   "please_check_your_inbox_to_confirm": "Please check your email inbox to confirm your <0>__institutionName__</0> affiliation.",
   "please_compile_pdf_before_download": "Please compile your project before downloading the PDF",
+  "please_compile_pdf_before_publish_as_template": "Please compile your project before publishing it as a template",
   "please_compile_pdf_before_word_count": "Please compile your project before performing a word count",
   "please_confirm_email": "Please confirm your email __emailAddress__ by clicking on the link in the confirmation email ",
   "please_confirm_primary_email_or_edit": "Please confirm your primary email address __emailAddress__. To edit it, go to <0>Account settings</0>.",
@@ -1666,6 +1695,7 @@
   "presentation": "Presentation",
   "presentation_mode": "Presentation mode",
   "press_and_awards": "Press & awards",
+  "prev": "Prev",
   "previous_page": "Previous page",
   "price": "Price",
   "primarily_work_study_question": "Where do you primarily work or study?",
@@ -1707,6 +1737,7 @@
   "project_ownership_transfer_confirmation_2": "This action cannot be undone. The new owner will be notified and will be able to change project access settings (including removing your own access).",
   "project_renamed_or_deleted": "Project Renamed or Deleted",
   "project_renamed_or_deleted_detail": "This project has either been renamed or deleted by an external data source such as Dropbox. We don’t want to delete your data on Overleaf, so this project still contains your history and collaborators. If the project has been renamed please look in your project list for a new project under the new name.",
+  "project_search": "Project search",
   "project_search_file_count": "in __count__ file",
   "project_search_file_count_plural": "in __count__ files",
   "project_search_result_count": "__count__ result",
@@ -1728,7 +1759,7 @@
   "pt": "Portuguese",
   "public": "Public",
   "publish": "Publish",
-  "publish_as_template": "Manage Template",
+  "publish_as_template": "Publish as a Template",
   "publisher_account": "Publisher Account",
   "publishing": "Publishing",
   "pull_github_changes_into_sharelatex": "Pull GitHub changes into __appName__",
@@ -1742,6 +1773,8 @@
   "reactivate_subscription": "Reactivate your subscription",
   "read_lines_from_path": "Read lines from __path__",
   "read_more": "Read more",
+  "read_more_about_compile_timeout_changes": "Read more about changes to compile timeout limits",
+  "read_more_about_fix_prevent_timeout": "Read more about how to fix and prevent timeouts",
   "read_more_about_free_compile_timeouts_servers": "Read more about changes to free compile timeouts and servers",
   "read_only_dropbox_sync_message": "As a read-only viewer you can sync the current project version to Dropbox, but changes made in Dropbox will <0>not</0> sync back to Overleaf.",
   "read_only_token": "Read-Only Token",
@@ -1816,6 +1849,7 @@
   "remove_secondary_email_addresses": "Remove any secondary email addresses associated with your account. <0>Remove them in account settings.</0>",
   "remove_sso_login_option": "Remove the SSO login option for your users.",
   "remove_tag": "Remove tag __tagName__",
+  "remove_user": "Remove user",
   "removed": "removed",
   "removed_from_project": "Removed from project",
   "removing": "Removing",
@@ -1846,7 +1880,6 @@
   "resend": "Resend",
   "resend_confirmation_code": "Resend confirmation code",
   "resend_confirmation_email": "Resend confirmation email",
-  "resend_email": "Resend email",
   "resend_group_invite": "Resend group invite",
   "resend_link_sso": "Resend SSO invite",
   "resend_managed_user_invite": "Resend managed user invite",
@@ -1945,6 +1978,7 @@
   "search_whole_word": "Whole word",
   "search_within_selection": "Within selection",
   "searched_path_for_lines_containing": "Searched __path__ for lines containing \"__query__\"",
+  "searching_all_project_files_is_now_available": "Searching all project files is now available (2 June 2025)",
   "secondary_email_password_reset": "That email is registered as a secondary email. Please enter the primary email for your account.",
   "security": "Security",
   "see_suggestions_from_collaborators": "See suggestions from collaborators",
@@ -2015,6 +2049,8 @@
   "sharelatex_beta_program": "__appName__ Beta Program",
   "shortcut_to_open_advanced_reference_search": "(<strong>__ctrlSpace__</strong> or <strong>__altSpace__</strong>)",
   "show_all_projects": "Show all projects",
+  "show_breadcrumbs": "Show breadcrumbs",
+  "show_breadcrumbs_in_toolbar": "Show breadcrumbs in toolbar",
   "show_document_preamble": "Show document preamble",
   "show_equation_preview": "Show equation preview",
   "show_file_tree": "Show file tree",
@@ -2127,6 +2163,7 @@
   "start_a_free_trial": "Start a free trial",
   "start_by_adding_your_email": "Start by adding your email address.",
   "start_by_fixing_the_first_error_in_your_doc": "Start by fixing the first error in your doc to avoid problems later on.",
+  "start_by_fixing_the_first_error_in_your_document": "Start by fixing the first error in the document to avoid cascading problems later on.",
   "start_free_trial": "Start Free Trial!",
   "start_free_trial_without_exclamation": "Start Free Trial",
   "start_the_conversation_by_saying_hello_or_sharing_an_update": "Start the conversation by saying hello or sharing an update",
@@ -2167,6 +2204,7 @@
   "suggest_a_different_fix": "Suggest a different fix",
   "suggest_fix": "Suggest fix",
   "suggested": "Suggested",
+  "suggested_code": "Suggested code",
   "suggested_fix_for_error_in_path": "Suggested fix for error in __path__",
   "suggestion": "Suggestion",
   "suggestion_applied": "Suggestion applied",
@@ -2215,6 +2253,7 @@
   "template_not_found_description": "This way of creating projects from templates has been removed. Please visit our template gallery to find more templates.",
   "template_title_taken_from_project_title": "The template title will be taken automatically from the project title",
   "template_top_pick_by_overleaf": "This template was hand-picked by Overleaf staff for its high quality",
+  "template_with_this_title_exists_and_owned_by_x": "A template with this title already exists and is owned by __x__.",
   "templates": "Templates",
   "templates_admin_source_project": "Admin: Source Project",
   "templates_lowercase": "templates",
@@ -2228,7 +2267,7 @@
   "test_configuration": "Test configuration",
   "test_configuration_successful": "Test configuration successful",
   "tex_live_version": "TeX Live version",
-  "texgpt": "TexGPT",
+  "texgpt": "TeXGPT",
   "text": "Text",
   "thank_you": "Thank you!",
   "thank_you_email_confirmed": "Thank you, your email is now confirmed",
@@ -2277,6 +2316,12 @@
   "there_was_an_error_opening_your_content": "There was an error creating your project",
   "thesis": "Thesis",
   "they_lose_access_to_account": "They lose all access to this Overleaf account immediately",
+  "they_will_be_removed_from_the_group": "They will be removed from the group.",
+  "they_will_continue_to_have_access_to_any_projects_shared_with_them": "They will continue to have access to any projects shared with them.",
+  "they_will_no_longer_be_a_managed_user": "They will no longer be a managed user.",
+  "they_will_retain_ownership_of_projects_currently_owned_by_them_and_collaborators_will_become_read_only": "They will retain ownership of projects currently owned by them and any collaborators on those projects will become read-only.",
+  "they_will_retain_their_existing_account_on_the_free_plan": "They will retain their existing account on the __appName__ free plan.",
+  "they_wont_be_able_to_log_in_with_sso_they_will_need_to_set_password": "They won’t be able to log in with SSO (if you have this enabled). They will need to set an __appName__ password.",
   "this_action_cannot_be_reversed": "This action cannot be reversed.",
   "this_action_cannot_be_undone": "This action cannot be undone.",
   "this_address_will_be_shown_on_the_invoice": "This address will be shown on the invoice",
@@ -2289,6 +2334,7 @@
   "this_is_the_file_that_references_pulled_from_your_reference_manager_will_be_added_to": "This is the file that references pulled from your reference manager will be added to.",
   "this_is_your_template": "This is your template from your project",
   "this_project_already_has_maximum_collaborators": "This project already has the maximum number of collaborators permitted on the owner’s plan. This means you can view but not edit or review the project.",
+  "this_project_compiled_but_soon_might_not": "This project compiled, but soon it might not",
   "this_project_contains_a_file_called_output": "This project contains a file called output.pdf. If that file exists, please rename it and compile again.",
   "this_project_exceeded_collaborator_limit": "This project exceeded the collaborator limit for your plan. All other users now have view-only access.",
   "this_project_exceeded_compile_timeout_limit_on_free_plan": "This project exceeded the compile timeout limit on our free plan.",
@@ -2418,6 +2464,7 @@
   "try_now": "Try Now",
   "try_papers_for_free": "Try Papers for free",
   "try_premium_for_free": "Try Premium for free",
+  "try_recompile_project": "Please try recompiling the project from scratch.",
   "try_recompile_project_or_troubleshoot": "Please try recompiling the project from scratch, and if that doesn’t help, follow our <0>troubleshooting guide</0>.",
   "try_relinking_provider": "It looks like you need to re-link your __provider__ account.",
   "try_the_new_editor": "Try the new editor",
@@ -2484,7 +2531,7 @@
   "updating_site": "Updating Site",
   "upgrade": "Upgrade",
   "upgrade_cc_btn": "Upgrade now, pay after 7 days",
-  "upgrade_for_12x_more_compile_time": "Upgrade to get 12x more compile time",
+  "upgrade_for_more_compile_time": "Upgrade to get more compile time",
   "upgrade_my_plan": "Upgrade my plan",
   "upgrade_now": "Upgrade now",
   "upgrade_plan": "Upgrade plan",
@@ -2492,7 +2539,7 @@
   "upgrade_to_add_more_collaborators_and_access_collaboration_features": "Upgrade to add more collaborators and access collaboration features like track changes and full project history.",
   "upgrade_to_get_feature": "Upgrade to get __feature__, plus:",
   "upgrade_to_review": "Upgrade to Review",
-  "upgrade_to_unlock_more_time": "Upgrade now to unlock 12x more compile time on our fastest servers.",
+  "upgrade_to_unlock_more_time": "Upgrade now to unlock 24x more compile time on our fastest servers.",
   "upgrade_your_subscription": "Upgrade your subscription",
   "upload": "Upload",
   "upload_failed": "Upload failed",
@@ -2518,6 +2565,7 @@
   "user_deletion_error": "Sorry, something went wrong deleting your account. Please try again in a minute.",
   "user_deletion_password_reset_tip": "If you cannot remember your password, or if you are using Single-Sign-On with another provider to sign in (such as ORCID or Google), please <0>reset your password</0> and try again.",
   "user_first_name_attribute": "User first name attribute",
+  "user_has_left_organization_and_need_to_transfer_their_projects": "In cases where a user has left your organization and you need to transfer their projects, the <0>Delete user</0> option should be used.",
   "user_is_not_part_of_group": "User is not part of group",
   "user_last_name_attribute": "User last name attribute",
   "user_management": "User management",
@@ -2593,8 +2641,8 @@
   "were_making_some_changes_to_project_sharing_this_means_you_will_be_visible": "We’re making some <0>changes to project sharing</0>. This means, as someone with edit access, your name and email address will be visible to the project owner and other editors.",
   "were_performing_maintenance": "We’re performing maintenance on Overleaf and you need to wait a moment. Sorry for any inconvenience. The editor will refresh automatically in __seconds__ seconds.",
   "were_redesigning_our_editor_to_make_it_easier_to_use": "We’re redesigning our editor to make it easier to use and ensure it’s future ready. Try it out and give us your feedback to help us get this right. (Some features are still in the works, so you can switch back at any time.)",
-  "weve_recently_reduced_the_compile_timeout_limit_which_may_have_affected_this_project": "We’ve recently <0>reduced the compile timeout limit</0> on our free plan, which may have affected this project.",
-  "weve_recently_reduced_the_compile_timeout_limit_which_may_have_affected_your_project": "We’ve recently <0>reduced the compile timeout limit</0> on our free plan, which may have affected your project.",
+  "were_reducing_compile_timeout": "We’re in the process of <0>reducing the compile timeout limit</0> on our free plan, which may affect your project in future.",
+  "what_did_you_find_most_helpful": "What did you find most helpful?",
   "what_do_you_need": "What do you need?",
   "what_do_you_need_help_with": "What do you need help with?",
   "what_does_this_mean": "What does this mean?",
@@ -2662,6 +2710,7 @@
   "you_can_still_use_your_premium_features": "You can still use your premium features until the pause becomes active.",
   "you_cant_add_or_change_password_due_to_sso": "You can’t add or change your password because your group or organization uses <0>single sign-on (SSO)</0>.",
   "you_cant_join_this_group_subscription": "You can’t join this group subscription",
+  "you_cant_overwrite_it": "You can’t overwrite it.",
   "you_cant_reset_password_due_to_sso": "You can’t reset your password because your group or organization uses SSO. <0>Log in with SSO</0>.",
   "you_dont_have_any_add_ons_on_your_account": "You don’t have any add-ons on your account.",
   "you_dont_have_any_repositories": "You don’t have any repositories",
@@ -2674,6 +2723,7 @@
   "you_have_been_removed_from_this_project_and_will_be_redirected_to_project_dashboard": "You have been removed from this project, and will no longer have access to it. You will be redirected to your project dashboard momentarily.",
   "you_have_x_licenses_and_your_plan_supports_up_to_y": "You have __addedUsersSize__ licenses and your plan supports up to __groupSize__.",
   "you_have_x_licenses_on_your_subscription": "You have __groupSize__ licenses on your subscription.",
+  "you_may_be_able_to_fix_issues_to_speed_up_the_compile": "You may be able to fix issues to <0>speed up the compile</0>.",
   "you_need_to_configure_your_sso_settings": "You need to configure and test your SSO settings before enabling SSO",
   "you_unpaused_your_subscription": "You unpaused your subscription.",
   "you_will_be_able_to_contact_us_any_time_to_share_your_feedback": "<0>You will be able to contact us</0> any time to share your feedback",
@@ -2711,6 +2761,7 @@
   "your_plan_is_limited_to_n_editors": "Your plan allows __count__ collaborator with edit access and unlimited viewers.",
   "your_plan_is_limited_to_n_editors_plural": "Your plan allows __count__ collaborators with edit access and unlimited viewers.",
   "your_premium_plan_is_paused": "Your Premium plan is <0>paused</0>.",
+  "your_project_compiled_but_soon_might_not": "Your project compiled, but soon it might not",
   "your_project_exceeded_collaborator_limit": "Your project exceeded the collaborator limit and access levels were changed. Select a new access level for your collaborators, or upgrade to add more editors or reviewers.",
   "your_project_exceeded_compile_timeout_limit_on_free_plan": "Your project exceeded the compile timeout limit on our free plan.",
   "your_project_near_compile_timeout_limit": "Your project is near the compile timeout limit for our free plan.",
@@ -2736,6 +2787,7 @@
   "youre_signed_up": "You’re signed up",
   "youve_added_more_licenses": "You’ve added more license(s)!",
   "youve_added_x_more_licenses_to_your_subscription_invite_people": "You’ve added __users__ more license(s) to your subscription. <0>Invite people</0>.",
+  "youve_already_used_your_free_tial": "You’ve already used your free trial. Upgrade to continue using premium features.",
   "youve_lost_collaboration_access": "You’ve lost collaboration access",
   "youve_paused_your_subscription": "Your <0>__planName__</0> subscription is paused until <0>__reactivationDate__</0>, then it’ll automatically unpause. You can unpause early at any time.",
   "youve_unlinked_all_users": "You’ve unlinked all users",
diff --git a/services/web/locales/fr.json b/services/web/locales/fr.json
index c081b84651..2e80ea2132 100644
--- a/services/web/locales/fr.json
+++ b/services/web/locales/fr.json
@@ -344,7 +344,6 @@
   "disable_stop_on_first_error": "Désactiver “Arrêter à la première erreur”",
   "disconnected": "Déconnecté",
   "discount_of": "Remise de __amount__",
-  "dismiss_error_popup": "Ignorer l’alerte de première erreur",
   "do_not_have_acct_or_do_not_want_to_link": "Si vous n’avez pas de compte <b>__appName__</b> ou si vous ne souhaitez pas le lier à votre compte <b>__institutionName__</b>, veuillez cliquer <b>__clickText__</b>.",
   "do_not_link_accounts": "Ne pas lier les comptes",
   "do_you_want_to_change_your_primary_email_address_to": "Voulez-vous définir <b>__email__</b> comme votre adresse email principale ?",
diff --git a/services/web/locales/ru.json b/services/web/locales/ru.json
index 13975aadf2..a416624fbe 100644
--- a/services/web/locales/ru.json
+++ b/services/web/locales/ru.json
@@ -3,6 +3,8 @@
   "12x_more_compile_time": "В 12 раз больше времени компиляции на наших быстрейших серверах",
   "1_2_width": "½ ширины",
   "1_4_width": "¼ ширины",
+  "24x_basic": "24х базовый",
+  "24x_more_compile_time": "В 24 раз больше времени компиляции на наших быстрейших серверах",
   "3_4_width": "¾ ширины",
   "About": "О сайте",
   "Account": "Аккаунт",
@@ -20,6 +22,7 @@
   "about_to_archive_projects": "Вы собираетесь архивировать следующие проекты:",
   "about_to_delete_cert": "Вы собираетесь удалить следующий сертификат:",
   "about_to_delete_projects": "Следующие проекты будут удалены:",
+  "about_to_delete_template": "Следующий шаблон будет удален:",
   "about_to_delete_the_following_project": "Вы собираетесь удалить следующий проект:",
   "about_to_delete_the_following_projects": "Вы собираетесь удалить следующие проекты:",
   "about_to_leave_project": "Вы собираетесь покинуть этот проект:",
@@ -69,6 +72,7 @@
   "cancel_your_subscription": "Остановить подписку",
   "cant_find_email": "Извините, данный адрес не зарегистрирован.",
   "cant_find_page": "К сожалению, страница не найдена",
+  "category": "Категория",
   "change": "Изменить",
   "change_password": "Изменение пароля",
   "change_plan": "Сменить тарифный план",
@@ -127,9 +131,11 @@
   "delete_account_warning_message_3": "Вы собираетесь <strong>удалить все данные Вашего аккаунта</strong>, включая все Ваши проекты и настройки. Пожалуйста, введите адрес электронной почты и пароль Вашего аккаунта в форму внизу для продолжения.",
   "delete_and_leave_projects": "Удалить или оставить проекты",
   "delete_projects": "Удалить проекты",
+  "delete_template": "Удалить шаблон",
   "delete_your_account": "Удалить аккаунт",
   "deleting": "Удаление",
   "disconnected": "Разъединен",
+  "do_you_want_to_overwrite_it": "Перезаписать?",
   "documentation": "Документация",
   "doesnt_match": "Не совпадает",
   "done": "Готово",
@@ -138,6 +144,7 @@
   "download_zip_file": "Скачать архив (.zip)",
   "dropbox_sync": "Синхронизация с Dropbox",
   "dropbox_sync_description": "Синхронизируйте Ваши __appName__ проекты с Вашим Dropbox. Изменения в __appName__ автоматически сохраняются в Вашем Dropbox, и наоборот.",
+  "edit_template": "Редактировать шаблон",
   "editing": "Редактор",
   "email": "Адрес электронной почты",
   "email_already_registered": "Этот адрес уже зарегистрирован.",
@@ -149,6 +156,7 @@
   "example_project": "Использовать пример",
   "expiry": "Срок действия",
   "export_project_to_github": "Экспорт проекта на GitHub",
+  "failed_to_publish_as_a_template": "Не удалось создать шаблон.",
   "fast": "быстрый",
   "features": "Возможности",
   "february": "Февраль",
@@ -272,6 +280,7 @@
   "no_projects": "Нет проектов",
   "no_search_results": "Ничего не найдено",
   "no_thanks_cancel_now": "Нет, спасибо - я хочу удалить сейчас",
+  "no_templates_found": "Шаблоны не найдены.",
   "normal": "нормальный",
   "not_now": "Не сейчас",
   "notification_project_invite": "<b>__userName__</b> приглашает Вас принять участие в проекте __projectName__,<a class=\"ben btn-xs btn-info\" href=\"’/project/__projectId__/invite/token/__token__’\">Присоединиться</a>",
@@ -300,7 +309,8 @@
   "plans_amper_pricing": "Тарифы",
   "plans_and_pricing": "Тарифные планы",
   "please_compile_pdf_before_download": "Пожалуйста, скомпилируйте проект перед загрузкой PDF",
-  "please_compile_pdf_before_word_count": "Пожалуйста, скомпилируйте проект, прежде чем подсчитывать количество слов!",
+  "please_compile_pdf_before_publish_as_template": "Пожалуйста, скомпилируйте проект, прежде чем создавать из него шаблон",
+  "please_compile_pdf_before_word_count": "Пожалуйста, скомпилируйте проект, прежде чем подсчитывать количество слов.",
   "please_enter_email": "Пожалуйста, введите адрес электронной почты",
   "please_refresh": "Пожалуйста, обновите страницу для продолжения",
   "please_set_a_password": "Пожалуйста, укажите пароль",
@@ -409,6 +419,7 @@
   "syntax_validation": "Проверка кода",
   "take_me_home": "Вернуться в начало",
   "template_description": "Описание шаблона",
+  "template_with_this_title_exists_and_owned_by_x": "Уже есть шаблон с таким названием, его владелец __x__.",
   "templates": "Шаблоны",
   "terminated": "Компиляция отменена",
   "terms": "Условия",
@@ -433,8 +444,10 @@
   "total_words": "Количество слов",
   "tr": "Турецкий",
   "try_now": "Попробуйте",
+  "try_recompile_project": "Попробуйте скомпилировать проект заново.",
   "uk": "Украинский",
   "university": "Университет",
+  "unknown": "Неизвестный",
   "unlimited_collabs": "Неограниченно число соавторов",
   "unlimited_projects": "Неограниченное число проектов",
   "unlink": "Отсоединить",
@@ -462,6 +475,8 @@
   "welcome_to_sl": "Добро пожаловать в __appName__",
   "word_count": "Количество слов",
   "year": "год",
+  "you": "Вы",
+  "you_cant_overwrite_it": "Перезаписать нельзя.",
   "you_have_added_x_of_group_size_y": "Вы добавили <0>__addedUsersSize__</0> из <1>__groupSize__</1> доступных участников",
   "your_plan": "Ваш тариф",
   "your_projects": "Созданные мной",
diff --git a/services/web/locales/sv.json b/services/web/locales/sv.json
index 9ed626fe36..ab9f615050 100644
--- a/services/web/locales/sv.json
+++ b/services/web/locales/sv.json
@@ -208,7 +208,6 @@
   "dictionary": "Ordbok",
   "disable_stop_on_first_error": "Inaktivera \"Stopp vid första fel\"",
   "disconnected": "Frånkopplad",
-  "dismiss_error_popup": "Avfärda varning om första fel",
   "do_not_have_acct_or_do_not_want_to_link": "Om du inte har ett <b>__appName__</b>-konto, eller om du inte vill länka till ditt <b>__institutionName__</b>-konto, vänligen klicka på <b>__clickText__</b>.",
   "do_not_link_accounts": "Länka ej konton",
   "documentation": "Dokumentation",
diff --git a/services/web/locales/zh-CN.json b/services/web/locales/zh-CN.json
index bd05d2ab1b..6c4249aeff 100644
--- a/services/web/locales/zh-CN.json
+++ b/services/web/locales/zh-CN.json
@@ -3,6 +3,8 @@
   "12x_more_compile_time": "在更快的服务器上获取12倍的编译时间",
   "1_2_width": "½ 宽度",
   "1_4_width": "¼ 宽度",
+  "24x_basic": "24倍 免费时长 (240s)",
+  "24x_more_compile_time": "在更快的服务器上获取24倍的编译时间",
   "3_4_width": "¾ 宽度",
   "About": "关于",
   "Account": "账户",
@@ -518,7 +520,6 @@
   "discover_latex_templates_and_examples": "探索 LaTeX 模板和示例，以帮助完成从撰写期刊文章到使用特定 LaTeX 包的所有工作。",
   "discover_the_fastest_way_to_search_and_cite": "探索搜索和引用的最快方法",
   "discover_why_over_people_worldwide_trust_overleaf": "了解为什么全世界有超过__count__万人信任 Overleaf 并把工作交给它。",
-  "dismiss_error_popup": "忽略第一个错误提示",
   "display": "显示",
   "display_deleted_user": "显示已删除的用户",
   "display_math": "显示数学公式",
@@ -1792,7 +1793,6 @@
   "resend": "重发",
   "resend_confirmation_code": "重新发送确认码",
   "resend_confirmation_email": "重新发送确认电子邮件",
-  "resend_email": "重新发送电子邮件",
   "resend_group_invite": "重新发送群组邀请",
   "resend_link_sso": "重新发送 SSO 邀请",
   "resend_managed_user_invite": "重新发送托管用户邀请",
diff --git a/services/web/migrations/20190912145020_create_projectHistoryMetaData_indexes.mjs b/services/web/migrations/20190912145020_create_projectHistoryMetaData_indexes.mjs
index ef9115a8bf..9272afc2e7 100644
--- a/services/web/migrations/20190912145020_create_projectHistoryMetaData_indexes.mjs
+++ b/services/web/migrations/20190912145020_create_projectHistoryMetaData_indexes.mjs
@@ -1,6 +1,7 @@
 /* eslint-disable no-unused-vars */
 
 import Helpers from './lib/helpers.mjs'
+import mongodb from '../app/src/infrastructure/mongodb.js'
 
 const tags = ['saas']
 
@@ -13,17 +14,19 @@ const indexes = [
   },
 ]
 
-const migrate = async client => {
-  const { db } = client
-
-  await Helpers.addIndexesToCollection(db.projectHistoryMetaData, indexes)
+const migrate = async () => {
+  await Helpers.addIndexesToCollection(
+    await mongodb.getCollectionInternal('projectHistoryMetaData'),
+    indexes
+  )
 }
 
-const rollback = async client => {
-  const { db } = client
-
+const rollback = async () => {
   try {
-    await Helpers.dropIndexesFromCollection(db.projectHistoryMetaData, indexes)
+    await Helpers.dropIndexesFromCollection(
+      await mongodb.getCollectionInternal('projectHistoryMetaData'),
+      indexes
+    )
   } catch (err) {
     console.error('Something went wrong rolling back the migrations', err)
   }
diff --git a/services/web/migrations/20210726083523_convert_split_tests_assigned_at_strings_to_dates.mjs b/services/web/migrations/20210726083523_convert_split_tests_assigned_at_strings_to_dates.mjs
index 8dbac841c6..094f3501c3 100644
--- a/services/web/migrations/20210726083523_convert_split_tests_assigned_at_strings_to_dates.mjs
+++ b/services/web/migrations/20210726083523_convert_split_tests_assigned_at_strings_to_dates.mjs
@@ -1,4 +1,4 @@
-import updateStringDates from '../scripts/confirmed_at_to_dates.mjs'
+import updateStringDates from '../scripts/split_tests_assigned_at_to_dates.mjs'
 
 const tags = ['saas']
 
diff --git a/services/web/migrations/20230110140452_rename_recurly_cached_status.mjs b/services/web/migrations/20230110140452_rename_recurly_cached_status.mjs
index 227555b4e3..37608bc1a1 100644
--- a/services/web/migrations/20230110140452_rename_recurly_cached_status.mjs
+++ b/services/web/migrations/20230110140452_rename_recurly_cached_status.mjs
@@ -1,13 +1,12 @@
-/* eslint-disable no-unused-vars */
-
-import Helpers from './lib/helpers.mjs'
+import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
 
 const tags = ['saas']
 
 const migrate = async client => {
   const { db } = client
   // 'recurly' -> 'recurlyStatus'
-  await db.subscriptions.updateMany(
+  await batchedUpdate(
+    db.subscriptions,
     {
       $and: [
         { recurlyStatus: { $exists: false } },
@@ -17,7 +16,8 @@ const migrate = async client => {
     { $rename: { recurly: 'recurlyStatus' } }
   )
   // some records may have already recached the recurly status, discard old cache
-  await db.subscriptions.updateMany(
+  await batchedUpdate(
+    db.subscriptions,
     {
       $and: [
         { recurlyStatus: { $exists: true } },
@@ -31,7 +31,8 @@ const migrate = async client => {
 const rollback = async client => {
   const { db } = client
   // 'recurlyStatus' -> 'recurly'
-  await db.subscriptions.updateMany(
+  await batchedUpdate(
+    db.subscriptions,
     {
       $and: [
         { recurly: { $exists: false } },
@@ -41,7 +42,8 @@ const rollback = async client => {
     { $rename: { recurlyStatus: 'recurly' } }
   )
   // some records may have already recached the recurly status, discard old cache
-  await db.subscriptions.updateMany(
+  await batchedUpdate(
+    db.subscriptions,
     {
       $and: [
         { recurlyStatus: { $exists: true } },
diff --git a/services/web/migrations/20230207134844_group_invite_emails_to_lowercase.mjs b/services/web/migrations/20230207134844_group_invite_emails_to_lowercase.mjs
index fdb2bc8e8d..7b8c76b9f2 100644
--- a/services/web/migrations/20230207134844_group_invite_emails_to_lowercase.mjs
+++ b/services/web/migrations/20230207134844_group_invite_emails_to_lowercase.mjs
@@ -1,12 +1,11 @@
-/* eslint-disable no-unused-vars */
-
-import Helpers from './lib/helpers.mjs'
+import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
 
 const tags = ['saas']
 
 const migrate = async client => {
   const { db } = client
-  db.subscriptions.updateMany(
+  await batchedUpdate(
+    db.subscriptions,
     {
       'teamInvites.0': {
         $exists: true,
@@ -36,7 +35,7 @@ const migrate = async client => {
   )
 }
 
-const rollback = async client => {
+const rollback = async () => {
   // There is no way back.
 }
 
diff --git a/services/web/migrations/20230928092537_backfill_subscriptions_managed_users_feature_flag.mjs b/services/web/migrations/20230928092537_backfill_subscriptions_managed_users_feature_flag.mjs
index 4d782bf0d0..285cadcd92 100644
--- a/services/web/migrations/20230928092537_backfill_subscriptions_managed_users_feature_flag.mjs
+++ b/services/web/migrations/20230928092537_backfill_subscriptions_managed_users_feature_flag.mjs
@@ -1,8 +1,11 @@
+import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
+
 const tags = ['saas']
 
 const migrate = async client => {
   const { db } = client
-  await db.subscriptions.updateMany(
+  await batchedUpdate(
+    db.subscriptions,
     { 'features.managedUsers': { $ne: true } },
     { $set: { 'features.managedUsers': null } }
   )
@@ -10,7 +13,8 @@ const migrate = async client => {
 
 const rollback = async client => {
   const { db } = client
-  await db.subscriptions.updateMany(
+  await batchedUpdate(
+    db.subscriptions,
     { 'features.managedUsers': { $eq: null } },
     { $set: { 'features.managedUsers': false } }
   )
diff --git a/services/web/migrations/20231025094810_sso_config_certificates_array.mjs b/services/web/migrations/20231025094810_sso_config_certificates_array.mjs
index 1ec19f481e..f14f8b9b1c 100644
--- a/services/web/migrations/20231025094810_sso_config_certificates_array.mjs
+++ b/services/web/migrations/20231025094810_sso_config_certificates_array.mjs
@@ -1,8 +1,11 @@
+import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
+
 const tags = ['saas']
 
 const migrate = async client => {
   const { db } = client
-  await db.ssoConfigs.updateMany(
+  await batchedUpdate(
+    db.ssoConfigs,
     { certificate: { $exists: true }, certificates: { $exists: false } },
     [
       { $set: { certificates: ['$certificate'] } },
@@ -11,11 +14,13 @@ const migrate = async client => {
       },
     ]
   )
-  await db.ssoConfigs.updateMany(
+  await batchedUpdate(
+    db.ssoConfigs,
     { userFirstNameAttribute: null },
     { $unset: { userFirstNameAttribute: true } }
   )
-  await db.ssoConfigs.updateMany(
+  await batchedUpdate(
+    db.ssoConfigs,
     { userLastNameAttribute: null },
     { $unset: { userLastNameAttribute: true } }
   )
@@ -23,7 +28,8 @@ const migrate = async client => {
 
 const rollback = async client => {
   const { db } = client
-  await db.ssoConfigs.updateMany(
+  await batchedUpdate(
+    db.ssoConfigs,
     { certificate: { $exists: false }, certificates: { $exists: true } },
     [
       { $set: { certificate: { $arrayElemAt: ['$certificates', 0] } } },
diff --git a/services/web/migrations/20231030160030_managed_users_enabled.mjs b/services/web/migrations/20231030160030_managed_users_enabled.mjs
index 772c9bfc44..6255102866 100644
--- a/services/web/migrations/20231030160030_managed_users_enabled.mjs
+++ b/services/web/migrations/20231030160030_managed_users_enabled.mjs
@@ -1,12 +1,11 @@
-/* eslint-disable no-unused-vars */
-
-import Helpers from './lib/helpers.mjs'
+import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
 
 const tags = ['saas']
 
 const migrate = async client => {
   const { db } = client
-  await db.subscriptions.updateMany(
+  await batchedUpdate(
+    db.subscriptions,
     { groupPolicy: { $exists: true } },
     { $set: { managedUsersEnabled: true } }
   )
@@ -14,7 +13,8 @@ const migrate = async client => {
 
 const rollback = async client => {
   const { db } = client
-  await db.subscriptions.updateMany(
+  await batchedUpdate(
+    db.subscriptions,
     { groupPolicy: { $exists: true } },
     { $unset: { managedUsersEnabled: '' } }
   )
diff --git a/services/web/migrations/20240923131936_create_user_last_active_index.js b/services/web/migrations/20240923131936_create_user_last_active_index.mjs
similarity index 55%
rename from services/web/migrations/20240923131936_create_user_last_active_index.js
rename to services/web/migrations/20240923131936_create_user_last_active_index.mjs
index 62beada2c0..76bdb0d941 100644
--- a/services/web/migrations/20240923131936_create_user_last_active_index.js
+++ b/services/web/migrations/20240923131936_create_user_last_active_index.mjs
@@ -1,6 +1,6 @@
-const Helpers = require('./lib/helpers')
+import Helpers from './lib/helpers.mjs'
 
-exports.tags = ['server-ce', 'server-pro', 'saas']
+const tags = ['server-ce', 'server-pro', 'saas']
 
 const indexes = [
   {
@@ -9,12 +9,18 @@ const indexes = [
   },
 ]
 
-exports.migrate = async client => {
+async function migrate(client) {
   const { db } = client
   await Helpers.addIndexesToCollection(db.users, indexes)
 }
 
-exports.rollback = async client => {
+async function rollback(client) {
   const { db } = client
   await Helpers.dropIndexesFromCollection(db.users, indexes)
 }
+
+export default {
+  tags,
+  migrate,
+  rollback,
+}
diff --git a/services/web/migrations/20241111133330_remove_null_managed_users_sso_from_subscriptions.mjs b/services/web/migrations/20241111133330_remove_null_managed_users_sso_from_subscriptions.mjs
index de6282daac..003c519abc 100644
--- a/services/web/migrations/20241111133330_remove_null_managed_users_sso_from_subscriptions.mjs
+++ b/services/web/migrations/20241111133330_remove_null_managed_users_sso_from_subscriptions.mjs
@@ -1,12 +1,16 @@
+import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
+
 const tags = ['saas']
 
 const migrate = async client => {
   const { db } = client
-  await db.subscriptions.updateMany(
+  await batchedUpdate(
+    db.subscriptions,
     { 'features.managedUsers': { $eq: null } },
     { $set: { 'features.managedUsers': true } }
   )
-  await db.subscriptions.updateMany(
+  await batchedUpdate(
+    db.subscriptions,
     { 'features.groupSSO': { $eq: null } },
     { $set: { 'features.groupSSO': true } }
   )
diff --git a/services/web/migrations/20250528141310_drop_projectHistoryMetaData_collection.mjs b/services/web/migrations/20250528141310_drop_projectHistoryMetaData_collection.mjs
new file mode 100644
index 0000000000..45ec81c02d
--- /dev/null
+++ b/services/web/migrations/20250528141310_drop_projectHistoryMetaData_collection.mjs
@@ -0,0 +1,17 @@
+import Helpers from './lib/helpers.mjs'
+
+const tags = ['saas']
+
+const migrate = async () => {
+  await Helpers.dropCollection('projectHistoryMetaData')
+}
+
+const rollback = async () => {
+  // Can't really do anything here
+}
+
+export default {
+  tags,
+  migrate,
+  rollback,
+}
diff --git a/services/web/migrations/20250604112908_add_dropbox_policy_to_group_policy.mjs b/services/web/migrations/20250604112908_add_dropbox_policy_to_group_policy.mjs
new file mode 100644
index 0000000000..47cc644554
--- /dev/null
+++ b/services/web/migrations/20250604112908_add_dropbox_policy_to_group_policy.mjs
@@ -0,0 +1,23 @@
+const tags = ['saas']
+
+const migrate = async client => {
+  const { db } = client
+  await db.grouppolicies.updateMany(
+    {},
+    { $set: { userCannotUseDropbox: false } }
+  )
+}
+
+const rollback = async client => {
+  const { db } = client
+  await db.grouppolicies.updateMany(
+    {},
+    { $unset: { userCannotUseDropbox: '' } }
+  )
+}
+
+export default {
+  tags,
+  migrate,
+  rollback,
+}
diff --git a/services/web/modules/launchpad/test/unit/src/LaunchpadController.test.mjs b/services/web/modules/launchpad/test/unit/src/LaunchpadController.test.mjs
index 89bc165305..e34a3583b0 100644
--- a/services/web/modules/launchpad/test/unit/src/LaunchpadController.test.mjs
+++ b/services/web/modules/launchpad/test/unit/src/LaunchpadController.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import * as path from 'node:path'
-import { expect } from 'chai'
 import sinon from 'sinon'
 import MockResponse from '../../../../../test/unit/src/helpers/MockResponse.js'
 
diff --git a/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs b/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
index 7f17ae210f..29f5e7ffd2 100644
--- a/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
+++ b/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
@@ -7,6 +7,7 @@ import {
 const { ObjectId } = mongodb
 
 const MIN_MONGO_VERSION = [6, 0]
+const MIN_MONGO_FEATURE_COMPATIBILITY_VERSION = [6, 0]
 
 async function main() {
   let mongoClient
@@ -18,6 +19,7 @@ async function main() {
   }
 
   await checkMongoVersion(mongoClient)
+  await checkFeatureCompatibilityVersion(mongoClient)
 
   try {
     await testTransactions(mongoClient)
@@ -53,6 +55,41 @@ async function checkMongoVersion(mongoClient) {
   }
 }
 
+async function checkFeatureCompatibilityVersion(mongoClient) {
+  const {
+    featureCompatibilityVersion: { version },
+  } = await mongoClient
+    .db()
+    .admin()
+    .command({ getParameter: 1, featureCompatibilityVersion: 1 })
+  const [major, minor] = version.split('.').map(v => parseInt(v))
+  const [minMajor, minMinor] = MIN_MONGO_FEATURE_COMPATIBILITY_VERSION
+
+  if (major < minMajor || (major === minMajor && minor < minMinor)) {
+    const minVersion = MIN_MONGO_FEATURE_COMPATIBILITY_VERSION.join('.')
+    console.error(`
+The MongoDB server has featureCompatibilityVersion=${version}, but Overleaf requires at least version ${minVersion}.
+
+Open a mongo shell:
+- Overleaf Toolkit deployments: $ bin/mongo
+- Legacy docker-compose.yml deployments: $ docker exec -it mongo mongosh localhost/sharelatex
+
+In the mongo shell:
+> db.adminCommand( { setFeatureCompatibilityVersion: "${minMajor}.${minMinor}" } )
+
+Verify the new value:
+> db.adminCommand( { getParameter: 1, featureCompatibilityVersion: 1 } )
+ ...
+ {
+    featureCompatibilityVersion: { version: ${minMajor}.${minMinor}' },
+...
+
+Aborting.
+`)
+    process.exit(1)
+  }
+}
+
 main()
   .then(() => {
     console.error('Mongodb is up.')
diff --git a/services/web/modules/server-ce-scripts/scripts/create-user.mjs b/services/web/modules/server-ce-scripts/scripts/create-user.mjs
index 219578b4b0..7c29ca7f5f 100644
--- a/services/web/modules/server-ce-scripts/scripts/create-user.mjs
+++ b/services/web/modules/server-ce-scripts/scripts/create-user.mjs
@@ -48,3 +48,13 @@ Please visit the following URL to set a password for ${email} and log in:
     )
   })
 }
+
+if (filename === process.argv[1]) {
+  try {
+    await main()
+    process.exit(0)
+  } catch (error) {
+    console.error({ error })
+    process.exit(1)
+  }
+}
diff --git a/services/web/modules/server-ce-scripts/test/acceptance/src/ServerCEScriptsTests.mjs b/services/web/modules/server-ce-scripts/test/acceptance/src/ServerCEScriptsTests.mjs
index a02e9a0e68..f8d458ff6b 100644
--- a/services/web/modules/server-ce-scripts/test/acceptance/src/ServerCEScriptsTests.mjs
+++ b/services/web/modules/server-ce-scripts/test/acceptance/src/ServerCEScriptsTests.mjs
@@ -99,6 +99,14 @@ describe('ServerCEScripts', function () {
       expect(await getUser('foo@bar.com')).to.deep.equal({ isAdmin: false })
     })
 
+    it('should also work with mjs version', async function () {
+      const out = run(
+        'node modules/server-ce-scripts/scripts/create-user.mjs --email=foo@bar.com'
+      )
+      expect(out).to.include('/user/activate?token=')
+      expect(await getUser('foo@bar.com')).to.deep.equal({ isAdmin: false })
+    })
+
     it('should create an admin user with --admin flag', async function () {
       run(
         'node modules/server-ce-scripts/scripts/create-user.js --admin --email=foo@bar.com'
diff --git a/services/web/modules/template-gallery/app/src/CleanHtml.mjs b/services/web/modules/template-gallery/app/src/CleanHtml.mjs
new file mode 100644
index 0000000000..1e38437016
--- /dev/null
+++ b/services/web/modules/template-gallery/app/src/CleanHtml.mjs
@@ -0,0 +1,22 @@
+import sanitizeHtml from 'sanitize-html'
+
+const sanitizeOptions = {
+  linksOnly: {
+    allowedTags: ["a"],
+    allowedAttributes: { "a": ["href"] }
+  },
+  reachText: {
+    allowedTags: ["h1", "h2", "h3", "h4", "h5", "h6",
+                  "p", "blockquote", "ul", "ol", "li",
+                  "em", "strong", "s", "code", "pre", "hr", "a"],
+    allowedAttributes: { "a": ["href"] }
+  },
+  plainText: {
+    allowedTags: [],
+    allowedAttributes: {},
+  },
+}
+
+export function cleanHtml(text, sanitizeType) {
+  return sanitizeHtml(text, sanitizeOptions[sanitizeType])
+}
diff --git a/services/web/modules/template-gallery/app/src/TemplateErrors.mjs b/services/web/modules/template-gallery/app/src/TemplateErrors.mjs
new file mode 100644
index 0000000000..6b7ed014fe
--- /dev/null
+++ b/services/web/modules/template-gallery/app/src/TemplateErrors.mjs
@@ -0,0 +1,13 @@
+import OError from '@overleaf/o-error'
+
+export class TemplateNameConflictError extends OError {
+  constructor(ownerId, message = 'template_with_this_title_exists_and_owned_by_x') {
+    super(message, { ownerId })
+  }
+}
+
+export class RecompileRequiredError extends OError {
+  constructor(message = 'Recompile required') {
+    super(message, { status: 400 })
+  }
+}
diff --git a/services/web/modules/template-gallery/app/src/TemplateGalleryController.mjs b/services/web/modules/template-gallery/app/src/TemplateGalleryController.mjs
new file mode 100644
index 0000000000..1d88f50d1a
--- /dev/null
+++ b/services/web/modules/template-gallery/app/src/TemplateGalleryController.mjs
@@ -0,0 +1,162 @@
+import logger from '@overleaf/logger'
+import ErrorController from '../../../../app/src/Features/Errors/ErrorController.js'
+import Errors from '../../../../app/src/Features/Errors/Errors.js'
+import SessionManager from '../../../../app/src/Features/Authentication/SessionManager.js'
+import TemplateGalleryManager from'./TemplateGalleryManager.mjs'
+import { getUserName } from './TemplateGalleryHelper.mjs'
+import { TemplateNameConflictError, RecompileRequiredError } from './TemplateErrors.mjs'
+import Settings from '@overleaf/settings'
+
+async function createTemplateFromProject(req, res, next) {
+  const t = req.i18n.translate
+  try {
+    const userId = SessionManager.getLoggedInUserId(req.session)
+    const result = await TemplateGalleryManager.createTemplateFromProject({
+      projectId: req.params.Project_id,
+      userId,
+      templateSource: req.body,
+    })
+    if (result.conflict) {
+      const ownerName = (result.templateOwnerName === 'you') ? t('you') : result.templateOwnerName
+      const message = `${t('template_with_this_title_exists_and_owned_by_x', { x: ownerName })} `
+                    + t(result.canOverride ? 'do_you_want_to_overwrite_it' : 'you_cant_overwrite_it')
+      return res.status(409).json({ canOverride: result.canOverride, message })
+    }
+    return res.status(200).json({ template_id: result.templateId })
+  } catch (error) {
+    if (error instanceof Errors.InvalidNameError) {
+      return res.status(error.info?.status || 400).json({ message: error.message })
+    }
+
+    const mainMessage = t('failed_to_publish_as_a_template')
+    if (error instanceof RecompileRequiredError) {
+      return res.status(error.info?.status || 400).json({
+        message: `${mainMessage} ${t('try_recompile_project')}`
+      })
+    }
+    return res.status(400).json({ message: mainMessage })
+  }
+}
+
+async function editTemplate(req, res, next) {
+  const t = req.i18n.translate
+  try {
+    const result = await TemplateGalleryManager.editTemplate({
+      templateId: req.params.template_id,
+      updates: req.body
+    })
+    res.status(200).json(result)
+  } catch (error) {
+    if (error instanceof TemplateNameConflictError) {
+      const ownerId = error.info?.ownerId
+      const userId = SessionManager.getLoggedInUserId(req.session)
+      const ownerName = (ownerId === userId)
+        ? t('you')
+        : await getUserName(ownerId) || t('unknown')
+      const message = t(error.message, { x: ownerName })
+      return res.status(409).json({ message })
+    }
+    if (error instanceof Errors.InvalidNameError) {
+      return res.status(error.info?.status || 400).json({ message: error.message })
+    }
+    logger.error({ error }, 'Failure saving template')
+    return res.status(500).json({ message: t('something_went_wrong_server') })
+  }
+}
+
+async function deleteTemplate(req, res, next) {
+  const t = req.i18n.translate
+  try {
+    await TemplateGalleryManager.deleteTemplate({
+      templateId: req.params.template_id,
+      version: req.body.version
+    })
+    res.sendStatus(200)
+  } catch (error) {
+    logger.error({ error }, 'Failure deleting template')
+    return res.status(500).json({ message: t('something_went_wrong_server') })
+  }
+}
+
+async function getTemplatePreview(req, res, next) {
+  try {
+    const templateId = req.params.template_id
+    const { version, style } = req.query
+
+    const { stream, contentType } = await TemplateGalleryManager.fetchTemplatePreview({ templateId, version, style })
+
+    res.setHeader('Content-Type', contentType)
+    stream.pipe(res)
+  } catch (error) {
+    if (error.info?.status == 404) {
+      return ErrorController.notFound(req, res, next)
+    }
+    return res.status(error.info?.status || 400).json(error.info)
+  }
+}
+
+async function templatesCategoryPage(req, res, next) {
+  const t = req.i18n.translate
+  try {
+    let { category } = req.params
+    const result = await TemplateGalleryManager.getTemplatesPageData(category)
+
+    let title
+    if (result.categoryName) {
+      title = t('latex_templates') + ' — ' + result.categoryName
+    } else {
+      category = null
+      title = t('templates_page_title')
+    }
+    res.render('template_gallery/template-gallery', {
+      title,
+      category,
+    })
+  } catch (error) {
+    next(error)
+  }
+}
+
+async function templateDetailsPage(req, res, next) {
+  const t = req.i18n.translate
+  try {
+    const template = await TemplateGalleryManager.getTemplate('_id', req.params.template_id)
+    res.render('template_gallery/template', {
+      title: `${t('template')}: ${template.name}`,
+      template: JSON.stringify(template),
+      languages: Settings.languages,
+    })
+  } catch (error) {
+    return ErrorController.notFound(req, res, next)
+  }
+}
+
+async function getTemplateJSON(req, res, next) {
+  try {
+    const { key, val } = req.query
+    const template = await TemplateGalleryManager.getTemplate(key, val)
+    res.json(template)
+  } catch (error) {
+    next(error)
+  }
+}
+
+async function getCategoryTemplatesJSON(req, res, next) {
+  try {
+    const result = await TemplateGalleryManager.getCategoryTemplates(req.query)
+    res.json(result)
+  } catch (error) {
+    next(error)
+  }
+}
+
+export default {
+  createTemplateFromProject,
+  editTemplate,
+  deleteTemplate,
+  getTemplatePreview,
+  templatesCategoryPage,
+  templateDetailsPage,
+  getTemplateJSON,
+  getCategoryTemplatesJSON,
+}
diff --git a/services/web/modules/template-gallery/app/src/TemplateGalleryHelper.mjs b/services/web/modules/template-gallery/app/src/TemplateGalleryHelper.mjs
new file mode 100644
index 0000000000..97fc86d650
--- /dev/null
+++ b/services/web/modules/template-gallery/app/src/TemplateGalleryHelper.mjs
@@ -0,0 +1,238 @@
+import { marked } from 'marked'
+import request from 'request'
+import logger from '@overleaf/logger'
+import settings from '@overleaf/settings'
+import Errors from '../../../../app/src/Features/Errors/Errors.js'
+import ProjectGetter from '../../../../app/src/Features/Project/ProjectGetter.js'
+import ProjectLocator from '../../../../app/src/Features/Project/ProjectLocator.js'
+import ProjectZipStreamManager from '../../../../app/src/Features/Downloads/ProjectZipStreamManager.mjs'
+import DocumentUpdaterHandler from '../../../../app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js'
+import ClsiManager from '../../../../app/src/Features/Compile/ClsiManager.js'
+import CompileManager from '../../../../app/src/Features/Compile/CompileManager.js'
+import UserGetter from '../../../../app/src/Features/User/UserGetter.js'
+import { fetchStreamWithResponse } from '@overleaf/fetch-utils'
+import { Template } from './models/Template.js'
+import { RecompileRequiredError } from './TemplateErrors.mjs'
+import { cleanHtml }  from './CleanHtml.mjs'
+
+const TIMEOUT = 30000
+
+const MAX_PROJECT_NAME_LENGTH = 150
+const MAX_FORM_INPUT_LENGTH = 512
+const MAX_TEMPLATE_DESCRIPTION_LENGTH = 4096
+
+// Configure marked for CommonMark-only parsing
+marked.setOptions({
+  gfm: false,
+  breaks: false,
+  headerIds: false,
+  mangle: false,
+})
+
+marked.use({
+  renderer: {
+    html: () => '' // strips any HTML tags
+  }
+})
+
+function _createZipStreamForProjectAsync(projectId) {
+  return new Promise((resolve, reject) => {
+    ProjectZipStreamManager.createZipStreamForProject(projectId, (err, archive) => {
+      if (err) {
+        return reject(err)
+      }
+      archive.on('error', (err) => reject(err))
+      resolve(archive)
+    })
+  })
+}
+
+export function validateTemplateInput({ name, descriptionMD, authorMD, license }) {
+  if (name?.length > MAX_PROJECT_NAME_LENGTH) {
+    throw new Errors.InvalidNameError(`Template title exceeds the maximum length of ${MAX_PROJECT_NAME_LENGTH} characters.`)
+  }
+  if (descriptionMD?.length > MAX_TEMPLATE_DESCRIPTION_LENGTH) {
+    throw new Errors.InvalidNameError(`Template description exceeds the maximum length of ${MAX_TEMPLATE_DESCRIPTION_LENGTH} characters.`)
+  }
+  if (authorMD?.length > MAX_FORM_INPUT_LENGTH) {
+    throw new Errors.InvalidNameError('Author name is too long.')
+  }
+  if (license?.length > MAX_FORM_INPUT_LENGTH) {
+    throw new Errors.InvalidNameError('License name is too long.')
+  }
+}
+
+export async function canUserOverrideTemplate(template, userId) {
+  let templateOwnerId = template.owner
+  let templateOwnerName = 'you'
+  let userIsOwner = true
+  let userIsAdmin
+  if (templateOwnerId != userId) {
+    userIsOwner = false
+    try {
+      userIsAdmin = (await UserGetter.promises.getUser(userId, { isAdmin: 1 })).isAdmin
+    } catch {
+      logger.error({ error, userId }, 'Logged in user does not exist, strange...')
+      userIsAdmin = false
+    }
+    templateOwnerName = await getUserName(templateOwnerId) || 'unknown'
+  }
+  const canOverride = userIsOwner || userIsAdmin
+  return { canOverride, templateOwnerName }
+}
+
+export async function getUserName(userId) {
+  try {
+    const user = await UserGetter.promises.getUser(userId, {
+      first_name: 1,
+      last_name: 1,
+    })
+    return ((user?.first_name || "") + " " + (user?.last_name || "")).trim()
+  } catch (error) {
+    return 'unknown'
+  }
+}
+
+export async function generateTemplateData(projectId, {
+  descriptionMD,
+  authorMD,
+  category,
+  license,
+  name,
+}) {
+  try {
+    await DocumentUpdaterHandler.promises.flushProjectToMongo(projectId)
+
+    const project = await ProjectGetter.promises.getProject(projectId, {
+      imageName: true,
+      compiler: true,
+      spellCheckLanguage: true,
+      rootDoc_id: true,
+      rootFolder: true,
+    })
+
+    const { path } = await ProjectLocator.promises.findRootDoc({ project })
+    const mainFile = path.fileSystem.replace(/^\/+/, '')
+    const template = {
+      name,
+      category,
+      authorMD,
+      descriptionMD,
+      license,
+      mainFile,
+      compiler: project.compiler,
+      imageName: project.imageName,
+      language: project.spellCheckLanguage,
+      lastUpdated: new Date(),
+    }
+
+    await renderTemplateHtmlFields(template)
+    return template
+  } catch (error) {
+    logger.error({ error, projectId }, 'Failed to retrieve project data')
+    throw error
+  }
+}
+
+export async function uploadTemplateAssets(projectId, userId, build, template) {
+  let zipStream, pdfStream
+  try {
+    [zipStream, pdfStream] = await Promise.all([
+      _createZipStreamForProjectAsync(projectId),
+      CompileManager.promises
+        .getProjectCompileLimits(projectId)
+        .then((limits) =>
+          ClsiManager.promises.getOutputFileStream(projectId, userId, limits, undefined, build, 'output.pdf')
+        )
+    ])
+  } catch (error) {
+    logger.error({ error, projectId }, 'No output.pdf?')
+    throw new RecompileRequiredError()
+  }
+  try {
+    const templateUrl = `${settings.apis.filestore.url}/template/${template._id}/v/${template.version}`
+    const zipUrl = `${templateUrl}/zip`
+    const pdfUrl = `${templateUrl}/pdf`
+    const [zipReq, pdfReq] = await Promise.all([
+      fetchStreamWithResponse(zipUrl, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/octet-stream',
+        },
+        body: zipStream,
+        signal: AbortSignal.timeout(TIMEOUT),
+      }),
+      fetchStreamWithResponse(pdfUrl, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/pdf',
+        },
+        body: pdfStream,
+        signal: AbortSignal.timeout(TIMEOUT),
+      }),
+    ])
+    const uploadErrors = []
+    if (zipReq?.response.status !== 200) {
+      uploadErrors.push({ file: 'zip', uri: zipUrl, statusCode: zipReq.response.status })
+    }
+    if (pdfReq?.response.status !== 200) {
+      uploadErrors.push({ file: 'pdf', uri: pdfUrl, statusCode: pdfReq.response.status })
+    }
+    if (uploadErrors.length > 0) {
+      logger.error({ uploadErrors }, 'Template upload failed')
+      throw new RecompileRequiredError()
+    }
+  } catch (error) {
+    if (error instanceof RecompileRequiredError) throw error
+    throw error
+  }
+}
+
+export async function deleteTemplateAssets(templateId, version, deleteFromDb) {
+  if (deleteFromDb) {
+    try {
+      await Template.deleteOne({ _id: templateId }).exec()
+    } catch (error) {
+      logger.error({ err, templateId }, 'Failed to delete template from MongoDB')
+      throw error
+    }
+  }
+
+  // kick off file deletions, but don't wait
+  const baseUrl = settings.apis.filestore.url
+  const urlTemplate = `${baseUrl}/template/${templateId}/v/${version}/zip`
+  const urlImages = `${baseUrl}/template/${templateId}/v/${version}/pdf`
+
+  const optsTemplate = {
+    method: 'DELETE',
+    uri: urlTemplate,
+    timeout: TIMEOUT,
+  }
+
+  const optsImages = {
+    method: 'DELETE',
+    uri: urlImages,
+    timeout: TIMEOUT,
+  }
+
+  request(optsTemplate, (err, response) => {
+    if (err)
+      logger.warn({ err, templateId }, 'Failed to delete template zip from filestore')
+  })
+
+  request(optsImages, (err, response) => {
+    if (err)
+      logger.warn({ err, templateId }, 'Failed to delete images from filestore')
+  })
+}
+
+export function renderTemplateHtmlFields(updates) {
+  if (updates.descriptionMD !== undefined) {
+    const descriptionRawHTML = marked.parse(updates.descriptionMD)
+    updates.description = cleanHtml(descriptionRawHTML, "reachText")
+  }
+  if (updates.authorMD !== undefined) {
+    const authorRawHTML = marked.parse(updates.authorMD)
+    updates.author = cleanHtml(authorRawHTML, "linksOnly")
+  }
+}
diff --git a/services/web/modules/template-gallery/app/src/TemplateGalleryManager.mjs b/services/web/modules/template-gallery/app/src/TemplateGalleryManager.mjs
new file mode 100644
index 0000000000..f3993d6854
--- /dev/null
+++ b/services/web/modules/template-gallery/app/src/TemplateGalleryManager.mjs
@@ -0,0 +1,214 @@
+import _ from 'lodash'
+import logger from '@overleaf/logger'
+import { Readable } from 'stream'
+import settings from '@overleaf/settings'
+import { OError } from '../../../../app/src/Features/Errors/Errors.js'
+import { Template } from './models/Template.js'
+import {
+  validateTemplateInput,
+  renderTemplateHtmlFields,
+  uploadTemplateAssets,
+  deleteTemplateAssets,
+  canUserOverrideTemplate,
+  generateTemplateData
+} from './TemplateGalleryHelper.mjs'
+import { cleanHtml }  from './CleanHtml.mjs'
+import { TemplateNameConflictError } from './TemplateErrors.mjs'
+import { fetchStreamWithResponse } from '@overleaf/fetch-utils'
+const TIMEOUT = 30000
+
+async function editTemplate({ templateId, updates }) {
+
+  validateTemplateInput(updates)
+
+  const template = await Template.findById(templateId)
+  if (!template) {
+    throw new OError('Current template not found, strange...', { status: 500, templateId })
+  }
+
+  if (updates.name) {
+    const conflictingTemplate = await Template.findOne(
+      { name: updates.name, _id: { $ne: templateId } },
+      { owner: true }
+    ).exec()
+    if (conflictingTemplate) {
+      throw new TemplateNameConflictError(String(conflictingTemplate.owner))
+    }
+  }
+
+  await renderTemplateHtmlFields(updates)
+  updates.lastUpdated = new Date()
+  Object.assign(template, updates)
+
+  await template.save()
+
+  return updates
+}
+
+async function deleteTemplate({ templateId, version }) {
+  await deleteTemplateAssets(templateId, version, true)
+}
+
+async function createTemplateFromProject({ projectId, userId, templateSource }) {
+  validateTemplateInput(templateSource)
+  let template = await Template.findOne({ name: templateSource.name }).exec()
+
+  if (template && !templateSource.override) {
+    const { canOverride, templateOwnerName } = await canUserOverrideTemplate(template, userId)
+
+    return {
+      conflict: true,
+      canOverride,
+      templateOwnerName
+    }
+  }
+
+  const templateData = await generateTemplateData(projectId, templateSource)
+
+  let previousVersionExists
+  if (!template) {
+    template = new Template(templateData)
+    template.owner = userId
+    previousVersionExists = false
+  } else {
+    Object.assign(template, templateData, {
+      version: template.version + 1,
+    })
+    previousVersionExists = true
+  }
+
+  await uploadTemplateAssets(projectId, userId, templateSource.build, template)
+  await template.save()
+
+  if (previousVersionExists) {
+    deleteTemplateAssets(template._id, template.version - 1, false)
+  }
+  return {
+    conflict: false,
+    templateId: template._id,
+  }
+}
+
+async function fetchTemplatePreview({ templateId, version, style }) {
+  if (!templateId || !version) {
+    throw new OError('Template ID and version are required', { status: 404 })
+  }
+  const styleParam = style ? `style=${style}` : ''
+  const isImage = (style === 'preview' || style === 'thumbnail')
+
+  if (style && !isImage) {
+    throw new OError('Wrong style', { status: 404, style })
+  }
+
+  const pdfUrl = `${settings.apis.filestore.url}/template/${templateId}/v/${version}/pdf?${styleParam}`
+  const { response } = await fetchStreamWithResponse(pdfUrl, {
+    method: 'GET',
+    signal: AbortSignal.timeout(TIMEOUT),
+  })
+
+  if (!response.ok) {
+    throw new OError(`Failed to fetch file: ${response.statusText}`, { status: 400, templateId, version, styleParam })
+  }
+
+  return {
+    stream: Readable.from(response.body),
+    contentType: isImage ? 'application/octet-stream' : 'application/pdf'
+  }
+}
+
+async function getTemplatesPageData(category) {
+  const categoryName = settings.templateLinks.find(item => item.url.endsWith(`/${category}`))?.name
+  const templateLinks = categoryName ? undefined : settings.templateLinks.filter(link => link.url !== '/templates/all')
+  return {
+    categoryName,
+    templateLinks
+  }
+}
+
+async function getTemplate(key, val) {
+  if (!key || !val) {
+    logger.warn('No key or val provided to getTemplate')
+    return null
+  }
+
+  const query = { [key]: val }
+  const template = await Template.findOne(query).exec()
+  if (!template) return null
+
+  return _formatTemplateForPage(template)
+}
+
+async function getCategoryTemplates(reqQuery) {
+  const {
+    category,
+    by = 'lastUpdated',
+    order = 'desc',
+  } = reqQuery || {}
+
+  const query = (category === 'all') ? {} : { category : '/templates/' + category }
+  const projection = { _id : 1, version : 1, name : 1, author : 1, description : 1, lastUpdated : 1 }
+  const allTemplates = await Template.find(query, projection).exec()
+  const formattedTemplates = allTemplates.map(_formatTemplateForList)
+  const sortedTemplates = _sortTemplates(formattedTemplates, { by, order })
+
+  return {
+    totalSize: sortedTemplates.length,
+    templates: sortedTemplates,
+  }
+}
+
+function _sortTemplates(templates, sort) {
+  if (
+    (sort.by && !['lastUpdated', 'name'].includes(sort.by)) ||
+    (sort.order && !['asc', 'desc'].includes(sort.order))
+  ) {
+    throw new OError('Invalid sorting criteria', { status: 400, sort })
+  }
+  const sortedTemplates = _.orderBy(
+    templates,
+    [sort.by || 'lastUpdated'],
+    [sort.order || 'desc']
+  )
+  return sortedTemplates
+}
+
+function _formatTemplateForList(template) {
+  return {
+    id: String(template._id),
+    version: String(template.version),
+    name: template.name,
+    author: cleanHtml(template.author, "plainText"),
+    description: cleanHtml(template.description, "plainText"),
+    lastUpdated: template.lastUpdated,
+  }
+}
+
+function _formatTemplateForPage(template) {
+  return {
+    id: template._id.toString(),
+    version: template.version.toString(),
+    category: template.category,
+    name: template.name,
+    author: cleanHtml(template.author, "linksOnly"),
+    authorMD: template.authorMD,
+    description: cleanHtml(template.description, "reachText"),
+    descriptionMD: template.descriptionMD,
+    license: template.license,
+    lastUpdated: template.lastUpdated,
+    owner: template.owner,
+    mainFile: template.mainFile,
+    compiler: template.compiler,
+    imageName: template.imageName,
+    language: template.language,
+  }
+}
+
+export default {
+  createTemplateFromProject,
+  editTemplate,
+  deleteTemplate,
+  getTemplate,
+  getCategoryTemplates,
+  fetchTemplatePreview,
+  getTemplatesPageData,
+}
diff --git a/services/web/modules/template-gallery/app/src/TemplateGalleryRouter.mjs b/services/web/modules/template-gallery/app/src/TemplateGalleryRouter.mjs
new file mode 100644
index 0000000000..b76f86d718
--- /dev/null
+++ b/services/web/modules/template-gallery/app/src/TemplateGalleryRouter.mjs
@@ -0,0 +1,82 @@
+import logger from '@overleaf/logger'
+
+import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
+import RateLimiterMiddleware from '../../../../app/src/Features/Security/RateLimiterMiddleware.js'
+import { RateLimiter } from '../../../../app/src/infrastructure/RateLimiter.js'
+import TemplateGalleryController from './TemplateGalleryController.mjs'
+
+const rateLimiterNewTemplate = new RateLimiter('create-template-from-project', {
+  points: 20,
+  duration: 60,
+})
+const rateLimiter = new RateLimiter('template-gallery', {
+  points: 60,
+  duration: 60,
+})
+const rateLimiterThumbnails = new RateLimiter('template-gallery-thumbnails', {
+  points: 240,
+  duration: 60,
+})
+
+
+export default {
+  rateLimiter,
+  apply(webRouter) {
+    logger.debug({}, 'Init templates router')
+
+    webRouter.post(
+      '/template/new/:Project_id',
+      AuthenticationController.requireLogin(),
+      RateLimiterMiddleware.rateLimit(rateLimiterNewTemplate),
+      TemplateGalleryController.createTemplateFromProject
+    )
+
+    webRouter.get(
+      '/template/:template_id',
+      RateLimiterMiddleware.rateLimit(rateLimiter),
+      TemplateGalleryController.templateDetailsPage
+    )
+
+    webRouter.post(
+      '/template/:template_id/edit',
+      AuthenticationController.requireLogin(),
+      RateLimiterMiddleware.rateLimit(rateLimiter),
+      TemplateGalleryController.editTemplate
+    )
+
+    webRouter.delete(
+      '/template/:template_id/delete',
+      AuthenticationController.requireLogin(),
+      RateLimiterMiddleware.rateLimit(rateLimiter),
+      TemplateGalleryController.deleteTemplate
+    )
+
+    webRouter.get(
+      '/templates/:category?',
+      RateLimiterMiddleware.rateLimit(rateLimiter),
+      TemplateGalleryController.templatesCategoryPage
+    )
+
+    webRouter.get(
+      '/api/template',
+      RateLimiterMiddleware.rateLimit(rateLimiter),
+      TemplateGalleryController.getTemplateJSON
+    )
+
+    webRouter.get(
+      '/api/templates',
+      RateLimiterMiddleware.rateLimit(rateLimiter),
+      TemplateGalleryController.getCategoryTemplatesJSON
+    )
+
+    webRouter.get(
+      '/template/:template_id/preview',
+      (req, res, next) => {
+        req.query.style === 'thumbnail'
+          ? RateLimiterMiddleware.rateLimit(rateLimiterThumbnails)(req, res, next)
+          : RateLimiterMiddleware.rateLimit(rateLimiter)(req, res, next)
+      },
+      TemplateGalleryController.getTemplatePreview
+    )
+  },
+}
diff --git a/services/web/modules/template-gallery/app/src/models/Template.js b/services/web/modules/template-gallery/app/src/models/Template.js
new file mode 100644
index 0000000000..79792f150e
--- /dev/null
+++ b/services/web/modules/template-gallery/app/src/models/Template.js
@@ -0,0 +1,33 @@
+const mongoose = require('../../../../../app/src/infrastructure/Mongoose')
+
+const { Schema } = mongoose
+const { ObjectId } = Schema
+
+const TemplateSchema = new Schema(
+  {
+    name: { type: String, required: true },
+    category: { type: String, required: true },
+    description: { type: String },
+    descriptionMD: { type: String },
+    author: { type: String },
+    authorMD: { type: String },
+    license: { type: String, required: true },
+    mainFile: { type: String, required: true },
+    compiler: { type: String, required: true },
+    imageName: { type: String },
+    language: { type: String },
+    version: { type: Number, default: 1, required: true },
+    owner: { type: ObjectId, ref: 'User' },
+    lastUpdated: {
+      type: Date,
+      default() {
+        return new Date()
+      },
+    required: true
+    },
+  },
+  { minimize: false }
+)
+
+exports.Template = mongoose.model('Template', TemplateSchema)
+exports.TemplateSchema = TemplateSchema
diff --git a/services/web/modules/template-gallery/index.mjs b/services/web/modules/template-gallery/index.mjs
new file mode 100644
index 0000000000..16e39f46e7
--- /dev/null
+++ b/services/web/modules/template-gallery/index.mjs
@@ -0,0 +1,42 @@
+import Settings from '@overleaf/settings'
+import TemplateGalleryRouter from './app/src/TemplateGalleryRouter.mjs'
+
+function boolFromEnv(env) {
+  if (env === undefined || env === null) return undefined
+  if (typeof env === "string") {
+    const envLower = env.toLowerCase()
+    if (envLower === 'true') return true
+    if (envLower === 'false') return false
+  }
+  throw new Error("Invalid value for boolean environment variable")
+}
+
+let TemplateGalleryModule = {}
+
+if (process.env.OVERLEAF_TEMPLATE_GALLERY === 'true') {
+  TemplateGalleryModule = {
+    router: TemplateGalleryRouter,
+  }
+
+  Settings.templates = {
+    nonAdminCanManage: boolFromEnv(process.env.OVERLEAF_NON_ADMIN_CAN_PUBLISH_TEMPLATES)
+  }
+
+  const templateKeys = process.env.OVERLEAF_TEMPLATE_CATEGORIES
+    ? process.env.OVERLEAF_TEMPLATE_CATEGORIES + ' all'
+    : 'all'
+
+  Settings.templateLinks = templateKeys.split(/\s+/).map(key => {
+    const envKeyBase = key.toUpperCase().replace(/-/g, "_")
+    const name = process.env[`TEMPLATE_${envKeyBase}_NAME`] || ( key === 'all' ? 'All templates' : key)
+    const description = process.env[`TEMPLATE_${envKeyBase}_DESCRIPTION`] || ''
+
+    return {
+      name,
+      url: `/templates/${key}`,
+      description
+    }
+  })
+}
+
+export default TemplateGalleryModule
diff --git a/services/web/modules/user-activate/app/views/user/activate.pug b/services/web/modules/user-activate/app/views/user/activate.pug
index 20ccb4dd8e..deebe0b08a 100644
--- a/services/web/modules/user-activate/app/views/user/activate.pug
+++ b/services/web/modules/user-activate/app/views/user/activate.pug
@@ -1,4 +1,9 @@
-extends ../../../../../app/views/layout-website-redesign-bootstrap-5
+extends ../../../../../app/views/layout-website-redesign
+
+block vars
+	- isWebsiteRedesign = true
+
+include ../../../../../app/views/_mixins/material_symbol
 
 block content
 	main.content.content-alt#main-content
@@ -8,8 +13,7 @@ block content
 					.notification.notification-type-success(aria-live="off" role="alert")
 						.notification-content-and-cta
 							.notification-icon
-								span.material-symbols(aria-hidden="true")
-									| check_circle
+								+material-symbol("check_circle")
 							.notification-content
 								p
 									| #{translate("nearly_activated")}
diff --git a/services/web/modules/user-activate/frontend/js/pages/user-activate-page.jsx b/services/web/modules/user-activate/frontend/js/pages/user-activate-page.jsx
deleted file mode 100644
index c03b5206a7..0000000000
--- a/services/web/modules/user-activate/frontend/js/pages/user-activate-page.jsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import '@/marketing'
-
-import { createRoot } from 'react-dom/client'
-import UserActivateRegister from '../components/user-activate-register'
-
-const container = document.getElementById('user-activate-register-container')
-if (container) {
-  const root = createRoot(container)
-  root.render(<UserActivateRegister />)
-}
diff --git a/services/web/modules/user-activate/frontend/js/pages/user-activate-page.tsx b/services/web/modules/user-activate/frontend/js/pages/user-activate-page.tsx
new file mode 100644
index 0000000000..0172bf5573
--- /dev/null
+++ b/services/web/modules/user-activate/frontend/js/pages/user-activate-page.tsx
@@ -0,0 +1,7 @@
+import { renderInReactLayout } from '@/react'
+
+import UserActivateRegister from '../components/user-activate-register'
+
+renderInReactLayout('user-activate-register-container', () => (
+  <UserActivateRegister />
+))
diff --git a/services/web/package.json b/services/web/package.json
index 609d24c0a3..59825e0e68 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -13,6 +13,8 @@
     "test:unit:all": "npm run test:unit:run_dir -- test/unit/src modules/*/test/unit/src",
     "test:unit:all:silent": "npm run test:unit:all -- --reporter dot",
     "test:unit:app": "npm run test:unit:run_dir -- test/unit/src",
+    "test:unit:mocha": "npm run test:unit:mocha:run_dir -- test/unit/src modules/*/test/unit/src",
+    "test:unit:mocha:run_dir": "mocha --recursive --timeout 25000 --exit --grep=$MOCHA_GREP --require test/unit/bootstrap.js --extension=js",
     "test:unit:esm": "vitest run",
     "test:unit:esm:watch": "vitest",
     "test:frontend": "NODE_ENV=test TZ=GMT mocha --recursive --timeout 5000 --exit --extension js,jsx,mjs,ts,tsx --grep=$MOCHA_GREP --require test/frontend/bootstrap.js --ignore '**/*.spec.{js,jsx,ts,tsx}' --ignore '**/helpers/**/*.{js,jsx,ts,tsx}' test/frontend modules/*/test/frontend",
@@ -89,8 +91,7 @@
     "@overleaf/settings": "*",
     "@phosphor-icons/react": "^2.1.7",
     "@slack/webhook": "^7.0.2",
-    "@stripe/stripe-js": "^5.6.0",
-    "@stripe/react-stripe-js": "^3.1.1",
+    "@stripe/stripe-js": "^7.3.0",
     "@xmldom/xmldom": "^0.7.13",
     "accepts": "^1.3.7",
     "ajv": "^8.12.0",
@@ -142,7 +143,7 @@
     "moment": "^2.29.4",
     "mongodb-legacy": "6.1.3",
     "mongoose": "8.9.5",
-    "multer": "overleaf/multer#199c5ff05bd375c508f4074498237baead7f5148",
+    "multer": "overleaf/multer#4dbceda355efc3fc8ac3cf5c66c3778c8a6fdb23",
     "nocache": "^2.1.0",
     "node-fetch": "^2.7.0",
     "nodemailer": "^6.7.0",
diff --git a/services/web/public/img/ai-assist/editing-tools.png b/services/web/public/img/ai-assist/editing-tools.png
new file mode 100644
index 0000000000..c98f77f6aa
Binary files /dev/null and b/services/web/public/img/ai-assist/editing-tools.png differ
diff --git a/services/web/public/img/ai-assist/equation-generator.png b/services/web/public/img/ai-assist/equation-generator.png
new file mode 100644
index 0000000000..98635334b5
Binary files /dev/null and b/services/web/public/img/ai-assist/equation-generator.png differ
diff --git a/services/web/public/img/ai-assist/error-assist.png b/services/web/public/img/ai-assist/error-assist.png
new file mode 100644
index 0000000000..23cfa3710e
Binary files /dev/null and b/services/web/public/img/ai-assist/error-assist.png differ
diff --git a/services/web/public/img/ai-assist/language-suggestions.png b/services/web/public/img/ai-assist/language-suggestions.png
new file mode 100644
index 0000000000..ed821a83ed
Binary files /dev/null and b/services/web/public/img/ai-assist/language-suggestions.png differ
diff --git a/services/web/public/img/ai-assist/table-generator.png b/services/web/public/img/ai-assist/table-generator.png
new file mode 100644
index 0000000000..60d909e159
Binary files /dev/null and b/services/web/public/img/ai-assist/table-generator.png differ
diff --git a/services/web/public/img/ai-assist/texgpt.png b/services/web/public/img/ai-assist/texgpt.png
new file mode 100644
index 0000000000..80cf7fa7bb
Binary files /dev/null and b/services/web/public/img/ai-assist/texgpt.png differ
diff --git a/services/web/public/img/check-circle-blue-filled.svg b/services/web/public/img/check-circle-blue-filled.svg
new file mode 100644
index 0000000000..1a195007cc
--- /dev/null
+++ b/services/web/public/img/check-circle-blue-filled.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="7.90039" cy="8" r="7" fill="#366CBF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.8008 5.5166C14.1341 6.28324 14.3008 7.11114 14.3008 8L14.293 8.32715C14.2565 9.08412 14.0924 9.80296 13.8008 10.4834L13.6689 10.7705C13.3493 11.4303 12.9322 12.018 12.417 12.5332L12.1953 12.7441C11.6679 13.2229 11.0643 13.6088 10.3838 13.9004C9.61715 14.2337 8.78925 14.4004 7.90039 14.4004L7.57324 14.3926C6.81627 14.3561 6.09743 14.192 5.41699 13.9004C4.63921 13.5671 3.95608 13.111 3.36719 12.5332C2.78941 11.9443 2.33333 11.2612 2 10.4834C1.7084 9.80296 1.5443 9.08412 1.50781 8.32715L1.5 8C1.5 7.11115 1.66669 6.28324 2 5.5166C2.29164 4.83611 2.67749 4.23247 3.15625 3.70508L3.36719 3.4834C3.88242 2.96817 4.47005 2.55105 5.12988 2.23145L5.41699 2.09961C6.19475 1.7663 7.02265 1.59961 7.90039 1.59961L8.23047 1.60742C8.995 1.64384 9.71286 1.80791 10.3838 2.09961L10.6709 2.23145C11.3294 2.55104 11.9115 2.96821 12.417 3.4834C13.0059 4.06118 13.4674 4.73882 13.8008 5.5166ZM14.8564 10.5342C15.1535 9.72879 15.3008 8.88186 15.3008 8C15.3008 7.10999 15.1533 6.26057 14.8545 5.45898L14.7178 5.11816C14.3825 4.33724 13.9322 3.63797 13.3672 3.02637L13.1172 2.76953C12.4496 2.09262 11.6692 1.5633 10.7822 1.18262C9.88199 0.791261 8.91754 0.599609 7.90039 0.599609C7.01853 0.599609 6.1716 0.746894 5.36621 1.04395L5.02344 1.18066C4.24213 1.51551 3.53918 1.9653 2.91992 2.52832L2.66016 2.77637C1.99035 3.44618 1.46448 4.22955 1.08301 5.11816C0.691652 6.0184 0.5 6.98285 0.5 8C0.5 9.00792 0.692469 9.97013 1.08105 10.877L1.23047 11.2061C1.59508 11.9615 2.06987 12.6387 2.65332 13.2334L2.66699 13.2471C3.34667 13.9139 4.1347 14.4384 5.02344 14.8193L5.36621 14.9561C6.1716 15.2531 7.01853 15.4004 7.90039 15.4004C8.91754 15.4004 9.88199 15.2087 10.7822 14.8174L10.7812 14.8164C11.6701 14.4349 12.4541 13.9102 13.124 13.2402L13.3721 12.9805C13.9351 12.3612 14.3849 11.6583 14.7197 10.877L14.8564 10.5342Z" fill="#366CBF"/>
+<path d="M10.7559 6.56348C10.733 6.67379 10.6755 6.77461 10.584 6.86621L7.4668 9.9834L7.37207 10.0635C7.27429 10.1321 7.16726 10.1669 7.05078 10.167L6.93652 10.1553C6.86301 10.14 6.79371 10.1093 6.72852 10.0635L6.63379 9.9834L5.2168 8.56641C5.09485 8.44435 5.03428 8.30568 5.03418 8.15039C5.03418 7.98381 5.09471 7.83898 5.2168 7.7168C5.33902 7.59457 5.47823 7.5332 5.63379 7.5332C5.78932 7.53322 5.92858 7.59459 6.05078 7.7168L7.05078 8.7002L9.75 6.0166C9.8722 5.8944 10.0115 5.83302 10.167 5.83301C10.3225 5.83301 10.4618 5.89438 10.584 6.0166C10.7061 6.1388 10.7666 6.28357 10.7666 6.4502L10.7559 6.56348Z" fill="white"/>
+</svg>
diff --git a/services/web/public/img/check-circle-blue.svg b/services/web/public/img/check-circle-blue.svg
new file mode 100644
index 0000000000..456ba2bfa4
--- /dev/null
+++ b/services/web/public/img/check-circle-blue.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-outside-1_4820_1409" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="16" fill="black">
+<rect fill="white" width="16" height="16"/>
+<path d="M7.15 8.7L6.15 7.71667C6.02778 7.59444 5.88889 7.53333 5.73333 7.53333C5.57778 7.53333 5.43889 7.59444 5.31667 7.71667C5.19444 7.83889 5.13333 7.98333 5.13333 8.15C5.13333 8.30556 5.19444 8.44444 5.31667 8.56667L6.73333 9.98333C6.85556 10.1056 6.99444 10.1667 7.15 10.1667C7.30556 10.1667 7.44444 10.1056 7.56667 9.98333L10.6833 6.86667C10.8056 6.74444 10.8667 6.60555 10.8667 6.45C10.8667 6.28333 10.8056 6.13889 10.6833 6.01667C10.5611 5.89444 10.4222 5.83333 10.2667 5.83333C10.1111 5.83333 9.97222 5.89444 9.85 6.01667L7.15 8.7ZM8 14.4C7.12222 14.4 6.29444 14.2333 5.51667 13.9C4.73889 13.5667 4.05556 13.1111 3.46667 12.5333C2.88889 11.9444 2.43333 11.2611 2.1 10.4833C1.76667 9.70556 1.6 8.87778 1.6 8C1.6 7.11111 1.76667 6.28333 2.1 5.51667C2.43333 4.73889 2.88889 4.06111 3.46667 3.48333C4.05556 2.89444 4.73889 2.43333 5.51667 2.1C6.29444 1.76667 7.12222 1.6 8 1.6C8.88889 1.6 9.71667 1.76667 10.4833 2.1C11.2611 2.43333 11.9389 2.89444 12.5167 3.48333C13.1056 4.06111 13.5667 4.73889 13.9 5.51667C14.2333 6.28333 14.4 7.11111 14.4 8C14.4 8.87778 14.2333 9.70556 13.9 10.4833C13.5667 11.2611 13.1056 11.9444 12.5167 12.5333C11.9389 13.1111 11.2611 13.5667 10.4833 13.9C9.71667 14.2333 8.88889 14.4 8 14.4Z"/>
+</mask>
+<path d="M7.15 8.7L6.44886 9.41302L7.15373 10.1061L7.85491 9.40929L7.15 8.7ZM6.15 7.71667L5.44287 8.4238L5.44886 8.42969L6.15 7.71667ZM5.31667 8.56667L6.02377 7.85956H6.02377L5.31667 8.56667ZM6.73333 9.98333L6.02623 10.6904H6.02623L6.73333 9.98333ZM10.6833 6.86667L11.3904 7.57377L11.3904 7.57377L10.6833 6.86667ZM10.6833 6.01667L11.3904 5.30956L11.3904 5.30956L10.6833 6.01667ZM9.85 6.01667L10.5549 6.72596L10.5571 6.72377L9.85 6.01667ZM5.51667 13.9L5.12275 14.8191H5.12275L5.51667 13.9ZM3.46667 12.5333L2.75286 13.2337L2.75953 13.2405L2.76633 13.2471L3.46667 12.5333ZM2.1 10.4833L1.18086 10.8773H1.18086L2.1 10.4833ZM2.1 5.51667L3.01708 5.9154L3.01915 5.91059L2.1 5.51667ZM3.46667 3.48333L2.75956 2.77623H2.75956L3.46667 3.48333ZM5.51667 2.1L5.12275 1.18085L5.12275 1.18085L5.51667 2.1ZM10.4833 2.1L10.0846 3.01708L10.0894 3.01914L10.4833 2.1ZM12.5167 3.48333L11.8029 4.18367L11.8095 4.19047L11.8163 4.19714L12.5167 3.48333ZM13.9 5.51667L12.9808 5.91059L12.9829 5.91539L13.9 5.51667ZM13.9 10.4833L14.8191 10.8773L13.9 10.4833ZM12.5167 12.5333L13.2238 13.2404L12.5167 12.5333ZM10.4833 13.9L10.0894 12.9808L10.0846 12.9829L10.4833 13.9ZM7.15 8.7L7.85114 7.98698L6.85114 7.00364L6.15 7.71667L5.44886 8.42969L6.44886 9.41302L7.15 8.7ZM6.15 7.71667L6.85711 7.00956C6.57019 6.72264 6.18475 6.53333 5.73333 6.53333V7.53333V8.53333C5.67603 8.53333 5.61214 8.5212 5.55143 8.49448C5.49273 8.46865 5.45737 8.43825 5.44289 8.42377L6.15 7.71667ZM5.73333 7.53333V6.53333C5.28192 6.53333 4.89648 6.72264 4.60956 7.00956L5.31667 7.71667L6.02377 8.42377C6.0093 8.43825 5.97394 8.46865 5.91524 8.49448C5.85452 8.5212 5.79064 8.53333 5.73333 8.53333V7.53333ZM5.31667 7.71667L4.60956 7.00956C4.30757 7.31155 4.13333 7.70733 4.13333 8.15H5.13333H6.13333C6.13333 8.19202 6.12495 8.24765 6.10013 8.30631C6.07562 8.36425 6.04441 8.40314 6.02377 8.42377L5.31667 7.71667ZM5.13333 8.15H4.13333C4.13333 8.60141 4.32264 8.98685 4.60956 9.27377L5.31667 8.56667L6.02377 7.85956C6.03825 7.87404 6.06866 7.9094 6.09448 7.96809C6.1212 8.02881 6.13333 8.09269 6.13333 8.15H5.13333ZM5.31667 8.56667L4.60956 9.27377L6.02623 10.6904L6.73333 9.98333L7.44044 9.27623L6.02377 7.85956L5.31667 8.56667ZM6.73333 9.98333L6.02623 10.6904C6.31315 10.9774 6.69859 11.1667 7.15 11.1667V10.1667V9.16667C7.20731 9.16667 7.27119 9.1788 7.33191 9.20552C7.3906 9.23135 7.42596 9.26175 7.44044 9.27623L6.73333 9.98333ZM7.15 10.1667V11.1667C7.60141 11.1667 7.98685 10.9774 8.27377 10.6904L7.56667 9.98333L6.85956 9.27623C6.87404 9.26175 6.9094 9.23135 6.96809 9.20552C7.02881 9.1788 7.09269 9.16667 7.15 9.16667V10.1667ZM7.56667 9.98333L8.27377 10.6904L11.3904 7.57377L10.6833 6.86667L9.97623 6.15956L6.85956 9.27623L7.56667 9.98333ZM10.6833 6.86667L11.3904 7.57377C11.6774 7.28685 11.8667 6.90141 11.8667 6.45H10.8667H9.86667C9.86667 6.39269 9.8788 6.32881 9.90552 6.2681C9.93134 6.2094 9.96175 6.17404 9.97623 6.15956L10.6833 6.86667ZM10.8667 6.45H11.8667C11.8667 6.00733 11.6924 5.61155 11.3904 5.30956L10.6833 6.01667L9.97623 6.72377C9.95559 6.70313 9.92438 6.66425 9.89987 6.6063C9.87505 6.54764 9.86667 6.49202 9.86667 6.45H10.8667ZM10.6833 6.01667L11.3904 5.30956C11.1035 5.02264 10.7181 4.83333 10.2667 4.83333V5.83333V6.83333C10.2094 6.83333 10.1455 6.8212 10.0848 6.79448C10.0261 6.76865 9.9907 6.73825 9.97623 6.72377L10.6833 6.01667ZM10.2667 5.83333V4.83333C9.81525 4.83333 9.42981 5.02264 9.14289 5.30956L9.85 6.01667L10.5571 6.72377C10.5426 6.73825 10.5073 6.76865 10.4486 6.79448C10.3879 6.8212 10.324 6.83333 10.2667 6.83333V5.83333ZM9.85 6.01667L9.14509 5.30737L6.44509 7.99071L7.15 8.7L7.85491 9.40929L10.5549 6.72596L9.85 6.01667ZM8 14.4V13.4C7.25248 13.4 6.55923 13.2588 5.91059 12.9809L5.51667 13.9L5.12275 14.8191C6.02966 15.2078 6.99196 15.4 8 15.4V14.4ZM5.51667 13.9L5.91059 12.9809C5.24381 12.6951 4.66508 12.3082 4.16701 11.8195L3.46667 12.5333L2.76633 13.2471C3.44603 13.914 4.23397 14.4382 5.12275 14.8191L5.51667 13.9ZM3.46667 12.5333L4.18048 11.833C3.6918 11.3349 3.30491 10.7562 3.01915 10.0894L2.1 10.4833L1.18086 10.8773C1.56176 11.766 2.08598 12.554 2.75286 13.2337L3.46667 12.5333ZM2.1 10.4833L3.01915 10.0894C2.74116 9.44077 2.6 8.74752 2.6 8H1.6H0.6C0.6 9.00804 0.792177 9.97034 1.18086 10.8773L2.1 10.4833ZM1.6 8H2.6C2.6 7.23948 2.74185 6.5484 3.01707 5.91539L2.1 5.51667L1.18293 5.11794C0.791485 6.01826 0.6 6.98274 0.6 8H1.6ZM2.1 5.51667L3.01915 5.91059C3.30418 5.2455 3.68916 4.67505 4.17377 4.19044L3.46667 3.48333L2.75956 2.77623C2.08862 3.44717 1.56248 4.23228 1.18086 5.12275L2.1 5.51667ZM3.46667 3.48333L4.17377 4.19044C4.67124 3.69298 5.24782 3.30319 5.91059 3.01914L5.51667 2.1L5.12275 1.18085C4.22996 1.56348 3.43987 2.09591 2.75956 2.77623L3.46667 3.48333ZM5.51667 2.1L5.91059 3.01914C6.55923 2.74116 7.25248 2.6 8 2.6V1.6V0.599999C6.99196 0.599999 6.02966 0.792176 5.12275 1.18085L5.51667 2.1ZM8 1.6V2.6C8.76052 2.6 9.4516 2.74185 10.0846 3.01707L10.4833 2.1L10.8821 1.18293C9.98174 0.791485 9.01726 0.599999 8 0.599999V1.6ZM10.4833 2.1L10.0894 3.01914C10.7505 3.30245 11.3188 3.6903 11.8029 4.18367L12.5167 3.48333L13.2305 2.78299C12.559 2.09859 11.7718 1.56421 10.8773 1.18085L10.4833 2.1ZM12.5167 3.48333L11.8163 4.19714C12.3097 4.68121 12.6975 5.24954 12.9809 5.91059L13.9 5.51667L14.8191 5.12275C14.4358 4.22824 13.9014 3.44101 13.217 2.76952L12.5167 3.48333ZM13.9 5.51667L12.9829 5.91539C13.2582 6.5484 13.4 7.23948 13.4 8H14.4H15.4C15.4 6.98274 15.2085 6.01826 14.8171 5.11794L13.9 5.51667ZM14.4 8H13.4C13.4 8.74752 13.2588 9.44077 12.9809 10.0894L13.9 10.4833L14.8191 10.8773C15.2078 9.97034 15.4 9.00804 15.4 8H14.4ZM13.9 10.4833L12.9809 10.0894C12.6968 10.7522 12.307 11.3288 11.8096 11.8262L12.5167 12.5333L13.2238 13.2404C13.9041 12.5601 14.4365 11.77 14.8191 10.8773L13.9 10.4833ZM12.5167 12.5333L11.8096 11.8262C11.3249 12.3108 10.7545 12.6958 10.0894 12.9809L10.4833 13.9L10.8773 14.8191C11.7677 14.4375 12.5528 13.9114 13.2238 13.2404L12.5167 12.5333ZM10.4833 13.9L10.0846 12.9829C9.4516 13.2582 8.76052 13.4 8 13.4V14.4V15.4C9.01726 15.4 9.98174 15.2085 10.8821 14.8171L10.4833 13.9Z" fill="#3265B2" mask="url(#path-1-outside-1_4820_1409)"/>
+</svg>
diff --git a/services/web/public/img/sparkle-2-stars.svg b/services/web/public/img/sparkle-2-stars.svg
new file mode 100644
index 0000000000..5e4fc5e657
--- /dev/null
+++ b/services/web/public/img/sparkle-2-stars.svg
@@ -0,0 +1,16 @@
+<svg width="41" height="40" viewBox="0 0 41 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.2344 23.5171C20.275 21.2682 18.7323 19.7255 16.4837 9.76641C16.3807 9.31122 15.9756 8.987 15.5074 8.987C15.0392 8.987 14.6341 9.3112 14.531 9.76641C12.281 19.7259 10.7394 21.2686 0.780336 23.5171C0.324219 23.6212 0 24.0253 0 24.4935C0 24.9616 0.324203 25.3659 0.780336 25.4698C10.7398 27.7199 12.2813 29.2624 14.531 39.2205C14.6341 39.6757 15.0392 39.9999 15.5074 39.9999C15.9756 39.9999 16.3807 39.6757 16.4837 39.2205C18.7338 29.2622 20.2754 27.7196 30.2344 25.4698C30.6906 25.3657 31.0139 24.9616 31.0139 24.4935C31.0139 24.0253 30.6897 23.6211 30.2344 23.5171Z" fill="url(#paint0_linear_4820_1102)"/>
+<path d="M39.2371 8.01179C33.9428 6.81627 33.1993 6.07299 32.004 0.779476C31.8998 0.32336 31.4958 6.10352e-05 31.0276 6.10352e-05C30.5595 6.10352e-05 30.1552 0.323168 30.0513 0.779476C28.8558 6.07255 28.1125 6.81607 22.819 8.01179C22.3628 8.11589 22.0396 8.51996 22.0396 8.98812C22.0396 9.45629 22.3627 9.86054 22.819 9.96447C28.112 11.16 28.8556 11.9033 30.0513 17.1976C30.1554 17.6528 30.5595 17.977 31.0276 17.977C31.4958 17.977 31.9 17.6528 32.004 17.1976C33.1995 11.9033 33.9427 11.1598 39.2371 9.96447C39.6923 9.86036 40.0165 9.45629 40.0165 8.98812C40.0165 8.51996 39.6923 8.11571 39.2371 8.01179Z" fill="url(#paint1_linear_4820_1102)"/>
+<defs>
+<linearGradient id="paint0_linear_4820_1102" x1="31.0139" y1="8.987" x2="-5.13702" y2="25.3634" gradientUnits="userSpaceOnUse">
+<stop stop-color="#214475"/>
+<stop offset="0.295154" stop-color="#254C84"/>
+<stop offset="1" stop-color="#6597E0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_4820_1102" x1="40.0165" y1="6.2448e-05" x2="19.0617" y2="9.49231" gradientUnits="userSpaceOnUse">
+<stop stop-color="#214475"/>
+<stop offset="0.295154" stop-color="#254C84"/>
+<stop offset="1" stop-color="#6597E0"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/services/web/scripts/backfill_mixpanel_user_properties.mjs b/services/web/scripts/backfill_mixpanel_user_properties.mjs
index 3e966a3a62..ef8b8e0565 100644
--- a/services/web/scripts/backfill_mixpanel_user_properties.mjs
+++ b/services/web/scripts/backfill_mixpanel_user_properties.mjs
@@ -66,6 +66,7 @@ async function _getGroupSubscriptionPlanCode(userId) {
     const plan = PlansLocator.findLocalPlanInSettings(subscription.planCode)
     if (
       plan &&
+      plan.features &&
       FeaturesHelper.isFeatureSetBetter(plan.features, bestFeatures)
     ) {
       bestPlanCode = plan.planCode
diff --git a/services/web/scripts/history/clean_sl_history_data.mjs b/services/web/scripts/history/clean_sl_history_data.mjs
index 8eb541e078..8f2bc1eab0 100644
--- a/services/web/scripts/history/clean_sl_history_data.mjs
+++ b/services/web/scripts/history/clean_sl_history_data.mjs
@@ -1,4 +1,7 @@
-import { db } from '../../app/src/infrastructure/mongodb.js'
+import {
+  db,
+  getCollectionInternal,
+} from '../../app/src/infrastructure/mongodb.js'
 import { ensureMongoTimeout } from '../helpers/env_variable_helper.mjs'
 import { scriptRunner } from '../lib/ScriptRunner.mjs'
 // Ensure default mongo query timeout has been increased 1h
@@ -47,7 +50,10 @@ async function setAllowDowngradeToFalse() {
 async function deleteHistoryCollections() {
   await gracefullyDropCollection(db.docHistory)
   await gracefullyDropCollection(db.docHistoryIndex)
-  await gracefullyDropCollection(db.projectHistoryMetaData)
+  const projectHistoryMetaData = await getCollectionInternal(
+    'projectHistoryMetaData'
+  )
+  await gracefullyDropCollection(projectHistoryMetaData)
 }
 
 async function gracefullyDropCollection(collection) {
diff --git a/services/web/scripts/recurly/resync_subscriptions.mjs b/services/web/scripts/recurly/resync_subscriptions.mjs
index a0b5ca1438..6a03c8e3c1 100644
--- a/services/web/scripts/recurly/resync_subscriptions.mjs
+++ b/services/web/scripts/recurly/resync_subscriptions.mjs
@@ -89,20 +89,18 @@ const syncSubscription = async subscription => {
 
   ScriptLogger.recordMismatch(subscription, recurlySubscription)
 
-  if (!COMMIT) {
-    return
+  if (COMMIT) {
+    try {
+      await SubscriptionUpdater.promises.updateSubscriptionFromRecurly(
+        recurlySubscription,
+        subscription,
+        {}
+      )
+    } catch (error) {
+      await handleSyncSubscriptionError(subscription, error)
+    }
   }
 
-  try {
-    await SubscriptionUpdater.promises.updateSubscriptionFromRecurly(
-      recurlySubscription,
-      subscription,
-      {}
-    )
-  } catch (error) {
-    await handleSyncSubscriptionError(subscription, error)
-    return
-  }
   await setTimeout(80)
 }
 
@@ -181,6 +179,13 @@ const setup = () => {
   }
 }
 
+if (process.env.NODE_ENV !== 'development') {
+  console.warn(
+    'This script can cause issues with manually amended subscriptions and can also exhaust our rate-limit with Recurly so is not intended to be run in production. Please use it in development environments only.'
+  )
+  process.exit(1)
+}
+
 setup()
 await run()
 process.exit()
diff --git a/services/web/test/acceptance/src/helpers/SAMLHelper.mjs b/services/web/test/acceptance/src/helpers/SAMLHelper.mjs
index 6732454c1e..531e3fdacc 100644
--- a/services/web/test/acceptance/src/helpers/SAMLHelper.mjs
+++ b/services/web/test/acceptance/src/helpers/SAMLHelper.mjs
@@ -12,7 +12,7 @@ const __dirname = fileURLToPath(new URL('.', import.meta.url))
 const samlDataDefaults = {
   firstName: 'first-name',
   hasEntitlement: 'Y',
-  issuer: 'Overleaf',
+  issuer: 'https://www.overleaf.test/saml/ukamf/sp/entity',
   lastName: 'last-name',
   requestId: 'dummy-request-id',
 }
diff --git a/services/web/test/acceptance/src/helpers/Subscription.mjs b/services/web/test/acceptance/src/helpers/Subscription.mjs
index a9adc113ae..420dda56d9 100644
--- a/services/web/test/acceptance/src/helpers/Subscription.mjs
+++ b/services/web/test/acceptance/src/helpers/Subscription.mjs
@@ -45,6 +45,18 @@ class PromisifiedSubscription {
     return await db.subscriptions.findOne({ _id: new ObjectId(this._id) })
   }
 
+  async getSSOConfig() {
+    const subscription = await this.get()
+
+    if (!subscription.ssoConfig) {
+      return
+    }
+
+    return await db.ssoConfigs.findOne({
+      _id: new ObjectId(subscription.ssoConfig),
+    })
+  }
+
   async getWithGroupPolicy() {
     // eslint-disable-next-line no-restricted-syntax
     return await SubscriptionModel.findById(this._id)
diff --git a/services/web/test/acceptance/src/helpers/groupSSO.mjs b/services/web/test/acceptance/src/helpers/groupSSO.mjs
index c5bde77236..1953b3e787 100644
--- a/services/web/test/acceptance/src/helpers/groupSSO.mjs
+++ b/services/web/test/acceptance/src/helpers/groupSSO.mjs
@@ -34,7 +34,10 @@ export const baseSsoConfig = {
   userIdAttribute,
 } // the database also sets enabled and validated, but we cannot set that in the POST request for /manage/groups/:ID/settings/sso
 
-export async function createGroupSSO(SSOConfigValidated = true) {
+export async function createGroupSSO(
+  SSOConfigValidated = true,
+  useSettingsUKAMF
+) {
   const nonSSOMemberHelper = await UserHelper.createUser()
   const nonSSOMember = nonSSOMemberHelper.user
 
@@ -44,11 +47,17 @@ export async function createGroupSSO(SSOConfigValidated = true) {
   await groupAdminUser.ensureUserExists()
   await memberUser.ensureUserExists()
 
-  const ssoConfig = new SSOConfig({
+  const ssoConfigDoc = {
     ...baseSsoConfig,
     enabled: true,
     validated: SSOConfigValidated,
-  })
+  }
+
+  if (useSettingsUKAMF) {
+    ssoConfigDoc.useSettingsUKAMF = useSettingsUKAMF // conditionally adding because this field was added after group SSO was released and it will be undefined for some groups
+  }
+
+  const ssoConfig = new SSOConfig(ssoConfigDoc)
 
   await ssoConfig.save()
 
@@ -73,7 +82,8 @@ export async function createGroupSSO(SSOConfigValidated = true) {
       memberUser.email,
       memberUser.password,
       subscriptionId,
-      'mock@email.com'
+      'mock@email.com',
+      useSettingsUKAMF
     )
   }
 
@@ -98,8 +108,13 @@ export async function linkGroupMember(
   userEmail,
   userPassword,
   groupId,
-  externalUserId
+  externalUserId,
+  usingSettingsUKAMF
 ) {
+  const samlSettings = usingSettingsUKAMF
+    ? Settings.saml.ukamf
+    : Settings.saml.groupSSO
+
   // eslint-disable-next-line no-restricted-syntax
   const subscription = await SubscriptionModel.findById(groupId)
     .populate('ssoConfig')
@@ -121,7 +136,7 @@ export async function linkGroupMember(
   })
   if (
     !headers.get('location') ||
-    !headers.get('location').includes(Settings.saml.groupSSO.initPath)
+    !headers.get('location').includes(samlSettings.initPath)
   ) {
     throw new Error('invalid redirect when linking to group SSO')
   }
@@ -133,18 +148,22 @@ export async function linkGroupMember(
   // redirect to IdP
   const idpEntryPointUrl = new URL(initSSOResponse.headers.get('location'))
   const requestId = await SAMLHelper.getRequestId(idpEntryPointUrl)
-  const response = await userHelper.fetch(Settings.saml.groupSSO.path, {
+  const response = await userHelper.fetch(samlSettings.path, {
     method: 'POST',
     body: new URLSearchParams({
       SAMLResponse: SAMLHelper.createMockSamlResponse({
         requestId,
         userIdAttribute,
         uniqueId: externalUserId,
-        issuer: 'https://www.overleaf.test/saml/group-sso/meta',
+        issuer: samlSettings.issuer,
       }),
     }),
   })
-  if (response.status !== 302) {
+
+  if (
+    response.status !== 302 &&
+    response.headers.get('location').path !== '/project'
+  ) {
     throw new Error('failed to link group SSO')
   }
 
diff --git a/services/web/test/acceptance/src/mocks/MockGitBridgeApi.mjs b/services/web/test/acceptance/src/mocks/MockGitBridgeApi.mjs
index 4927814b9a..805bbdd8fe 100644
--- a/services/web/test/acceptance/src/mocks/MockGitBridgeApi.mjs
+++ b/services/web/test/acceptance/src/mocks/MockGitBridgeApi.mjs
@@ -3,12 +3,16 @@ import AbstractMockApi from './AbstractMockApi.mjs'
 class MockGitBridgeApi extends AbstractMockApi {
   reset() {
     this.projects = {}
+    this.postbacks = {}
   }
 
   applyRoutes() {
     this.app.delete('/api/projects/:projectId', (req, res) => {
       this.deleteProject(req, res)
     })
+    this.app.post('/postback/:id', (req, res) => {
+      this.postback(req, res)
+    })
   }
 
   deleteProject(req, res) {
@@ -16,6 +20,24 @@ class MockGitBridgeApi extends AbstractMockApi {
     delete this.projects[projectId]
     res.sendStatus(204)
   }
+
+  // Git bridge accepts a postback to indicate when a operation is complete.
+  // Each postback is identified by a unique ID.
+  // Allow registering a handler which resolves when a postback is received.
+  registerPostback(id) {
+    return new Promise((resolve, reject) => {
+      this.postbacks[id] = { resolve, reject }
+    })
+  }
+
+  postback(req, res) {
+    const { id } = req.params
+    const postbackData = req.body
+    if (this.postbacks[id]) {
+      this.postbacks[id].resolve(postbackData)
+    }
+    res.sendStatus(204)
+  }
 }
 
 export default MockGitBridgeApi
diff --git a/services/web/test/acceptance/src/mocks/MockRecurlyApi.mjs b/services/web/test/acceptance/src/mocks/MockRecurlyApi.mjs
index c1e7c2aa8b..091ff62ad5 100644
--- a/services/web/test/acceptance/src/mocks/MockRecurlyApi.mjs
+++ b/services/web/test/acceptance/src/mocks/MockRecurlyApi.mjs
@@ -7,6 +7,9 @@ class MockRecurlyApi extends AbstractMockApi {
     this.mockSubscriptions = []
     this.redemptions = {}
     this.coupons = {}
+    this.rateLimitResetSeconds = Math.ceil(
+      (Date.now() + 24 * 60 * 60 * 1000) / 1000
+    )
   }
 
   addMockSubscription(recurlySubscription) {
@@ -25,7 +28,21 @@ class MockRecurlyApi extends AbstractMockApi {
     )
   }
 
+  getRateLimitHeaders() {
+    return {
+      'X-RateLimit-Limit': 1000,
+      'X-RateLimit-Remaining': 999,
+      'X-RateLimit-Reset': this.rateLimitResetSeconds,
+    }
+  }
+
   applyRoutes() {
+    this.app.use((req, res, next) => {
+      for (const [name, v] of Object.entries(this.getRateLimitHeaders())) {
+        res.setHeader(name, v)
+      }
+      next()
+    })
     this.app.get('/subscriptions/:id', (req, res) => {
       const subscription = this.getMockSubscriptionById(req.params.id)
       if (!subscription) {
diff --git a/services/web/test/frontend/bootstrap.js b/services/web/test/frontend/bootstrap.js
index df4d3f1464..496b7b588d 100644
--- a/services/web/test/frontend/bootstrap.js
+++ b/services/web/test/frontend/bootstrap.js
@@ -65,8 +65,12 @@ globalThis.BroadcastChannel =
   global.BroadcastChannel =
   window.BroadcastChannel =
     class BroadcastChannel {
+      // Unused arguments left to document the signature of the stubbed function.
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
       addEventListener(type, listener) {}
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
       removeEventListener(type, listener) {}
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
       postMessage(message) {}
     }
 
diff --git a/services/web/test/frontend/components/pdf-preview/pdf-preview-detached-root.spec.tsx b/services/web/test/frontend/components/pdf-preview/pdf-preview-detached-root.spec.tsx
index cbb65861f9..4262c8070b 100644
--- a/services/web/test/frontend/components/pdf-preview/pdf-preview-detached-root.spec.tsx
+++ b/services/web/test/frontend/components/pdf-preview/pdf-preview-detached-root.spec.tsx
@@ -8,6 +8,10 @@ describe('<PdfPreviewDetachedRoot/>', function () {
     window.metaAttributesCache.set('ol-detachRole', 'detached')
     window.metaAttributesCache.set('ol-projectName', 'Project Name')
     window.metaAttributesCache.set('ol-preventCompileOnLoad', true)
+    window.metaAttributesCache.set('ol-compileSettings', {
+      reducedWarningThreshold: 'default',
+      compileTimeout: 240,
+    })
 
     cy.interceptEvents()
   })
diff --git a/services/web/test/frontend/components/pdf-preview/pdf-preview.spec.tsx b/services/web/test/frontend/components/pdf-preview/pdf-preview.spec.tsx
index fd2075236c..ed0ab2ffc1 100644
--- a/services/web/test/frontend/components/pdf-preview/pdf-preview.spec.tsx
+++ b/services/web/test/frontend/components/pdf-preview/pdf-preview.spec.tsx
@@ -50,6 +50,10 @@ describe('<PdfPreview/>', function () {
       'populate-clsi-cache': 'enabled',
     })
     window.metaAttributesCache.set('ol-projectOwnerHasPremiumOnPageLoad', true)
+    window.metaAttributesCache.set('ol-compileSettings', {
+      reducedWarningThreshold: 'default',
+      compileTimeout: 240,
+    })
     cy.interceptEvents()
   })
 
diff --git a/services/web/test/frontend/components/project-list/notifications/group-invitation.spec.tsx b/services/web/test/frontend/components/project-list/notifications/group-invitation.spec.tsx
index 5767302fed..c29de58f98 100644
--- a/services/web/test/frontend/components/project-list/notifications/group-invitation.spec.tsx
+++ b/services/web/test/frontend/components/project-list/notifications/group-invitation.spec.tsx
@@ -27,6 +27,10 @@ describe('<GroupInvitationNotification />', function () {
   }
 
   beforeEach(function () {
+    cy.intercept('GET', `/user/notification/${notification._id}`, {
+      statusCode: 200,
+      body: notification,
+    }).as('getNotification')
     cy.intercept(
       'PUT',
       `/subscription/invites/${notification.messageOpts.token}`,
@@ -48,6 +52,7 @@ describe('<GroupInvitationNotification />', function () {
 
       cy.findByRole('button', { name: 'Join now' }).click()
 
+      cy.wait('@getNotification')
       cy.wait('@acceptInvite')
 
       cy.findByText(
@@ -62,10 +67,7 @@ describe('<GroupInvitationNotification />', function () {
 
   describe('user with existing personal subscription', function () {
     beforeEach(function () {
-      window.metaAttributesCache.set(
-        'ol-hasIndividualRecurlySubscription',
-        true
-      )
+      window.metaAttributesCache.set('ol-hasIndividualPaidSubscription', true)
     })
 
     it('is able to join group successfully without cancelling personal subscription', function () {
@@ -85,6 +87,7 @@ describe('<GroupInvitationNotification />', function () {
 
       cy.findByRole('button', { name: 'Join now' }).click()
 
+      cy.wait('@getNotification')
       cy.wait('@acceptInvite')
 
       cy.findByText(
@@ -119,6 +122,7 @@ describe('<GroupInvitationNotification />', function () {
 
       cy.findByRole('button', { name: 'Join now' }).click()
 
+      cy.wait('@getNotification')
       cy.wait('@acceptInvite')
 
       cy.findByText(
diff --git a/services/web/test/frontend/components/shared/tooltip.spec.tsx b/services/web/test/frontend/components/shared/tooltip.spec.tsx
index 29b2c75ede..b78a559c35 100644
--- a/services/web/test/frontend/components/shared/tooltip.spec.tsx
+++ b/services/web/test/frontend/components/shared/tooltip.spec.tsx
@@ -32,4 +32,33 @@ describe('<OLTooltip />', function () {
     cy.get('@blurHandler').should('have.been.calledOnce')
     cy.findByText(description).should('not.exist')
   })
+
+  it('hides the tooltip when Escape key is pressed', function () {
+    const description = 'Press Escape to close'
+    const btnText = 'Hover me!'
+
+    cy.mount(
+      <div
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          height: '100vh',
+        }}
+      >
+        <OLTooltip id="esc" description={description}>
+          <button>{btnText}</button>
+        </OLTooltip>
+      </div>
+    )
+
+    cy.findByRole('button', { name: btnText }).as('button')
+    cy.get('@button').trigger('mouseover')
+    cy.findByText(description)
+    cy.get('@button').trigger('mouseout')
+    cy.get('@button').focus()
+    cy.findByText(description)
+    cy.get('body').type('{esc}')
+    cy.findByText(description).should('not.exist')
+  })
 })
diff --git a/services/web/test/frontend/features/chat/components/chat-pane.test.jsx b/services/web/test/frontend/features/chat/components/chat-pane.test.jsx
index 5a59b9b19f..f990a8c6ce 100644
--- a/services/web/test/frontend/features/chat/components/chat-pane.test.jsx
+++ b/services/web/test/frontend/features/chat/components/chat-pane.test.jsx
@@ -7,10 +7,7 @@ import {
 import fetchMock from 'fetch-mock'
 
 import ChatPane from '../../../../../frontend/js/features/chat/components/chat-pane'
-import {
-  cleanUpContext,
-  renderWithEditorContext,
-} from '../../../helpers/render-with-context'
+import { renderWithEditorContext } from '../../../helpers/render-with-context'
 import { stubMathJax, tearDownMathJaxStubs } from './stubs'
 
 describe('<ChatPane />', function () {
@@ -22,7 +19,6 @@ describe('<ChatPane />', function () {
 
   beforeEach(function () {
     window.metaAttributesCache.set('ol-user', user)
-    window.metaAttributesCache.set('ol-chatEnabled', true)
     window.metaAttributesCache.set('ol-preventCompileOnLoad', true)
   })
 
@@ -47,8 +43,6 @@ describe('<ChatPane />', function () {
 
   beforeEach(function () {
     fetchMock.removeRoutes().clearHistory()
-    cleanUpContext()
-
     stubMathJax()
   })
 
diff --git a/services/web/test/frontend/features/chat/context/chat-context.test.jsx b/services/web/test/frontend/features/chat/context/chat-context.test.jsx
index ddb69d3025..a930ba3a9c 100644
--- a/services/web/test/frontend/features/chat/context/chat-context.test.jsx
+++ b/services/web/test/frontend/features/chat/context/chat-context.test.jsx
@@ -9,7 +9,6 @@ import {
   useChatContext,
   chatClientIdGenerator,
 } from '@/features/chat/context/chat-context'
-import { cleanUpContext } from '../../../helpers/render-with-context'
 import { stubMathJax, tearDownMathJaxStubs } from '../components/stubs'
 import { SocketIOMock } from '@/ide/connection/SocketIoShim'
 import { EditorProviders } from '../../../helpers/editor-providers'
@@ -24,12 +23,10 @@ describe('ChatContext', function () {
 
   beforeEach(function () {
     fetchMock.removeRoutes().clearHistory()
-    cleanUpContext()
 
     stubMathJax()
 
     window.metaAttributesCache.set('ol-user', user)
-    window.metaAttributesCache.set('ol-chatEnabled', true)
     window.metaAttributesCache.set('ol-preventCompileOnLoad', true)
 
     this.stub = sinon.stub(chatClientIdGenerator, 'generate').returns(uuidValue)
diff --git a/services/web/test/frontend/features/dictionary/components/dictionary-modal-content.spec.jsx b/services/web/test/frontend/features/dictionary/components/dictionary-modal-content.spec.jsx
index c28eef66ef..c8cdd931b3 100644
--- a/services/web/test/frontend/features/dictionary/components/dictionary-modal-content.spec.jsx
+++ b/services/web/test/frontend/features/dictionary/components/dictionary-modal-content.spec.jsx
@@ -19,7 +19,7 @@ describe('<DictionaryModalContent />', function () {
   })
 
   it('list words', function () {
-    cy.then(win => {
+    cy.then(() => {
       learnedWords.global = new Set(['foo', 'bar'])
     })
 
@@ -34,7 +34,7 @@ describe('<DictionaryModalContent />', function () {
   })
 
   it('shows message when empty', function () {
-    cy.then(win => {
+    cy.then(() => {
       learnedWords.global = new Set([])
     })
 
@@ -50,7 +50,7 @@ describe('<DictionaryModalContent />', function () {
   it('removes words', function () {
     cy.intercept('/spelling/unlearn', { statusCode: 200 })
 
-    cy.then(win => {
+    cy.then(() => {
       learnedWords.global = new Set(['Foo', 'bar'])
     })
 
@@ -76,7 +76,7 @@ describe('<DictionaryModalContent />', function () {
   it('handles errors', function () {
     cy.intercept('/spelling/unlearn', { statusCode: 500 }).as('unlearn')
 
-    cy.then(win => {
+    cy.then(() => {
       learnedWords.global = new Set(['foo'])
     })
 
diff --git a/services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.jsx b/services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.jsx
index 84b1e680ef..be7894fc73 100644
--- a/services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.jsx
+++ b/services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.jsx
@@ -27,7 +27,6 @@ describe('<ToolbarHeader />', function () {
   }
 
   beforeEach(function () {
-    window.metaAttributesCache.set('ol-chatEnabled', true)
     window.metaAttributesCache.set('ol-preventCompileOnLoad', true)
   })
 
diff --git a/services/web/test/frontend/features/group-management/components/members-table/dropdown-button.spec.tsx b/services/web/test/frontend/features/group-management/components/members-table/dropdown-button.spec.tsx
index 9213069699..93d24865b2 100644
--- a/services/web/test/frontend/features/group-management/components/members-table/dropdown-button.spec.tsx
+++ b/services/web/test/frontend/features/group-management/components/members-table/dropdown-button.spec.tsx
@@ -24,6 +24,7 @@ function mountDropDownComponent(user: User, subscriptionId: string) {
       <DropdownButton
         user={user}
         openOffboardingModalForUser={sinon.stub()}
+        openRemoveModalForUser={sinon.stub()}
         openUnlinkUserModal={sinon.stub()}
         groupId={subscriptionId}
         setGroupUserAlert={sinon.stub()}
@@ -174,6 +175,7 @@ describe('DropdownButton', function () {
       beforeEach(function () {
         cy.window().then(win => {
           win.metaAttributesCache.set('ol-users', [user])
+          win.metaAttributesCache.set('ol-isUserGroupManager', true)
         })
         mountDropDownComponent(user, subscriptionId)
       })
@@ -189,6 +191,7 @@ describe('DropdownButton', function () {
         cy.findByRole('button', { name: /actions/i }).click()
 
         cy.findByTestId('delete-user-action').should('be.visible')
+        cy.findByTestId('release-user-action')
 
         cy.findByTestId('remove-user-action').should('not.exist')
         cy.findByTestId('resend-managed-user-invite-action').should('not.exist')
@@ -566,6 +569,7 @@ describe('DropdownButton', function () {
         cy.findByTestId('unlink-user-action').should('be.visible')
 
         cy.findByTestId('delete-user-action').should('not.exist')
+        cy.findByTestId('release-user-action').should('not.exist')
         cy.findByTestId('resend-sso-link-invite-action').should('not.exist')
         cy.findByTestId('no-actions-available').should('not.exist')
       })
@@ -608,6 +612,7 @@ describe('DropdownButton', function () {
         )
         cy.findByTestId('remove-user-action').should('be.visible')
         cy.findByTestId('delete-user-action').should('not.exist')
+        cy.findByTestId('release-user-action').should('not.exist')
         cy.findByTestId('resend-sso-link-invite-action').should('exist')
 
         cy.findByTestId('no-actions-available').should('not.exist')
@@ -633,6 +638,7 @@ describe('DropdownButton', function () {
       beforeEach(function () {
         cy.window().then(win => {
           win.metaAttributesCache.set('ol-users', [user])
+          win.metaAttributesCache.set('ol-isUserGroupManager', true)
         })
         mountDropDownComponent(user, subscriptionId)
       })
@@ -648,6 +654,7 @@ describe('DropdownButton', function () {
         cy.findByRole('button', { name: /actions/i }).click()
 
         cy.findByTestId('delete-user-action').should('be.visible')
+        cy.findByTestId('release-user-action')
 
         cy.findByTestId('remove-user-action').should('not.exist')
         cy.findByTestId('resend-managed-user-invite-action').should('not.exist')
@@ -682,6 +689,7 @@ describe('DropdownButton', function () {
       beforeEach(function () {
         cy.window().then(win => {
           win.metaAttributesCache.set('ol-users', [user])
+          win.metaAttributesCache.set('ol-isUserGroupManager', true)
         })
         mountDropDownComponent(user, subscriptionId)
       })
@@ -697,6 +705,7 @@ describe('DropdownButton', function () {
         cy.findByRole('button', { name: /actions/i }).click()
 
         cy.findByTestId('delete-user-action').should('be.visible')
+        cy.findByTestId('release-user-action')
 
         cy.findByTestId('remove-user-action').should('not.exist')
         cy.findByTestId('resend-managed-user-invite-action').should('not.exist')
@@ -745,6 +754,7 @@ describe('DropdownButton', function () {
         cy.findByTestId('resend-managed-user-invite-action').should('not.exist')
         cy.findByTestId('remove-user-action').should('not.exist')
         cy.findByTestId('delete-user-action').should('not.exist')
+        cy.findByTestId('release-user-action').should('not.exist')
         cy.findByTestId('no-actions-available').should('not.exist')
       })
     })
@@ -793,6 +803,7 @@ describe('DropdownButton', function () {
 
         cy.findByTestId('no-actions-available').should('not.exist')
         cy.findByTestId('delete-user-action').should('not.exist')
+        cy.findByTestId('release-user-action').should('not.exist')
         cy.findByTestId('remove-user-action').should('not.exist')
         cy.findByTestId('resend-managed-user-invite-action').should('not.exist')
         cy.findByTestId('resend-sso-link-invite-action').should('not.exist')
diff --git a/services/web/test/frontend/features/group-management/components/members-table/member-row.spec.tsx b/services/web/test/frontend/features/group-management/components/members-table/member-row.spec.tsx
index 538e3036b8..0ae6ee8d04 100644
--- a/services/web/test/frontend/features/group-management/components/members-table/member-row.spec.tsx
+++ b/services/web/test/frontend/features/group-management/components/members-table/member-row.spec.tsx
@@ -30,6 +30,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -82,6 +83,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -121,6 +123,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -159,6 +162,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -207,6 +211,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -258,6 +263,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -297,6 +303,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -335,6 +342,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -383,6 +391,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -435,6 +444,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -474,6 +484,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -512,6 +523,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -561,6 +573,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -613,6 +626,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -652,6 +666,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
@@ -690,6 +705,7 @@ describe('MemberRow', function () {
             <MemberRow
               user={user}
               openOffboardingModalForUser={sinon.stub()}
+              openRemoveModalForUser={sinon.stub()}
               openUnlinkUserModal={sinon.stub()}
               groupId={subscriptionId}
               setGroupUserAlert={sinon.stub()}
diff --git a/services/web/test/frontend/features/group-management/components/members-table/remove-managed-user-modal.spec.tsx b/services/web/test/frontend/features/group-management/components/members-table/remove-managed-user-modal.spec.tsx
new file mode 100644
index 0000000000..1bf6b677d5
--- /dev/null
+++ b/services/web/test/frontend/features/group-management/components/members-table/remove-managed-user-modal.spec.tsx
@@ -0,0 +1,96 @@
+import RemoveManagedUserModal from '@/features/group-management/components/members-table/remove-managed-user-modal'
+import sinon from 'sinon'
+
+describe('RemoveManagedUserModal', function () {
+  describe('happy path', function () {
+    const groupId = 'some-group'
+    const user = {
+      _id: 'some-user',
+      email: 'some.user@example.com',
+      first_name: 'Some',
+      last_name: 'User',
+      invite: true,
+      last_active_at: new Date(),
+      enrollment: {
+        managedBy: `${groupId}`,
+        enrolledAt: new Date(),
+      },
+      isEntityAdmin: undefined,
+    }
+
+    beforeEach(function () {
+      cy.mount(
+        <RemoveManagedUserModal
+          user={user}
+          groupId={groupId}
+          onClose={sinon.stub()}
+        />
+      )
+    })
+
+    it('should render the modal', function () {
+      cy.findByTestId('release-user-form')
+    })
+
+    it('should render content', function () {
+      cy.findByText(
+        `You’re about to remove ${user.first_name} ${user.last_name} (${user.email}). Doing this will mean:`
+      )
+      cy.findAllByRole('listitem')
+        .eq(0)
+        .contains(/they will be removed from the group/i)
+      cy.findAllByRole('listitem')
+        .eq(1)
+        .contains(/they will no longer be a managed user/i)
+      cy.findAllByRole('listitem')
+        .eq(2)
+        .contains(
+          /they will retain their existing account on the .* free plan/i
+        )
+      cy.findAllByRole('listitem')
+        .eq(3)
+        .contains(
+          /they will retain ownership of projects currently owned by them and any collaborators on those projects will become read-only/i
+        )
+      cy.findAllByRole('listitem')
+        .eq(4)
+        .contains(
+          /they will continue to have access to any projects shared with them/i
+        )
+      cy.findAllByRole('listitem')
+        .eq(5)
+        .contains(
+          /they won’t be able to log in with SSO \(if you have this enabled\)\. they will need to set an .* password/i
+        )
+      cy.contains(
+        /in cases where a user has left your organization and you need to transfer their projects, the delete user option should be used/i
+      )
+    })
+
+    it('should disable the remove button if the email does not match the user', function () {
+      // Button should be disabled initially
+      cy.findByRole('button', { name: /remove user/i }).should('be.disabled')
+
+      // Fill in the email input, with the wrong email address
+      cy.findByLabelText(
+        /to confirm you want to remove .* please type the email address associated with their account/i
+      ).type('totally.wrong@example.com')
+
+      // Button still disabled
+      cy.findByRole('button', { name: /remove user/i }).should('be.disabled')
+    })
+
+    it('should fill out the form, and enable the remove button', function () {
+      // Button should be disabled initially
+      cy.findByRole('button', { name: /remove user/i }).should('be.disabled')
+
+      // Fill in the email input
+      cy.findByLabelText(
+        /to confirm you want to remove .* please type the email address associated with their account/i
+      ).type(user.email)
+
+      // Button should be enabled now
+      cy.findByRole('button', { name: /remove user/i }).should('be.enabled')
+    })
+  })
+})
diff --git a/services/web/test/frontend/features/history/components/change-list.spec.tsx b/services/web/test/frontend/features/history/components/change-list.spec.tsx
index b3a1071015..763845db54 100644
--- a/services/web/test/frontend/features/history/components/change-list.spec.tsx
+++ b/services/web/test/frontend/features/history/components/change-list.spec.tsx
@@ -372,7 +372,7 @@ describe('change list (Bootstrap 5)', function () {
       cy.findAllByTestId('history-version-details')
         .eq(1)
         .within(() => {
-          cy.get('[aria-label="Compare"]').click()
+          cy.findByRole('button', { name: /compare/i }).click()
           cy.findByRole('menu').within(() => {
             cy.findByRole('menuitem', {
               name: /compare up to this version/i,
diff --git a/services/web/test/frontend/features/ide-react/unit/share-js-history-ot-type.ts b/services/web/test/frontend/features/ide-react/unit/share-js-history-ot-type.ts
new file mode 100644
index 0000000000..8418c59ed0
--- /dev/null
+++ b/services/web/test/frontend/features/ide-react/unit/share-js-history-ot-type.ts
@@ -0,0 +1,134 @@
+import { expect } from 'chai'
+import {
+  StringFileData,
+  TextOperation,
+  AddCommentOperation,
+  Range,
+} from 'overleaf-editor-core'
+import { historyOTType } from '@/features/ide-react/editor/share-js-history-ot-type'
+
+describe('historyOTType', function () {
+  let snapshot: StringFileData
+  let opsA: TextOperation[]
+  let opsB: TextOperation[]
+
+  beforeEach(function () {
+    snapshot = new StringFileData('one plus two equals three')
+
+    // After opsA: "seven plus five equals twelve"
+    opsA = [new TextOperation(), new TextOperation(), new TextOperation()]
+
+    opsA[0].remove(3)
+    opsA[0].insert('seven')
+    opsA[0].retain(22)
+
+    opsA[1].retain(11)
+    opsA[1].remove(3)
+    opsA[1].insert('five')
+    opsA[1].retain(13)
+
+    opsA[2].retain(23)
+    opsA[2].remove(5)
+    opsA[2].insert('twelve')
+
+    // After ops2: "one times two equals two"
+    opsB = [new TextOperation(), new TextOperation()]
+
+    opsB[0].retain(4)
+    opsB[0].remove(4)
+    opsB[0].insert('times')
+    opsB[0].retain(17)
+
+    opsB[1].retain(21)
+    opsB[1].remove(5)
+    opsB[1].insert('two')
+  })
+
+  describe('apply', function () {
+    it('supports an empty operations array', function () {
+      const result = historyOTType.apply(snapshot, [])
+      expect(result.getContent()).to.equal('one plus two equals three')
+    })
+
+    it('applies operations to the snapshot (opsA)', function () {
+      const result = historyOTType.apply(snapshot, opsA)
+      expect(result.getContent()).to.equal('seven plus five equals twelve')
+    })
+
+    it('applies operations to the snapshot (opsB)', function () {
+      const result = historyOTType.apply(snapshot, opsB)
+      expect(result.getContent()).to.equal('one times two equals two')
+    })
+  })
+
+  describe('compose', function () {
+    it('supports empty operations', function () {
+      const ops = historyOTType.compose([], [])
+      expect(ops).to.deep.equal([])
+    })
+
+    it('supports an empty operation on the left', function () {
+      const ops = historyOTType.compose([], opsA)
+      const result = historyOTType.apply(snapshot, ops)
+      expect(result.getContent()).to.equal('seven plus five equals twelve')
+    })
+
+    it('supports an empty operation on the right', function () {
+      const ops = historyOTType.compose(opsA, [])
+      const result = historyOTType.apply(snapshot, ops)
+      expect(result.getContent()).to.equal('seven plus five equals twelve')
+    })
+
+    it('supports operations on both sides', function () {
+      const ops = historyOTType.compose(opsA.slice(0, 2), opsA.slice(2))
+      const result = historyOTType.apply(snapshot, ops)
+      expect(ops.length).to.equal(1)
+      expect(result.getContent()).to.equal('seven plus five equals twelve')
+    })
+
+    it("supports operations that can't be composed", function () {
+      const comment = new AddCommentOperation('comment-id', [new Range(3, 10)])
+      const ops = historyOTType.compose(opsA.slice(0, 2), [
+        comment,
+        ...opsA.slice(2),
+      ])
+      expect(ops.length).to.equal(3)
+      const result = historyOTType.apply(snapshot, ops)
+      expect(result.getContent()).to.equal('seven plus five equals twelve')
+    })
+  })
+
+  describe('transformX', function () {
+    it('supports empty operations', function () {
+      const [aPrime, bPrime] = historyOTType.transformX([], [])
+      expect(aPrime).to.deep.equal([])
+      expect(bPrime).to.deep.equal([])
+    })
+
+    it('supports an empty operation on the left', function () {
+      const [aPrime, bPrime] = historyOTType.transformX([], opsB)
+      expect(aPrime).to.deep.equal([])
+      expect(bPrime).to.deep.equal(opsB)
+    })
+
+    it('supports an empty operation on the right', function () {
+      const [aPrime, bPrime] = historyOTType.transformX(opsA, [])
+      expect(aPrime).to.deep.equal(opsA)
+      expect(bPrime).to.deep.equal([])
+    })
+
+    it('supports operations on both sides (a then b)', function () {
+      const [, bPrime] = historyOTType.transformX(opsA, opsB)
+      const ops = historyOTType.compose(opsA, bPrime)
+      const result = historyOTType.apply(snapshot, ops)
+      expect(result.getContent()).to.equal('seven times five equals twelvetwo')
+    })
+
+    it('supports operations on both sides (b then a)', function () {
+      const [aPrime] = historyOTType.transformX(opsA, opsB)
+      const ops = historyOTType.compose(opsB, aPrime)
+      const result = historyOTType.apply(snapshot, ops)
+      expect(result.getContent()).to.equal('seven times five equals twelvetwo')
+    })
+  })
+})
diff --git a/services/web/test/frontend/features/project-list/components/notifications.test.tsx b/services/web/test/frontend/features/project-list/components/notifications.test.tsx
index 78c732ebe3..9a845283d7 100644
--- a/services/web/test/frontend/features/project-list/components/notifications.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/notifications.test.tsx
@@ -441,7 +441,7 @@ describe('<UserNotifications />', function () {
               ),
             ])
             window.metaAttributesCache.set(
-              'ol-hasIndividualRecurlySubscription',
+              'ol-hasIndividualPaidSubscription',
               true
             )
 
diff --git a/services/web/test/frontend/features/settings/components/emails/add-email-input.test.tsx b/services/web/test/frontend/features/settings/components/emails/add-email-input.test.tsx
index 50220152c6..694a13f32c 100644
--- a/services/web/test/frontend/features/settings/components/emails/add-email-input.test.tsx
+++ b/services/web/test/frontend/features/settings/components/emails/add-email-input.test.tsx
@@ -13,7 +13,7 @@ const testInstitutionData = [
 
 describe('<AddEmailInput/>', function () {
   const defaultProps = {
-    onChange: (value: string) => {},
+    onChange: () => {},
     handleAddNewEmail: () => {},
   }
 
diff --git a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
index 88f3482c4b..b86207fb0f 100644
--- a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
+++ b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
@@ -5,10 +5,7 @@ import fetchMock from 'fetch-mock'
 import userEvent from '@testing-library/user-event'
 
 import ShareProjectModal from '../../../../../frontend/js/features/share-project-modal/components/share-project-modal'
-import {
-  renderWithEditorContext,
-  cleanUpContext,
-} from '../../../helpers/render-with-context'
+import { renderWithEditorContext } from '../../../helpers/render-with-context'
 import {
   EditorProviders,
   USER_EMAIL,
@@ -100,7 +97,6 @@ describe('<ShareProjectModal/>', function () {
   afterEach(function () {
     this.locationWrapperSandbox.restore()
     fetchMock.removeRoutes().clearHistory()
-    cleanUpContext()
   })
 
   it('renders the modal', async function () {
@@ -617,7 +613,7 @@ describe('<ShareProjectModal/>', function () {
 
     fetchMock.post(
       'express:/project/:projectId/invite',
-      ({ args: [url, req] }) => {
+      ({ args: [, req] }) => {
         const data = JSON.parse(req.body)
 
         if (data.email === 'a@b.c') {
diff --git a/services/web/test/frontend/features/source-editor/helpers/mock-doc.ts b/services/web/test/frontend/features/source-editor/helpers/mock-doc.ts
index 4c239c1f60..a4944c1e97 100644
--- a/services/web/test/frontend/features/source-editor/helpers/mock-doc.ts
+++ b/services/web/test/frontend/features/source-editor/helpers/mock-doc.ts
@@ -1,4 +1,4 @@
-import { ShareDoc } from '../../../../../types/share-doc'
+import { ShareLatexOTShareDoc } from '../../../../../types/share-doc'
 import { EventEmitter } from 'events'
 
 export const docId = 'test-doc'
@@ -36,6 +36,9 @@ const defaultContent = mockDocContent(contentLines.join('\n'))
 const MAX_DOC_LENGTH = 2 * 1024 * 1024 // ol-maxDocLength
 
 class MockShareDoc extends EventEmitter {
+  otType = 'sharejs-text-ot' as const
+  snapshot = ''
+
   constructor(public text: string) {
     super()
   }
@@ -51,16 +54,21 @@ class MockShareDoc extends EventEmitter {
   del() {
     // do nothing
   }
+
+  submitOp() {
+    // do nothing
+  }
 }
 
 export const mockDoc = (
   content = defaultContent,
   { rangesOptions = {} } = {}
 ) => {
-  const mockShareJSDoc: ShareDoc = new MockShareDoc(content)
+  const mockShareJSDoc: ShareLatexOTShareDoc = new MockShareDoc(content)
 
   return {
     doc_id: docId,
+    getType: () => 'sharejs-text-ot',
     getSnapshot: () => {
       return content
     },
@@ -98,10 +106,11 @@ export const mockDoc = (
       removeCommentId: () => {},
       ...rangesOptions,
     },
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     submitOp: (op: any) => {},
     setTrackChangesIdSeeds: () => {},
     getTrackingChanges: () => true,
-    setTrackingChanges: () => {},
+    setTrackChangesUserId: () => {},
     getInflightOp: () => null,
     getPendingOp: () => null,
     hasBufferedOps: () => false,
diff --git a/services/web/test/frontend/features/subscription/components/dashboard/personal-subscription.test.tsx b/services/web/test/frontend/features/subscription/components/dashboard/personal-subscription.test.tsx
index 8edc881caa..a61c9fca7f 100644
--- a/services/web/test/frontend/features/subscription/components/dashboard/personal-subscription.test.tsx
+++ b/services/web/test/frontend/features/subscription/components/dashboard/personal-subscription.test.tsx
@@ -190,7 +190,9 @@ describe('<PersonalSubscription />', function () {
   })
 
   it('shows different payment email address section', async function () {
-    fetchMock.post('/user/subscription/account/email', 200)
+    fetchMock.post('/user/subscription/account/email', {
+      status: 200,
+    })
     const usersEmail = 'foo@example.com'
     renderWithSubscriptionDashContext(<PersonalSubscription />, {
       metaTags: [
diff --git a/services/web/test/frontend/features/subscription/components/group-invite/group-invite.test.tsx b/services/web/test/frontend/features/subscription/components/group-invite/group-invite.test.tsx
index cc70eff90d..d7b769fd20 100644
--- a/services/web/test/frontend/features/subscription/components/group-invite/group-invite.test.tsx
+++ b/services/web/test/frontend/features/subscription/components/group-invite/group-invite.test.tsx
@@ -18,10 +18,7 @@ describe('group invite', function () {
 
   describe('when user has personal subscription', function () {
     beforeEach(function () {
-      window.metaAttributesCache.set(
-        'ol-hasIndividualRecurlySubscription',
-        true
-      )
+      window.metaAttributesCache.set('ol-hasIndividualPaidSubscription', true)
     })
 
     it('renders cancel personal subscription view', async function () {
@@ -55,10 +52,7 @@ describe('group invite', function () {
 
   describe('when user does not have a personal subscription', function () {
     beforeEach(function () {
-      window.metaAttributesCache.set(
-        'ol-hasIndividualRecurlySubscription',
-        false
-      )
+      window.metaAttributesCache.set('ol-hasIndividualPaidSubscription', false)
       window.metaAttributesCache.set('ol-inviteToken', 'token123')
     })
 
diff --git a/services/web/test/frontend/features/subscription/fixtures/subscriptions.ts b/services/web/test/frontend/features/subscription/fixtures/subscriptions.ts
index 08690742d3..8011c5206d 100644
--- a/services/web/test/frontend/features/subscription/fixtures/subscriptions.ts
+++ b/services/web/test/frontend/features/subscription/fixtures/subscriptions.ts
@@ -25,7 +25,6 @@ export const annualActiveSubscription: PaidSubscription = {
   admin_id: 'abc123',
   teamInvites: [],
   planCode: 'collaborator-annual',
-  recurlySubscription_id: 'ghi789',
   plan: {
     planCode: 'collaborator-annual',
     name: 'Standard (Collaborator) Annual',
@@ -68,7 +67,6 @@ export const annualActiveSubscriptionEuro: PaidSubscription = {
   admin_id: 'abc123',
   teamInvites: [],
   planCode: 'collaborator-annual',
-  recurlySubscription_id: 'ghi789',
   plan: {
     planCode: 'collaborator-annual',
     name: 'Standard (Collaborator) Annual',
@@ -111,7 +109,6 @@ export const annualActiveSubscriptionPro: PaidSubscription = {
   admin_id: 'abc123',
   teamInvites: [],
   planCode: 'professional',
-  recurlySubscription_id: 'ghi789',
   plan: {
     planCode: 'professional',
     name: 'Professional',
@@ -153,7 +150,6 @@ export const pastDueExpiredSubscription: PaidSubscription = {
   admin_id: 'abc123',
   teamInvites: [],
   planCode: 'collaborator-annual',
-  recurlySubscription_id: 'ghi789',
   plan: {
     planCode: 'collaborator-annual',
     name: 'Standard (Collaborator) Annual',
@@ -196,7 +192,6 @@ export const canceledSubscription: PaidSubscription = {
   admin_id: 'abc123',
   teamInvites: [],
   planCode: 'collaborator-annual',
-  recurlySubscription_id: 'ghi789',
   plan: {
     planCode: 'collaborator-annual',
     name: 'Standard (Collaborator) Annual',
@@ -239,7 +234,6 @@ export const pendingSubscriptionChange: PaidSubscription = {
   admin_id: 'abc123',
   teamInvites: [],
   planCode: 'collaborator-annual',
-  recurlySubscription_id: 'ghi789',
   plan: {
     planCode: 'collaborator-annual',
     name: 'Standard (Collaborator) Annual',
@@ -290,7 +284,6 @@ export const groupActiveSubscription: GroupSubscription = {
   admin_id: 'abc123',
   teamInvites: [],
   planCode: 'group_collaborator_10_enterprise',
-  recurlySubscription_id: 'ghi789',
   plan: {
     planCode: 'group_collaborator_10_enterprise',
     name: 'Overleaf Standard (Collaborator) - Group Account (10 licenses) - Enterprise',
@@ -338,7 +331,6 @@ export const groupActiveSubscriptionWithPendingLicenseChange: GroupSubscription
     admin_id: 'abc123',
     teamInvites: [],
     planCode: 'group_collaborator_10_enterprise',
-    recurlySubscription_id: 'ghi789',
     plan: {
       planCode: 'group_collaborator_10_enterprise',
       name: 'Overleaf Standard (Collaborator) - Group Account (10 licenses) - Enterprise',
@@ -396,7 +388,6 @@ export const trialSubscription: PaidSubscription = {
   admin_id: 'abc123',
   teamInvites: [],
   planCode: 'paid-personal_free_trial_7_days',
-  recurlySubscription_id: 'ghi789',
   plan: {
     planCode: 'paid-personal_free_trial_7_days',
     name: 'Personal',
@@ -439,7 +430,6 @@ export const customSubscription: CustomSubscription = {
   admin_id: 'abc123',
   teamInvites: [],
   planCode: 'collaborator-annual',
-  recurlySubscription_id: 'ghi789',
   plan: {
     planCode: 'collaborator-annual',
     name: 'Standard (Collaborator) Annual',
@@ -460,7 +450,6 @@ export const trialCollaboratorSubscription: PaidSubscription = {
   admin_id: 'abc123',
   teamInvites: [],
   planCode: 'collaborator_free_trial_7_days',
-  recurlySubscription_id: 'ghi789',
   plan: {
     planCode: 'collaborator_free_trial_7_days',
     name: 'Standard (Collaborator)',
@@ -503,7 +492,6 @@ export const monthlyActiveCollaborator: PaidSubscription = {
   admin_id: 'abc123',
   teamInvites: [],
   planCode: 'collaborator',
-  recurlySubscription_id: 'ghi789',
   plan: {
     planCode: 'collaborator',
     name: 'Standard (Collaborator)',
diff --git a/services/web/test/frontend/features/word-count-modal/components/word-count-modal.spec.tsx b/services/web/test/frontend/features/word-count-modal/components/word-count-modal.spec.tsx
index 2ed1dc9448..9fc5887535 100644
--- a/services/web/test/frontend/features/word-count-modal/components/word-count-modal.spec.tsx
+++ b/services/web/test/frontend/features/word-count-modal/components/word-count-modal.spec.tsx
@@ -12,7 +12,7 @@ describe('<WordCountModal />', function () {
     })
 
     cy.mount(
-      <EditorProviders projectId="project-1" clsiServerId="clsi-server-1">
+      <EditorProviders projectId="project-1">
         <WordCountModal show handleHide={cy.stub()} />
       </EditorProviders>
     )
@@ -30,7 +30,7 @@ describe('<WordCountModal />', function () {
     })
 
     cy.mount(
-      <EditorProviders projectId="project-1" clsiServerId="clsi-server-1">
+      <EditorProviders projectId="project-1">
         <WordCountModal show handleHide={cy.stub()} />
       </EditorProviders>
     )
@@ -48,7 +48,7 @@ describe('<WordCountModal />', function () {
     })
 
     cy.mount(
-      <EditorProviders projectId="project-1" clsiServerId="clsi-server-1">
+      <EditorProviders projectId="project-1">
         <WordCountModal show handleHide={cy.stub()} />
       </EditorProviders>
     )
@@ -64,7 +64,7 @@ describe('<WordCountModal />', function () {
     })
 
     cy.mount(
-      <EditorProviders projectId="project-1" clsiServerId="clsi-server-1">
+      <EditorProviders projectId="project-1">
         <WordCountModal show handleHide={cy.stub()} />
       </EditorProviders>
     )
@@ -87,7 +87,7 @@ describe('<WordCountModal />', function () {
     })
 
     cy.mount(
-      <EditorProviders projectId="project-1" clsiServerId="clsi-server-1">
+      <EditorProviders projectId="project-1">
         <WordCountModal show handleHide={cy.stub()} />
       </EditorProviders>
     )
diff --git a/services/web/test/frontend/helpers/editor-providers.jsx b/services/web/test/frontend/helpers/editor-providers.jsx
index a6bc9c32c6..1fe143a8e3 100644
--- a/services/web/test/frontend/helpers/editor-providers.jsx
+++ b/services/web/test/frontend/helpers/editor-providers.jsx
@@ -1,7 +1,6 @@
 // Disable prop type checks for test harnesses
 /* eslint-disable react/prop-types */
-import sinon from 'sinon'
-import { get, merge } from 'lodash'
+import { merge } from 'lodash'
 import { SocketIOMock } from '@/ide/connection/SocketIoShim'
 import { IdeContext } from '@/shared/context/ide-context'
 import React, { useEffect, useState } from 'react'
@@ -48,8 +47,7 @@ export function EditorProviders({
   compiler = 'pdflatex',
   socket = new SocketIOMock(),
   isRestrictedTokenMember = false,
-  clsiServerId = '1234',
-  scope = {},
+  scope: defaultScope = {},
   features = {
     referencesSearch: true,
   },
@@ -71,18 +69,6 @@ export function EditorProviders({
     },
   ],
   ui = { view: 'editor', pdfLayout: 'sideBySide', chatOpen: true },
-  fileTreeManager = {
-    findEntityById: () => null,
-    findEntityByPath: () => null,
-    getEntityPath: () => '',
-    getRootDocDirname: () => '',
-    getPreviewByPath: path => ({ url: path, extension: 'png' }),
-  },
-  editorManager = {
-    getCurrentDocumentId: () => 'foo',
-    getCurrentDocValue: () => {},
-    openDoc: sinon.stub(),
-  },
   userSettings = {},
   providers = {},
 }) {
@@ -99,7 +85,9 @@ export function EditorProviders({
     merge({}, defaultUserSettings, userSettings)
   )
 
-  const $scope = merge(
+  window.metaAttributesCache.set('ol-capabilities', ['chat', 'dropbox'])
+
+  const scope = merge(
     {
       user,
       editor: {
@@ -117,31 +105,17 @@ export function EditorProviders({
         name: PROJECT_NAME,
         owner: projectOwner,
         features: projectFeatures,
-        rootDoc_id: rootDocId,
+        rootDocId,
         rootFolder,
         imageName,
         compiler,
       },
       ui,
-      $watch: (path, callback) => {
-        callback(get($scope, path))
-        return () => null
-      },
-      $on: sinon.stub(),
-      $applyAsync: sinon.stub(),
       permissionsLevel,
     },
-    scope
+    defaultScope
   )
 
-  window._ide = {
-    $scope,
-    socket,
-    clsiServerId,
-    editorManager,
-    fileTreeManager,
-  }
-
   // Add details for useUserContext
   window.metaAttributesCache.set('ol-user', { ...user, features })
   window.metaAttributesCache.set('ol-project_id', projectId)
@@ -149,8 +123,8 @@ export function EditorProviders({
   return (
     <ReactContextRoot
       providers={{
-        ConnectionProvider,
-        IdeReactProvider,
+        ConnectionProvider: makeConnectionProvider(socket),
+        IdeReactProvider: makeIdeReactProvider(scope, socket),
         ...providers,
       }}
     >
@@ -159,79 +133,85 @@ export function EditorProviders({
   )
 }
 
-const ConnectionProvider = ({ children }) => {
-  const [value] = useState(() => ({
-    socket: window._ide.socket,
-    connectionState: {
-      readyState: WebSocket.OPEN,
-      forceDisconnected: false,
-      inactiveDisconnect: false,
-      reconnectAt: null,
-      forcedDisconnectDelay: 0,
-      lastConnectionAttempt: 0,
-      error: '',
-    },
-    isConnected: true,
-    isStillReconnecting: false,
-    secondsUntilReconnect: () => 0,
-    tryReconnectNow: () => {},
-    registerUserActivity: () => {},
-    disconnect: () => {},
-  }))
-
-  return (
-    <ConnectionContext.Provider value={value}>
-      {children}
-    </ConnectionContext.Provider>
-  )
-}
-
-const IdeReactProvider = ({ children }) => {
-  const [startedFreeTrial, setStartedFreeTrial] = useState(false)
-
-  const [ideReactContextValue] = useState(() => ({
-    projectId: PROJECT_ID,
-    eventEmitter: new IdeEventEmitter(),
-    startedFreeTrial,
-    setStartedFreeTrial,
-    reportError: () => {},
-    projectJoined: true,
-  }))
-
-  const [ideContextValue] = useState(() => {
-    const ide = window._ide
-
-    const scopeStore = createReactScopeValueStore(PROJECT_ID)
-    for (const [key, value] of Object.entries(ide.$scope)) {
-      // TODO: path for nested entries
-      scopeStore.set(key, value)
-    }
-    scopeStore.set('editor.sharejs_doc', ide.$scope.editor.sharejs_doc)
-    scopeStore.set('ui.chatOpen', ide.$scope.ui.chatOpen)
-    const scopeEventEmitter = new ReactScopeEventEmitter(new IdeEventEmitter())
-
-    return {
-      ...ide,
-      scopeStore,
-      scopeEventEmitter,
-    }
-  })
-
-  useEffect(() => {
-    window.overleaf = {
-      ...window.overleaf,
-      unstable: {
-        ...window.overleaf?.unstable,
-        store: ideContextValue.scopeStore,
+const makeConnectionProvider = socket => {
+  const ConnectionProvider = ({ children }) => {
+    const [value] = useState(() => ({
+      socket,
+      connectionState: {
+        readyState: WebSocket.OPEN,
+        forceDisconnected: false,
+        inactiveDisconnect: false,
+        reconnectAt: null,
+        forcedDisconnectDelay: 0,
+        lastConnectionAttempt: 0,
+        error: '',
       },
-    }
-  }, [ideContextValue.scopeStore])
+      isConnected: true,
+      isStillReconnecting: false,
+      secondsUntilReconnect: () => 0,
+      tryReconnectNow: () => {},
+      registerUserActivity: () => {},
+      disconnect: () => {},
+    }))
 
-  return (
-    <IdeReactContext.Provider value={ideReactContextValue}>
-      <IdeContext.Provider value={ideContextValue}>
+    return (
+      <ConnectionContext.Provider value={value}>
         {children}
-      </IdeContext.Provider>
-    </IdeReactContext.Provider>
-  )
+      </ConnectionContext.Provider>
+    )
+  }
+  return ConnectionProvider
+}
+
+const makeIdeReactProvider = (scope, socket) => {
+  const IdeReactProvider = ({ children }) => {
+    const [startedFreeTrial, setStartedFreeTrial] = useState(false)
+
+    const [ideReactContextValue] = useState(() => ({
+      projectId: PROJECT_ID,
+      eventEmitter: new IdeEventEmitter(),
+      startedFreeTrial,
+      setStartedFreeTrial,
+      reportError: () => {},
+      projectJoined: true,
+    }))
+
+    const [ideContextValue] = useState(() => {
+      const scopeStore = createReactScopeValueStore(PROJECT_ID)
+      for (const [key, value] of Object.entries(scope)) {
+        // TODO: path for nested entries
+        scopeStore.set(key, value)
+      }
+      scopeStore.set('editor.sharejs_doc', scope.editor.sharejs_doc)
+      scopeStore.set('ui.chatOpen', scope.ui.chatOpen)
+      const scopeEventEmitter = new ReactScopeEventEmitter(
+        new IdeEventEmitter()
+      )
+
+      return {
+        socket,
+        scopeStore,
+        scopeEventEmitter,
+      }
+    })
+
+    useEffect(() => {
+      window.overleaf = {
+        ...window.overleaf,
+        unstable: {
+          ...window.overleaf?.unstable,
+          store: ideContextValue.scopeStore,
+        },
+      }
+    }, [ideContextValue.scopeStore])
+
+    return (
+      <IdeReactContext.Provider value={ideReactContextValue}>
+        <IdeContext.Provider value={ideContextValue}>
+          {children}
+        </IdeContext.Provider>
+      </IdeReactContext.Provider>
+    )
+  }
+  return IdeReactProvider
 }
diff --git a/services/web/test/frontend/helpers/render-with-context.jsx b/services/web/test/frontend/helpers/render-with-context.jsx
index e3aba6264d..31ee64d5be 100644
--- a/services/web/test/frontend/helpers/render-with-context.jsx
+++ b/services/web/test/frontend/helpers/render-with-context.jsx
@@ -18,7 +18,3 @@ export function renderWithEditorContext(
     ...renderOptions,
   })
 }
-
-export function cleanUpContext() {
-  delete window._ide
-}
diff --git a/services/web/test/frontend/helpers/reset-meta.ts b/services/web/test/frontend/helpers/reset-meta.ts
index f5a979828a..e59e62342d 100644
--- a/services/web/test/frontend/helpers/reset-meta.ts
+++ b/services/web/test/frontend/helpers/reset-meta.ts
@@ -2,6 +2,7 @@ export function resetMeta() {
   window.metaAttributesCache = new Map()
   window.metaAttributesCache.set('ol-projectHistoryBlobsEnabled', true)
   window.metaAttributesCache.set('ol-i18n', { currentLangCode: 'en' })
+  window.metaAttributesCache.set('ol-capabilities', ['chat', 'dropbox'])
   window.metaAttributesCache.set('ol-ExposedSettings', {
     appName: 'Overleaf',
     maxEntitiesPerProject: 10,
diff --git a/services/web/test/frontend/ide/log-parser/logParserTests.js b/services/web/test/frontend/ide/log-parser/logParserTests.js
index 098ee056b9..59cdd5d22e 100644
--- a/services/web/test/frontend/ide/log-parser/logParserTests.js
+++ b/services/web/test/frontend/ide/log-parser/logParserTests.js
@@ -6,7 +6,7 @@ const fixturePath = '../../helpers/fixtures/logs/'
 const fs = require('fs')
 const path = require('path')
 
-describe('logParser', function (done) {
+describe('logParser', function () {
   it('should parse errors', function () {
     const { errors } = parseLatexLog('errors.log', { ignoreDuplicates: true })
     expect(errors.map(e => [e.line, e.message])).to.deep.equal([
diff --git a/services/web/test/unit/bootstrap.js b/services/web/test/unit/bootstrap.js
index f3d3f382f2..00bcc3e958 100644
--- a/services/web/test/unit/bootstrap.js
+++ b/services/web/test/unit/bootstrap.js
@@ -1,7 +1,24 @@
 const Path = require('path')
 const sinon = require('sinon')
 require('./common_bootstrap')
+const chai = require('chai')
 
+/*
+ * Chai configuration
+ */
+
+// add chai.should()
+chai.should()
+
+// Load sinon-chai assertions so expect(stubFn).to.have.been.calledWith('abc')
+// has a nicer failure messages
+chai.use(require('sinon-chai'))
+
+// Load promise support for chai
+chai.use(require('chai-as-promised'))
+
+// Do not truncate assertion errors
+chai.config.truncateThreshold = 0
 /*
  * Global stubs
  */
diff --git a/services/web/test/unit/common_bootstrap.js b/services/web/test/unit/common_bootstrap.js
index d74fee60b2..a77aad61c6 100644
--- a/services/web/test/unit/common_bootstrap.js
+++ b/services/web/test/unit/common_bootstrap.js
@@ -1,22 +1,3 @@
-const chai = require('chai')
-
-/*
- * Chai configuration
- */
-
-// add chai.should()
-chai.should()
-
-// Load sinon-chai assertions so expect(stubFn).to.have.been.calledWith('abc')
-// has a nicer failure messages
-chai.use(require('sinon-chai'))
-
-// Load promise support for chai
-chai.use(require('chai-as-promised'))
-
-// Do not truncate assertion errors
-chai.config.truncateThreshold = 0
-
 // add support for mongoose in sinon
 require('sinon-mongoose')
 
diff --git a/services/web/test/unit/src/Analytics/AnalyticsUTMTrackingMiddleware.test.mjs b/services/web/test/unit/src/Analytics/AnalyticsUTMTrackingMiddleware.test.mjs
index fff5224b48..463407b180 100644
--- a/services/web/test/unit/src/Analytics/AnalyticsUTMTrackingMiddleware.test.mjs
+++ b/services/web/test/unit/src/Analytics/AnalyticsUTMTrackingMiddleware.test.mjs
@@ -1,8 +1,7 @@
-import { vi } from 'vitest'
+import { assert, vi } from 'vitest'
 import sinon from 'sinon'
 import MockRequest from '../helpers/MockRequest.js'
 import MockResponse from '../helpers/MockResponse.js'
-import { assert } from 'chai'
 
 const MODULE_PATH = new URL(
   '../../../../app/src/Features/Analytics/AnalyticsUTMTrackingMiddleware',
diff --git a/services/web/test/unit/src/Authorization/AuthorizationManagerTests.js b/services/web/test/unit/src/Authorization/AuthorizationManagerTests.js
index 7463bbdeb7..e4c67d2f77 100644
--- a/services/web/test/unit/src/Authorization/AuthorizationManagerTests.js
+++ b/services/web/test/unit/src/Authorization/AuthorizationManagerTests.js
@@ -27,7 +27,10 @@ describe('AuthorizationManager', function () {
 
     this.CollaboratorsGetter = {
       promises: {
-        getMemberIdPrivilegeLevel: sinon.stub().resolves(PrivilegeLevels.NONE),
+        getProjectAccess: sinon.stub().resolves({
+          publicAccessLevel: sinon.stub().returns(PublicAccessLevels.PRIVATE),
+          privilegeLevelForUser: sinon.stub().returns(PrivilegeLevels.NONE),
+        }),
       },
     }
 
@@ -113,9 +116,17 @@ describe('AuthorizationManager', function () {
 
       describe('with a user id with a privilege level', function () {
         beforeEach(async function () {
-          this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel
-            .withArgs(this.user._id, this.project._id)
-            .resolves(PrivilegeLevels.READ_ONLY)
+          this.CollaboratorsGetter.promises.getProjectAccess
+            .withArgs(this.project._id)
+            .resolves({
+              publicAccessLevel: sinon
+                .stub()
+                .returns(PublicAccessLevels.PRIVATE),
+              privilegeLevelForUser: sinon
+                .stub()
+                .withArgs(this.user._id)
+                .returns(PrivilegeLevels.READ_ONLY),
+            })
           this.result =
             await this.AuthorizationManager.promises.getPrivilegeLevelForProject(
               this.user._id,
@@ -171,8 +182,8 @@ describe('AuthorizationManager', function () {
               )
           })
 
-          it('should not call CollaboratorsGetter.getMemberIdPrivilegeLevel', function () {
-            this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel.called.should.equal(
+          it('should not call CollaboratorsGetter.getProjectAccess', function () {
+            this.CollaboratorsGetter.promises.getProjectAccess.called.should.equal(
               false
             )
           })
@@ -204,8 +215,8 @@ describe('AuthorizationManager', function () {
               )
           })
 
-          it('should not call CollaboratorsGetter.getMemberIdPrivilegeLevel', function () {
-            this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel.called.should.equal(
+          it('should not call CollaboratorsGetter.getProjectAccess', function () {
+            this.CollaboratorsGetter.promises.getProjectAccess.called.should.equal(
               false
             )
           })
@@ -237,8 +248,8 @@ describe('AuthorizationManager', function () {
               )
           })
 
-          it('should not call CollaboratorsGetter.getMemberIdPrivilegeLevel', function () {
-            this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel.called.should.equal(
+          it('should not call CollaboratorsGetter.getProjectAccess', function () {
+            this.CollaboratorsGetter.promises.getProjectAccess.called.should.equal(
               false
             )
           })
@@ -264,9 +275,17 @@ describe('AuthorizationManager', function () {
 
       describe('with a user id with a privilege level', function () {
         beforeEach(async function () {
-          this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel
-            .withArgs(this.user._id, this.project._id)
-            .resolves(PrivilegeLevels.READ_ONLY)
+          this.CollaboratorsGetter.promises.getProjectAccess
+            .withArgs(this.project._id)
+            .resolves({
+              publicAccessLevel: sinon
+                .stub()
+                .returns(PublicAccessLevels.PRIVATE),
+              privilegeLevelForUser: sinon
+                .stub()
+                .withArgs(this.user._id)
+                .returns(PrivilegeLevels.READ_ONLY),
+            })
           this.result =
             await this.AuthorizationManager.promises.getPrivilegeLevelForProject(
               this.user._id,
@@ -321,8 +340,8 @@ describe('AuthorizationManager', function () {
             )
         })
 
-        it('should not call CollaboratorsGetter.getMemberIdPrivilegeLevel', function () {
-          this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel.called.should.equal(
+        it('should not call CollaboratorsGetter.getProjectAccess', function () {
+          this.CollaboratorsGetter.promises.getProjectAccess.called.should.equal(
             false
           )
         })
@@ -336,13 +355,32 @@ describe('AuthorizationManager', function () {
     describe('with a public project', function () {
       beforeEach(function () {
         this.project.publicAccesLevel = 'readAndWrite'
+        this.CollaboratorsGetter.promises.getProjectAccess
+          .withArgs(this.project._id)
+          .resolves({
+            publicAccessLevel: sinon
+              .stub()
+              .returns(this.project.publicAccesLevel),
+            privilegeLevelForUser: sinon
+              .stub()
+              .withArgs(this.user._id)
+              .returns(PrivilegeLevels.NONE),
+          })
       })
 
       describe('with a user id with a privilege level', function () {
         beforeEach(async function () {
-          this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel
-            .withArgs(this.user._id, this.project._id)
-            .resolves(PrivilegeLevels.READ_ONLY)
+          this.CollaboratorsGetter.promises.getProjectAccess
+            .withArgs(this.project._id)
+            .resolves({
+              publicAccessLevel: sinon
+                .stub()
+                .returns(this.project.publicAccesLevel),
+              privilegeLevelForUser: sinon
+                .stub()
+                .withArgs(this.user._id)
+                .returns(PrivilegeLevels.READ_ONLY),
+            })
           this.result =
             await this.AuthorizationManager.promises.getPrivilegeLevelForProject(
               this.user._id,
@@ -397,8 +435,8 @@ describe('AuthorizationManager', function () {
             )
         })
 
-        it('should not call CollaboratorsGetter.getMemberIdPrivilegeLevel', function () {
-          this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel.called.should.equal(
+        it('should not call CollaboratorsGetter.getProjectAccess', function () {
+          this.CollaboratorsGetter.promises.getProjectAccess.called.should.equal(
             false
           )
         })
@@ -410,6 +448,11 @@ describe('AuthorizationManager', function () {
     })
 
     describe("when the project doesn't exist", function () {
+      beforeEach(function () {
+        this.CollaboratorsGetter.promises.getProjectAccess.rejects(
+          new Errors.NotFoundError()
+        )
+      })
       it('should return a NotFoundError', async function () {
         const someOtherId = new ObjectId()
         await expect(
@@ -424,9 +467,15 @@ describe('AuthorizationManager', function () {
 
     describe('when the project id is not valid', function () {
       beforeEach(function () {
-        this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel
-          .withArgs(this.user._id, this.project._id)
-          .resolves(PrivilegeLevels.READ_ONLY)
+        this.CollaboratorsGetter.promises.getProjectAccess
+          .withArgs(this.project._id)
+          .resolves({
+            publicAccessLevel: sinon.stub().returns(PublicAccessLevels.PRIVATE),
+            privilegeLevelForUser: sinon
+              .stub()
+              .withArgs(this.user._id)
+              .returns(PrivilegeLevels.READ_ONLY),
+          })
       })
 
       it('should return a error', async function () {
@@ -529,9 +578,15 @@ describe('AuthorizationManager', function () {
 
   describe('canUserDeleteOrResolveThread', function () {
     it('should return true when user has write permissions', async function () {
-      this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel
-        .withArgs(this.user._id, this.project._id)
-        .resolves(PrivilegeLevels.READ_AND_WRITE)
+      this.CollaboratorsGetter.promises.getProjectAccess
+        .withArgs(this.project._id)
+        .resolves({
+          publicAccessLevel: sinon.stub().returns(PublicAccessLevels.PRIVATE),
+          privilegeLevelForUser: sinon
+            .stub()
+            .withArgs(this.user._id)
+            .returns(PrivilegeLevels.READ_AND_WRITE),
+        })
 
       const canResolve =
         await this.AuthorizationManager.promises.canUserDeleteOrResolveThread(
@@ -546,9 +601,15 @@ describe('AuthorizationManager', function () {
     })
 
     it('should return false when user has read permission', async function () {
-      this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel
-        .withArgs(this.user._id, this.project._id)
-        .resolves(PrivilegeLevels.READ_ONLY)
+      this.CollaboratorsGetter.promises.getProjectAccess
+        .withArgs(this.project._id)
+        .resolves({
+          publicAccessLevel: sinon.stub().returns(PublicAccessLevels.PRIVATE),
+          privilegeLevelForUser: sinon
+            .stub()
+            .withArgs(this.user._id)
+            .returns(PrivilegeLevels.READ_ONLY),
+        })
 
       const canResolve =
         await this.AuthorizationManager.promises.canUserDeleteOrResolveThread(
@@ -564,9 +625,15 @@ describe('AuthorizationManager', function () {
 
     describe('when user has review permission', function () {
       beforeEach(function () {
-        this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel
-          .withArgs(this.user._id, this.project._id)
-          .resolves(PrivilegeLevels.REVIEW)
+        this.CollaboratorsGetter.promises.getProjectAccess
+          .withArgs(this.project._id)
+          .resolves({
+            publicAccessLevel: sinon.stub().returns(PublicAccessLevels.PRIVATE),
+            privilegeLevelForUser: sinon
+              .stub()
+              .withArgs(this.user._id)
+              .returns(PrivilegeLevels.REVIEW),
+          })
       })
 
       it('should return false when user is not the comment author', async function () {
@@ -691,15 +758,27 @@ function testPermission(permission, privilegeLevels) {
 
 function setupUserPrivilegeLevel(privilegeLevel) {
   beforeEach(`set user privilege level to ${privilegeLevel}`, function () {
-    this.CollaboratorsGetter.promises.getMemberIdPrivilegeLevel
-      .withArgs(this.user._id, this.project._id)
-      .resolves(privilegeLevel)
+    this.CollaboratorsGetter.promises.getProjectAccess
+      .withArgs(this.project._id)
+      .resolves({
+        publicAccessLevel: sinon.stub().returns(PublicAccessLevels.PRIVATE),
+        privilegeLevelForUser: sinon
+          .stub()
+          .withArgs(this.user._id)
+          .returns(privilegeLevel),
+      })
   })
 }
 
 function setupPublicAccessLevel(level) {
   beforeEach(`set public access level to ${level}`, function () {
     this.project.publicAccesLevel = level
+    this.CollaboratorsGetter.promises.getProjectAccess
+      .withArgs(this.project._id)
+      .resolves({
+        publicAccessLevel: sinon.stub().returns(this.project.publicAccesLevel),
+        privilegeLevelForUser: sinon.stub().returns(PrivilegeLevels.NONE),
+      })
   })
 }
 
diff --git a/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs b/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
index e2160cca08..23dd4dc1c8 100644
--- a/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
+++ b/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
@@ -1,7 +1,6 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import path from 'node:path'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import MockResponse from '../helpers/MockResponse.js'
 import { fileURLToPath } from 'node:url'
 
diff --git a/services/web/test/unit/src/BetaProgram/BetaProgramHandler.test.mjs b/services/web/test/unit/src/BetaProgram/BetaProgramHandler.test.mjs
index 14438a8ed7..4034835666 100644
--- a/services/web/test/unit/src/BetaProgram/BetaProgramHandler.test.mjs
+++ b/services/web/test/unit/src/BetaProgram/BetaProgramHandler.test.mjs
@@ -1,8 +1,7 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import path from 'node:path'
 
 import sinon from 'sinon'
-import { expect } from 'chai'
 import { fileURLToPath } from 'node:url'
 
 const __dirname = fileURLToPath(new URL('.', import.meta.url))
diff --git a/services/web/test/unit/src/Chat/ChatManagerTests.js b/services/web/test/unit/src/Chat/ChatManagerTests.js
index bdd3042513..5578b8b167 100644
--- a/services/web/test/unit/src/Chat/ChatManagerTests.js
+++ b/services/web/test/unit/src/Chat/ChatManagerTests.js
@@ -12,7 +12,7 @@ describe('ChatManager', function () {
     this.user_id = 'mock-user-id'
     this.ChatManager = SandboxedModule.require(modulePath, {
       requires: {
-        '../User/UserInfoManager': (this.UserInfoManager = {}),
+        '../User/UserGetter': (this.UserGetter = { promises: {} }),
         '../User/UserInfoController': (this.UserInfoController = {}),
       },
     })
@@ -32,18 +32,22 @@ describe('ChatManager', function () {
     beforeEach(function () {
       this.users = {
         user_id_1: {
-          mock: 'user_1',
+          _id: 'user_id_1',
         },
         user_id_2: {
-          mock: 'user_2',
+          _id: 'user_id_2',
         },
       }
-      this.UserInfoManager.getPersonalInfo = (userId, callback) => {
-        return callback(null, this.users[userId])
-      }
-      sinon.spy(this.UserInfoManager, 'getPersonalInfo')
+      this.UserGetter.promises.getUsers = userIds =>
+        Promise.resolve(
+          Array.from(userIds)
+            .map(id => this.users[id])
+            .filter(u => !!u)
+        )
+
+      sinon.spy(this.UserGetter.promises, 'getUsers')
       return (this.UserInfoController.formatPersonalInfo = user => ({
-        formatted: user.mock,
+        formatted: { id: user._id.toString() },
       }))
     })
 
@@ -79,16 +83,16 @@ describe('ChatManager', function () {
         thread1: {
           resolved: true,
           resolved_by_user_id: 'user_id_1',
-          resolved_by_user: { formatted: 'user_1' },
+          resolved_by_user: { formatted: { id: 'user_id_1' } },
           messages: [
             {
               user_id: 'user_id_1',
-              user: { formatted: 'user_1' },
+              user: { formatted: { id: 'user_id_1' } },
               content: 'foo',
             },
             {
               user_id: 'user_id_2',
-              user: { formatted: 'user_2' },
+              user: { formatted: { id: 'user_id_2' } },
               content: 'bar',
             },
           ],
@@ -97,7 +101,7 @@ describe('ChatManager', function () {
           messages: [
             {
               user_id: 'user_id_1',
-              user: { formatted: 'user_1' },
+              user: { formatted: { id: 'user_id_1' } },
               content: 'baz',
             },
           ],
@@ -105,7 +109,7 @@ describe('ChatManager', function () {
       })
     })
 
-    it('should only need to look up each user once', async function () {
+    it('should lookup all users in a single batch', async function () {
       await this.ChatManager.promises.injectUserInfoIntoThreads([
         {
           messages: [
@@ -121,7 +125,7 @@ describe('ChatManager', function () {
         },
       ])
 
-      this.UserInfoManager.getPersonalInfo.calledOnce.should.equal(true)
+      this.UserGetter.promises.getUsers.should.have.been.calledOnce
     })
   })
 })
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsController.test.mjs b/services/web/test/unit/src/Collaborators/CollaboratorsController.test.mjs
index 9bb9c4b3c0..1d8345a195 100644
--- a/services/web/test/unit/src/Collaborators/CollaboratorsController.test.mjs
+++ b/services/web/test/unit/src/Collaborators/CollaboratorsController.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import mongodb from 'mongodb-legacy'
 import Errors from '../../../../app/src/Features/Errors/Errors.js'
 import MockRequest from '../helpers/MockRequest.js'
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsGetterTests.js b/services/web/test/unit/src/Collaborators/CollaboratorsGetterTests.js
index dda99e04f3..10542c4564 100644
--- a/services/web/test/unit/src/Collaborators/CollaboratorsGetterTests.js
+++ b/services/web/test/unit/src/Collaborators/CollaboratorsGetterTests.js
@@ -62,7 +62,7 @@ describe('CollaboratorsGetter', function () {
       },
     }
     this.ProjectEditorHandler = {
-      buildOwnerAndMembersViews: sinon.stub(),
+      buildUserModelView: sinon.stub(),
     }
     this.CollaboratorsGetter = SandboxedModule.require(MODULE_PATH, {
       requires: {
@@ -204,30 +204,6 @@ describe('CollaboratorsGetter', function () {
     })
   })
 
-  describe('getInvitedMembersWithPrivilegeLevels', function () {
-    beforeEach(function () {
-      this.UserGetter.promises.getUsers.resolves([
-        { _id: this.readOnlyRef1 },
-        { _id: this.readOnlyTokenRef },
-        { _id: this.readWriteRef2 },
-        { _id: this.readWriteTokenRef },
-        { _id: this.reviewer1Ref },
-      ])
-    })
-
-    it('should return an array of invited members with their privilege levels', async function () {
-      const result =
-        await this.CollaboratorsGetter.promises.getInvitedMembersWithPrivilegeLevels(
-          this.project._id
-        )
-      expect(result).to.have.deep.members([
-        { user: { _id: this.readOnlyRef1 }, privilegeLevel: 'readOnly' },
-        { user: { _id: this.readWriteRef2 }, privilegeLevel: 'readAndWrite' },
-        { user: { _id: this.reviewer1Ref }, privilegeLevel: 'review' },
-      ])
-    })
-  })
-
   describe('getMemberIdPrivilegeLevel', function () {
     it('should return the privilege level if it exists', async function () {
       const level =
@@ -401,20 +377,21 @@ describe('CollaboratorsGetter', function () {
         { user: this.readWriteUser, privilegeLevel: 'readAndWrite' },
         { user: this.reviewUser, privilegeLevel: 'review' },
       ]
-      this.views = {
-        owner: this.owningUser,
-        ownerFeatures: this.owningUser.features,
-        members: [
-          { _id: this.readWriteUser._id, email: this.readWriteUser.email },
-          { _id: this.reviewUser._id, email: this.reviewUser.email },
-        ],
-      }
+      this.memberViews = [
+        { _id: this.readWriteUser._id, email: this.readWriteUser.email },
+        { _id: this.reviewUser._id, email: this.reviewUser.email },
+      ]
       this.UserGetter.promises.getUsers.resolves([
         this.owningUser,
         this.readWriteUser,
         this.reviewUser,
       ])
-      this.ProjectEditorHandler.buildOwnerAndMembersViews.returns(this.views)
+      this.ProjectEditorHandler.buildUserModelView
+        .withArgs(this.members[1])
+        .returns(this.memberViews[0])
+      this.ProjectEditorHandler.buildUserModelView
+        .withArgs(this.members[2])
+        .returns(this.memberViews[1])
       this.result =
         await this.CollaboratorsGetter.promises.getAllInvitedMembers(
           this.project._id
@@ -422,15 +399,18 @@ describe('CollaboratorsGetter', function () {
     })
 
     it('should produce a list of members', function () {
-      expect(this.result).to.deep.equal(this.views.members)
+      expect(this.result).to.deep.equal(this.memberViews)
     })
 
-    it('should call ProjectEditorHandler.buildOwnerAndMembersViews', function () {
-      expect(this.ProjectEditorHandler.buildOwnerAndMembersViews).to.have.been
-        .calledOnce
+    it('should call ProjectEditorHandler.buildUserModelView', function () {
+      expect(this.ProjectEditorHandler.buildUserModelView).to.have.been
+        .calledTwice
       expect(
-        this.ProjectEditorHandler.buildOwnerAndMembersViews
-      ).to.have.been.calledWith(this.members)
+        this.ProjectEditorHandler.buildUserModelView
+      ).to.have.been.calledWith(this.members[1])
+      expect(
+        this.ProjectEditorHandler.buildUserModelView
+      ).to.have.been.calledWith(this.members[2])
     })
   })
 
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js b/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js
index 8542bd8355..73fb699772 100644
--- a/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js
+++ b/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js
@@ -447,6 +447,40 @@ describe('CollaboratorsHandler', function () {
       })
     })
 
+    describe('when user already exists as a reviewer', function () {
+      beforeEach(function () {
+        this.project.collaberator_refs = []
+        this.project.reviewer_refs = [this.userId]
+        this.project.readOnly_refs = []
+      })
+
+      it('should not add the user again', async function () {
+        await this.CollaboratorsHandler.promises.addUserIdToProject(
+          this.project._id,
+          this.addingUserId,
+          this.userId,
+          'readAndWrite'
+        )
+      })
+    })
+
+    describe('when user already exists as a read-only user', function () {
+      beforeEach(function () {
+        this.project.collaberator_refs = []
+        this.project.reviewer_refs = []
+        this.project.readOnly_refs = [this.userId]
+      })
+
+      it('should not add the user again', async function () {
+        await this.CollaboratorsHandler.promises.addUserIdToProject(
+          this.project._id,
+          this.addingUserId,
+          this.userId,
+          'readAndWrite'
+        )
+      })
+    })
+
     describe('with null addingUserId', function () {
       beforeEach(async function () {
         this.project.collaberator_refs = []
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsInviteController.test.mjs b/services/web/test/unit/src/Collaborators/CollaboratorsInviteController.test.mjs
index d948e69ed4..edac9c6c92 100644
--- a/services/web/test/unit/src/Collaborators/CollaboratorsInviteController.test.mjs
+++ b/services/web/test/unit/src/Collaborators/CollaboratorsInviteController.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import MockRequest from '../helpers/MockRequest.js'
 import MockResponse from '../helpers/MockResponse.js'
 import mongodb from 'mongodb-legacy'
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsInviteHandler.test.mjs b/services/web/test/unit/src/Collaborators/CollaboratorsInviteHandler.test.mjs
index ec8f453536..5d6690d7c0 100644
--- a/services/web/test/unit/src/Collaborators/CollaboratorsInviteHandler.test.mjs
+++ b/services/web/test/unit/src/Collaborators/CollaboratorsInviteHandler.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import mongodb from 'mongodb-legacy'
 import Crypto from 'crypto'
 
diff --git a/services/web/test/unit/src/Contact/ContactController.test.mjs b/services/web/test/unit/src/Contact/ContactController.test.mjs
index 2defc2c3a7..13f70c81f6 100644
--- a/services/web/test/unit/src/Contact/ContactController.test.mjs
+++ b/services/web/test/unit/src/Contact/ContactController.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import MockResponse from '../helpers/MockResponse.js'
 const modulePath = '../../../../app/src/Features/Contacts/ContactController.mjs'
 
diff --git a/services/web/test/unit/src/Cooldown/CooldownMiddleware.test.mjs b/services/web/test/unit/src/Cooldown/CooldownMiddleware.test.mjs
index 2bb1ed81dd..846a54d4ce 100644
--- a/services/web/test/unit/src/Cooldown/CooldownMiddleware.test.mjs
+++ b/services/web/test/unit/src/Cooldown/CooldownMiddleware.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 const modulePath = new URL(
   '../../../../app/src/Features/Cooldown/CooldownMiddleware.mjs',
   import.meta.url
diff --git a/services/web/test/unit/src/DocumentUpdater/DocumentUpdaterController.test.mjs b/services/web/test/unit/src/DocumentUpdater/DocumentUpdaterController.test.mjs
index 095e598d39..5a60903552 100644
--- a/services/web/test/unit/src/DocumentUpdater/DocumentUpdaterController.test.mjs
+++ b/services/web/test/unit/src/DocumentUpdater/DocumentUpdaterController.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import MockResponse from '../helpers/MockResponse.js'
 
 const MODULE_PATH =
diff --git a/services/web/test/unit/src/Editor/EditorHttpControllerTests.js b/services/web/test/unit/src/Editor/EditorHttpControllerTests.js
index dffa2d21ff..7fc08c45d3 100644
--- a/services/web/test/unit/src/Editor/EditorHttpControllerTests.js
+++ b/services/web/test/unit/src/Editor/EditorHttpControllerTests.js
@@ -20,6 +20,12 @@ describe('EditorHttpController', function () {
       _id: new ObjectId(),
       projects: {},
     }
+    this.members = [
+      { user: { _id: 'owner', features: {} }, privilegeLevel: 'owner' },
+      { user: { _id: 'one' }, privilegeLevel: 'readOnly' },
+    ]
+    this.ownerMember = this.members[0]
+    this.invites = [{ _id: 'three' }, { _id: 'four' }]
     this.projectView = {
       _id: this.project._id,
       owner: {
@@ -27,7 +33,10 @@ describe('EditorHttpController', function () {
         email: 'owner@example.com',
         other_property: true,
       },
-      members: [{ one: 1 }, { two: 2 }],
+      members: [
+        { _id: 'owner', privileges: 'owner' },
+        { _id: 'one', privileges: 'readOnly' },
+      ],
       invites: [{ three: 3 }, { four: 4 }],
     }
     this.reducedProjectView = {
@@ -51,14 +60,32 @@ describe('EditorHttpController', function () {
     this.AuthorizationManager = {
       isRestrictedUser: sinon.stub().returns(false),
       promises: {
-        getPrivilegeLevelForProject: sinon.stub().resolves('owner'),
+        getPrivilegeLevelForProjectWithProjectAccess: sinon
+          .stub()
+          .resolves('owner'),
       },
     }
+    const members = this.members
+    const ownerMember = this.ownerMember
     this.CollaboratorsGetter = {
+      ProjectAccess: class {
+        loadOwnerAndInvitedMembers() {
+          return { members, ownerMember }
+        }
+
+        loadOwner() {
+          return ownerMember
+        }
+
+        isUserTokenMember() {
+          return false
+        }
+
+        isUserInvitedMember() {
+          return false
+        }
+      },
       promises: {
-        getInvitedMembersWithPrivilegeLevels: sinon
-          .stub()
-          .resolves(['members', 'mock']),
         isUserInvitedMemberOfProject: sinon.stub().resolves(false),
       },
     }
@@ -67,22 +94,23 @@ describe('EditorHttpController', function () {
         userIsTokenMember: sinon.stub().resolves(false),
       },
     }
+    this.invites = [
+      {
+        _id: 'invite_one',
+        email: 'user-one@example.com',
+        privileges: 'readOnly',
+        projectId: this.project._id,
+      },
+      {
+        _id: 'invite_two',
+        email: 'user-two@example.com',
+        privileges: 'readOnly',
+        projectId: this.project._id,
+      },
+    ]
     this.CollaboratorsInviteGetter = {
       promises: {
-        getAllInvites: sinon.stub().resolves([
-          {
-            _id: 'invite_one',
-            email: 'user-one@example.com',
-            privileges: 'readOnly',
-            projectId: this.project._id,
-          },
-          {
-            _id: 'invite_two',
-            email: 'user-two@example.com',
-            privileges: 'readOnly',
-            projectId: this.project._id,
-          },
-        ]),
+        getAllInvites: sinon.stub().resolves(this.invites),
       },
     }
     this.EditorController = {
@@ -170,13 +198,28 @@ describe('EditorHttpController', function () {
 
     describe('successfully', function () {
       beforeEach(function (done) {
-        this.CollaboratorsGetter.promises.isUserInvitedMemberOfProject.resolves(
-          true
-        )
+        sinon
+          .stub(
+            this.CollaboratorsGetter.ProjectAccess.prototype,
+            'isUserInvitedMember'
+          )
+          .returns(true)
         this.res.callback = done
         this.EditorHttpController.joinProject(this.req, this.res)
       })
 
+      it('should request a full view', function () {
+        expect(
+          this.ProjectEditorHandler.buildProjectModelView
+        ).to.have.been.calledWith(
+          this.project,
+          this.ownerMember,
+          this.members,
+          this.invites,
+          false
+        )
+      })
+
       it('should return the project and privilege level', function () {
         expect(this.res.json).to.have.been.calledWith({
           project: this.projectView,
@@ -213,14 +256,23 @@ describe('EditorHttpController', function () {
 
     describe('with a restricted user', function () {
       beforeEach(function (done) {
+        this.ProjectEditorHandler.buildProjectModelView.returns(
+          this.reducedProjectView
+        )
         this.AuthorizationManager.isRestrictedUser.returns(true)
-        this.AuthorizationManager.promises.getPrivilegeLevelForProject.resolves(
+        this.AuthorizationManager.promises.getPrivilegeLevelForProjectWithProjectAccess.resolves(
           'readOnly'
         )
         this.res.callback = done
         this.EditorHttpController.joinProject(this.req, this.res)
       })
 
+      it('should request a restricted view', function () {
+        expect(
+          this.ProjectEditorHandler.buildProjectModelView
+        ).to.have.been.calledWith(this.project, this.ownerMember, [], [], true)
+      })
+
       it('should mark the user as restricted, and hide details of owner', function () {
         expect(this.res.json).to.have.been.calledWith({
           project: this.reducedProjectView,
@@ -234,7 +286,7 @@ describe('EditorHttpController', function () {
 
     describe('when not authorized', function () {
       beforeEach(function (done) {
-        this.AuthorizationManager.promises.getPrivilegeLevelForProject.resolves(
+        this.AuthorizationManager.promises.getPrivilegeLevelForProjectWithProjectAccess.resolves(
           null
         )
         this.res.callback = done
@@ -250,6 +302,9 @@ describe('EditorHttpController', function () {
       beforeEach(function (done) {
         this.token = 'token'
         this.TokenAccessHandler.getRequestToken.returns(this.token)
+        this.ProjectEditorHandler.buildProjectModelView.returns(
+          this.reducedProjectView
+        )
         this.req.body = {
           userId: 'anonymous-user',
           anonymousAccessToken: this.token,
@@ -258,12 +313,18 @@ describe('EditorHttpController', function () {
         this.AuthorizationManager.isRestrictedUser
           .withArgs(null, 'readOnly', false, false)
           .returns(true)
-        this.AuthorizationManager.promises.getPrivilegeLevelForProject
+        this.AuthorizationManager.promises.getPrivilegeLevelForProjectWithProjectAccess
           .withArgs(null, this.project._id, this.token)
           .resolves('readOnly')
         this.EditorHttpController.joinProject(this.req, this.res)
       })
 
+      it('should request a restricted view', function () {
+        expect(
+          this.ProjectEditorHandler.buildProjectModelView
+        ).to.have.been.calledWith(this.project, this.ownerMember, [], [], true)
+      })
+
       it('should mark the user as restricted', function () {
         expect(this.res.json).to.have.been.calledWith({
           project: this.reducedProjectView,
@@ -277,11 +338,19 @@ describe('EditorHttpController', function () {
 
     describe('with a token access user', function () {
       beforeEach(function (done) {
-        this.CollaboratorsGetter.promises.isUserInvitedMemberOfProject.resolves(
-          false
-        )
-        this.CollaboratorsHandler.promises.userIsTokenMember.resolves(true)
-        this.AuthorizationManager.promises.getPrivilegeLevelForProject.resolves(
+        sinon
+          .stub(
+            this.CollaboratorsGetter.ProjectAccess.prototype,
+            'isUserInvitedMember'
+          )
+          .returns(false)
+        sinon
+          .stub(
+            this.CollaboratorsGetter.ProjectAccess.prototype,
+            'isUserTokenMember'
+          )
+          .returns(true)
+        this.AuthorizationManager.promises.getPrivilegeLevelForProjectWithProjectAccess.resolves(
           'readAndWrite'
         )
         this.res.callback = done
diff --git a/services/web/test/unit/src/Email/EmailBuilderTests.js b/services/web/test/unit/src/Email/EmailBuilderTests.js
index a8a0dc1ad5..8cc83f0228 100644
--- a/services/web/test/unit/src/Email/EmailBuilderTests.js
+++ b/services/web/test/unit/src/Email/EmailBuilderTests.js
@@ -818,6 +818,43 @@ describe('EmailBuilder', function () {
           })
         })
       })
+
+      describe('removeGroupMember', function () {
+        beforeEach(function () {
+          this.passwordResetUrl = `${this.settings.siteUrl}/user/password/reset`
+          this.emailAddress = 'example@overleaf.com'
+          this.opts = {
+            to: this.emailAddress,
+            adminName: 'abcdef',
+          }
+          this.email = this.EmailBuilder.buildEmail(
+            'removeGroupMember',
+            this.opts
+          )
+          this.dom = cheerio.load(this.email.html)
+        })
+
+        it('should build the email', function () {
+          expect(this.email.html).to.exist
+          expect(this.email.text).to.exist
+        })
+
+        describe('HTML email', function () {
+          it('should include links', function () {
+            const resetPasswordLink = this.dom('a:contains("set a password")')
+            expect(resetPasswordLink.length).to.equal(1)
+            expect(resetPasswordLink.attr('href')).to.equal(
+              this.passwordResetUrl
+            )
+          })
+        })
+
+        describe('plain text email', function () {
+          it('should include URLs', function () {
+            expect(this.email.text).to.contain(this.passwordResetUrl)
+          })
+        })
+      })
     })
   })
 })
diff --git a/services/web/test/unit/src/Exports/ExportsController.test.mjs b/services/web/test/unit/src/Exports/ExportsController.test.mjs
index af9c1483fb..cd8f4ba7a9 100644
--- a/services/web/test/unit/src/Exports/ExportsController.test.mjs
+++ b/services/web/test/unit/src/Exports/ExportsController.test.mjs
@@ -1,5 +1,4 @@
-import { vi } from 'vitest'
-import { expect } from 'chai'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
 const modulePath = new URL(
   '../../../../app/src/Features/Exports/ExportsController.mjs',
diff --git a/services/web/test/unit/src/Exports/ExportsHandler.test.mjs b/services/web/test/unit/src/Exports/ExportsHandler.test.mjs
index 0eb8a98e26..a7944beced 100644
--- a/services/web/test/unit/src/Exports/ExportsHandler.test.mjs
+++ b/services/web/test/unit/src/Exports/ExportsHandler.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 const modulePath = '../../../../app/src/Features/Exports/ExportsHandler.mjs'
 
 describe('ExportsHandler', function () {
diff --git a/services/web/test/unit/src/FileStore/FileStoreController.test.mjs b/services/web/test/unit/src/FileStore/FileStoreController.test.mjs
index 5c46e516a0..ba0670d49c 100644
--- a/services/web/test/unit/src/FileStore/FileStoreController.test.mjs
+++ b/services/web/test/unit/src/FileStore/FileStoreController.test.mjs
@@ -1,5 +1,4 @@
-import { vi } from 'vitest'
-import { expect } from 'chai'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
 import Errors from '../../../../app/src/Features/Errors/Errors.js'
 import MockResponse from '../helpers/MockResponse.js'
diff --git a/services/web/test/unit/src/History/RestoreManagerTests.js b/services/web/test/unit/src/History/RestoreManagerTests.js
index 2474425bfb..f76ba506ad 100644
--- a/services/web/test/unit/src/History/RestoreManagerTests.js
+++ b/services/web/test/unit/src/History/RestoreManagerTests.js
@@ -9,6 +9,12 @@ const tk = require('timekeeper')
 const moment = require('moment')
 const { expect } = require('chai')
 
+function nestedMapWithSetToObject(m) {
+  return Object.fromEntries(
+    Array.from(m.entries()).map(([key, set]) => [key, Array.from(set)])
+  )
+}
+
 describe('RestoreManager', function () {
   beforeEach(function () {
     tk.freeze(Date.now()) // freeze the time for these tests
@@ -28,7 +34,7 @@ describe('RestoreManager', function () {
             promises: { flushProjectToMongo: sinon.stub().resolves() },
           }),
         '../Docstore/DocstoreManager': (this.DocstoreManager = {
-          promises: {},
+          promises: { getCommentThreadIds: sinon.stub().resolves({}) },
         }),
         '../Chat/ChatApiHandler': (this.ChatApiHandler = { promises: {} }),
         '../Chat/ChatManager': (this.ChatManager = { promises: {} }),
@@ -260,22 +266,33 @@ describe('RestoreManager', function () {
       beforeEach(function () {
         this.pathname = 'foo.tex'
         this.comments = [
-          { op: { t: 'comment-in-other-doc', p: 0, c: 'foo' } },
-          { op: { t: 'single-comment', p: 10, c: 'bar' } },
-          { op: { t: 'deleted-comment', p: 20, c: 'baz' } },
+          {
+            id: 'comment-in-other-doc',
+            op: { t: 'comment-in-other-doc', p: 0, c: 'foo' },
+          },
+          {
+            id: 'single-comment',
+            op: { t: 'single-comment', p: 10, c: 'bar' },
+          },
+          {
+            id: 'deleted-comment',
+            op: { t: 'deleted-comment', p: 20, c: 'baz' },
+          },
         ]
         this.remappedComments = [
-          { op: { t: 'duplicate-comment', p: 0, c: 'foo' } },
-          { op: { t: 'single-comment', p: 10, c: 'bar' } },
+          {
+            id: 'duplicate-comment',
+            op: { t: 'duplicate-comment', p: 0, c: 'foo' },
+          },
+          {
+            id: 'single-comment',
+            op: { t: 'single-comment', p: 10, c: 'bar' },
+          },
         ]
         this.ProjectLocator.promises.findElementByPath = sinon.stub().rejects()
-        this.DocstoreManager.promises.getAllRanges = sinon.stub().resolves([
-          {
-            ranges: {
-              comments: this.comments.slice(0, 1),
-            },
-          },
-        ])
+        this.DocstoreManager.promises.getCommentThreadIds = sinon
+          .stub()
+          .resolves({ 'other-doc': [this.comments[0].op.t] })
         this.ChatApiHandler.promises.duplicateCommentThreads = sinon
           .stub()
           .resolves({
@@ -355,7 +372,7 @@ describe('RestoreManager', function () {
           expect(
             this.DocumentUpdaterHandler.promises.flushProjectToMongo
           ).to.have.been.calledBefore(
-            this.DocstoreManager.promises.getAllRanges
+            this.DocstoreManager.promises.getCommentThreadIds
           )
         })
 
@@ -451,19 +468,11 @@ describe('RestoreManager', function () {
           )
         })
 
-        it('should delete the document before flushing', function () {
-          expect(
-            this.EditorController.promises.deleteEntity
-          ).to.have.been.calledBefore(
-            this.DocumentUpdaterHandler.promises.flushProjectToMongo
-          )
-        })
-
         it('should flush the document before fetching ranges', function () {
           expect(
             this.DocumentUpdaterHandler.promises.flushProjectToMongo
           ).to.have.been.calledBefore(
-            this.DocstoreManager.promises.getAllRanges
+            this.DocstoreManager.promises.getCommentThreadIds
           )
         })
 
@@ -499,6 +508,143 @@ describe('RestoreManager', function () {
           )
         })
       })
+
+      describe('with comments in same doc', function () {
+        // copy of the above, addition: inject and later inspect threadIds set
+        beforeEach(async function () {
+          this.ProjectLocator.promises.findElementByPath = sinon
+            .stub()
+            .resolves({ type: 'doc', element: { _id: 'mock-file-id' } })
+          this.EditorController.promises.deleteEntity = sinon.stub().resolves()
+          this.ChatApiHandler.promises.generateThreadData = sinon
+            .stub()
+            .resolves(
+              (this.threadData = {
+                [this.comments[0].op.t]: {
+                  messages: [
+                    {
+                      content: 'message',
+                      timestamp: '2024-01-01T00:00:00.000Z',
+                      user_id: 'user-1',
+                    },
+                  ],
+                },
+                [this.comments[1].op.t]: {
+                  messages: [
+                    {
+                      content: 'other message',
+                      timestamp: '2024-01-01T00:00:00.000Z',
+                      user_id: 'user-1',
+                    },
+                  ],
+                },
+              })
+            )
+
+          this.threadIds = new Map([
+            [
+              'mock-file-id',
+              new Set([this.comments[0].op.t, this.comments[1].op.t]),
+            ],
+          ])
+          // Comments are updated in-place. Look up threads before reverting.
+          this.afterThreadIds = {
+            // mock-file-id removed
+            [this.addedFile._id]: [
+              this.comments[0].op.t,
+              this.comments[1].op.t,
+            ],
+          }
+          this.data = await this.RestoreManager.promises._revertSingleFile(
+            this.user_id,
+            this.project_id,
+            this.version,
+            this.pathname,
+            this.threadIds
+          )
+        })
+
+        it('should import the file with original comments minus the deleted one', function () {
+          expect(
+            this.EditorController.promises.addDocWithRanges
+          ).to.have.been.calledWith(
+            this.project_id,
+            this.folder_id,
+            'foo.tex',
+            ['foo', 'bar', 'baz'],
+            {
+              changes: this.tracked_changes,
+              comments: this.comments.slice(0, 2),
+            },
+            {
+              kind: 'file-restore',
+              path: this.pathname,
+              version: this.version,
+              timestamp: new Date(this.endTs).toISOString(),
+            }
+          )
+        })
+
+        it('should add the seen thread ids to the map', function () {
+          expect(nestedMapWithSetToObject(this.threadIds)).to.deep.equal(
+            this.afterThreadIds
+          )
+        })
+      })
+
+      describe('with remapped comments during revertProject', function () {
+        // copy of the above, addition: inject and later inspect threadIds set
+        beforeEach(async function () {
+          this.ProjectLocator.promises.findElementByPath = sinon
+            .stub()
+            .resolves({ type: 'doc', element: { _id: 'mock-file-id' } })
+          this.EditorController.promises.deleteEntity = sinon.stub().resolves()
+
+          this.threadIds = new Map([
+            ['other-doc', new Set([this.comments[0].op.t])],
+          ])
+          // Comments are updated in-place. Look up threads before reverting.
+          this.afterThreadIds = {
+            // mock-file-id removed
+            'other-doc': [this.comments[0].op.t],
+            [this.addedFile._id]: [
+              this.remappedComments[0].op.t,
+              this.remappedComments[1].op.t,
+            ],
+          }
+          this.data = await this.RestoreManager.promises._revertSingleFile(
+            this.user_id,
+            this.project_id,
+            this.version,
+            this.pathname,
+            this.threadIds
+          )
+        })
+
+        it('should import the file', function () {
+          expect(
+            this.EditorController.promises.addDocWithRanges
+          ).to.have.been.calledWith(
+            this.project_id,
+            this.folder_id,
+            'foo.tex',
+            ['foo', 'bar', 'baz'],
+            { changes: this.tracked_changes, comments: this.remappedComments },
+            {
+              kind: 'file-restore',
+              path: this.pathname,
+              version: this.version,
+              timestamp: new Date(this.endTs).toISOString(),
+            }
+          )
+        })
+
+        it('should add the seen thread ids to the map', function () {
+          expect(nestedMapWithSetToObject(this.threadIds)).to.deep.equal(
+            this.afterThreadIds
+          )
+        })
+      })
     })
 
     describe('reverting a file or document with metadata', function () {
@@ -524,7 +670,9 @@ describe('RestoreManager', function () {
           .stub()
           .resolves((this.addedFile = { _id: 'mock-doc-id', type: 'doc' }))
 
-        this.DocstoreManager.promises.getAllRanges = sinon.stub().resolves([])
+        this.DocstoreManager.promises.getCommentThreadIds = sinon
+          .stub()
+          .resolves({})
         this.ChatApiHandler.promises.generateThreadData = sinon
           .stub()
           .resolves({})
@@ -741,7 +889,7 @@ describe('RestoreManager', function () {
       this.ProjectGetter.promises.getProject
         .withArgs(this.project_id)
         .resolves({ overleaf: { history: { rangesSupportEnabled: true } } })
-      this.RestoreManager.promises.revertFile = sinon.stub().resolves()
+      this.RestoreManager.promises._revertSingleFile = sinon.stub().resolves()
       this.RestoreManager.promises._getProjectPathsAtVersion = sinon
         .stub()
         .resolves([])
@@ -832,21 +980,27 @@ describe('RestoreManager', function () {
       })
 
       it('should revert the old files', function () {
-        expect(this.RestoreManager.promises.revertFile).to.have.been.calledWith(
+        expect(
+          this.RestoreManager.promises._revertSingleFile
+        ).to.have.been.calledWith(
           this.user_id,
           this.project_id,
           this.version,
           'main.tex'
         )
 
-        expect(this.RestoreManager.promises.revertFile).to.have.been.calledWith(
+        expect(
+          this.RestoreManager.promises._revertSingleFile
+        ).to.have.been.calledWith(
           this.user_id,
           this.project_id,
           this.version,
           'figures/image.png'
         )
 
-        expect(this.RestoreManager.promises.revertFile).to.have.been.calledWith(
+        expect(
+          this.RestoreManager.promises._revertSingleFile
+        ).to.have.been.calledWith(
           this.user_id,
           this.project_id,
           this.version,
@@ -856,7 +1010,7 @@ describe('RestoreManager', function () {
 
       it('should not revert the current files', function () {
         expect(
-          this.RestoreManager.promises.revertFile
+          this.RestoreManager.promises._revertSingleFile
         ).to.not.have.been.calledWith(
           this.user_id,
           this.project_id,
diff --git a/services/web/test/unit/src/LinkedFiles/LinkedFilesController.test.mjs b/services/web/test/unit/src/LinkedFiles/LinkedFilesController.test.mjs
index b29d10bba4..e712d17198 100644
--- a/services/web/test/unit/src/LinkedFiles/LinkedFilesController.test.mjs
+++ b/services/web/test/unit/src/LinkedFiles/LinkedFilesController.test.mjs
@@ -1,5 +1,4 @@
-import { vi } from 'vitest'
-import { expect } from 'chai'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
 const modulePath =
   '../../../../app/src/Features/LinkedFiles/LinkedFilesController.mjs'
diff --git a/services/web/test/unit/src/Metadata/MetaController.test.mjs b/services/web/test/unit/src/Metadata/MetaController.test.mjs
index 00b3568ae2..ee3488137a 100644
--- a/services/web/test/unit/src/Metadata/MetaController.test.mjs
+++ b/services/web/test/unit/src/Metadata/MetaController.test.mjs
@@ -1,5 +1,4 @@
-import { vi } from 'vitest'
-import { expect } from 'chai'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
 import MockResponse from '../helpers/MockResponse.js'
 const modulePath = '../../../../app/src/Features/Metadata/MetaController.mjs'
diff --git a/services/web/test/unit/src/Metadata/MetaHandler.test.mjs b/services/web/test/unit/src/Metadata/MetaHandler.test.mjs
index c6009a2dd6..48d5cc51a4 100644
--- a/services/web/test/unit/src/Metadata/MetaHandler.test.mjs
+++ b/services/web/test/unit/src/Metadata/MetaHandler.test.mjs
@@ -1,5 +1,4 @@
-import { vi } from 'vitest'
-import { expect } from 'chai'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
 
 const modulePath = '../../../../app/src/Features/Metadata/MetaHandler.mjs'
diff --git a/services/web/test/unit/src/Notifications/NotificationsController.test.mjs b/services/web/test/unit/src/Notifications/NotificationsController.test.mjs
index 6e1f9177c0..1bc5c51b31 100644
--- a/services/web/test/unit/src/Notifications/NotificationsController.test.mjs
+++ b/services/web/test/unit/src/Notifications/NotificationsController.test.mjs
@@ -14,6 +14,9 @@ describe('NotificationsController', function () {
     ctx.handler = {
       getUserNotifications: sinon.stub().callsArgWith(1),
       markAsRead: sinon.stub().callsArgWith(2),
+      promises: {
+        getUserNotifications: sinon.stub().callsArgWith(1),
+      },
     }
     ctx.req = {
       params: {
@@ -77,4 +80,22 @@ describe('NotificationsController', function () {
       })
     })
   })
+
+  it('should get a notification by notification id', function (ctx) {
+    return new Promise(resolve => {
+      const notification = { _id: notificationId, user_id: userId }
+      ctx.handler.getUserNotifications = sinon
+        .stub()
+        .callsArgWith(1, null, [notification])
+      ctx.controller.getNotification(ctx.req, {
+        json: body => {
+          body.should.deep.equal(notification)
+          resolve()
+        },
+        status: () => ({
+          end: () => {},
+        }),
+      })
+    })
+  })
 })
diff --git a/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs b/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs
index e4cf6e569f..05bbfdb433 100644
--- a/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs
+++ b/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import MockResponse from '../helpers/MockResponse.js'
 
 const MODULE_PATH = new URL(
diff --git a/services/web/test/unit/src/PasswordReset/PasswordResetHandler.test.mjs b/services/web/test/unit/src/PasswordReset/PasswordResetHandler.test.mjs
index 25d664b795..aab46ae2bf 100644
--- a/services/web/test/unit/src/PasswordReset/PasswordResetHandler.test.mjs
+++ b/services/web/test/unit/src/PasswordReset/PasswordResetHandler.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 const modulePath = new URL(
   '../../../../app/src/Features/PasswordReset/PasswordResetHandler',
   import.meta.url
diff --git a/services/web/test/unit/src/Project/ProjectControllerTests.js b/services/web/test/unit/src/Project/ProjectControllerTests.js
index 46427171da..0acd900b90 100644
--- a/services/web/test/unit/src/Project/ProjectControllerTests.js
+++ b/services/web/test/unit/src/Project/ProjectControllerTests.js
@@ -201,9 +201,6 @@ describe('ProjectController', function () {
         getCurrentAffiliations: sinon.stub().resolves([]),
       },
     }
-    this.SubscriptionViewModelBuilder = {
-      getBestSubscription: sinon.stub().yields(null, { type: 'free' }),
-    }
     this.SurveyHandler = {
       getSurvey: sinon.stub().yields(null, {}),
     }
@@ -303,6 +300,7 @@ describe('ProjectController', function () {
         translate() {},
       },
       ip: '192.170.18.1',
+      capabilitySet: new Set(['chat']),
     }
     this.res = {
       locals: {
@@ -1088,34 +1086,12 @@ describe('ProjectController', function () {
       this.ProjectController.loadEditor(this.req, this.res)
     })
 
-    describe('chatEnabled flag', function () {
-      it('should be set to false when the feature is disabled', function (done) {
+    describe('capabilitySet', function () {
+      it('should be passed as an array when loading the editor', function (done) {
         this.Features.hasFeature = sinon.stub().withArgs('chat').returns(false)
 
         this.res.render = (pageName, opts) => {
-          expect(opts.chatEnabled).to.be.false
-          done()
-        }
-        this.ProjectController.loadEditor(this.req, this.res)
-      })
-
-      it('should be set to false when the feature is enabled but the capability is not available', function (done) {
-        this.Features.hasFeature = sinon.stub().withArgs('chat').returns(false)
-        this.req.capabilitySet = new Set()
-
-        this.res.render = (pageName, opts) => {
-          expect(opts.chatEnabled).to.be.false
-          done()
-        }
-        this.ProjectController.loadEditor(this.req, this.res)
-      })
-
-      it('should be set to true when the feature is enabled and the capability is available', function (done) {
-        this.Features.hasFeature = sinon.stub().withArgs('chat').returns(true)
-        this.req.capabilitySet = new Set(['chat'])
-
-        this.res.render = (pageName, opts) => {
-          expect(opts.chatEnabled).to.be.true
+          expect(opts.capabilities).to.deep.equal(['chat'])
           done()
         }
         this.ProjectController.loadEditor(this.req, this.res)
diff --git a/services/web/test/unit/src/Project/ProjectEditorHandlerTests.js b/services/web/test/unit/src/Project/ProjectEditorHandlerTests.js
index 0fb5b5fce4..8456fe2227 100644
--- a/services/web/test/unit/src/Project/ProjectEditorHandlerTests.js
+++ b/services/web/test/unit/src/Project/ProjectEditorHandlerTests.js
@@ -8,6 +8,7 @@ describe('ProjectEditorHandler', function () {
   beforeEach(function () {
     this.project = {
       _id: 'project-id',
+      owner_ref: 'owner-id',
       name: 'Project Name',
       rootDoc_id: 'file-id',
       publicAccesLevel: 'private',
@@ -43,16 +44,19 @@ describe('ProjectEditorHandler', function () {
         },
       ],
     }
+    this.ownerMember = {
+      user: (this.owner = {
+        _id: 'owner-id',
+        first_name: 'Owner',
+        last_name: 'Overleaf',
+        email: 'owner@overleaf.com',
+        features: {
+          compileTimeout: 240,
+        },
+      }),
+      privilegeLevel: 'owner',
+    }
     this.members = [
-      {
-        user: (this.owner = {
-          _id: 'owner-id',
-          first_name: 'Owner',
-          last_name: 'Overleaf',
-          email: 'owner@overleaf.com',
-        }),
-        privilegeLevel: 'owner',
-      },
       {
         user: {
           _id: 'read-only-id',
@@ -96,8 +100,10 @@ describe('ProjectEditorHandler', function () {
       beforeEach(function () {
         this.result = this.handler.buildProjectModelView(
           this.project,
+          this.ownerMember,
           this.members,
-          this.invites
+          this.invites,
+          false
         )
       })
 
@@ -206,6 +212,93 @@ describe('ProjectEditorHandler', function () {
           expect(invite.token).not.to.exist
         }
       })
+
+      it('should have the correct features', function () {
+        expect(this.result.features.compileTimeout).to.equal(240)
+      })
+    })
+
+    describe('with a restricted user', function () {
+      beforeEach(function () {
+        this.result = this.handler.buildProjectModelView(
+          this.project,
+          this.ownerMember,
+          [],
+          [],
+          true
+        )
+      })
+
+      it('should include the id', function () {
+        expect(this.result._id).to.exist
+        this.result._id.should.equal('project-id')
+      })
+
+      it('should include the name', function () {
+        expect(this.result.name).to.exist
+        this.result.name.should.equal('Project Name')
+      })
+
+      it('should include the root doc id', function () {
+        expect(this.result.rootDoc_id).to.exist
+        this.result.rootDoc_id.should.equal('file-id')
+      })
+
+      it('should include the public access level', function () {
+        expect(this.result.publicAccesLevel).to.exist
+        this.result.publicAccesLevel.should.equal('private')
+      })
+
+      it('should hide the owner', function () {
+        expect(this.result.owner).to.deep.equal({ _id: 'owner-id' })
+      })
+
+      it('should hide members', function () {
+        this.result.members.length.should.equal(0)
+      })
+
+      it('should include folders in the project', function () {
+        this.result.rootFolder[0]._id.should.equal('root-folder-id')
+        this.result.rootFolder[0].name.should.equal('')
+
+        this.result.rootFolder[0].folders[0]._id.should.equal('sub-folder-id')
+        this.result.rootFolder[0].folders[0].name.should.equal('folder')
+      })
+
+      it('should not duplicate folder contents', function () {
+        this.result.rootFolder[0].docs.length.should.equal(0)
+        this.result.rootFolder[0].fileRefs.length.should.equal(0)
+      })
+
+      it('should include files in the project', function () {
+        this.result.rootFolder[0].folders[0].fileRefs[0]._id.should.equal(
+          'file-id'
+        )
+        this.result.rootFolder[0].folders[0].fileRefs[0].name.should.equal(
+          'image.png'
+        )
+        this.result.rootFolder[0].folders[0].fileRefs[0].created.should.equal(
+          this.created
+        )
+        expect(this.result.rootFolder[0].folders[0].fileRefs[0].size).not.to
+          .exist
+      })
+
+      it('should include docs in the project but not the lines', function () {
+        this.result.rootFolder[0].folders[0].docs[0]._id.should.equal('doc-id')
+        this.result.rootFolder[0].folders[0].docs[0].name.should.equal(
+          'main.tex'
+        )
+        expect(this.result.rootFolder[0].folders[0].docs[0].lines).not.to.exist
+      })
+
+      it('should hide invites', function () {
+        expect(this.result.invites).to.have.length(0)
+      })
+
+      it('should have the correct features', function () {
+        expect(this.result.features.compileTimeout).to.equal(240)
+      })
     })
 
     describe('deletedByExternalDataSource', function () {
@@ -213,8 +306,10 @@ describe('ProjectEditorHandler', function () {
         delete this.project.deletedByExternalDataSource
         const result = this.handler.buildProjectModelView(
           this.project,
+          this.ownerMember,
           this.members,
-          []
+          [],
+          false
         )
         result.deletedByExternalDataSource.should.equal(false)
       })
@@ -222,8 +317,10 @@ describe('ProjectEditorHandler', function () {
       it('should set the deletedByExternalDataSource flag to false when it is false', function () {
         const result = this.handler.buildProjectModelView(
           this.project,
+          this.ownerMember,
           this.members,
-          []
+          [],
+          false
         )
         result.deletedByExternalDataSource.should.equal(false)
       })
@@ -232,8 +329,10 @@ describe('ProjectEditorHandler', function () {
         this.project.deletedByExternalDataSource = true
         const result = this.handler.buildProjectModelView(
           this.project,
+          this.ownerMember,
           this.members,
-          []
+          [],
+          false
         )
         result.deletedByExternalDataSource.should.equal(true)
       })
@@ -249,8 +348,10 @@ describe('ProjectEditorHandler', function () {
         }
         this.result = this.handler.buildProjectModelView(
           this.project,
+          this.ownerMember,
           this.members,
-          []
+          [],
+          false
         )
       })
 
@@ -278,8 +379,10 @@ describe('ProjectEditorHandler', function () {
           }
           this.result = this.handler.buildProjectModelView(
             this.project,
+            this.ownerMember,
             this.members,
-            []
+            [],
+            false
           )
         })
         it('should not emit trackChangesState', function () {
@@ -302,8 +405,10 @@ describe('ProjectEditorHandler', function () {
               this.project.track_changes = dbEntry
               this.result = this.handler.buildProjectModelView(
                 this.project,
+                this.ownerMember,
                 this.members,
-                []
+                [],
+                false
               )
             })
             it(`should set trackChangesState=${expected}`, function () {
@@ -322,66 +427,4 @@ describe('ProjectEditorHandler', function () {
       })
     })
   })
-
-  describe('buildOwnerAndMembersViews', function () {
-    beforeEach(function () {
-      this.owner.features = {
-        versioning: true,
-        collaborators: 3,
-        compileGroup: 'priority',
-        compileTimeout: 22,
-      }
-      this.result = this.handler.buildOwnerAndMembersViews(this.members)
-    })
-
-    it('should produce an object with the right keys', function () {
-      expect(this.result).to.have.all.keys([
-        'owner',
-        'ownerFeatures',
-        'members',
-      ])
-    })
-
-    it('should separate the owner from the members', function () {
-      this.result.members.length.should.equal(this.members.length - 1)
-      expect(this.result.owner._id).to.equal(this.owner._id)
-      expect(this.result.owner.email).to.equal(this.owner.email)
-      expect(
-        this.result.members.filter(m => m._id === this.owner._id).length
-      ).to.equal(0)
-    })
-
-    it('should extract the ownerFeatures from the owner object', function () {
-      expect(this.result.ownerFeatures).to.deep.equal(this.owner.features)
-    })
-
-    describe('when there is no owner', function () {
-      beforeEach(function () {
-        // remove the owner from members list
-        this.membersWithoutOwner = this.members.filter(
-          m => m.user._id !== this.owner._id
-        )
-        this.result = this.handler.buildOwnerAndMembersViews(
-          this.membersWithoutOwner
-        )
-      })
-
-      it('should produce an object with the right keys', function () {
-        expect(this.result).to.have.all.keys([
-          'owner',
-          'ownerFeatures',
-          'members',
-        ])
-      })
-
-      it('should not separate out an owner', function () {
-        this.result.members.length.should.equal(this.membersWithoutOwner.length)
-        expect(this.result.owner).to.equal(null)
-      })
-
-      it('should not extract the ownerFeatures from the owner object', function () {
-        expect(this.result.ownerFeatures).to.equal(null)
-      })
-    })
-  })
 })
diff --git a/services/web/test/unit/src/Project/ProjectListController.test.mjs b/services/web/test/unit/src/Project/ProjectListController.test.mjs
index a051382279..ae1bc72210 100644
--- a/services/web/test/unit/src/Project/ProjectListController.test.mjs
+++ b/services/web/test/unit/src/Project/ProjectListController.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import mongodb from 'mongodb-legacy'
 import Errors from '../../../../app/src/Features/Errors/Errors.js'
 
@@ -99,6 +98,7 @@ describe('ProjectListController', function () {
     ctx.SplitTestHandler = {
       promises: {
         getAssignment: sinon.stub().resolves({ variant: 'default' }),
+        hasUserBeenAssignedToVariant: sinon.stub().resolves(false),
       },
     }
     ctx.SplitTestSessionHandler = {
diff --git a/services/web/test/unit/src/Referal/ReferalHandler.test.mjs b/services/web/test/unit/src/Referal/ReferalHandler.test.mjs
index 5174918bd7..5c042f2ef9 100644
--- a/services/web/test/unit/src/Referal/ReferalHandler.test.mjs
+++ b/services/web/test/unit/src/Referal/ReferalHandler.test.mjs
@@ -1,5 +1,4 @@
-import { vi } from 'vitest'
-import { expect } from 'chai'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
 const modulePath = '../../../../app/src/Features/Referal/ReferalHandler.mjs'
 
diff --git a/services/web/test/unit/src/References/ReferencesHandler.test.mjs b/services/web/test/unit/src/References/ReferencesHandler.test.mjs
index ae7b86822a..92666e6bcc 100644
--- a/services/web/test/unit/src/References/ReferencesHandler.test.mjs
+++ b/services/web/test/unit/src/References/ReferencesHandler.test.mjs
@@ -1,6 +1,4 @@
-import { vi } from 'vitest'
-
-import { expect } from 'chai'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
 import Errors from '../../../../app/src/Features/Errors/Errors.js'
 const modulePath =
diff --git a/services/web/test/unit/src/Subscription/PaymentProviderEntitiesTest.js b/services/web/test/unit/src/Subscription/PaymentProviderEntitiesTest.js
index c6593da28d..07c401dfb8 100644
--- a/services/web/test/unit/src/Subscription/PaymentProviderEntitiesTest.js
+++ b/services/web/test/unit/src/Subscription/PaymentProviderEntitiesTest.js
@@ -11,6 +11,7 @@ const {
   PaymentProviderSubscription,
   PaymentProviderSubscriptionAddOnUpdate,
 } = require('../../../../app/src/Features/Subscription/PaymentProviderEntities')
+const SubscriptionHelper = require('../../../../app/src/Features/Subscription/SubscriptionHelper')
 
 const MODULE_PATH =
   '../../../../app/src/Features/Subscription/PaymentProviderEntities'
@@ -32,6 +33,7 @@ describe('PaymentProviderEntities', function () {
         requires: {
           '@overleaf/settings': this.Settings,
           './Errors': Errors,
+          './SubscriptionHelper': SubscriptionHelper,
         },
       })
     })
@@ -102,6 +104,23 @@ describe('PaymentProviderEntities', function () {
           )
         })
 
+        it('returns a change request for downgrades while on trial', function () {
+          const fiveDaysFromNow = new Date()
+          fiveDaysFromNow.setDate(fiveDaysFromNow.getDate() + 5)
+          this.subscription.trialPeriodEnd = fiveDaysFromNow
+          const { PaymentProviderSubscriptionChangeRequest } =
+            this.PaymentProviderEntities
+          const changeRequest =
+            this.subscription.getRequestForPlanChange('cheap-plan')
+          expect(changeRequest).to.deep.equal(
+            new PaymentProviderSubscriptionChangeRequest({
+              subscription: this.subscription,
+              timeframe: 'now',
+              planCode: 'cheap-plan',
+            })
+          )
+        })
+
         it('preserves the AI add-on on upgrades', function () {
           const { PaymentProviderSubscriptionChangeRequest } =
             this.PaymentProviderEntities
@@ -154,7 +173,7 @@ describe('PaymentProviderEntities', function () {
           expect(changeRequest).to.deep.equal(
             new PaymentProviderSubscriptionChangeRequest({
               subscription: this.subscription,
-              timeframe: 'term_end',
+              timeframe: 'now',
               planCode: 'cheap-plan',
               addOnUpdates: [
                 new PaymentProviderSubscriptionAddOnUpdate({
@@ -280,6 +299,22 @@ describe('PaymentProviderEntities', function () {
           )
         })
 
+        it('returns a change request when in trial', function () {
+          const fiveDaysFromNow = new Date()
+          fiveDaysFromNow.setDate(fiveDaysFromNow.getDate() + 5)
+          this.subscription.trialPeriodEnd = fiveDaysFromNow
+          const changeRequest = this.subscription.getRequestForAddOnRemoval(
+            this.addOn.code
+          )
+          expect(changeRequest).to.deep.equal(
+            new PaymentProviderSubscriptionChangeRequest({
+              subscription: this.subscription,
+              timeframe: 'now',
+              addOnUpdates: [],
+            })
+          )
+        })
+
         it("throws an AddOnNotPresentError if the subscription doesn't have the add-on", function () {
           expect(() =>
             this.subscription.getRequestForAddOnRemoval('another-add-on')
diff --git a/services/web/test/unit/src/Subscription/PlansLocatorTests.js b/services/web/test/unit/src/Subscription/PlansLocatorTests.js
index f705baa01c..bd15f5cfaa 100644
--- a/services/web/test/unit/src/Subscription/PlansLocatorTests.js
+++ b/services/web/test/unit/src/Subscription/PlansLocatorTests.js
@@ -29,6 +29,7 @@ const plans = [
 describe('PlansLocator', function () {
   beforeEach(function () {
     this.settings = { plans }
+    this.AI_ADD_ON_CODE = 'assistant'
 
     this.PlansLocator = SandboxedModule.require(modulePath, {
       requires: {
@@ -49,68 +50,139 @@ describe('PlansLocator', function () {
     })
   })
 
-  describe('mapRecurlyPlanCodeToStripeLookupKey', function () {
+  describe('buildStripeLookupKey', function () {
     it('should map "collaborator" plan code to stripe lookup keys', function () {
       const planCode = 'collaborator'
-      const lookupKey =
-        this.PlansLocator.mapRecurlyPlanCodeToStripeLookupKey(planCode)
-      expect(lookupKey).to.equal('standard_monthly')
+      const currency = 'eur'
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        planCode,
+        currency
+      )
+      expect(lookupKey).to.equal('standard_monthly_jun2025_eur')
     })
 
     it('should map "collaborator_free_trial_7_days" plan code to stripe lookup keys', function () {
       const planCode = 'collaborator_free_trial_7_days'
-      const lookupKey =
-        this.PlansLocator.mapRecurlyPlanCodeToStripeLookupKey(planCode)
-      expect(lookupKey).to.equal('standard_monthly')
+      const currency = 'eur'
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        planCode,
+        currency
+      )
+      expect(lookupKey).to.equal('standard_monthly_jun2025_eur')
     })
 
     it('should map "collaborator-annual" plan code to stripe lookup keys', function () {
       const planCode = 'collaborator-annual'
-      const lookupKey =
-        this.PlansLocator.mapRecurlyPlanCodeToStripeLookupKey(planCode)
-      expect(lookupKey).to.equal('standard_annual')
+      const currency = 'eur'
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        planCode,
+        currency
+      )
+      expect(lookupKey).to.equal('standard_annual_jun2025_eur')
     })
 
     it('should map "professional" plan code to stripe lookup keys', function () {
       const planCode = 'professional'
-      const lookupKey =
-        this.PlansLocator.mapRecurlyPlanCodeToStripeLookupKey(planCode)
-      expect(lookupKey).to.equal('professional_monthly')
+      const currency = 'eur'
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        planCode,
+        currency
+      )
+      expect(lookupKey).to.equal('professional_monthly_jun2025_eur')
     })
 
     it('should map "professional_free_trial_7_days" plan code to stripe lookup keys', function () {
       const planCode = 'professional_free_trial_7_days'
-      const lookupKey =
-        this.PlansLocator.mapRecurlyPlanCodeToStripeLookupKey(planCode)
-      expect(lookupKey).to.equal('professional_monthly')
+      const currency = 'eur'
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        planCode,
+        currency
+      )
+      expect(lookupKey).to.equal('professional_monthly_jun2025_eur')
     })
 
     it('should map "professional-annual" plan code to stripe lookup keys', function () {
       const planCode = 'professional-annual'
-      const lookupKey =
-        this.PlansLocator.mapRecurlyPlanCodeToStripeLookupKey(planCode)
-      expect(lookupKey).to.equal('professional_annual')
+      const currency = 'eur'
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        planCode,
+        currency
+      )
+      expect(lookupKey).to.equal('professional_annual_jun2025_eur')
     })
 
     it('should map "student" plan code to stripe lookup keys', function () {
       const planCode = 'student'
-      const lookupKey =
-        this.PlansLocator.mapRecurlyPlanCodeToStripeLookupKey(planCode)
-      expect(lookupKey).to.equal('student_monthly')
+      const currency = 'eur'
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        planCode,
+        currency
+      )
+      expect(lookupKey).to.equal('student_monthly_jun2025_eur')
     })
 
     it('shoult map "student_free_trial_7_days" plan code to stripe lookup keys', function () {
       const planCode = 'student_free_trial_7_days'
-      const lookupKey =
-        this.PlansLocator.mapRecurlyPlanCodeToStripeLookupKey(planCode)
-      expect(lookupKey).to.equal('student_monthly')
+      const currency = 'eur'
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        planCode,
+        currency
+      )
+      expect(lookupKey).to.equal('student_monthly_jun2025_eur')
     })
 
     it('should map "student-annual" plan code to stripe lookup keys', function () {
       const planCode = 'student-annual'
-      const lookupKey =
-        this.PlansLocator.mapRecurlyPlanCodeToStripeLookupKey(planCode)
-      expect(lookupKey).to.equal('student_annual')
+      const currency = 'eur'
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        planCode,
+        currency
+      )
+      expect(lookupKey).to.equal('student_annual_jun2025_eur')
+    })
+
+    it('should return null for unknown add-on codes', function () {
+      const billingCycleInterval = 'month'
+      const addOnCode = 'unknown_addon'
+      const currency = 'gbp'
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        addOnCode,
+        currency,
+        billingCycleInterval
+      )
+      expect(lookupKey).to.equal(null)
+    })
+
+    it('should handle missing input', function () {
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        undefined,
+        undefined
+      )
+      expect(lookupKey).to.equal(null)
+    })
+
+    it('returns the key for a monthly AI assist add-on', function () {
+      const billingCycleInterval = 'month'
+      const addOnCode = this.AI_ADD_ON_CODE
+      const currency = 'gbp'
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        addOnCode,
+        currency,
+        billingCycleInterval
+      )
+      expect(lookupKey).to.equal('assistant_monthly_jun2025_gbp')
+    })
+
+    it('returns the key for an annual AI assist add-on', function () {
+      const billingCycleInterval = 'year'
+      const addOnCode = this.AI_ADD_ON_CODE
+      const currency = 'gbp'
+      const lookupKey = this.PlansLocator.buildStripeLookupKey(
+        addOnCode,
+        currency,
+        billingCycleInterval
+      )
+      expect(lookupKey).to.equal('assistant_annual_jun2025_gbp')
     })
   })
 
diff --git a/services/web/test/unit/src/Subscription/RecurlyClientTests.js b/services/web/test/unit/src/Subscription/RecurlyClientTests.js
index 97088e9944..6194e35a5f 100644
--- a/services/web/test/unit/src/Subscription/RecurlyClientTests.js
+++ b/services/web/test/unit/src/Subscription/RecurlyClientTests.js
@@ -692,4 +692,20 @@ describe('RecurlyClient', function () {
       ).to.be.rejectedWith(Error)
     })
   })
+
+  describe('terminateSubscriptionByUuid', function () {
+    it('should attempt to terminate the subscription', async function () {
+      this.client.terminateSubscription = sinon
+        .stub()
+        .resolves(this.recurlySubscription)
+      const subscription =
+        await this.RecurlyClient.promises.terminateSubscriptionByUuid(
+          this.subscription.uuid
+        )
+      expect(subscription).to.deep.equal(this.recurlySubscription)
+      expect(this.client.terminateSubscription).to.be.calledWith(
+        'uuid-' + this.subscription.uuid
+      )
+    })
+  })
 })
diff --git a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
index b3ae6610e1..087df52815 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
@@ -6,6 +6,7 @@ const MockResponse = require('../helpers/MockResponse')
 const modulePath =
   '../../../../app/src/Features/Subscription/SubscriptionController'
 const SubscriptionErrors = require('../../../../app/src/Features/Subscription/Errors')
+const SubscriptionHelper = require('../../../../app/src/Features/Subscription/SubscriptionHelper')
 
 const mockSubscriptions = {
   'subscription-123-active': {
@@ -77,7 +78,6 @@ describe('SubscriptionController', function () {
       buildPlansList: sinon.stub(),
       promises: {
         buildUsersSubscriptionViewModel: sinon.stub().resolves({}),
-        getBestSubscription: sinon.stub().resolves({}),
       },
       buildPlansListForSubscriptionDash: sinon
         .stub()
@@ -146,14 +146,16 @@ describe('SubscriptionController', function () {
         '../SplitTests/SplitTestHandler': this.SplitTestV2Hander,
         '../Authentication/SessionManager': this.SessionManager,
         './SubscriptionHandler': this.SubscriptionHandler,
-        './SubscriptionHelper': this.SubscriptionHelper,
+        './SubscriptionHelper': SubscriptionHelper,
         './SubscriptionViewModelBuilder': this.SubscriptionViewModelBuilder,
         './LimitationsManager': this.LimitationsManager,
         '../../infrastructure/GeoIpLookup': this.GeoIpLookup,
         '@overleaf/settings': this.settings,
         '../User/UserGetter': this.UserGetter,
         './RecurlyWrapper': (this.RecurlyWrapper = {
-          updateAccountEmailAddress: sinon.stub().yields(),
+          promises: {
+            updateAccountEmailAddress: sinon.stub().resolves(),
+          },
         }),
         './RecurlyEventHandler': {
           sendRecurlyAnalyticsEvent: sinon.stub().resolves(),
@@ -309,31 +311,50 @@ describe('SubscriptionController', function () {
   })
 
   describe('updateAccountEmailAddress via put', function () {
-    it('should send the user and subscriptionId to RecurlyWrapper', function () {
-      this.res.sendStatus = sinon.spy()
-      this.SubscriptionController.updateAccountEmailAddress(this.req, this.res)
-      this.RecurlyWrapper.updateAccountEmailAddress
-        .calledWith(this.user._id, this.user.email)
-        .should.equal(true)
+    beforeEach(function () {
+      this.req.body = {
+        account_email: 'current_account_email@overleaf.com',
+      }
     })
 
-    it('should respond with 200', function () {
+    it('should send the user and subscriptionId to "updateAccountEmailAddress" hooks', async function () {
       this.res.sendStatus = sinon.spy()
-      this.SubscriptionController.updateAccountEmailAddress(this.req, this.res)
+
+      await this.SubscriptionController.updateAccountEmailAddress(
+        this.req,
+        this.res
+      )
+
+      expect(this.Modules.promises.hooks.fire).to.have.been.calledWith(
+        'updateAccountEmailAddress',
+        this.user._id,
+        this.user.email
+      )
+    })
+
+    it('should respond with 200', async function () {
+      this.res.sendStatus = sinon.spy()
+      await this.SubscriptionController.updateAccountEmailAddress(
+        this.req,
+        this.res
+      )
       this.res.sendStatus.calledWith(200).should.equal(true)
     })
 
-    it('should send the error to the next handler when updating recurly account email fails', function (done) {
-      this.RecurlyWrapper.updateAccountEmailAddress.yields(new Error())
+    it('should send the error to the next handler when updating recurly account email fails', async function () {
+      this.Modules.promises.hooks.fire
+        .withArgs('updateAccountEmailAddress', this.user._id, this.user.email)
+        .rejects(new Error())
+
       this.next = sinon.spy(error => {
-        expect(error).instanceOf(Error)
-        done()
+        expect(error).to.be.instanceOf(Error)
       })
-      this.SubscriptionController.updateAccountEmailAddress(
+      await this.SubscriptionController.updateAccountEmailAddress(
         this.req,
         this.res,
         this.next
       )
+      expect(this.next.calledOnce).to.be.true
     })
   })
 
diff --git a/services/web/test/unit/src/Subscription/SubscriptionHandlerTests.js b/services/web/test/unit/src/Subscription/SubscriptionHandlerTests.js
index ed5ed2f6d1..7bf23defd2 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionHandlerTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionHandlerTests.js
@@ -5,6 +5,7 @@ const { expect } = chai
 const {
   PaymentProviderSubscription,
 } = require('../../../../app/src/Features/Subscription/PaymentProviderEntities')
+const SubscriptionHelper = require('../../../../app/src/Features/Subscription/SubscriptionHelper')
 
 const MODULE_PATH =
   '../../../../app/src/Features/Subscription/SubscriptionHandler'
@@ -149,6 +150,7 @@ describe('SubscriptionHandler', function () {
         '../../models/User': {
           User: this.User,
         },
+        './SubscriptionHelper': SubscriptionHelper,
         './SubscriptionUpdater': this.SubscriptionUpdater,
         './SubscriptionLocator': this.SubscriptionLocator,
         './LimitationsManager': this.LimitationsManager,
diff --git a/services/web/test/unit/src/Subscription/SubscriptionHelperTests.js b/services/web/test/unit/src/Subscription/SubscriptionHelperTests.js
index a6e1ffa089..fb667ca451 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionHelperTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionHelperTests.js
@@ -102,38 +102,65 @@ describe('SubscriptionHelper', function () {
   })
 
   describe('shouldPlanChangeAtTermEnd', function () {
-    it('should return true if the new plan is less expensive', function () {
+    it('should return false if isInTrial is true', function () {
+      const isInTrial = true
       const changeAtTermEnd = this.SubscriptionHelper.shouldPlanChangeAtTermEnd(
         plans.expensive,
-        plans.cheaper
+        plans.cheaper,
+        isInTrial
+      )
+      expect(changeAtTermEnd).to.be.false
+    })
+
+    it('should return true if the new plan is less expensive', function () {
+      const isInTrial = false
+      const changeAtTermEnd = this.SubscriptionHelper.shouldPlanChangeAtTermEnd(
+        plans.expensive,
+        plans.cheaper,
+        isInTrial
       )
       expect(changeAtTermEnd).to.be.true
     })
+
     it('should return false if the new plan is more exepensive', function () {
+      const isInTrial = false
       const changeAtTermEnd = this.SubscriptionHelper.shouldPlanChangeAtTermEnd(
         plans.cheaper,
-        plans.expensive
+        plans.expensive,
+        isInTrial
       )
       expect(changeAtTermEnd).to.be.false
     })
+
     it('should return false if the new plan is the same price', function () {
+      const isInTrial = false
+
       const changeAtTermEnd = this.SubscriptionHelper.shouldPlanChangeAtTermEnd(
         plans.cheaper,
-        plans.alsoCheap
+        plans.alsoCheap,
+        isInTrial
       )
       expect(changeAtTermEnd).to.be.false
     })
+
     it('should return false if the change is from an individual plan to a more expensive group plan', function () {
+      const isInTrial = false
+
       const changeAtTermEnd = this.SubscriptionHelper.shouldPlanChangeAtTermEnd(
         plans.expensive,
-        plans.expensiveGroup
+        plans.expensiveGroup,
+        isInTrial
       )
       expect(changeAtTermEnd).to.be.false
     })
+
     it('should return true if the change is from an individual plan to a cheaper group plan', function () {
+      const isInTrial = false
+
       const changeAtTermEnd = this.SubscriptionHelper.shouldPlanChangeAtTermEnd(
         plans.expensive,
-        plans.cheapGroup
+        plans.cheapGroup,
+        isInTrial
       )
       expect(changeAtTermEnd).to.be.true
     })
@@ -267,4 +294,229 @@ describe('SubscriptionHelper', function () {
       })
     })
   })
+
+  describe('isPaidSubscription', function () {
+    it('should return true for a subscription with a recurly subscription id', function () {
+      const result = this.SubscriptionHelper.isPaidSubscription({
+        recurlySubscription_id: 'some-id',
+      })
+      expect(result).to.be.true
+    })
+
+    it('should return true for a subscription with a stripe subscription id', function () {
+      const result = this.SubscriptionHelper.isPaidSubscription({
+        paymentProvider: { subscriptionId: 'some-id' },
+      })
+      expect(result).to.be.true
+    })
+
+    it('should return false for a free subscription', function () {
+      const result = this.SubscriptionHelper.isPaidSubscription({})
+      expect(result).to.be.false
+    })
+
+    it('should return false for a missing subscription', function () {
+      const result = this.SubscriptionHelper.isPaidSubscription()
+      expect(result).to.be.false
+    })
+  })
+
+  describe('isIndividualActivePaidSubscription', function () {
+    it('should return true for an active recurly subscription', function () {
+      const result = this.SubscriptionHelper.isIndividualActivePaidSubscription(
+        {
+          groupPlan: false,
+          recurlyStatus: { state: 'active' },
+          recurlySubscription_id: 'some-id',
+        }
+      )
+      expect(result).to.be.true
+    })
+
+    it('should return true for an active stripe subscription', function () {
+      const result = this.SubscriptionHelper.isIndividualActivePaidSubscription(
+        {
+          groupPlan: false,
+          paymentProvider: { subscriptionId: 'sub_123', state: 'active' },
+        }
+      )
+      expect(result).to.be.true
+    })
+
+    it('should return false for a canceled recurly subscription', function () {
+      const result = this.SubscriptionHelper.isIndividualActivePaidSubscription(
+        {
+          groupPlan: false,
+          recurlyStatus: { state: 'canceled' },
+          recurlySubscription_id: 'some-id',
+        }
+      )
+      expect(result).to.be.false
+    })
+
+    it('should return false for a canceled stripe subscription', function () {
+      const result = this.SubscriptionHelper.isIndividualActivePaidSubscription(
+        {
+          groupPlan: false,
+          paymentProvider: { state: 'canceled', subscriptionId: 'sub_123' },
+        }
+      )
+      expect(result).to.be.false
+    })
+
+    it('should return false for a group plan subscription', function () {
+      const result = this.SubscriptionHelper.isIndividualActivePaidSubscription(
+        {
+          groupPlan: true,
+          recurlyStatus: { state: 'active' },
+          recurlySubscription_id: 'some-id',
+        }
+      )
+      expect(result).to.be.false
+    })
+
+    it('should return false for a free subscription', function () {
+      const result = this.SubscriptionHelper.isIndividualActivePaidSubscription(
+        {}
+      )
+      expect(result).to.be.false
+    })
+
+    it('should return false for a subscription with an empty string for recurlySubscription_id', function () {
+      const result = this.SubscriptionHelper.isIndividualActivePaidSubscription(
+        {
+          groupPlan: false,
+          recurlySubscription_id: '',
+          recurlyStatus: { state: 'active' },
+        }
+      )
+      expect(result).to.be.false
+    })
+
+    it('should return false for a subscription with an empty string for paymentProvider.subscriptionId', function () {
+      const result = this.SubscriptionHelper.isIndividualActivePaidSubscription(
+        {
+          groupPlan: false,
+          paymentProvider: { state: 'active', subscriptionId: '' },
+        }
+      )
+      expect(result).to.be.false
+    })
+
+    it('should return false for a missing subscription', function () {
+      const result = this.SubscriptionHelper.isPaidSubscription()
+      expect(result).to.be.false
+    })
+  })
+
+  describe('getPaymentProviderSubscriptionId', function () {
+    it('should return the recurly subscription id if it exists', function () {
+      const result = this.SubscriptionHelper.getPaymentProviderSubscriptionId({
+        recurlySubscription_id: 'some-id',
+      })
+      expect(result).to.equal('some-id')
+    })
+
+    it('should return the payment provider subscription id if it exists', function () {
+      const result = this.SubscriptionHelper.getPaymentProviderSubscriptionId({
+        paymentProvider: { subscriptionId: 'sub_123' },
+      })
+      expect(result).to.equal('sub_123')
+    })
+
+    it('should return null if no subscription id exists', function () {
+      const result = this.SubscriptionHelper.getPaymentProviderSubscriptionId(
+        {}
+      )
+      expect(result).to.be.null
+    })
+  })
+
+  describe('getPaidSubscriptionState', function () {
+    it('should return the recurly state if it exists', function () {
+      const result = this.SubscriptionHelper.getPaidSubscriptionState({
+        recurlyStatus: { state: 'active' },
+      })
+      expect(result).to.equal('active')
+    })
+
+    it('should return the payment provider state if it exists', function () {
+      const result = this.SubscriptionHelper.getPaidSubscriptionState({
+        paymentProvider: { state: 'active' },
+      })
+      expect(result).to.equal('active')
+    })
+
+    it('should return null if no state exists', function () {
+      const result = this.SubscriptionHelper.getPaidSubscriptionState({})
+      expect(result).to.be.null
+    })
+  })
+
+  describe('getSubscriptionTrialStartedAt', function () {
+    it('should return the recurly trial start date if it exists', function () {
+      const result = this.SubscriptionHelper.getSubscriptionTrialStartedAt({
+        recurlySubscription_id: 'some-id',
+        recurlyStatus: { trialStartedAt: new Date('2023-01-01') },
+      })
+      expect(result).to.deep.equal(new Date('2023-01-01'))
+    })
+
+    it('should return the payment provider trial start date if it exists', function () {
+      const result = this.SubscriptionHelper.getSubscriptionTrialStartedAt({
+        recurlyStatus: {},
+        paymentProvider: { trialStartedAt: new Date('2023-01-01') },
+      })
+      expect(result).to.deep.equal(new Date('2023-01-01'))
+    })
+
+    it('should return undefined if no trial start date exists', function () {
+      const result = this.SubscriptionHelper.getSubscriptionTrialStartedAt({})
+      expect(result).to.be.undefined
+    })
+  })
+
+  describe('getSubscriptionTrialEndsAt', function () {
+    it('should return the recurly trial end date if it exists', function () {
+      const result = this.SubscriptionHelper.getSubscriptionTrialEndsAt({
+        recurlySubscription_id: 'some-id',
+        recurlyStatus: { trialEndsAt: new Date('2023-01-01') },
+      })
+      expect(result).to.deep.equal(new Date('2023-01-01'))
+    })
+
+    it('should return the payment provider trial end date if it exists', function () {
+      const result = this.SubscriptionHelper.getSubscriptionTrialEndsAt({
+        recurlyStatus: {},
+        paymentProvider: { trialEndsAt: new Date('2023-01-01') },
+      })
+      expect(result).to.deep.equal(new Date('2023-01-01'))
+    })
+
+    it('should return undefined if no trial end date exists', function () {
+      const result = this.SubscriptionHelper.getSubscriptionTrialEndsAt({})
+      expect(result).to.be.undefined
+    })
+  })
+
+  describe('isInTrial', function () {
+    it('should return false if trialEndsAt is null', function () {
+      const result = this.SubscriptionHelper.isInTrial(null)
+      expect(result).to.be.false
+    })
+
+    it('should return false if trialEndsAt is before now', function () {
+      const tenDaysAgo = new Date()
+      tenDaysAgo.setDate(tenDaysAgo.getDate() - 10)
+      const result = this.SubscriptionHelper.isInTrial(tenDaysAgo)
+      expect(result).to.be.false
+    })
+
+    it('should return true if trialEndsAt is after now', function () {
+      const tenDaysFromNow = new Date()
+      tenDaysFromNow.setDate(tenDaysFromNow.getDate() + 10)
+      const result = this.SubscriptionHelper.isInTrial(tenDaysFromNow)
+      expect(result).to.be.true
+    })
+  })
 })
diff --git a/services/web/test/unit/src/Subscription/SubscriptionLocatorTests.js b/services/web/test/unit/src/Subscription/SubscriptionLocatorTests.js
index f66eda5b7f..e8202424fc 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionLocatorTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionLocatorTests.js
@@ -13,6 +13,11 @@ describe('Subscription Locator Tests', function () {
         exec: sinon.stub().resolves(),
       }),
       find: sinon.stub().returns({
+        populate: sinon.stub().returns({
+          populate: sinon.stub().returns({
+            exec: sinon.stub().resolves([]),
+          }),
+        }),
         exec: sinon.stub().resolves(),
       }),
     }
@@ -77,4 +82,110 @@ describe('Subscription Locator Tests', function () {
       subscription.should.equal(this.subscription)
     })
   })
+
+  describe('getUserSubscriptionStatus', function () {
+    it('should return no active personal or group subscription when no user is passed', async function () {
+      const subscriptionStatus =
+        await this.SubscriptionLocator.promises.getUserSubscriptionStatus(
+          undefined
+        )
+      expect(subscriptionStatus).to.deep.equal({
+        personal: false,
+        group: false,
+      })
+    })
+
+    it('should return no active personal or group subscription when the user has no subscription', async function () {
+      const subscriptionStatus =
+        await this.SubscriptionLocator.promises.getUserSubscriptionStatus(
+          this.user._id
+        )
+      expect(subscriptionStatus).to.deep.equal({
+        personal: false,
+        group: false,
+      })
+    })
+
+    it('should return active personal subscription', async function () {
+      this.Subscription.findOne.returns({
+        exec: sinon.stub().resolves({
+          recurlyStatus: {
+            state: 'active',
+          },
+        }),
+      })
+      const subscriptionStatus =
+        await this.SubscriptionLocator.promises.getUserSubscriptionStatus(
+          this.user._id
+        )
+      expect(subscriptionStatus).to.deep.equal({ personal: true, group: false })
+    })
+
+    it('should return active group subscription when member of a group plan', async function () {
+      this.Subscription.find.returns({
+        populate: sinon.stub().returns({
+          populate: sinon.stub().returns({
+            exec: sinon.stub().resolves([
+              {
+                recurlyStatus: {
+                  state: 'active',
+                },
+                groupPlan: true,
+              },
+            ]),
+          }),
+        }),
+      })
+      const subscriptionStatus =
+        await this.SubscriptionLocator.promises.getUserSubscriptionStatus(
+          this.user._id
+        )
+      expect(subscriptionStatus).to.deep.equal({ personal: false, group: true })
+    })
+
+    it('should return active group subscription when owner of a group plan', async function () {
+      this.Subscription.findOne.returns({
+        exec: sinon.stub().resolves({
+          recurlyStatus: {
+            state: 'active',
+          },
+          groupPlan: true,
+        }),
+      })
+      const subscriptionStatus =
+        await this.SubscriptionLocator.promises.getUserSubscriptionStatus(
+          this.user._id
+        )
+      expect(subscriptionStatus).to.deep.equal({ personal: false, group: true })
+    })
+
+    it('should return active personal and group subscription when has personal subscription and member of a group', async function () {
+      this.Subscription.find.returns({
+        populate: sinon.stub().returns({
+          populate: sinon.stub().returns({
+            exec: sinon.stub().resolves([
+              {
+                recurlyStatus: {
+                  state: 'active',
+                },
+                groupPlan: true,
+              },
+            ]),
+          }),
+        }),
+      })
+      this.Subscription.findOne.returns({
+        exec: sinon.stub().resolves({
+          recurlyStatus: {
+            state: 'active',
+          },
+        }),
+      })
+      const subscriptionStatus =
+        await this.SubscriptionLocator.promises.getUserSubscriptionStatus(
+          this.user._id
+        )
+      expect(subscriptionStatus).to.deep.equal({ personal: true, group: true })
+    })
+  })
 })
diff --git a/services/web/test/unit/src/Subscription/SubscriptionUpdaterTests.js b/services/web/test/unit/src/Subscription/SubscriptionUpdaterTests.js
index a122f0e4b2..d272ad51e4 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionUpdaterTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionUpdaterTests.js
@@ -70,6 +70,7 @@ describe('SubscriptionUpdater', function () {
       .stub()
       .returns({ exec: sinon.stub().resolves() })
     this.SubscriptionModel.findOne = sinon.stub().resolves()
+    this.SubscriptionModel.findById = sinon.stub().resolves()
     this.SubscriptionModel.updateMany = sinon
       .stub()
       .returns({ exec: sinon.stub().resolves() })
@@ -173,6 +174,12 @@ describe('SubscriptionUpdater', function () {
       },
     }
 
+    this.UserUpdater = {
+      promises: {
+        updateUser: sinon.stub().resolves(),
+      },
+    }
+
     this.SubscriptionUpdater = SandboxedModule.require(modulePath, {
       requires: {
         '../../models/Subscription': {
@@ -193,6 +200,7 @@ describe('SubscriptionUpdater', function () {
         }),
         '../../infrastructure/Features': this.Features,
         '../User/UserAuditLogHandler': this.UserAuditLogHandler,
+        '../User/UserUpdater': this.UserUpdater,
         '../../infrastructure/Modules': (this.Modules = {
           promises: {
             hooks: {
@@ -622,6 +630,9 @@ describe('SubscriptionUpdater', function () {
         },
       ]
       this.SubscriptionModel.findOne.resolves(this.groupSubscription)
+      this.SubscriptionModel.findById = sinon
+        .stub()
+        .resolves(this.groupSubscription)
       this.SubscriptionLocator.promises.getMemberSubscriptions.resolves(
         this.fakeSubscriptions
       )
@@ -638,6 +649,28 @@ describe('SubscriptionUpdater', function () {
         .should.equal(true)
     })
 
+    it('should remove user enrollment if the group is managed', async function () {
+      this.SubscriptionModel.findById.resolves({
+        ...this.groupSubscription,
+        managedUsersEnabled: true,
+      })
+      await this.SubscriptionUpdater.promises.removeUserFromGroup(
+        this.groupSubscription._id,
+        this.otherUserId
+      )
+      this.UserUpdater.promises.updateUser
+        .calledWith(
+          { _id: this.otherUserId },
+          {
+            $unset: {
+              'enrollment.managedBy': 1,
+              'enrollment.enrolledAt': 1,
+            },
+          }
+        )
+        .should.equal(true)
+    })
+
     it('should send a group-subscription-left event', async function () {
       await this.SubscriptionUpdater.promises.removeUserFromGroup(
         this.groupSubscription._id,
diff --git a/services/web/test/unit/src/Subscription/SubscriptionViewModelBuilderTests.js b/services/web/test/unit/src/Subscription/SubscriptionViewModelBuilderTests.js
index 0f666b888a..86eb51070e 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionViewModelBuilderTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionViewModelBuilderTests.js
@@ -7,6 +7,7 @@ const {
   PaymentProviderSubscriptionAddOn,
   PaymentProviderSubscriptionChange,
 } = require('../../../../app/src/Features/Subscription/PaymentProviderEntities')
+const SubscriptionHelper = require('../../../../app/src/Features/Subscription/SubscriptionHelper')
 
 const modulePath =
   '../../../../app/src/Features/Subscription/SubscriptionViewModelBuilder'
@@ -159,13 +160,14 @@ describe('SubscriptionViewModelBuilder', function () {
         './SubscriptionUpdater': this.SubscriptionUpdater,
         './PlansLocator': this.PlansLocator,
         '../../infrastructure/Modules': (this.Modules = {
+          promises: { hooks: { fire: sinon.stub().resolves([]) } },
           hooks: {
             fire: sinon.stub().yields(null, []),
           },
         }),
         './V1SubscriptionManager': {},
         '../Publishers/PublishersGetter': this.PublishersGetter,
-        './SubscriptionHelper': {},
+        './SubscriptionHelper': SubscriptionHelper,
       },
     })
 
@@ -180,10 +182,10 @@ describe('SubscriptionViewModelBuilder', function () {
       .returns(this.commonsPlan)
   })
 
-  describe('getBestSubscription', function () {
+  describe('getUsersSubscriptionDetails', function () {
     it('should return a free plan when user has no subscription or affiliation', async function () {
-      const usersBestSubscription =
-        await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+      const { bestSubscription: usersBestSubscription } =
+        await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
           this.user
         )
       assert.deepEqual(usersBestSubscription, { type: 'free' })
@@ -195,8 +197,8 @@ describe('SubscriptionViewModelBuilder', function () {
           .withArgs(this.user)
           .resolves(this.individualCustomSubscription)
 
-        const usersBestSubscription =
-          await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+        const { bestSubscription: usersBestSubscription } =
+          await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
             this.user
           )
 
@@ -213,8 +215,8 @@ describe('SubscriptionViewModelBuilder', function () {
           .withArgs(this.user)
           .resolves(this.individualSubscription)
 
-        const usersBestSubscription =
-          await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+        const { bestSubscription: usersBestSubscription } =
+          await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
             this.user
           )
 
@@ -234,8 +236,8 @@ describe('SubscriptionViewModelBuilder', function () {
           .withArgs(this.user)
           .resolves(this.individualSubscription)
 
-        const usersBestSubscription =
-          await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+        const { bestSubscription: usersBestSubscription } =
+          await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
             this.user
           )
 
@@ -255,8 +257,8 @@ describe('SubscriptionViewModelBuilder', function () {
           .withArgs(this.user)
           .resolves(this.individualSubscription)
 
-        const usersBestSubscription =
-          await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+        const { bestSubscription: usersBestSubscription } =
+          await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
             this.user
           )
 
@@ -268,8 +270,8 @@ describe('SubscriptionViewModelBuilder', function () {
         })
       })
 
-      it('should update subscription if recurly data is missing', async function () {
-        this.individualSubscriptionWithoutRecurly = {
+      it('should update subscription if recurly payment state is missing', async function () {
+        this.individualSubscriptionWithoutPaymentState = {
           planCode: this.planCode,
           plan: this.plan,
           recurlySubscription_id: this.recurlySubscription_id,
@@ -280,37 +282,104 @@ describe('SubscriptionViewModelBuilder', function () {
         this.SubscriptionLocator.promises.getUsersSubscription
           .withArgs(this.user)
           .onCall(0)
-          .resolves(this.individualSubscriptionWithoutRecurly)
+          .resolves(this.individualSubscriptionWithoutPaymentState)
           .withArgs(this.user)
           .onCall(1)
           .resolves(this.individualSubscription)
-        this.RecurlyWrapper.promises.getSubscription
-          .withArgs(this.individualSubscription.recurlySubscription_id, {
-            includeAccount: true,
-          })
-          .resolves(this.paymentRecord)
+        const payment = {
+          subscription: this.paymentRecord,
+          account: new PaymentProviderAccount({}),
+          coupons: [],
+        }
 
-        const usersBestSubscription =
-          await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+        this.Modules.promises.hooks.fire
+          .withArgs(
+            'getPaymentFromRecordPromise',
+            this.individualSubscriptionWithoutPaymentState
+          )
+          .resolves([payment])
+        this.Modules.promises.hooks.fire
+          .withArgs(
+            'syncSubscription',
+            payment,
+            this.individualSubscriptionWithoutPaymentState
+          )
+          .resolves([])
+
+        const { bestSubscription: usersBestSubscription } =
+          await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
             this.user
           )
 
-        sinon.assert.calledWith(
-          this.RecurlyWrapper.promises.getSubscription,
-          this.individualSubscriptionWithoutRecurly.recurlySubscription_id,
-          { includeAccount: true }
-        )
-        sinon.assert.calledWith(
-          this.SubscriptionUpdater.promises.updateSubscriptionFromRecurly,
-          this.paymentRecord,
-          this.individualSubscriptionWithoutRecurly
-        )
         assert.deepEqual(usersBestSubscription, {
           type: 'individual',
           subscription: this.individualSubscription,
           plan: this.plan,
           remainingTrialDays: -1,
         })
+        assert.isTrue(
+          this.Modules.promises.hooks.fire.withArgs(
+            'getPaymentFromRecordPromise',
+            this.individualSubscriptionWithoutPaymentState
+          ).calledOnce
+        )
+      })
+
+      it('should update subscription if stripe payment state is missing', async function () {
+        this.individualSubscriptionWithoutPaymentState = {
+          planCode: this.planCode,
+          plan: this.plan,
+          paymentProvider: {
+            subscriptionId: this.recurlySubscription_id,
+          },
+        }
+        this.paymentRecord = {
+          state: 'active',
+        }
+        this.SubscriptionLocator.promises.getUsersSubscription
+          .withArgs(this.user)
+          .onCall(0)
+          .resolves(this.individualSubscriptionWithoutPaymentState)
+          .withArgs(this.user)
+          .onCall(1)
+          .resolves(this.individualSubscription)
+        const payment = {
+          subscription: this.paymentRecord,
+          account: new PaymentProviderAccount({}),
+          coupons: [],
+        }
+
+        this.Modules.promises.hooks.fire
+          .withArgs(
+            'getPaymentFromRecordPromise',
+            this.individualSubscriptionWithoutPaymentState
+          )
+          .resolves([payment])
+        this.Modules.promises.hooks.fire
+          .withArgs(
+            'syncSubscription',
+            payment,
+            this.individualSubscriptionWithoutPaymentState
+          )
+          .resolves([])
+
+        const { bestSubscription: usersBestSubscription } =
+          await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
+            this.user
+          )
+
+        assert.deepEqual(usersBestSubscription, {
+          type: 'individual',
+          subscription: this.individualSubscription,
+          plan: this.plan,
+          remainingTrialDays: -1,
+        })
+        assert.isTrue(
+          this.Modules.promises.hooks.fire.withArgs(
+            'getPaymentFromRecordPromise',
+            this.individualSubscriptionWithoutPaymentState
+          ).calledOnce
+        )
       })
     })
 
@@ -318,8 +387,8 @@ describe('SubscriptionViewModelBuilder', function () {
       this.SubscriptionLocator.promises.getMemberSubscriptions
         .withArgs(this.user)
         .resolves([this.groupSubscription])
-      const usersBestSubscription =
-        await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+      const { bestSubscription: usersBestSubscription } =
+        await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
           this.user
         )
       assert.deepEqual(usersBestSubscription, {
@@ -336,8 +405,8 @@ describe('SubscriptionViewModelBuilder', function () {
         .resolves([
           Object.assign({}, this.groupSubscription, { teamName: 'test team' }),
         ])
-      const usersBestSubscription =
-        await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+      const { bestSubscription: usersBestSubscription } =
+        await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
           this.user
         )
       assert.deepEqual(usersBestSubscription, {
@@ -353,8 +422,8 @@ describe('SubscriptionViewModelBuilder', function () {
         .withArgs(this.user._id)
         .resolves([this.commonsSubscription])
 
-      const usersBestSubscription =
-        await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+      const { bestSubscription: usersBestSubscription } =
+        await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
           this.user
         )
 
@@ -385,8 +454,8 @@ describe('SubscriptionViewModelBuilder', function () {
           compileTimeout: 60,
         }
 
-        const usersBestSubscription =
-          await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+        const { bestSubscription: usersBestSubscription } =
+          await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
             this.user
           )
 
@@ -410,8 +479,8 @@ describe('SubscriptionViewModelBuilder', function () {
           compileTimeout: 60,
         }
 
-        const usersBestSubscription =
-          await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+        const { bestSubscription: usersBestSubscription } =
+          await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
             this.user
           )
 
@@ -440,8 +509,8 @@ describe('SubscriptionViewModelBuilder', function () {
           compileTimeout: 240,
         }
 
-        const usersBestSubscription =
-          await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+        const { bestSubscription: usersBestSubscription } =
+          await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
             this.user
           )
 
@@ -469,8 +538,8 @@ describe('SubscriptionViewModelBuilder', function () {
           compileTimeout: 240,
         }
 
-        const usersBestSubscription =
-          await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+        const { bestSubscription: usersBestSubscription } =
+          await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
             this.user
           )
 
@@ -499,8 +568,8 @@ describe('SubscriptionViewModelBuilder', function () {
           compileTimeout: 240,
         }
 
-        const usersBestSubscription =
-          await this.SubscriptionViewModelBuilder.promises.getBestSubscription(
+        const { bestSubscription: usersBestSubscription } =
+          await this.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails(
             this.user
           )
 
@@ -589,7 +658,7 @@ describe('SubscriptionViewModelBuilder', function () {
 
       describe('isEligibleForGroupPlan', function () {
         it('is false for Stripe subscriptions', async function () {
-          this.paymentRecord.service = 'stripe'
+          this.paymentRecord.service = 'stripe-us'
           const result =
             await this.SubscriptionViewModelBuilder.promises.buildUsersSubscriptionViewModel(
               this.user
@@ -627,7 +696,7 @@ describe('SubscriptionViewModelBuilder', function () {
 
       describe('isEligibleForPause', function () {
         it('is false for Stripe subscriptions', async function () {
-          this.paymentRecord.service = 'stripe'
+          this.paymentRecord.service = 'stripe-us'
           const result =
             await this.SubscriptionViewModelBuilder.promises.buildUsersSubscriptionViewModel(
               this.user
@@ -777,7 +846,7 @@ describe('SubscriptionViewModelBuilder', function () {
           this.paymentRecord.pausePeriodStart = null
           this.paymentRecord.remainingPauseCycles = null
           this.paymentRecord.trialPeriodEnd = null
-          this.paymentRecord.service = 'stripe'
+          this.paymentRecord.service = 'stripe-us'
           const result =
             await this.SubscriptionViewModelBuilder.promises.buildUsersSubscriptionViewModel(
               this.user
@@ -847,7 +916,7 @@ describe('SubscriptionViewModelBuilder', function () {
       })
 
       it('does not add a billing details link for a Stripe subscription', async function () {
-        this.paymentRecord.service = 'stripe'
+        this.paymentRecord.service = 'stripe-us'
         this.Modules.hooks.fire
           .withArgs('getPaymentFromRecord', this.individualSubscription)
           .yields(null, [
diff --git a/services/web/test/unit/src/Subscription/TeamInvitesController.test.mjs b/services/web/test/unit/src/Subscription/TeamInvitesController.test.mjs
index b72a406ac0..be5fe26670 100644
--- a/services/web/test/unit/src/Subscription/TeamInvitesController.test.mjs
+++ b/services/web/test/unit/src/Subscription/TeamInvitesController.test.mjs
@@ -1,6 +1,6 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
+
 const modulePath =
   '../../../../app/src/Features/Subscription/TeamInvitesController'
 
@@ -175,7 +175,7 @@ describe('TeamInvitesController', function () {
       },
     }
 
-    describe('hasIndividualRecurlySubscription', function () {
+    describe('hasIndividualPaidSubscription', function () {
       it('is true for personal subscription', function (ctx) {
         return new Promise(resolve => {
           ctx.SubscriptionLocator.promises.getUsersSubscription.resolves({
@@ -184,7 +184,7 @@ describe('TeamInvitesController', function () {
           })
           const res = {
             render: (template, data) => {
-              expect(data.hasIndividualRecurlySubscription).to.be.true
+              expect(data.hasIndividualPaidSubscription).to.be.true
               resolve()
             },
           }
@@ -200,7 +200,7 @@ describe('TeamInvitesController', function () {
           })
           const res = {
             render: (template, data) => {
-              expect(data.hasIndividualRecurlySubscription).to.be.false
+              expect(data.hasIndividualPaidSubscription).to.be.false
               resolve()
             },
           }
@@ -219,7 +219,7 @@ describe('TeamInvitesController', function () {
           })
           const res = {
             render: (template, data) => {
-              expect(data.hasIndividualRecurlySubscription).to.be.false
+              expect(data.hasIndividualPaidSubscription).to.be.false
               resolve()
             },
           }
diff --git a/services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js b/services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js
index fdd247bf96..b15232c822 100644
--- a/services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js
+++ b/services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js
@@ -29,6 +29,7 @@ describe('TeamInvitesHandler', function () {
     this.subscription = {
       id: '55153a8014829a865bbf700d',
       _id: new ObjectId('55153a8014829a865bbf700d'),
+      recurlySubscription_id: '1a2b3c4d5e6f7g',
       admin_id: this.manager._id,
       groupPlan: true,
       member_ids: [],
@@ -54,6 +55,7 @@ describe('TeamInvitesHandler', function () {
     this.SubscriptionUpdater = {
       promises: {
         addUserToGroup: sinon.stub().resolves(),
+        deleteSubscription: sinon.stub().resolves(),
       },
     }
 
@@ -109,6 +111,12 @@ describe('TeamInvitesHandler', function () {
 
     this.Subscription.findOne.resolves(this.subscription)
 
+    this.RecurlyClient = {
+      promises: {
+        terminateSubscriptionByUuid: sinon.stub().resolves(),
+      },
+    }
+
     this.TeamInvitesHandler = SandboxedModule.require(modulePath, {
       requires: {
         'mongodb-legacy': { ObjectId },
@@ -126,6 +134,7 @@ describe('TeamInvitesHandler', function () {
         '../../infrastructure/Modules': (this.Modules = {
           promises: { hooks: { fire: sinon.stub().resolves() } },
         }),
+        './RecurlyClient': this.RecurlyClient,
       },
     })
   })
@@ -335,6 +344,8 @@ describe('TeamInvitesHandler', function () {
         email: 'tyrion@example.com',
       }
 
+      this.ipAddress = '127.0.0.1'
+
       this.UserGetter.promises.getUserByAnyEmail
         .withArgs(this.user.email)
         .resolves(this.user)
@@ -350,7 +361,8 @@ describe('TeamInvitesHandler', function () {
       it('adds the user to the team', async function () {
         await this.TeamInvitesHandler.promises.acceptInvite(
           'dddddddd',
-          this.user.id
+          this.user.id,
+          this.ipAddress
         )
         this.SubscriptionUpdater.promises.addUserToGroup
           .calledWith(this.subscription._id, this.user.id)
@@ -360,7 +372,8 @@ describe('TeamInvitesHandler', function () {
       it('removes the invite from the subscription', async function () {
         await this.TeamInvitesHandler.promises.acceptInvite(
           'dddddddd',
-          this.user.id
+          this.user.id,
+          this.ipAddress
         )
         this.Subscription.updateOne
           .calledWith(
@@ -375,7 +388,8 @@ describe('TeamInvitesHandler', function () {
 
         await this.TeamInvitesHandler.promises.acceptInvite(
           'dddddddd',
-          this.user.id
+          this.user.id,
+          this.ipAddress
         )
         sinon.assert.called(
           this.NotificationsBuilder.promises.groupInvitation(
@@ -389,7 +403,8 @@ describe('TeamInvitesHandler', function () {
       it('should not schedule an SSO invite reminder', async function () {
         await this.TeamInvitesHandler.promises.acceptInvite(
           'dddddddd',
-          this.user.id
+          this.user.id,
+          this.ipAddress
         )
         sinon.assert.notCalled(this.Modules.promises.hooks.fire)
       })
@@ -401,7 +416,17 @@ describe('TeamInvitesHandler', function () {
 
         await this.TeamInvitesHandler.promises.acceptInvite(
           'dddddddd',
-          this.user.id
+          this.user.id,
+          this.ipAddress
+        )
+        sinon.assert.calledWith(
+          this.SubscriptionUpdater.promises.deleteSubscription,
+          this.subscription,
+          { id: this.user.id, ip: this.ipAddress }
+        )
+        sinon.assert.calledWith(
+          this.RecurlyClient.promises.terminateSubscriptionByUuid,
+          this.subscription.recurlySubscription_id
         )
         sinon.assert.calledWith(
           this.Modules.promises.hooks.fire,
@@ -421,7 +446,8 @@ describe('TeamInvitesHandler', function () {
 
         await this.TeamInvitesHandler.promises.acceptInvite(
           'dddddddd',
-          this.user.id
+          this.user.id,
+          this.ipAddress
         )
         sinon.assert.calledWith(
           this.Modules.promises.hooks.fire,
diff --git a/services/web/test/unit/src/Tags/TagsController.test.mjs b/services/web/test/unit/src/Tags/TagsController.test.mjs
index 927c6283a5..c8cb739d0e 100644
--- a/services/web/test/unit/src/Tags/TagsController.test.mjs
+++ b/services/web/test/unit/src/Tags/TagsController.test.mjs
@@ -1,6 +1,6 @@
-import { vi } from 'vitest'
+import { assert, vi } from 'vitest'
 import sinon from 'sinon'
-import { assert } from 'chai'
+
 const modulePath = '../../../../app/src/Features/Tags/TagsController.mjs'
 
 describe('TagsController', function () {
diff --git a/services/web/test/unit/src/ThirdPartyDataStore/TpdsController.test.mjs b/services/web/test/unit/src/ThirdPartyDataStore/TpdsController.test.mjs
index 313f2d2456..29daa00efc 100644
--- a/services/web/test/unit/src/ThirdPartyDataStore/TpdsController.test.mjs
+++ b/services/web/test/unit/src/ThirdPartyDataStore/TpdsController.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import mongodb from 'mongodb-legacy'
-import { expect } from 'chai'
 import sinon from 'sinon'
 import Errors from '../../../../app/src/Features/Errors/Errors.js'
 import MockResponse from '../helpers/MockResponse.js'
diff --git a/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateHandler.test.mjs b/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateHandler.test.mjs
index 96cc22279e..08a7dcf494 100644
--- a/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateHandler.test.mjs
+++ b/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateHandler.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import mongodb from 'mongodb-legacy'
 import Errors from '../../../../app/src/Features/Errors/Errors.js'
 
diff --git a/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs b/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs
index 3408c3bb32..96d2d19b04 100644
--- a/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs
+++ b/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import mongodb from 'mongodb-legacy'
 import MockRequest from '../helpers/MockRequest.js'
 import MockResponse from '../helpers/MockResponse.js'
diff --git a/services/web/test/unit/src/Uploads/ProjectUploadController.test.mjs b/services/web/test/unit/src/Uploads/ProjectUploadController.test.mjs
index 1f6fd7adb9..443578f747 100644
--- a/services/web/test/unit/src/Uploads/ProjectUploadController.test.mjs
+++ b/services/web/test/unit/src/Uploads/ProjectUploadController.test.mjs
@@ -5,9 +5,8 @@
  * DS206: Consider reworking classes to avoid initClass
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import MockRequest from '../helpers/MockRequest.js'
 import MockResponse from '../helpers/MockResponse.js'
 import ArchiveErrors from '../../../../app/src/Features/Uploads/ArchiveErrors.js'
diff --git a/services/web/test/unit/src/User/UserGetterTests.js b/services/web/test/unit/src/User/UserGetterTests.js
index 0e0c170fd6..315a8073d6 100644
--- a/services/web/test/unit/src/User/UserGetterTests.js
+++ b/services/web/test/unit/src/User/UserGetterTests.js
@@ -119,6 +119,17 @@ describe('UserGetter', function () {
       })
     })
 
+    it('should not call mongo with empty list', function (done) {
+      const query = []
+      const projection = { email: 1 }
+      this.UserGetter.getUsers(query, projection, (error, users) => {
+        expect(error).to.not.exist
+        expect(users).to.deep.equal([])
+        expect(this.find).to.not.have.been.called
+        done()
+      })
+    })
+
     it('should not allow null query', function (done) {
       this.UserGetter.getUser(null, {}, error => {
         error.should.exist
diff --git a/services/web/test/unit/src/User/UserPagesController.test.mjs b/services/web/test/unit/src/User/UserPagesController.test.mjs
index 181c9513ae..1fa908d1be 100644
--- a/services/web/test/unit/src/User/UserPagesController.test.mjs
+++ b/services/web/test/unit/src/User/UserPagesController.test.mjs
@@ -1,7 +1,6 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import assert from 'assert'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import MockResponse from '../helpers/MockResponse.js'
 import MockRequest from '../helpers/MockRequest.js'
 
diff --git a/services/web/test/unit/src/User/UserUpdaterTests.js b/services/web/test/unit/src/User/UserUpdaterTests.js
index 5832bc4656..2803e6d6f2 100644
--- a/services/web/test/unit/src/User/UserUpdaterTests.js
+++ b/services/web/test/unit/src/User/UserUpdaterTests.js
@@ -59,11 +59,6 @@ describe('UserUpdater', function () {
         changeEmail: sinon.stub().resolves(),
       },
     }
-    this.RecurlyWrapper = {
-      promises: {
-        updateAccountEmailAddress: sinon.stub().resolves(),
-      },
-    }
     this.AnalyticsManager = {
       recordEventForUserInBackground: sinon.stub(),
     }
@@ -264,9 +259,11 @@ describe('UserUpdater', function () {
       expect(
         this.NewsletterManager.promises.changeEmail
       ).to.have.been.calledWith(this.user, this.newEmail)
-      expect(
-        this.RecurlyWrapper.promises.updateAccountEmailAddress
-      ).to.have.been.calledWith(this.user._id, this.newEmail)
+      expect(this.Modules.promises.hooks.fire).to.have.been.calledWith(
+        'updateAccountEmailAddress',
+        this.user._id,
+        this.newEmail
+      )
     })
 
     it('validates email', async function () {
@@ -615,9 +612,11 @@ describe('UserUpdater', function () {
       expect(
         this.NewsletterManager.promises.changeEmail
       ).to.have.been.calledWith(this.user, this.newEmail)
-      expect(
-        this.RecurlyWrapper.promises.updateAccountEmailAddress
-      ).to.have.been.calledWith(this.user._id, this.newEmail)
+      expect(this.Modules.promises.hooks.fire).to.have.been.calledWith(
+        'updateAccountEmailAddress',
+        this.user._id,
+        this.newEmail
+      )
     })
 
     it('handles Mongo errors', async function () {
diff --git a/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs b/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs
index 55bc62cd2d..18e2d8526b 100644
--- a/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs
+++ b/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs
@@ -1,6 +1,5 @@
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 import sinon from 'sinon'
-import { expect } from 'chai'
 import MockRequest from '../helpers/MockRequest.js'
 import MockResponse from '../helpers/MockResponse.js'
 import EntityConfigs from '../../../../app/src/Features/UserMembership/UserMembershipEntityConfigs.js'
@@ -185,6 +184,7 @@ describe('UserMembershipController', function () {
           expect(viewParams.users).to.deep.equal(ctx.users)
           expect(viewParams.groupSize).to.equal(ctx.subscription.membersLimit)
           expect(viewParams.managedUsersActive).to.equal(true)
+          expect(viewParams.isUserGroupManager).to.equal(false)
         },
       })
     })
diff --git a/services/web/test/unit/src/infrastructure/ServeStaticWrapper.test.mjs b/services/web/test/unit/src/infrastructure/ServeStaticWrapper.test.mjs
index 4d8479a9cb..619fe74a2b 100644
--- a/services/web/test/unit/src/infrastructure/ServeStaticWrapper.test.mjs
+++ b/services/web/test/unit/src/infrastructure/ServeStaticWrapper.test.mjs
@@ -1,5 +1,4 @@
-import { vi } from 'vitest'
-import { expect } from 'chai'
+import { expect, vi } from 'vitest'
 import Path from 'node:path'
 import sinon from 'sinon'
 import MockResponse from '../helpers/MockResponse.js'
diff --git a/services/web/test/unit/vitest_bootstrap.mjs b/services/web/test/unit/vitest_bootstrap.mjs
index 2244faefd3..5a39b2d587 100644
--- a/services/web/test/unit/vitest_bootstrap.mjs
+++ b/services/web/test/unit/vitest_bootstrap.mjs
@@ -1,8 +1,26 @@
-import { vi } from 'vitest'
+import { chai, vi } from 'vitest'
 import './common_bootstrap.js'
 import sinon from 'sinon'
 import logger from '@overleaf/logger'
+import sinonChai from 'sinon-chai'
+import chaiAsPromised from 'chai-as-promised'
 
+/*
+ * Chai configuration
+ */
+
+// add chai.should()
+chai.should()
+
+// Load sinon-chai assertions so expect(stubFn).to.have.been.calledWith('abc')
+// has a nicer failure messages
+chai.use(sinonChai)
+
+// Load promise support for chai
+chai.use(chaiAsPromised)
+
+// Do not truncate assertion errors
+chai.config.truncateThreshold = 0
 vi.mock('@overleaf/logger', async () => {
   return {
     default: {
diff --git a/services/web/types/admin/subscription.ts b/services/web/types/admin/subscription.ts
index bbcdd3b953..811ebf54bf 100644
--- a/services/web/types/admin/subscription.ts
+++ b/services/web/types/admin/subscription.ts
@@ -1,7 +1,15 @@
-import { GroupPolicy } from '../subscription/dashboard/subscription'
+import {
+  GroupPolicy,
+  PaymentProvider,
+} from '../subscription/dashboard/subscription'
 import { SSOConfig } from '../subscription/sso'
 import { TeamInvite } from '../team-invite'
 
+type RecurlyAdminClientPaymentProvider = Record<string, never>
+type StripeAdminClientPaymentProvider = PaymentProvider & {
+  service: 'stripe-us' | 'stripe-uk'
+}
+
 export type Subscription = {
   _id: string
   teamInvites: TeamInvite[]
@@ -13,4 +21,8 @@ export type Subscription = {
   managedUsersEnabled: boolean
   v1_id: number
   salesforce_id: string
+  recurlySubscription_id?: string
+  paymentProvider:
+    | RecurlyAdminClientPaymentProvider
+    | StripeAdminClientPaymentProvider
 }
diff --git a/services/web/types/onboarding.ts b/services/web/types/onboarding.ts
new file mode 100644
index 0000000000..11ae3e51d0
--- /dev/null
+++ b/services/web/types/onboarding.ts
@@ -0,0 +1,25 @@
+export type UsedLatex = 'never' | 'occasionally' | 'often'
+export type Occupation =
+  | 'university'
+  | 'company'
+  | 'nonprofitngo'
+  | 'government'
+  | 'other'
+
+export type OnboardingFormData = {
+  firstName: string
+  lastName: string
+  primaryOccupation: Occupation | null
+  usedLatex: UsedLatex | null
+  companyDivisionDepartment: string
+  companyJobTitle: string
+  governmentJobTitle: string
+  institutionName: string
+  otherJobTitle: string
+  nonprofitDivisionDepartment: string
+  nonprofitJobTitle: string
+  role: string
+  subjectArea: string
+  updatedAt?: Date
+  shouldReceiveUpdates?: boolean
+}
diff --git a/services/web/types/project.ts b/services/web/types/project.ts
index 83a28533b3..0fc21533e2 100644
--- a/services/web/types/project.ts
+++ b/services/web/types/project.ts
@@ -25,7 +25,8 @@ export type Project = {
   owner: MongoUser
   members: ProjectMember[]
   invites: ProjectInvite[]
-  rootDoc_id?: string
+  // `rootDoc_id` in the backend; `rootDocId` in the frontend
+  rootDocId?: string
   rootFolder?: Folder[]
   deletedByExternalDataSource?: boolean
 }
diff --git a/services/web/types/project/dashboard/subscription.ts b/services/web/types/project/dashboard/subscription.ts
index e8b595c49f..c8f8835b34 100644
--- a/services/web/types/project/dashboard/subscription.ts
+++ b/services/web/types/project/dashboard/subscription.ts
@@ -1,4 +1,7 @@
-import { SubscriptionState } from '../../subscription/dashboard/subscription'
+import {
+  SubscriptionState,
+  PaymentProvider,
+} from '../../subscription/dashboard/subscription'
 
 type SubscriptionBase = {
   featuresPageURL: string
@@ -22,6 +25,7 @@ type PaidSubscriptionBase = {
     teamName?: string
     name: string
     recurlyStatus?: RecurlyStatus
+    paymentProvider?: PaymentProvider
   }
 } & SubscriptionBase
 
diff --git a/services/web/types/share-doc.ts b/services/web/types/share-doc.ts
index d071c97f28..7c75e6d0de 100644
--- a/services/web/types/share-doc.ts
+++ b/services/web/types/share-doc.ts
@@ -1,9 +1,23 @@
 import EventEmitter from 'events'
+import { StringFileData } from 'overleaf-editor-core'
 
 // type for the Doc class in vendor/libs/sharejs.js
-export interface ShareDoc extends EventEmitter {
+export interface ShareLatexOTShareDoc extends EventEmitter {
+  otType: 'sharejs-text-ot'
+  snapshot: string
   detach_cm6?: () => void
   getText: () => string
   insert: (pos: number, insert: string, fromUndo: boolean) => void
   del: (pos: number, length: number, fromUndo: boolean) => void
+  submitOp(op: any[]): void
 }
+
+export interface HistoryOTShareDoc extends EventEmitter {
+  otType: 'history-ot'
+  snapshot: StringFileData
+  detach_cm6?: () => void
+  getText: () => string
+  submitOp(op: any[]): void
+}
+
+export type ShareDoc = ShareLatexOTShareDoc | HistoryOTShareDoc
diff --git a/services/web/types/subscription/currency.ts b/services/web/types/subscription/currency.ts
index 8d6b88dc0b..d63d71be74 100644
--- a/services/web/types/subscription/currency.ts
+++ b/services/web/types/subscription/currency.ts
@@ -20,3 +20,4 @@ export const currencies = <const>{
 
 type Currency = typeof currencies
 export type CurrencyCode = keyof Currency
+export type StripeCurrencyCode = Lowercase<CurrencyCode>
diff --git a/services/web/types/subscription/dashboard/subscription.ts b/services/web/types/subscription/dashboard/subscription.ts
index a1ee934423..db17b25684 100644
--- a/services/web/types/subscription/dashboard/subscription.ts
+++ b/services/web/types/subscription/dashboard/subscription.ts
@@ -64,7 +64,6 @@ export type Subscription = {
   membersLimit: number
   teamInvites: object[]
   planCode: string
-  recurlySubscription_id: string
   plan: Plan
   pendingPlan?: PendingPaymentProviderPlan
   addOns?: AddOn[]
@@ -103,7 +102,7 @@ export type MemberGroupSubscription = Omit<GroupSubscription, 'admin_id'> & {
   admin_id: User
 }
 
-type PaymentProviderService = 'stripe' | 'recurly'
+type PaymentProviderService = 'stripe-us' | 'stripe-uk' | 'recurly'
 
 export type PaymentProvider = {
   service: PaymentProviderService
diff --git a/services/web/types/subscription/plan.ts b/services/web/types/subscription/plan.ts
index c5e8f7e820..d6f3008a19 100644
--- a/services/web/types/subscription/plan.ts
+++ b/services/web/types/subscription/plan.ts
@@ -1,3 +1,5 @@
+import { StripeCurrencyCode } from './currency'
+
 type Features = {
   collaborators: number
   compileGroup: string
@@ -60,6 +62,7 @@ export type Plan = {
   name: string
   planCode: string
   price_in_cents: number
+  canUseFlexibleLicensing?: boolean
 }
 
 export type PriceForDisplayData = {
@@ -85,15 +88,27 @@ export type RecurlyPlanCode =
   | 'group_professional_educational'
   | 'group_collaborator'
   | 'group_collaborator_educational'
+  | 'assistant'
+  | 'assistant-annual'
 
-export type StripeLookupKey =
+export type RecurlyAddOnCode = 'assistant'
+
+export type StripeBaseLookupKey =
   | 'standard_monthly'
   | 'standard_annual'
   | 'professional_monthly'
   | 'professional_annual'
   | 'student_monthly'
   | 'student_annual'
+  | 'assistant_annual'
+  | 'assistant_monthly'
+  // TODO: change all group plans' lookup_keys to match the UK account after they have been added
   | 'group_standard_enterprise'
   | 'group_professional_enterprise'
   | 'group_standard_educational'
   | 'group_professional_educational'
+
+export type StripeLookupKeyVersion = 'jun2025'
+
+export type StripeLookupKey =
+  `${StripeBaseLookupKey}_${StripeLookupKeyVersion}_${StripeCurrencyCode}`
diff --git a/services/web/types/subscription/sso.ts b/services/web/types/subscription/sso.ts
index cf869ec741..6500817407 100644
--- a/services/web/types/subscription/sso.ts
+++ b/services/web/types/subscription/sso.ts
@@ -13,6 +13,7 @@ export type SSOConfig = {
   userLastNameAttribute?: string
   validated?: boolean
   enabled?: boolean
+  useSettingsUKAMF?: boolean
 }
 
 export type GroupSSOLinkingStatus = {
diff --git a/services/web/types/template.ts b/services/web/types/template.ts
new file mode 100644
index 0000000000..214c388969
--- /dev/null
+++ b/services/web/types/template.ts
@@ -0,0 +1,16 @@
+export type Template = {
+  id: string
+  version: number
+  name: string
+  lastUpdated: Date
+  author: string
+  authorMD: string
+  description: string
+  descriptionMD: string
+  license: string
+  category: string
+  compiler?: string
+  language?: string
+  owner: string
+}
+
diff --git a/services/web/types/user-settings.ts b/services/web/types/user-settings.ts
index 3e748d937e..add460edfa 100644
--- a/services/web/types/user-settings.ts
+++ b/services/web/types/user-settings.ts
@@ -17,4 +17,5 @@ export type UserSettings = {
   mathPreview: boolean
   referencesSearchMode: 'advanced' | 'simple'
   enableNewEditor: boolean
+  breadcrumbs: boolean
 }
diff --git a/services/web/types/user.ts b/services/web/types/user.ts
index 8d00ea803f..2fce1ce46b 100644
--- a/services/web/types/user.ts
+++ b/services/web/types/user.ts
@@ -39,7 +39,7 @@ export type User = {
   isAdmin?: boolean
   email: string
   allowedFreeTrial?: boolean
-  hasRecurlySubscription?: boolean
+  hasPaidSubscription?: boolean
   first_name?: string
   last_name?: string
   alphaProgram?: boolean
diff --git a/services/web/types/window.ts b/services/web/types/window.ts
index 1150bf1e50..d2856e7179 100644
--- a/services/web/types/window.ts
+++ b/services/web/types/window.ts
@@ -1,20 +1,11 @@
 import 'recurly__recurly-js'
 import { ScopeValueStore } from './ide/scope-value-store'
 import { MetaAttributesCache } from '@/utils/meta'
-import { Socket } from '@/features/ide-react/connection/types/socket'
 
 declare global {
   // eslint-disable-next-line no-unused-vars
   interface Window {
     metaAttributesCache: MetaAttributesCache
-    _ide: Record<string, unknown> & {
-      $scope: Record<string, unknown> & {
-        pdf?: {
-          logEntryAnnotations: Record<string, unknown>
-        }
-      }
-      socket: Socket
-    }
     MathJax: Record<string, any>
     // For react-google-recaptcha
     recaptchaOptions?: {