diff --git a/backend/uv.lock b/backend/uv.lock
index f57eda3feb..602f366a0d 100644
--- a/backend/uv.lock
+++ b/backend/uv.lock
@@ -459,12 +459,12 @@ dev = [
 
 [[package]]
 name = "baserow-enterprise"
-version = "2.0.6"
+version = "2.1.0"
 source = { editable = "../enterprise/backend" }
 
 [[package]]
 name = "baserow-premium"
-version = "2.0.6"
+version = "2.1.0"
 source = { editable = "../premium/backend" }
 
 [[package]]
@@ -1382,14 +1382,12 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d7/7c/f0a6d0ede2c7bf092d00bc83ad5bafb7e6ec9b4aab2fbdfa6f134dc73327/greenlet-3.3.0-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:60c2ef0f578afb3c8d92ea07ad327f9a062547137afe91f38408f08aacab667f", size = 275671, upload-time = "2025-12-04T14:23:05.267Z" },
     { url = "https://files.pythonhosted.org/packages/44/06/dac639ae1a50f5969d82d2e3dd9767d30d6dbdbab0e1a54010c8fe90263c/greenlet-3.3.0-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0a5d554d0712ba1de0a6c94c640f7aeba3f85b3a6e1f2899c11c2c0428da9365", size = 646360, upload-time = "2025-12-04T14:50:10.026Z" },
     { url = "https://files.pythonhosted.org/packages/e0/94/0fb76fe6c5369fba9bf98529ada6f4c3a1adf19e406a47332245ef0eb357/greenlet-3.3.0-cp314-cp314-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:3a898b1e9c5f7307ebbde4102908e6cbfcb9ea16284a3abe15cab996bee8b9b3", size = 658160, upload-time = "2025-12-04T14:57:45.41Z" },
-    { url = "https://files.pythonhosted.org/packages/93/79/d2c70cae6e823fac36c3bbc9077962105052b7ef81db2f01ec3b9bf17e2b/greenlet-3.3.0-cp314-cp314-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:dcd2bdbd444ff340e8d6bdf54d2f206ccddbb3ccfdcd3c25bf4afaa7b8f0cf45", size = 671388, upload-time = "2025-12-04T15:07:15.789Z" },
     { url = "https://files.pythonhosted.org/packages/b8/14/bab308fc2c1b5228c3224ec2bf928ce2e4d21d8046c161e44a2012b5203e/greenlet-3.3.0-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5773edda4dc00e173820722711d043799d3adb4f01731f40619e07ea2750b955", size = 660166, upload-time = "2025-12-04T14:26:05.099Z" },
     { url = "https://files.pythonhosted.org/packages/4b/d2/91465d39164eaa0085177f61983d80ffe746c5a1860f009811d498e7259c/greenlet-3.3.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:ac0549373982b36d5fd5d30beb8a7a33ee541ff98d2b502714a09f1169f31b55", size = 1615193, upload-time = "2025-12-04T15:04:27.041Z" },
     { url = "https://files.pythonhosted.org/packages/42/1b/83d110a37044b92423084d52d5d5a3b3a73cafb51b547e6d7366ff62eff1/greenlet-3.3.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d198d2d977460358c3b3a4dc844f875d1adb33817f0613f663a656f463764ccc", size = 1683653, upload-time = "2025-12-04T14:27:32.366Z" },
     { url = "https://files.pythonhosted.org/packages/a0/66/bd6317bc5932accf351fc19f177ffba53712a202f9df10587da8df257c7e/greenlet-3.3.0-cp314-cp314t-macosx_11_0_universal2.whl", hash = "sha256:d6ed6f85fae6cdfdb9ce04c9bf7a08d666cfcfb914e7d006f44f840b46741931", size = 282638, upload-time = "2025-12-04T14:25:20.941Z" },
     { url = "https://files.pythonhosted.org/packages/30/cf/cc81cb030b40e738d6e69502ccbd0dd1bced0588e958f9e757945de24404/greenlet-3.3.0-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d9125050fcf24554e69c4cacb086b87b3b55dc395a8b3ebe6487b045b2614388", size = 651145, upload-time = "2025-12-04T14:50:11.039Z" },
     { url = "https://files.pythonhosted.org/packages/9c/ea/1020037b5ecfe95ca7df8d8549959baceb8186031da83d5ecceff8b08cd2/greenlet-3.3.0-cp314-cp314t-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:87e63ccfa13c0a0f6234ed0add552af24cc67dd886731f2261e46e241608bee3", size = 654236, upload-time = "2025-12-04T14:57:47.007Z" },
-    { url = "https://files.pythonhosted.org/packages/69/cc/1e4bae2e45ca2fa55299f4e85854606a78ecc37fead20d69322f96000504/greenlet-3.3.0-cp314-cp314t-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:2662433acbca297c9153a4023fe2161c8dcfdcc91f10433171cf7e7d94ba2221", size = 662506, upload-time = "2025-12-04T15:07:16.906Z" },
     { url = "https://files.pythonhosted.org/packages/57/b9/f8025d71a6085c441a7eaff0fd928bbb275a6633773667023d19179fe815/greenlet-3.3.0-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3c6e9b9c1527a78520357de498b0e709fb9e2f49c3a513afd5a249007261911b", size = 653783, upload-time = "2025-12-04T14:26:06.225Z" },
     { url = "https://files.pythonhosted.org/packages/f6/c7/876a8c7a7485d5d6b5c6821201d542ef28be645aa024cfe1145b35c120c1/greenlet-3.3.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:286d093f95ec98fdd92fcb955003b8a3d054b4e2cab3e2707a5039e7b50520fd", size = 1614857, upload-time = "2025-12-04T15:04:28.484Z" },
     { url = "https://files.pythonhosted.org/packages/4f/dc/041be1dff9f23dac5f48a43323cd0789cb798342011c19a248d9c9335536/greenlet-3.3.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:6c10513330af5b8ae16f023e8ddbfb486ab355d04467c4679c5cfe4659975dd9", size = 1676034, upload-time = "2025-12-04T14:27:33.531Z" },
diff --git a/changelog/entries/unreleased/bug/fix_application_builder_date_picker_locale.json b/changelog/entries/unreleased/bug/fix_application_builder_date_picker_locale.json
new file mode 100644
index 0000000000..997e7717f2
--- /dev/null
+++ b/changelog/entries/unreleased/bug/fix_application_builder_date_picker_locale.json
@@ -0,0 +1,9 @@
+{
+  "type": "bug",
+  "message": "Set correct locale in application builder date picker.",
+  "issue_origin": "github",
+  "issue_number": null,
+  "domain": "builder",
+  "bullet_points": [],
+  "created_at": "2026-02-20"
+}
diff --git a/changelog/entries/unreleased/bug/fix_onboarding_scratch_step_validation.json b/changelog/entries/unreleased/bug/fix_onboarding_scratch_step_validation.json
new file mode 100644
index 0000000000..82ba576073
--- /dev/null
+++ b/changelog/entries/unreleased/bug/fix_onboarding_scratch_step_validation.json
@@ -0,0 +1,9 @@
+{
+  "type": "bug",
+  "message": "Fixed prevent moving forward in scratch onboarding step validation bug.",
+  "issue_origin": "github",
+  "issue_number": null,
+  "domain": "core",
+  "bullet_points": [],
+  "created_at": "2026-02-20"
+}
diff --git a/changelog/entries/unreleased/bug/fix_realtime_table_reorder_bug.json b/changelog/entries/unreleased/bug/fix_realtime_table_reorder_bug.json
new file mode 100644
index 0000000000..052bf0f5f0
--- /dev/null
+++ b/changelog/entries/unreleased/bug/fix_realtime_table_reorder_bug.json
@@ -0,0 +1,9 @@
+{
+  "type": "bug",
+  "message": "Fix table reorder bug with realtime event.",
+  "issue_origin": "github",
+  "issue_number": null,
+  "domain": "database",
+  "bullet_points": [],
+  "created_at": "2026-02-20"
+}
diff --git a/changelog/entries/unreleased/bug/fix_reopening_new_data_source_modal.json b/changelog/entries/unreleased/bug/fix_reopening_new_data_source_modal.json
new file mode 100644
index 0000000000..40821daad2
--- /dev/null
+++ b/changelog/entries/unreleased/bug/fix_reopening_new_data_source_modal.json
@@ -0,0 +1,9 @@
+{
+  "type": "bug",
+  "message": "Fix re-opening new data source modal bug.",
+  "issue_origin": "github",
+  "issue_number": null,
+  "domain": "builder",
+  "bullet_points": [],
+  "created_at": "2026-02-20"
+}
diff --git a/changelog/entries/unreleased/bug/fix_wrong_date_selection_in_the_datepicker_when_editing_valu.json b/changelog/entries/unreleased/bug/fix_wrong_date_selection_in_the_datepicker_when_editing_valu.json
new file mode 100644
index 0000000000..a30452b3c2
--- /dev/null
+++ b/changelog/entries/unreleased/bug/fix_wrong_date_selection_in_the_datepicker_when_editing_valu.json
@@ -0,0 +1,9 @@
+{
+    "type": "bug",
+    "message": "Fix wrong date selection in the datepicker when editing values directly in the text input.",
+    "issue_origin": "github",
+    "issue_number": null,
+    "domain": "core",
+    "bullet_points": [],
+    "created_at": "2026-02-20"
+}
\ No newline at end of file
diff --git a/web-frontend/modules/builder/components/dataSource/DataSourceCreateEditModal.vue b/web-frontend/modules/builder/components/dataSource/DataSourceCreateEditModal.vue
index 7c35c41c08..4f7a0fd6d3 100644
--- a/web-frontend/modules/builder/components/dataSource/DataSourceCreateEditModal.vue
+++ b/web-frontend/modules/builder/components/dataSource/DataSourceCreateEditModal.vue
@@ -41,7 +41,7 @@
         <Button
           size="large"
           :loading="loading"
-          :disabled="loading || !changed || $refs.dataSourceForm.v$.$anyError"
+          :disabled="submitIsDisabled"
           @click.prevent="$refs.dataSourceForm.submit()"
         >
           {{ create ? $t('action.create') : $t('action.save') }}
@@ -86,6 +86,11 @@ export default {
     }
   },
   computed: {
+    submitIsDisabled() {
+      return (
+        this.loading || !this.changed || this.$refs.dataSourceForm.v$.$anyError
+      )
+    },
     dataSources() {
       return this.$store.getters['dataSource/getPageDataSources'](
         this.currentPage
diff --git a/web-frontend/modules/builder/components/elements/baseComponents/ABDateTimePicker.vue b/web-frontend/modules/builder/components/elements/baseComponents/ABDateTimePicker.vue
index bb25e62bbc..bdd7b3f7f1 100644
--- a/web-frontend/modules/builder/components/elements/baseComponents/ABDateTimePicker.vue
+++ b/web-frontend/modules/builder/components/elements/baseComponents/ABDateTimePicker.vue
@@ -38,6 +38,7 @@
           :open-date="calendarValue || new Date()"
           :inline="true"
           :monday-first="true"
+          :language="datePickerLanguage"
           class="ab-datetime-picker__calendar"
           @update:model-value="updateDate"
         />
@@ -67,6 +68,7 @@
 
 <script>
 import { DATE_FORMATS, TIME_FORMATS } from '@baserow/modules/builder/enums'
+import { useDatePickerLanguage } from '@baserow/modules/core/composables/useDatePickerLanguage'
 import {
   generateTimePickerTimes,
   parseDateForCalendar,
@@ -136,6 +138,9 @@ export default {
       immediate: true,
     },
   },
+  setup() {
+    return useDatePickerLanguage()
+  },
   methods: {
     refreshDate(value) {
       if (!value) {
diff --git a/web-frontend/modules/builder/date.js b/web-frontend/modules/builder/date.js
index 63b0fb93cb..174c11000a 100644
--- a/web-frontend/modules/builder/date.js
+++ b/web-frontend/modules/builder/date.js
@@ -98,6 +98,6 @@ export function parseDateForCalendar(value, dateFormat) {
   if (!value) {
     return null
   }
-  const parsedDate = moment.utc(value, dateFormat, true) // Strict parsing
+  const parsedDate = moment(value, dateFormat, true) // Strict parsing
   return parsedDate.isValid() ? parsedDate.toDate() : null
 }
diff --git a/web-frontend/modules/core/components/formula/extensions/ZWSManagementExtension.js b/web-frontend/modules/core/components/formula/extensions/ZWSManagementExtension.js
index c77382a19f..d4d52a6ee7 100644
--- a/web-frontend/modules/core/components/formula/extensions/ZWSManagementExtension.js
+++ b/web-frontend/modules/core/components/formula/extensions/ZWSManagementExtension.js
@@ -16,23 +16,33 @@ export const ZWSManagementExtension = Extension.create({
         key: new PluginKey('zwsManagement'),
         appendTransaction(transactions, oldState, newState) {
           const tr = newState.tr
-          let modified = false
 
-          // Phase 1: Clean up consecutive ZWS
+          // Phase 1: Clean up consecutive ZWS.
+          // Collect replacements first, then apply in reverse order to avoid
+          // position drift: each insertText changes the document length, so
+          // positions calculated during iteration become invalid after the first
+          // modification. Applying in reverse (highest pos first) keeps earlier
+          // positions valid for subsequent operations.
+          const zwsReplacements = []
           newState.doc.descendants((node, pos) => {
             if (node.isText && node.text) {
-              // Check if the text contains multiple consecutive ZWS
               const text = node.text
               if (text.includes('\u200B\u200B')) {
-                // Replace multiple consecutive ZWS with a single one
                 const cleanedText = text.replace(/\u200B+/g, '\u200B')
                 if (cleanedText !== text) {
-                  tr.insertText(cleanedText, pos, pos + node.nodeSize)
-                  modified = true
+                  zwsReplacements.push({
+                    cleanedText,
+                    pos,
+                    end: pos + node.nodeSize,
+                  })
                 }
               }
             }
           })
+          let modified = Boolean(zwsReplacements.length)
+          for (const { cleanedText, pos, end } of zwsReplacements.reverse()) {
+            tr.insertText(cleanedText, pos, end)
+          }
 
           // Apply cleanup changes before checking for missing ZWS
           const docAfterCleanup = modified ? tr.doc : newState.doc
diff --git a/web-frontend/modules/core/utils/hashing.js b/web-frontend/modules/core/utils/hashing.js
index cefa546a3a..972211275b 100644
--- a/web-frontend/modules/core/utils/hashing.js
+++ b/web-frontend/modules/core/utils/hashing.js
@@ -1,6 +1,9 @@
 import { sha256 } from 'js-sha256'
 
 export function generateHash(value) {
+  if (Number.isInteger(value)) {
+    value = String(value)
+  }
   // TODO MIG do we want to use browser async version
   return sha256(value)
 }
diff --git a/web-frontend/modules/database/components/onboarding/DatabaseScratchTrackStep.vue b/web-frontend/modules/database/components/onboarding/DatabaseScratchTrackStep.vue
index a75f0daa2e..1048dec337 100644
--- a/web-frontend/modules/database/components/onboarding/DatabaseScratchTrackStep.vue
+++ b/web-frontend/modules/database/components/onboarding/DatabaseScratchTrackStep.vue
@@ -43,23 +43,17 @@
       v-show="what !== ''"
       :key="index"
       class="margin-bottom-2"
-      :error="v$['row' + index]?.$error"
       small-label
     >
       <template v-if="index === 0" #label>
         {{ $t('databaseScratchTrackStep.thisIncludes') }}</template
       >
       <FormInput
-        v-model="v$['row' + index].$model"
+        v-model="$data['row' + index]"
         :placeholder="$t('databaseScratchTrackStep.rowName') + '...'"
         size="large"
-        :error="v$['row' + index]?.$error"
         @input="updateValue"
-        @blur="v$['row' + index].$touch"
       />
-      <template #error>
-        {{ v$['row' + index].$errors[0].$message }}
-      </template>
     </FormGroup>
   </div>
 </template>
@@ -126,14 +120,17 @@ export default {
         this.what !== value &&
         Object.prototype.hasOwnProperty.call(this.whatItems, value)
       ) {
-        this.v$.row0.$model = this.whatItems[value][0]
-        this.v$.row1.$model = this.whatItems[value][1]
-        this.v$.row2.$model = this.whatItems[value][2]
+        this.row0 = this.whatItems[value][0]
+        this.row1 = this.whatItems[value][1]
+        this.row2 = this.whatItems[value][2]
       }
 
-      // this.v$.row0?.$touch()
       this.what = value
-      this.updateValue()
+
+      this.$nextTick(() => {
+        this.v$.$touch()
+        this.updateValue()
+      })
     },
     updateValue() {
       this.$nextTick(() => {
@@ -146,16 +143,6 @@ export default {
   validations() {
     const rules = {}
 
-    rules.row0 = {
-      required: helpers.withMessage(this.$t('error.requiredField'), required),
-    }
-    rules.row1 = {
-      required: helpers.withMessage(this.$t('error.requiredField'), required),
-    }
-    rules.row2 = {
-      required: helpers.withMessage(this.$t('error.requiredField'), required),
-    }
-
     if (this.what === 'own') {
       rules.tableName = {
         required: helpers.withMessage(this.$t('error.requiredField'), required),
diff --git a/web-frontend/modules/database/components/view/ViewFilterTypeDate.vue b/web-frontend/modules/database/components/view/ViewFilterTypeDate.vue
index 12a87dfd2c..ad1e437157 100644
--- a/web-frontend/modules/database/components/view/ViewFilterTypeDate.vue
+++ b/web-frontend/modules/database/components/view/ViewFilterTypeDate.vue
@@ -8,7 +8,7 @@
         :placeholder="getDatePlaceholder(field)"
         @focus="$refs.dateContext.toggle($refs.date, 'bottom', 'left', 0)"
         @blur="$refs.dateContext.hide()"
-        @input=";[setCopyFromDateString(dateString, 'dateString')]"
+        @input="setCopyFromDateString($event, 'dateString')"
         @keydown.enter="delayedUpdate(copy, true)"
       >
       </FormInput>
@@ -26,7 +26,7 @@
             :language="datePickerLanguage"
             :open-date="dateObject || new Date()"
             class="datepicker"
-            @updated:model-value="chooseDate($event)"
+            @update:model-value="chooseDate($event)"
           ></date-picker>
         </client-only>
       </Context>
@@ -78,6 +78,22 @@ export default {
       this.setCopy(pickerDate.format('YYYY-MM-DD'), 'dateObject')
       this.delayedUpdate(this.copy, true)
     },
+    setDateObject(date) {
+      // Because of some bugs with parsing and localizing correctly dates
+      // in the vuejs3-datepicker component passed both as string and
+      // dates, we need to localize the date correctly and replace the
+      // timezone with the browser timezone. This is needed to be able to
+      // show the correct date in the datepicker.
+
+      if (date === null) {
+        this.dateObject = null
+        return
+      }
+
+      const pickerDate = date.clone()
+      pickerDate.tz(moment.tz.guess(), true)
+      this.dateObject = pickerDate.toDate()
+    },
     setCopy(value, sender) {
       const [timezone, filterValue] = this.splitCombinedValue(value)
       this.timezoneValue = timezone
@@ -94,14 +110,7 @@ export default {
         this.copy = newDate.format('YYYY-MM-DD')
 
         if (sender !== 'dateObject') {
-          // Because of some bugs with parsing and localizing correctly dates in
-          // the vuejs3-datepicker component passed both as string and dates, we
-          // need to localize the date correctly and replace the timezone with
-          // the browser timezone. This is needed to be able to show the correct
-          // date in the datepicker.
-          const newPickerDate = newDate.clone()
-          newPickerDate.tz(moment.tz.guess(), true)
-          this.dateObject = newPickerDate.toDate()
+          this.setDateObject(newDate)
         }
 
         if (sender !== 'dateString') {
@@ -118,9 +127,9 @@ export default {
 
       const dateFormat = getDateMomentFormat(this.field.date_format)
       const timezone = this.getTimezone()
-      const newDate = moment.utc(value, dateFormat, true)
+      const newDate = moment(value, dateFormat, true)
       if (timezone !== null) {
-        newDate.tz(timezone)
+        newDate.tz(timezone, true)
       }
 
       if (newDate.isValid()) {
@@ -145,7 +154,7 @@ export default {
       dateString: {
         isValidDate(value) {
           const dateFormat = getDateMomentFormat(this.field.date_format)
-          return value === '' || moment.utc(value, dateFormat).isValid()
+          return value === '' || moment(value, dateFormat, true).isValid()
         },
       },
     }
diff --git a/web-frontend/modules/database/components/view/ViewFilterTypeMultiStepDate.vue b/web-frontend/modules/database/components/view/ViewFilterTypeMultiStepDate.vue
index 7c2d2587d8..2b6bfdf5e3 100644
--- a/web-frontend/modules/database/components/view/ViewFilterTypeMultiStepDate.vue
+++ b/web-frontend/modules/database/components/view/ViewFilterTypeMultiStepDate.vue
@@ -47,7 +47,7 @@
           :placeholder="getDatePlaceholder(field)"
           @focus="$refs.dateContext.toggle($refs.date, 'bottom', 'left', 0)"
           @blur="$refs.dateContext.hide()"
-          @input="setCopyFromDateString(dateString, 'dateString')"
+          @input="setCopyFromDateString($event, 'dateString')"
           @keydown.enter="delayedUpdate(copy, true)"
         />
       </span>
@@ -124,6 +124,16 @@ export default {
     operatorLabel(operator) {
       return this.$t(`${operator.stringKey}`)
     },
+    setDateObject(date) {
+      // Because of some bugs with parsing and localizing correctly dates
+      // in the vuejs3-datepicker component passed both as string and
+      // dates, we need to localize the date correctly and replace the
+      // timezone with the browser timezone. This is needed to be able to
+      // show the correct date in the datepicker.
+      const pickerDate = date.clone()
+      pickerDate.tz(moment.tz.guess(), true)
+      this.dateObject = pickerDate.toDate()
+    },
     setCopy(combinedValue, sender) {
       const [timezone, value, operator] = this.splitCombinedValue(combinedValue)
       this.operatorValue = operator
@@ -143,14 +153,7 @@ export default {
           this.copy = newDate.format('YYYY-MM-DD')
 
           if (sender !== 'dateObject') {
-            // Because of some bugs with parsing and localizing correctly dates
-            // in the vuejs3-datepicker component passed both as string and
-            // dates, we need to localize the date correctly and replace the
-            // timezone with the browser timezone. This is needed to be able to
-            // show the correct date in the datepicker.
-            const pickerDate = newDate.clone()
-            pickerDate.tz(moment.tz.guess(), true)
-            this.dateObject = pickerDate.toDate()
+            this.setDateObject(newDate)
           }
 
           if (sender !== 'dateString') {
@@ -189,13 +192,14 @@ export default {
 
       const dateFormat = getDateMomentFormat(this.field.date_format)
       const timezone = this.getTimezone()
-      const newDate = moment.utc(value, dateFormat, true)
+      const newDate = moment(value, dateFormat, true)
       if (timezone !== null) {
-        newDate.tz(timezone)
+        newDate.tz(timezone, true)
       }
 
       if (newDate.isValid()) {
         const dateString = newDate.format('YYYY-MM-DD')
+        this.setDateObject(newDate)
         this.setValue(dateString, sender)
       } else {
         this.copy = value
diff --git a/web-frontend/test/unit/core/formula/ZWSManagementExtension.spec.js b/web-frontend/test/unit/core/formula/ZWSManagementExtension.spec.js
new file mode 100644
index 0000000000..5ef08e7c8f
--- /dev/null
+++ b/web-frontend/test/unit/core/formula/ZWSManagementExtension.spec.js
@@ -0,0 +1,45 @@
+import { Editor } from '@tiptap/core'
+import { Document } from '@tiptap/extension-document'
+import { Text } from '@tiptap/extension-text'
+import { Paragraph } from '@tiptap/extension-paragraph'
+import { ZWSManagementExtension } from '@baserow/modules/core/components/formula/extensions/ZWSManagementExtension'
+
+/**
+ * Creates a minimal TipTap editor with only the ZWSManagementExtension active.
+ */
+function createEditor(content) {
+  return new Editor({
+    extensions: [Document, Paragraph, Text, ZWSManagementExtension],
+    content,
+  })
+}
+
+function triggerAppendTransaction(editor) {
+  editor.view.dispatch(editor.state.tr.setMeta('forceAppendTransaction', true))
+}
+
+describe('ZWSManagementExtension', () => {
+  let editor
+
+  afterEach(() => {
+    editor?.destroy()
+  })
+
+  it('reduces triple and quadruple consecutive ZWS to a single ZWS', () => {
+    editor = createEditor({
+      type: 'doc',
+      content: [
+        {
+          type: 'paragraph',
+          content: [{ type: 'text', text: 'x\u200B\u200B\u200B\u200By' }], // 4× ZWS
+        },
+        {
+          type: 'paragraph',
+          content: [{ type: 'text', text: 'p\u200B\u200B\u200Bq' }], // 3× ZWS
+        },
+      ],
+    })
+
+    expect(() => triggerAppendTransaction(editor)).not.toThrow()
+  })
+})
diff --git a/web-frontend/yarn.lock b/web-frontend/yarn.lock
index e8d165d6e1..ebfd718ddb 100644
--- a/web-frontend/yarn.lock
+++ b/web-frontend/yarn.lock
@@ -5815,9 +5815,9 @@ detect-libc@^2.0.0:
   integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
 
 devalue@^5.1.1, devalue@^5.6.0:
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/devalue/-/devalue-5.6.2.tgz#931e2bb1cc2b299e0f0fb9e4e5be8ebf521a25b8"
-  integrity sha512-nPRkjWzzDQlsejL1WVifk5rvcFi/y1onBRxjaFMjZeR9mFpqu2gmAZ9xUB9/IEanEP/vBtGeGganC/GO1fmufg==
+  version "5.6.3"
+  resolved "https://registry.yarnpkg.com/devalue/-/devalue-5.6.3.tgz#fee7b50bf072f4a4cdf18d1f27de3ce92131f699"
+  integrity sha512-nc7XjUU/2Lb+SvEFVGcWLiKkzfw8+qHI7zn8WYXKkLMgfGSHbgCEaR6bJpev8Cm6Rmrb19Gfd/tZvGqx9is3wg==
 
 devlop@^1.0.0:
   version "1.1.0"
@@ -9795,9 +9795,9 @@ qified@^0.5.3:
     hookified "^1.13.0"
 
 qs@^6.12.3:
-  version "6.14.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.1.tgz#a41d85b9d3902f31d27861790506294881871159"
-  integrity sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.15.0.tgz#db8fd5d1b1d2d6b5b33adaf87429805f1909e7b3"
+  integrity sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==
   dependencies:
     side-channel "^1.1.0"