diff --git a/.github/ISSUE_TEMPLATE/--bug-report.yaml b/.github/ISSUE_TEMPLATE/--bug-report.yaml
index 66f4b81e82..64d4766ed0 100644
--- a/.github/ISSUE_TEMPLATE/--bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/--bug-report.yaml
@@ -2,8 +2,6 @@ name: 🐛 Bug Report
 description: Create a bug report to help improve NocoDB
 title: "🐛 Bug: "
 labels: [Type : Bug]
-assignees:
-- o1lab
 body:
 - type: markdown
   attributes:
diff --git a/.github/ISSUE_TEMPLATE/--feature-request.yaml b/.github/ISSUE_TEMPLATE/--feature-request.yaml
index 74552d7db0..cfdeead034 100644
--- a/.github/ISSUE_TEMPLATE/--feature-request.yaml
+++ b/.github/ISSUE_TEMPLATE/--feature-request.yaml
@@ -2,8 +2,6 @@ name: 🔦 Feature request
 description: Suggest a new/missing feature for NocoDB
 title: "🔦 Feature: "
 labels: [Type : Feature]
-assignees:
-- o1lab
 body:
 - type: markdown
   attributes:
diff --git a/.github/workflows/uffizzi-preview.yml b/.github/workflows/uffizzi-preview.yml
index 6b4842de8c..437d42cc73 100644
--- a/.github/workflows/uffizzi-preview.yml
+++ b/.github/workflows/uffizzi-preview.yml
@@ -13,8 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     outputs:
-      compose-file-cache-key: ${{ env.COMPOSE_FILE_HASH }}
-      pr-number: ${{ env.PR_NUMBER }}
+      compose-file-cache-key: ${{ steps.hash.outputs.COMPOSE_FILE_HASH }}
+      git-ref: ${{ steps.event.outputs.GIT_REF }}
+      pr-number: ${{ steps.event.outputs.PR_NUMBER }}
+      action: ${{ steps.event.outputs.ACTION }}
     steps:
       - name: 'Download artifacts'
         # Fetch output (zip archive) from the workflow run that triggered this workflow.
@@ -29,6 +31,9 @@ jobs:
             let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
               return artifact.name == "preview-spec"
             })[0];
+            if (matchArtifact === undefined) {
+              throw TypeError('Build Artifact not found!');
+            }
             let download = await github.rest.actions.downloadArtifact({
                owner: context.repo.owner,
                repo: context.repo.repo,
@@ -37,44 +42,46 @@ jobs:
             });
             let fs = require('fs');
             fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/preview-spec.zip`, Buffer.from(download.data));
-      
-      - name: 'Unzip artifact'
-        run: unzip preview-spec.zip
-      
+
+      - name: 'Accept event from first stage'
+        run: unzip preview-spec.zip event.json
+
       - name: Read Event into ENV
+        id: event
         run: |
-          echo 'EVENT_JSON<<EOF' >> $GITHUB_ENV
-          cat event.json >> $GITHUB_ENV
-          echo 'EOF' >> $GITHUB_ENV
-      
+          echo PR_NUMBER=$(jq '.number | tonumber' < event.json) >> $GITHUB_OUTPUT
+          echo ACTION=$(jq --raw-output '.action | tostring | [scan("\\w+")][0]' < event.json) >> $GITHUB_OUTPUT
+          echo GIT_REF=$(jq --raw-output '.pull_request.head.sha | tostring | [scan("\\w+")][0]' < event.json) >> $GITHUB_OUTPUT
+
       - name: Hash Rendered Compose File
         id: hash
         # If the previous workflow was triggered by a PR close event, we will not have a compose file artifact.
-        if: ${{ fromJSON(env.EVENT_JSON).action != 'closed' }}
-        run: echo "COMPOSE_FILE_HASH=$(md5sum docker-compose.rendered.yml | awk '{ print $1 }')" >> $GITHUB_ENV
-      
+        if: ${{ steps.event.outputs.ACTION != 'closed' }}
+        run: |
+          unzip preview-spec.zip docker-compose.rendered.yml
+          echo "COMPOSE_FILE_HASH=$(md5sum docker-compose.rendered.yml | awk '{ print $1 }')" >> $GITHUB_OUTPUT
+
       - name: Cache Rendered Compose File
-        if: ${{ fromJSON(env.EVENT_JSON).action != 'closed' }}
+        if: ${{ steps.event.outputs.ACTION != 'closed' }}
         uses: actions/cache@v3
         with:
           path: docker-compose.rendered.yml
-          key: ${{ env.COMPOSE_FILE_HASH }}
+          key: ${{ steps.hash.outputs.COMPOSE_FILE_HASH }}
 
-      - name: Read PR Number From Event Object
-        id: pr
-        run: echo "PR_NUMBER=${{ fromJSON(env.EVENT_JSON).number }}" >> $GITHUB_ENV
-      
       - name: DEBUG - Print Job Outputs
         if: ${{ runner.debug }}
         run: |
-          echo "PR number: ${{ env.PR_NUMBER }}"
-          echo "Compose file hash: ${{ env.COMPOSE_FILE_HASH }}"
+          echo "PR number: ${{ steps.event.outputs.PR_NUMBER }}"
+          echo "Git Ref: ${{ steps.event.outputs.GIT_REF }}"
+          echo "Action: ${{ steps.event.outputs.ACTION }}"
+          echo "Compose file hash: ${{ steps.hash.outputs.COMPOSE_FILE_HASH }}"
           cat event.json
 
   deploy-uffizzi-preview:
     name: Use Remote Workflow to Preview on Uffizzi
     needs:
       - cache-compose-file
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     uses: UffizziCloud/preview-action/.github/workflows/reusable.yaml@v2
     with:
       # If this workflow was triggered by a PR close event, cache-key will be an empty string
diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index 46a6954999..b9d6529c4a 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -43,10 +43,6 @@ body {
   height: var(--topbar-height) !important;
 }
 
-.anticon-check-circle {
-  @apply !relative top-[-1px] left-0;
-}
-
 html,
 body,
 #__nuxt,
@@ -61,7 +57,7 @@ main {
 }
 
 .mobile {
-  .nc-scrollbar-md, .nc-scrollbar-x-md, .nc-scrollbar-dark-md, .nc-scrollbar-x-md-dark, .nc-scrollbar-x-lg {
+  .nc-scrollbar-md, .nc-scrollbar-lg, .nc-scrollbar-x-md, .nc-scrollbar-dark-md, .nc-scrollbar-x-md-dark, .nc-scrollbar-x-lg {
     &::-webkit-scrollbar {
       width: 0px;
     }
@@ -92,6 +88,30 @@ main {
   }
 }
 
+.nc-scrollbar-lg {
+  overflow-y: scroll;
+  overflow-x: hidden;
+  scrollbar-width: thin !important;
+
+  &::-webkit-scrollbar {
+    width: 10px;
+    height: 10px;
+  }
+  &::-webkit-scrollbar-track-piece {
+    width: 0px;
+  }
+  &::-webkit-scrollbar {
+    @apply bg-transparent;
+  }
+  &::-webkit-scrollbar-thumb {
+    width: 4px;
+    @apply bg-gray-200;
+  }
+  &::-webkit-scrollbar-thumb:hover {
+    @apply bg-gray-300;
+  }
+}
+
 .nc-scrollbar-x-md {
   overflow-x: scroll;
   scrollbar-width: thin !important;
@@ -701,4 +721,7 @@ input[type='number'] {
 
 .ant-message-notice-content {
   @apply !rounded-md;
+  .ant-message-custom-content{
+    @apply flex items-center
+  }
 }
\ No newline at end of file
diff --git a/packages/nc-gui/components/account/UserList.vue b/packages/nc-gui/components/account/UserList.vue
index c5d5293651..1a501e4c0d 100644
--- a/packages/nc-gui/components/account/UserList.vue
+++ b/packages/nc-gui/components/account/UserList.vue
@@ -261,7 +261,7 @@ const openDeleteModal = (user: UserType) => {
               <div
                 class="flex items-center gap-2"
                 :class="{
-                  'opacity-0': el.roles?.includes('super'),
+                  'opacity-0 pointer-events-none': el.roles?.includes('super'),
                 }"
               >
                 <NcDropdown :trigger="['click']">
diff --git a/packages/nc-gui/components/account/UsersModal.vue b/packages/nc-gui/components/account/UsersModal.vue
index 1d6f6fd055..096dc3761b 100644
--- a/packages/nc-gui/components/account/UsersModal.vue
+++ b/packages/nc-gui/components/account/UsersModal.vue
@@ -34,6 +34,8 @@ const { copy } = useCopy()
 
 const { dashboardUrl } = useDashboard()
 
+const { clearBasesUser } = useBases()
+
 const usersData = ref<Users>({ emails: '', role: OrgUserRoles.VIEWER, invitationToken: undefined })
 
 const formRef = ref()
@@ -64,6 +66,8 @@ const saveUser = async () => {
 
     // Successfully updated the user details
     message.success(t('msg.success.userAdded'))
+
+    clearBasesUser()
   } catch (e: any) {
     console.error(e)
     message.error(await extractSdkResponseErrorMsg(e))
diff --git a/packages/nc-gui/components/cell/Checkbox.vue b/packages/nc-gui/components/cell/Checkbox.vue
index be70d8d314..36c57dbc1c 100644
--- a/packages/nc-gui/components/cell/Checkbox.vue
+++ b/packages/nc-gui/components/cell/Checkbox.vue
@@ -42,6 +42,8 @@ const readOnly = inject(ReadonlyInj)
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))
 
+const rowHeight = inject(RowHeightInj, ref())
+
 const checkboxMeta = computed(() => {
   return {
     icon: {
@@ -82,18 +84,28 @@ useSelectedCellKeyupListener(active, (e) => {
 
 <template>
   <div
-    class="flex cursor-pointer w-full h-full items-center"
+    class="flex cursor-pointer w-full h-full items-center focus:outline-transparent"
     :class="{
       'w-full flex-start pl-2': isForm || isGallery || isExpandedFormOpen,
       'w-full justify-center': !isForm && !isGallery && !isExpandedFormOpen,
       'nc-cell-hover-show': !vModel && !readOnly,
       'opacity-0': readOnly && !vModel,
     }"
+    :style="{
+      height:
+        isForm || isExpandedFormOpen || isGallery || isEditColumnMenu ? undefined : `max(${(rowHeight || 1) * 1.8}rem, 41px)`,
+    }"
+    tabindex="0"
     @click="onClick(false, $event)"
+    @keydown.enter.stop="onClick(false, $event)"
   >
     <div
-      class="items-center"
-      :class="{ 'w-full justify-start': isEditColumnMenu || isGallery || isForm, 'py-2': isEditColumnMenu }"
+      class="flex items-center"
+      :class="{
+        'w-full justify-start': isEditColumnMenu || isGallery || isForm,
+        'justify-center': !isEditColumnMenu && !isGallery && !isForm,
+        'py-2': isEditColumnMenu,
+      }"
       @click="onClick(true)"
     >
       <Transition name="layout" mode="out-in" :duration="100">
diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index 3bf10c83e5..a3e07c780c 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -78,7 +78,7 @@ onMounted(() => {
     :ref="focus"
     v-model="vModel"
     type="number"
-    class="w-full h-full text-sm border-none rounded-md outline-none"
+    class="w-full h-full text-sm border-none rounded-md outline-none focus:outline-transparent focus:ring-0"
     :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="submitCurrency"
     @keydown.down.stop
diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue
index 82e08d95b0..6c6568b4e8 100644
--- a/packages/nc-gui/components/cell/DatePicker.vue
+++ b/packages/nc-gui/components/cell/DatePicker.vue
@@ -238,6 +238,7 @@ const clickHandler = () => {
   <a-date-picker
     v-model:value="localState"
     :picker="picker"
+    tabindex="0"
     :bordered="false"
     class="!w-full !px-1 !border-none"
     :class="{ 'nc-null': modelValue === null && showNull }"
@@ -249,6 +250,7 @@ const clickHandler = () => {
     :open="isOpen"
     @click="clickHandler"
     @update:open="updateOpen"
+    @keydown.enter="open = !open"
   >
     <template #suffixIcon></template>
   </a-date-picker>
diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue
index 0093fc4bce..f02780e069 100644
--- a/packages/nc-gui/components/cell/DateTimePicker.vue
+++ b/packages/nc-gui/components/cell/DateTimePicker.vue
@@ -303,6 +303,7 @@ const isColDisabled = computed(() => {
     :open="isOpen"
     @click="clickHandler"
     @ok="okHandler"
+    @keydown.enter="open = !open"
   >
     <template #suffixIcon></template>
   </a-date-picker>
diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue
index b531a07bb6..e5185aa97d 100644
--- a/packages/nc-gui/components/cell/MultiSelect.vue
+++ b/packages/nc-gui/components/cell/MultiSelect.vue
@@ -1,12 +1,10 @@
 <script lang="ts" setup>
-import { onUnmounted } from '@vue/runtime-core'
 import { message } from 'ant-design-vue'
 import tinycolor from 'tinycolor2'
 import type { Select as AntSelect } from 'ant-design-vue'
 import type { SelectOptionType, SelectOptionsType } from 'nocodb-sdk'
 import {
   ActiveCellInj,
-  CellClickHookInj,
   ColumnInj,
   EditColumnInj,
   EditModeInj,
@@ -53,14 +51,14 @@ const isEditable = inject(EditModeInj, ref(false))
 
 const activeCell = inject(ActiveCellInj, ref(false))
 
+const isForm = inject(IsFormInj, ref(false))
+
 // use both ActiveCellInj or EditModeInj to determine the active state
 // since active will be false in case of form view
-const active = computed(() => activeCell.value || isEditable.value)
+const active = computed(() => activeCell.value || isEditable.value || isForm.value)
 
 const isPublic = inject(IsPublicInj, ref(false))
 
-const isForm = inject(IsFormInj, ref(false))
-
 const isEditColumn = inject(EditColumnInj, ref(false))
 
 const rowHeight = inject(RowHeightInj, ref(undefined))
@@ -71,6 +69,8 @@ const aselect = ref<typeof AntSelect>()
 
 const isOpen = ref(false)
 
+const isFocusing = ref(false)
+
 const isKanban = inject(IsKanbanInj, ref(false))
 
 const searchVal = ref<string | null>()
@@ -180,9 +180,7 @@ watch(isOpen, (n, _o) => {
   if (!n) searchVal.value = ''
 
   if (editAllowed.value) {
-    if (!n) {
-      aselect.value?.$el?.querySelector('input')?.blur()
-    } else {
+    if (n) {
       aselect.value?.$el?.querySelector('input')?.focus()
     }
   }
@@ -299,22 +297,11 @@ const onTagClick = (e: Event, onClose: Function) => {
   }
 }
 
-const cellClickHook = inject(CellClickHookInj, null)
-
 const toggleMenu = () => {
-  if (cellClickHook) return
-  isOpen.value = editAllowed.value && !isOpen.value
-}
+  if (isFocusing.value) return
 
-const cellClickHookHandler = () => {
   isOpen.value = editAllowed.value && !isOpen.value
 }
-onMounted(() => {
-  cellClickHook?.on(cellClickHookHandler)
-})
-onUnmounted(() => {
-  cellClickHook?.on(cellClickHookHandler)
-})
 
 const handleClose = (e: MouseEvent) => {
   // close dropdown if clicked outside of dropdown
@@ -341,6 +328,26 @@ const selectedOpts = computed(() => {
     return selectedOptions
   }, [])
 })
+
+const onKeyDown = (e: KeyboardEvent) => {
+  // Tab
+  if (e.key === 'Tab') {
+    isOpen.value = false
+    return
+  }
+
+  e.stopPropagation()
+}
+
+const onFocus = () => {
+  isFocusing.value = true
+
+  setTimeout(() => {
+    isFocusing.value = false
+  }, 250)
+
+  isOpen.value = true
+}
 </script>
 
 <template>
@@ -357,7 +364,7 @@ const selectedOpts = computed(() => {
       }"
     >
       <template v-for="selectedOpt of selectedOpts" :key="selectedOpt.value">
-        <a-tag class="rounded-tag" :color="selectedOpt.color">
+        <a-tag class="rounded-tag max-w-full" :color="selectedOpt.color">
           <span
             :style="{
               'color': tinycolor.isReadable(selectedOpt.color || '#ccc', '#fff', { level: 'AA', size: 'large' })
@@ -367,7 +374,21 @@ const selectedOpts = computed(() => {
             }"
             :class="{ 'text-sm': isKanban }"
           >
-            {{ selectedOpt.title }}
+            <NcTooltip class="truncate max-w-full" show-on-truncate-only>
+              <template #title>
+                {{ selectedOpt.title }}
+              </template>
+              <span
+                class="text-ellipsis overflow-hidden"
+                :style="{
+                  wordBreak: 'keep-all',
+                  whiteSpace: 'nowrap',
+                  display: 'inline',
+                }"
+              >
+                {{ selectedOpt.title }}
+              </span>
+            </NcTooltip>
           </span>
         </a-tag>
       </template>
@@ -389,7 +410,9 @@ const selectedOpts = computed(() => {
       :class="{ 'caret-transparent': !hasEditRoles }"
       :dropdown-class-name="`nc-dropdown-multi-select-cell !min-w-200px ${isOpen ? 'active' : ''}`"
       @search="search"
-      @keydown.stop
+      @keydown="onKeyDown"
+      @focus="onFocus"
+      @blur="isOpen = false"
     >
       <template #suffixIcon>
         <GeneralIcon icon="arrowDown" class="text-gray-700 nc-select-expand-btn" />
@@ -402,7 +425,7 @@ const selectedOpts = computed(() => {
         :class="`nc-select-option-${column.title}-${op.title}`"
         @click.stop
       >
-        <a-tag class="rounded-tag" :color="op.color">
+        <a-tag class="rounded-tag max-w-full" :color="op.color">
           <span
             :style="{
               'color': tinycolor.isReadable(op.color || '#ccc', '#fff', { level: 'AA', size: 'large' })
@@ -412,7 +435,21 @@ const selectedOpts = computed(() => {
             }"
             :class="{ 'text-sm': isKanban }"
           >
-            {{ op.title }}
+            <NcTooltip class="truncate max-w-full" show-on-truncate-only>
+              <template #title>
+                {{ op.title }}
+              </template>
+              <span
+                class="text-ellipsis overflow-hidden"
+                :style="{
+                  wordBreak: 'keep-all',
+                  whiteSpace: 'nowrap',
+                  display: 'inline',
+                }"
+              >
+                {{ op.title }}
+              </span>
+            </NcTooltip>
           </span>
         </a-tag>
       </a-select-option>
@@ -530,3 +567,10 @@ const selectedOpts = computed(() => {
   @apply !text-xs;
 }
 </style>
+
+<style lang="scss">
+.ant-select-item-option-content,
+.ant-select-item-option-state {
+  @apply !flex !items-center;
+}
+</style>
diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index 516ddfe294..36b858229b 100644
--- a/packages/nc-gui/components/cell/Percent.vue
+++ b/packages/nc-gui/components/cell/Percent.vue
@@ -20,6 +20,8 @@ const isEditColumn = inject(EditColumnInj, ref(false))
 
 const _vModel = useVModel(props, 'modelValue', emits)
 
+const wrapperRef = ref<HTMLElement>()
+
 const vModel = computed({
   get: () => _vModel.value,
   set: (value) => {
@@ -56,6 +58,18 @@ const onBlur = () => {
 
 const onFocus = () => {
   cellFocused.value = true
+  editEnabled.value = true
+  expandedEditEnabled.value = true
+}
+
+const onWrapperFocus = () => {
+  cellFocused.value = true
+  editEnabled.value = true
+  expandedEditEnabled.value = true
+
+  nextTick(() => {
+    wrapperRef.value?.querySelector('input')?.focus()
+  })
 }
 
 const onMouseover = () => {
@@ -67,10 +81,41 @@ const onMouseleave = () => {
     expandedEditEnabled.value = false
   }
 }
+
+const onTabPress = (e: KeyboardEvent) => {
+  if (e.shiftKey) {
+    e.preventDefault()
+
+    // Shift + Tab does not work for percent cell
+    // so we manually focus on the last form item
+
+    const focusesNcCellIndex = Array.from(document.querySelectorAll('.nc-expanded-form-row .nc-data-cell')).findIndex((el) => {
+      return el.querySelector('.nc-filter-value-select') === wrapperRef.value
+    })
+
+    if (focusesNcCellIndex >= 0) {
+      const nodes = document.querySelectorAll('.nc-expanded-form-row .nc-data-cell')
+      for (let i = focusesNcCellIndex - 1; i >= 0; i--) {
+        const lastFormItem = nodes[i].querySelector('[tabindex="0"]') as HTMLElement
+        if (lastFormItem) {
+          lastFormItem.focus()
+          break
+        }
+      }
+    }
+  }
+}
 </script>
 
 <template>
-  <div class="nc-filter-value-select w-full" @mouseover="onMouseover" @mouseleave="onMouseleave">
+  <div
+    ref="wrapperRef"
+    tabindex="0"
+    class="nc-filter-value-select w-full focus:outline-transparent"
+    @mouseover="onMouseover"
+    @mouseleave="onMouseleave"
+    @focus="onWrapperFocus"
+  >
     <input
       v-if="(!isExpandedFormOpen && editEnabled) || (isExpandedFormOpen && expandedEditEnabled)"
       :ref="focus"
@@ -86,6 +131,7 @@ const onMouseleave = () => {
       @keydown.right.stop
       @keydown.up.stop
       @keydown.delete.stop
+      @keydown.tab="onTabPress"
       @selectstart.capture.stop
       @mousedown.stop
     />
diff --git a/packages/nc-gui/components/cell/Rating.vue b/packages/nc-gui/components/cell/Rating.vue
index 3e6299b212..6bb9244c15 100644
--- a/packages/nc-gui/components/cell/Rating.vue
+++ b/packages/nc-gui/components/cell/Rating.vue
@@ -36,14 +36,37 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEven
     vModel.value = +e.key === +vModel.value ? 0 : +e.key
   }
 })
+
+const onKeyPress = (e: KeyboardEvent) => {
+  if (/^\d$/.test(e.key)) {
+    e.stopPropagation()
+    vModel.value = +e.key === +vModel.value ? 0 : +e.key
+  }
+}
+
+const rateDomRef = ref()
+
+// Remove tabindex from rate inputs set by antd
+watch(rateDomRef, () => {
+  if (!rateDomRef.value) return
+
+  const rateInputs = rateDomRef.value.$el.querySelectorAll('div[role="radio"]')
+  if (!rateInputs) return
+
+  for (let i = 0; i < rateInputs.length; i++) {
+    rateInputs[i].setAttribute('tabindex', '-1')
+  }
+})
 </script>
 
 <template>
   <a-rate
+    ref="rateDomRef"
     v-model:value="vModel"
     :disabled="readonly"
     :count="ratingMeta.max"
     :style="`color: ${ratingMeta.color}; padding: 0px 5px`"
+    @keydown="onKeyPress"
   >
     <template #character>
       <MdiStar v-if="ratingMeta.icon.full === 'mdi-star'" class="text-sm" />
diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue
index e2c6522d86..c9a73f0cf2 100644
--- a/packages/nc-gui/components/cell/RichText.vue
+++ b/packages/nc-gui/components/cell/RichText.vue
@@ -19,6 +19,8 @@ const props = defineProps<{
 
 const emits = defineEmits(['update:value'])
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
+
 const turndownService = new TurndownService({})
 
 turndownService.addRule('lineBreak', {
@@ -108,7 +110,7 @@ const editor = useEditor({
   editable: !props.readonly,
 })
 
-const setEditorContent = (contentMd: any) => {
+const setEditorContent = (contentMd: any, focusEndOfDoc?: boolean) => {
   if (!editor.value) return
 
   const selection = editor.value.view.state.selection
@@ -120,6 +122,15 @@ const setEditorContent = (contentMd: any) => {
   editor.value.chain().setContent(content).setTextSelection(selection.to).run()
 
   setTimeout(() => {
+    if (focusEndOfDoc) {
+      const docSize = editor.value!.state.doc.nodeSize
+
+      editor.value
+        ?.chain()
+        .setTextSelection(docSize - 1)
+        .run()
+    }
+
     ;(editor.value!.state as any).history$.prevRanges = null
     ;(editor.value!.state as any).history$.done.eventCount = 0
   }, 100)
@@ -134,7 +145,7 @@ if (props.syncValueChange) {
 watch(editorDom, () => {
   if (!editorDom.value) return
 
-  setEditorContent(vModel.value)
+  setEditorContent(vModel.value, true)
 
   // Focus editor after editor is mounted
   setTimeout(() => {
@@ -162,7 +173,8 @@ watch(editorDom, () => {
       class="flex flex-col nc-textarea-rich-editor w-full"
       :class="{
         'ml-1 mt-2.5 flex-grow': props.fullMode,
-        'nc-scrollbar-md': !props.fullMode && !props.readonly,
+        'nc-scrollbar-md': (!props.fullMode && !props.readonly) || isExpandedFormOpen,
+        'flex-grow': isExpandedFormOpen,
       }"
     />
   </div>
diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue
index 1b4ec5907c..7b39081220 100644
--- a/packages/nc-gui/components/cell/SingleSelect.vue
+++ b/packages/nc-gui/components/cell/SingleSelect.vue
@@ -1,12 +1,10 @@
 <script lang="ts" setup>
-import { onUnmounted } from '@vue/runtime-core'
 import { message } from 'ant-design-vue'
 import tinycolor from 'tinycolor2'
 import type { Select as AntSelect } from 'ant-design-vue'
 import type { SelectOptionType } from 'nocodb-sdk'
 import {
   ActiveCellInj,
-  CellClickHookInj,
   ColumnInj,
   EditColumnInj,
   EditModeInj,
@@ -47,9 +45,11 @@ const isEditable = inject(EditModeInj, ref(false))
 
 const activeCell = inject(ActiveCellInj, ref(false))
 
+const isForm = inject(IsFormInj, ref(false))
+
 // use both ActiveCellInj or EditModeInj to determine the active state
 // since active will be false in case of form view
-const active = computed(() => activeCell.value || isEditable.value)
+const active = computed(() => activeCell.value || isEditable.value || isForm.value)
 
 const aselect = ref<typeof AntSelect>()
 
@@ -61,8 +61,6 @@ const isPublic = inject(IsPublicInj, ref(false))
 
 const isEditColumn = inject(EditColumnInj, ref(false))
 
-const isForm = inject(IsFormInj, ref(false))
-
 const { $api } = useNuxtApp()
 
 const searchVal = ref()
@@ -77,6 +75,8 @@ const { isPg, isMysql } = useBase()
 // temporary until it's add the option to column meta
 const tempSelectedOptState = ref<string>()
 
+const isFocusing = ref(false)
+
 const isNewOptionCreateEnabled = computed(() => !isPublic.value && !disableOptionCreation && isUIAllowed('fieldEdit'))
 
 const options = computed<(SelectOptionType & { value: string })[]>(() => {
@@ -97,7 +97,7 @@ const isOptionMissing = computed(() => {
   return (options.value ?? []).every((op) => op.title !== searchVal.value)
 })
 
-const hasEditRoles = computed(() => isUIAllowed('dataEdit'))
+const hasEditRoles = computed(() => isUIAllowed('dataEdit') || isForm.value)
 
 const editAllowed = computed(() => (hasEditRoles.value || isForm.value) && active.value)
 
@@ -215,6 +215,14 @@ const onKeydown = (e: KeyboardEvent) => {
   if (e.key === 'Enter') {
     e.stopPropagation()
   }
+
+  if (e.key === 'Escape') {
+    isOpen.value = false
+
+    setTimeout(() => {
+      aselect.value?.$el.querySelector('.ant-select-selection-search > input').focus()
+    }, 100)
+  }
 }
 
 const onSelect = () => {
@@ -222,8 +230,6 @@ const onSelect = () => {
   isEditable.value = false
 }
 
-const cellClickHook = inject(CellClickHookInj, null)
-
 const toggleMenu = (e: Event) => {
   // todo: refactor
   // check clicked element is clear icon
@@ -234,19 +240,11 @@ const toggleMenu = (e: Event) => {
     vModel.value = ''
     return e.stopPropagation()
   }
-  if (cellClickHook) return
-  isOpen.value = editAllowed.value && !isOpen.value
-}
 
-const cellClickHookHandler = () => {
+  if (isFocusing.value) return
+
   isOpen.value = editAllowed.value && !isOpen.value
 }
-onMounted(() => {
-  cellClickHook?.on(cellClickHookHandler)
-})
-onUnmounted(() => {
-  cellClickHook?.on(cellClickHookHandler)
-})
 
 const handleClose = (e: MouseEvent) => {
   if (isOpen.value && aselect.value && !aselect.value.$el.contains(e.target)) {
@@ -259,12 +257,27 @@ useEventListener(document, 'click', handleClose, true)
 const selectedOpt = computed(() => {
   return options.value.find((o) => o.value === vModel.value || o.value === vModel.value?.trim())
 })
+
+const onFocus = () => {
+  isFocusing.value = true
+
+  setTimeout(() => {
+    isFocusing.value = false
+  }, 250)
+
+  isOpen.value = true
+}
 </script>
 
 <template>
-  <div class="h-full w-full flex items-center nc-single-select" :class="{ 'read-only': readOnly }" @click="toggleMenu">
-    <div v-if="!(active || isEditable)">
-      <a-tag v-if="selectedOpt" class="rounded-tag" :color="selectedOpt.color">
+  <div
+    class="h-full w-full flex items-center nc-single-select focus:outline-transparent"
+    :class="{ 'read-only': readOnly }"
+    @click="toggleMenu"
+    @keydown.enter.stop.prevent="toggleMenu"
+  >
+    <div v-if="!(active || isEditable)" class="w-full">
+      <a-tag v-if="selectedOpt" class="rounded-tag max-w-full" :color="selectedOpt.color">
         <span
           :style="{
             'color': tinycolor.isReadable(selectedOpt.color || '#ccc', '#fff', { level: 'AA', size: 'large' })
@@ -274,12 +287,26 @@ const selectedOpt = computed(() => {
           }"
           :class="{ 'text-sm': isKanban }"
         >
-          {{ selectedOpt.title }}
+          <NcTooltip class="truncate max-w-full" show-on-truncate-only>
+            <template #title>
+              {{ selectedOpt.title }}
+            </template>
+            <span
+              class="text-ellipsis overflow-hidden"
+              :style="{
+                wordBreak: 'keep-all',
+                whiteSpace: 'nowrap',
+                display: 'inline',
+              }"
+            >
+              {{ selectedOpt.title }}
+            </span>
+          </NcTooltip>
         </span>
       </a-tag>
     </div>
 
-    <a-select
+    <NcSelect
       v-else
       ref="aselect"
       v-model:value="vModel"
@@ -290,12 +317,14 @@ const selectedOpt = computed(() => {
       :bordered="false"
       :open="isOpen && editAllowed"
       :disabled="readOnly || !editAllowed"
-      :show-arrow="hasEditRoles && !readOnly && active && vModel === null"
-      :dropdown-class-name="`nc-dropdown-single-select-cell !min-w-200px ${isOpen && active ? 'active' : ''}`"
       :show-search="!isMobileMode && isOpen && active"
+      :show-arrow="hasEditRoles && !readOnly && active && (vModel === null || vModel === undefined)"
+      :dropdown-class-name="`nc-dropdown-single-select-cell ${isOpen && active ? 'active' : ''}`"
       @select="onSelect"
       @keydown="onKeydown($event)"
       @search="search"
+      @blur="isOpen = false"
+      @focus="onFocus"
     >
       <a-select-option
         v-for="op of options"
@@ -305,7 +334,7 @@ const selectedOpt = computed(() => {
         :class="`nc-select-option-${column.title}-${op.title}`"
         @click.stop
       >
-        <a-tag class="rounded-tag" :color="op.color">
+        <a-tag class="rounded-tag max-w-full" :color="op.color">
           <span
             :style="{
               'color': tinycolor.isReadable(op.color || '#ccc', '#fff', { level: 'AA', size: 'large' })
@@ -315,7 +344,21 @@ const selectedOpt = computed(() => {
             }"
             :class="{ 'text-sm': isKanban }"
           >
-            {{ op.title }}
+            <NcTooltip class="truncate max-w-full" show-on-truncate-only>
+              <template #title>
+                {{ op.title }}
+              </template>
+              <span
+                class="text-ellipsis overflow-hidden"
+                :style="{
+                  wordBreak: 'keep-all',
+                  whiteSpace: 'nowrap',
+                  display: 'inline',
+                }"
+              >
+                {{ op.title }}
+              </span>
+            </NcTooltip>
           </span>
         </a-tag>
       </a-select-option>
@@ -327,7 +370,7 @@ const selectedOpt = computed(() => {
           </div>
         </div>
       </a-select-option>
-    </a-select>
+    </NcSelect>
   </div>
 </template>
 
@@ -342,6 +385,7 @@ const selectedOpt = computed(() => {
 
 :deep(.ant-select-clear) {
   opacity: 1;
+  border-radius: 100%;
 }
 
 .nc-single-select:not(.read-only) {
@@ -363,3 +407,9 @@ const selectedOpt = computed(() => {
   @apply block;
 }
 </style>
+
+<style lang="scss">
+.ant-select-item-option-content {
+  @apply !flex !items-center;
+}
+</style>
diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index 1f5fe5307c..b87e13af1d 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -58,7 +58,9 @@ const isDragging = ref(false)
 const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLTextAreaElement)?.focus()
 
 const height = computed(() => {
-  if (!rowHeight.value || rowHeight.value === 1) return 36
+  if (isExpandedFormOpen.value) return 36 * 4
+
+  if (!rowHeight.value || rowHeight.value === 1 || isEditColumn.value) return 36
 
   return rowHeight.value * 36
 })
@@ -169,16 +171,16 @@ watch(editEnabled, () => {
 <template>
   <NcDropdown
     v-model:visible="isVisible"
-    class="overflow-visible"
+    class="overflow-hidden group"
     :trigger="[]"
     placement="bottomLeft"
     :overlay-class-name="isVisible ? 'nc-textarea-dropdown-active' : undefined"
   >
     <div
-      class="flex flex-row pt-0.5 w-full rich-wrapper"
+      class="flex flex-row pt-0.5 w-full long-text-wrapper"
       :class="{
-        'min-h-10': rowHeight !== 1,
-        'min-h-6.5': rowHeight === 1,
+        'min-h-10': rowHeight !== 1 || isExpandedFormOpen,
+        'min-h-9': rowHeight === 1 && !isExpandedFormOpen,
         'h-full': isForm,
       }"
     >
@@ -198,7 +200,7 @@ watch(editEnabled, () => {
         :ref="focus"
         v-model="vModel"
         rows="4"
-        class="h-full w-full outline-none border-none"
+        class="h-full w-full outline-none border-none nc-scrollbar-lg"
         :class="{
           'p-2': editEnabled,
           'py-1 h-full': isForm,
@@ -239,8 +241,13 @@ watch(editEnabled, () => {
       <NcTooltip
         v-if="!isVisible"
         placement="bottom"
-        class="!absolute right-0 bottom-1 nc-text-area-expand-btn"
-        :class="{ 'right-0 bottom-1': editEnabled, '!bottom-0': !isRichMode }"
+        class="!absolute right-0 bottom-1 hidden nc-text-area-expand-btn"
+        :class="{
+          'right-0 bottom-1': editEnabled,
+          '!bottom-0': !isRichMode,
+          'top-1 hidden !group-hover:block': isExpandedFormOpen,
+          'bottom-1': !isExpandedFormOpen,
+        }"
       >
         <template #title>{{ $t('title.expand') }}</template>
         <NcButton type="secondary" size="xsmall" data-testid="attachment-cell-file-picker-button" @click.stop="onExpand">
@@ -300,6 +307,6 @@ textarea:focus {
 
 <style lang="scss">
 .cell:hover .nc-text-area-expand-btn {
-  @apply !block;
+  @apply !block cursor-pointer;
 }
 </style>
diff --git a/packages/nc-gui/components/cell/User.vue b/packages/nc-gui/components/cell/User.vue
new file mode 100644
index 0000000000..31e59ff727
--- /dev/null
+++ b/packages/nc-gui/components/cell/User.vue
@@ -0,0 +1,435 @@
+<script lang="ts" setup>
+import { onUnmounted } from '@vue/runtime-core'
+import tinycolor from 'tinycolor2'
+import type { Select as AntSelect } from 'ant-design-vue'
+import type { UserFieldRecordType } from 'nocodb-sdk'
+import {
+  ActiveCellInj,
+  CellClickHookInj,
+  ColumnInj,
+  EditColumnInj,
+  EditModeInj,
+  IsKanbanInj,
+  ReadonlyInj,
+  RowHeightInj,
+  computed,
+  h,
+  inject,
+  isDrawerOrModalExist,
+  onMounted,
+  ref,
+  useEventListener,
+  useRoles,
+  useSelectedCellKeyupListener,
+  watch,
+} from '#imports'
+import MdiCloseCircle from '~icons/mdi/close-circle'
+
+interface Props {
+  modelValue?: UserFieldRecordType[] | string | null
+  rowIndex?: number
+  location?: 'cell' | 'filter'
+  forceMulti?: boolean
+}
+
+const { modelValue, forceMulti } = defineProps<Props>()
+
+const emit = defineEmits(['update:modelValue'])
+
+const { isMobileMode } = useGlobal()
+
+const meta = inject(MetaInj)!
+
+const column = inject(ColumnInj)!
+
+const readOnly = inject(ReadonlyInj)!
+
+const isEditable = inject(EditModeInj, ref(false))
+
+const activeCell = inject(ActiveCellInj, ref(false))
+
+const basesStore = useBases()
+
+const { basesUser } = storeToRefs(basesStore)
+
+const baseUsers = computed(() => (meta.value.base_id ? basesUser.value.get(meta.value.base_id) || [] : []))
+
+// use both ActiveCellInj or EditModeInj to determine the active state
+// since active will be false in case of form view
+const active = computed(() => activeCell.value || isEditable.value)
+
+const isForm = inject(IsFormInj, ref(false))
+
+const isEditColumn = inject(EditColumnInj, ref(false))
+
+const isMultiple = computed(() => forceMulti || (column.value.meta as { is_multi: boolean; notify: boolean })?.is_multi)
+
+const rowHeight = inject(RowHeightInj, ref(undefined))
+
+const aselect = ref<typeof AntSelect>()
+
+const isOpen = ref(false)
+
+const isKanban = inject(IsKanbanInj, ref(false))
+
+const searchVal = ref<string | null>()
+
+const { isUIAllowed } = useRoles()
+
+const options = computed<UserFieldRecordType[]>(() => {
+  const collaborators: UserFieldRecordType[] = []
+
+  collaborators.push(
+    ...(baseUsers.value?.map((user: any) => ({
+      id: user.id,
+      email: user.email,
+      display_name: user.display_name,
+      deleted: user.deleted,
+    })) || []),
+  )
+  return collaborators
+})
+
+const hasEditRoles = computed(() => isUIAllowed('dataEdit'))
+
+const editAllowed = computed(() => (hasEditRoles.value || isForm.value) && active.value)
+
+const vModel = computed({
+  get: () => {
+    let selected: { label: string; value: string }[] = []
+    if (typeof modelValue === 'string') {
+      const idsOrMails = modelValue.split(',').map((idOrMail) => idOrMail.trim())
+      selected = idsOrMails.reduce((acc, idOrMail) => {
+        const user = options.value.find((u) => u.id === idOrMail || u.email === idOrMail)
+        if (user) {
+          acc.push({
+            label: user?.display_name || user?.email,
+            value: user.id,
+          })
+        }
+        return acc
+      }, [] as { label: string; value: string }[])
+    } else {
+      selected =
+        modelValue?.reduce((acc, item) => {
+          const label = item?.display_name || item?.email
+          if (label) {
+            acc.push({
+              label,
+              value: item.id,
+            })
+          }
+          return acc
+        }, [] as { label: string; value: string }[]) || []
+    }
+
+    return selected
+  },
+  set: (val) => {
+    const value: string[] = []
+    if (val && val.length) {
+      val.forEach((item) => {
+        // @ts-expect-error antd select returns string[] instead of { label: string, value: string }[]
+        const user = options.value.find((u) => u.id === item)
+        if (user) {
+          value.push(user.id)
+        }
+      })
+    }
+    if (isMultiple.value) {
+      emit('update:modelValue', val?.length ? value.join(',') : null)
+    } else {
+      emit('update:modelValue', val?.length ? value[value.length - 1] : null)
+      isOpen.value = false
+    }
+  },
+})
+
+watch(isOpen, (n, _o) => {
+  if (!n) searchVal.value = ''
+
+  if (editAllowed.value) {
+    if (!n) {
+      aselect.value?.$el?.querySelector('input')?.blur()
+    } else {
+      aselect.value?.$el?.querySelector('input')?.focus()
+    }
+  }
+})
+
+// set isOpen to false when active cell is changed
+watch(active, (n, _o) => {
+  if (!n) isOpen.value = false
+})
+
+useSelectedCellKeyupListener(activeCell, (e) => {
+  switch (e.key) {
+    case 'Escape':
+      isOpen.value = false
+      break
+    case 'Enter':
+      if (editAllowed.value && active.value && !isOpen.value) {
+        isOpen.value = true
+      }
+      break
+    // skip space bar key press since it's used for expand row
+    case ' ':
+      break
+    case 'ArrowUp':
+    case 'ArrowDown':
+    case 'ArrowRight':
+    case 'ArrowLeft':
+    case 'Delete':
+      // skip
+      break
+    default:
+      if (!editAllowed.value) {
+        e.preventDefault()
+        break
+      }
+      // toggle only if char key pressed
+      if (!(e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) && e.key?.length === 1 && !isDrawerOrModalExist()) {
+        e.stopPropagation()
+        isOpen.value = true
+      }
+      break
+  }
+})
+
+// close dropdown list on escape
+useSelectedCellKeyupListener(isOpen, (e) => {
+  if (e.key === 'Escape') isOpen.value = false
+})
+
+const search = () => {
+  searchVal.value = aselect.value?.$el?.querySelector('.ant-select-selection-search-input')?.value
+}
+
+const onTagClick = (e: Event, onClose: Function) => {
+  // check clicked element is remove icon
+  if (
+    (e.target as HTMLElement)?.classList.contains('ant-tag-close-icon') ||
+    (e.target as HTMLElement)?.closest('.ant-tag-close-icon')
+  ) {
+    e.stopPropagation()
+    onClose()
+  }
+}
+
+const cellClickHook = inject(CellClickHookInj, null)
+
+const toggleMenu = () => {
+  if (cellClickHook) return
+  isOpen.value = editAllowed.value && !isOpen.value
+}
+
+const cellClickHookHandler = () => {
+  isOpen.value = editAllowed.value && !isOpen.value
+}
+onMounted(() => {
+  cellClickHook?.on(cellClickHookHandler)
+})
+onUnmounted(() => {
+  cellClickHook?.on(cellClickHookHandler)
+})
+
+const handleClose = (e: MouseEvent) => {
+  // close dropdown if clicked outside of dropdown
+  if (
+    isOpen.value &&
+    aselect.value &&
+    !aselect.value.$el.contains(e.target) &&
+    !document.querySelector('.nc-dropdown-user-select-cell.active')?.contains(e.target as Node)
+  ) {
+    // loose focus when clicked outside
+    isEditable.value = false
+    isOpen.value = false
+  }
+}
+
+useEventListener(document, 'click', handleClose, true)
+
+// search with email
+const filterOption = (input: string, option: any) => {
+  const opt = options.value.find((o) => o.id === option.value)
+  const searchVal = opt?.display_name || opt?.email
+  if (searchVal) {
+    return searchVal.toLowerCase().includes(input.toLowerCase())
+  }
+}
+</script>
+
+<template>
+  <div class="nc-user-select h-full w-full flex items-center" :class="{ 'read-only': readOnly }" @click="toggleMenu">
+    <div
+      v-if="!active"
+      class="flex flex-wrap"
+      :style="{
+        'display': '-webkit-box',
+        'max-width': '100%',
+        '-webkit-line-clamp': rowHeight || 1,
+        '-webkit-box-orient': 'vertical',
+        'overflow': 'hidden',
+      }"
+    >
+      <template v-for="selectedOpt of vModel" :key="selectedOpt.value">
+        <a-tag class="rounded-tag" color="'#ccc'">
+          <span
+            :style="{
+              'color': tinycolor.isReadable('#ccc' || '#ccc', '#fff', { level: 'AA', size: 'large' })
+                ? '#fff'
+                : tinycolor.mostReadable('#ccc' || '#ccc', ['#0b1d05', '#fff']).toHex8String(),
+              'font-size': '13px',
+            }"
+            :class="{ 'text-sm': isKanban }"
+          >
+            {{ selectedOpt.label }}
+          </span>
+        </a-tag>
+      </template>
+    </div>
+
+    <a-select
+      v-else
+      ref="aselect"
+      v-model:value="vModel"
+      mode="multiple"
+      class="w-full overflow-hidden"
+      :placeholder="isEditColumn ? $t('labels.optional') : ''"
+      :bordered="false"
+      clear-icon
+      :show-search="!isMobileMode"
+      :show-arrow="editAllowed && !readOnly"
+      :open="isOpen && editAllowed"
+      :disabled="readOnly || !editAllowed"
+      :class="{ 'caret-transparent': !hasEditRoles }"
+      :dropdown-class-name="`nc-dropdown-user-select-cell ${isOpen ? 'active' : ''}`"
+      :filter-option="filterOption"
+      @search="search"
+      @keydown.stop
+    >
+      <template #suffixIcon>
+        <GeneralIcon icon="arrowDown" class="text-gray-700 nc-select-expand-btn" />
+      </template>
+      <template v-for="op of options" :key="op.id || op.email">
+        <a-select-option
+          v-if="!op.deleted"
+          :value="op.id"
+          :data-testid="`select-option-${column.title}-${location === 'filter' ? 'filter' : rowIndex}`"
+          :class="`nc-select-option-${column.title}-${op.email}`"
+          @click.stop
+        >
+          <a-tag class="rounded-tag" color="'#ccc'">
+            <span
+              :style="{
+                'color': tinycolor.isReadable('#ccc' || '#ccc', '#fff', { level: 'AA', size: 'large' })
+                  ? '#fff'
+                  : tinycolor.mostReadable('#ccc' || '#ccc', ['#0b1d05', '#fff']).toHex8String(),
+                'font-size': '13px',
+              }"
+              :class="{ 'text-sm': isKanban }"
+            >
+              {{ op.display_name?.length ? op.display_name : op.email }}
+            </span>
+          </a-tag>
+        </a-select-option>
+      </template>
+
+      <template #tagRender="{ label, value: val, onClose }">
+        <a-tag
+          v-if="options.find((el) => el.id === val)"
+          class="rounded-tag nc-selected-option"
+          :style="{ display: 'flex', alignItems: 'center' }"
+          color="'#ccc'"
+          :closable="editAllowed && ((vModel?.length ?? 0) > 1 || !column?.rqd)"
+          :close-icon="h(MdiCloseCircle, { class: ['ms-close-icon'] })"
+          @click="onTagClick($event, onClose)"
+          @close="onClose"
+        >
+          <span
+            :style="{
+              'color': tinycolor.isReadable('#ccc' || '#ccc', '#fff', {
+                level: 'AA',
+                size: 'large',
+              })
+                ? '#fff'
+                : tinycolor.mostReadable('#ccc' || '#ccc', ['#0b1d05', '#fff']).toHex8String(),
+              'font-size': '13px',
+            }"
+            :class="{ 'text-sm': isKanban }"
+          >
+            {{ label }}
+          </span>
+        </a-tag>
+      </template>
+    </a-select>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.ms-close-icon {
+  color: rgba(0, 0, 0, 0.25);
+  cursor: pointer;
+  display: flex;
+  font-size: 12px;
+  font-style: normal;
+  height: 12px;
+  line-height: 1;
+  text-align: center;
+  text-transform: none;
+  transition: color 0.3s ease, opacity 0.15s ease;
+  width: 12px;
+  z-index: 1;
+  margin-right: -6px;
+  margin-left: 3px;
+}
+
+.ms-close-icon:before {
+  display: block;
+}
+
+.ms-close-icon:hover {
+  color: rgba(0, 0, 0, 0.45);
+}
+
+.read-only {
+  .ms-close-icon {
+    display: none;
+  }
+}
+
+.rounded-tag {
+  @apply bg-gray-200 py-0 px-[12px] rounded-[12px];
+}
+
+:deep(.ant-tag) {
+  @apply "rounded-tag" my-[2px];
+}
+
+:deep(.ant-tag-close-icon) {
+  @apply "text-slate-500";
+}
+
+:deep(.ant-select-selection-overflow-item) {
+  @apply "flex overflow-hidden";
+}
+
+:deep(.ant-select-selection-overflow) {
+  @apply flex-nowrap overflow-hidden;
+}
+
+.nc-user-select:not(.read-only) {
+  :deep(.ant-select-selector),
+  :deep(.ant-select-selector input) {
+    @apply "!cursor-pointer";
+  }
+}
+
+:deep(.ant-select-selector) {
+  @apply !px-0;
+}
+
+:deep(.ant-select-selection-search-input) {
+  @apply !text-xs;
+}
+</style>
diff --git a/packages/nc-gui/components/cell/YearPicker.vue b/packages/nc-gui/components/cell/YearPicker.vue
index 1a1fe15537..3e51e35b4e 100644
--- a/packages/nc-gui/components/cell/YearPicker.vue
+++ b/packages/nc-gui/components/cell/YearPicker.vue
@@ -113,6 +113,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
 <template>
   <a-date-picker
     v-model:value="localState"
+    tabindex="0"
     picker="year"
     :bordered="false"
     class="!w-full !px-1 !border-none"
@@ -125,6 +126,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
     @click="open = (active || editable) && !open"
     @change="open = (active || editable) && !open"
     @ok="open = !open"
+    @keydown.enter="open = !open"
   >
     <template #suffixIcon></template>
   </a-date-picker>
diff --git a/packages/nc-gui/components/cell/attachment/index.vue b/packages/nc-gui/components/cell/attachment/index.vue
index 42a05aedcf..0f6989022d 100644
--- a/packages/nc-gui/components/cell/attachment/index.vue
+++ b/packages/nc-gui/components/cell/attachment/index.vue
@@ -180,7 +180,6 @@ const onImageClick = (item: any) => {
 <template>
   <div
     ref="attachmentCellRef"
-    tabindex="0"
     :style="{
       height: isForm || isExpandedForm ? undefined : `max(${(rowHeight || 1) * 1.8}rem, 41px)`,
     }"
@@ -207,7 +206,9 @@ const onImageClick = (item: any) => {
       :class="{ 'sm:(mx-auto px-4) xs:(w-full min-w-8)': !visibleItems.length }"
       class="group cursor-pointer py-1 flex gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-none shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
       data-testid="attachment-cell-file-picker-button"
+      tabindex="0"
       @click="open"
+      @keydown.enter="open"
     >
       <component :is="iconMap.reload" v-if="isLoading" :class="{ 'animate-infinite animate-spin': isLoading }" />
 
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/Collaborate.vue b/packages/nc-gui/components/dlg/share-and-collaborate/Collaborate.vue
index 863c8fabe4..896aeea1e9 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/Collaborate.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/Collaborate.vue
@@ -13,7 +13,7 @@ const validators = computed(() => {
       {
         validator: (rule: any, value: string, callback: (errMsg?: string) => void) => {
           if (!value || value.length === 0) {
-            callback(t('msg.error.signUpRules.emailReqd'))
+            callback(t('msg.error.signUpRules.emailRequired'))
             return
           }
           const invalidEmails = (value || '').split(/\s*,\s*/).filter((e: string) => !validateEmail(e))
diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue
index 4dbfb01049..a353cbca43 100644
--- a/packages/nc-gui/components/monaco/Editor.vue
+++ b/packages/nc-gui/components/monaco/Editor.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
-import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
-import TypescriptWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'
+import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker&inline'
+import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker&inline'
+
 import type { editor as MonacoEditor } from 'monaco-editor'
-import { deepCompare, isDrawerOrModalExist, onMounted, ref, watch } from '#imports'
+import { deepCompare, initWorker, isDrawerOrModalExist, onMounted, ref, watch } from '#imports'
 
 interface Props {
   modelValue: string | Record<string, any>
@@ -45,15 +45,17 @@ const isValid = ref(true)
  * Adding monaco editor to Vite
  *
  * @ts-expect-error */
-self.MonacoEnvironment = {
-  getWorker(_: any, label: string) {
+self.MonacoEnvironment = window.MonacoEnvironment = {
+  async getWorker(_: any, label: string) {
     switch (label) {
-      case 'json':
-        return new JsonWorker()
-      case 'typescript':
-        return new TypescriptWorker()
-      default:
-        return new EditorWorker()
+      case 'json': {
+        const workerBlob = new Blob([JsonWorker], { type: 'text/javascript' })
+        return await initWorker(URL.createObjectURL(workerBlob))
+      }
+      default: {
+        const workerBlob = new Blob([EditorWorker], { type: 'text/javascript' })
+        return await initWorker(URL.createObjectURL(workerBlob))
+      }
     }
   },
 }
diff --git a/packages/nc-gui/components/nc/Button.vue b/packages/nc-gui/components/nc/Button.vue
index 349d7af279..5a180e094a 100644
--- a/packages/nc-gui/components/nc/Button.vue
+++ b/packages/nc-gui/components/nc/Button.vue
@@ -84,6 +84,7 @@ useEventListener(NcButton, 'mousedown', () => {
       xxsmall: size === 'xxsmall',
       focused: isFocused,
     }"
+    :tabindex="props.disabled ? -1 : 0"
     @focus="onFocus"
     @blur="onBlur"
   >
diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index 3bed047889..4a8f7ac062 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -5,14 +5,14 @@ import {
   ProjectRoles,
   WorkspaceRolesToProjectRoles,
   extractRolesObj,
+  parseStringDateTime,
   timeAgo,
 } from 'nocodb-sdk'
 import type { WorkspaceUserRoles } from 'nocodb-sdk'
-import InfiniteLoading from 'v3-infinite-loading'
 import { isEeUI, storeToRefs } from '#imports'
 
 const basesStore = useBases()
-const { getProjectUsers, createProjectUser, updateProjectUser, removeProjectUser } = basesStore
+const { getBaseUsers, createProjectUser, updateProjectUser, removeProjectUser } = basesStore
 const { activeProjectId } = storeToRefs(basesStore)
 
 const { orgRoles, baseRoles } = useRoles()
@@ -30,7 +30,6 @@ interface Collaborators {
 const collaborators = ref<Collaborators[]>([])
 const totalCollaborators = ref(0)
 const userSearchText = ref('')
-const currentPage = ref(0)
 
 const isLoading = ref(false)
 const isSearching = ref(false)
@@ -38,52 +37,32 @@ const accessibleRoles = ref<(typeof ProjectRoles)[keyof typeof ProjectRoles][]>(
 
 const loadCollaborators = async () => {
   try {
-    currentPage.value += 1
-
-    const { users, totalRows } = await getProjectUsers({
+    const { users, totalRows } = await getBaseUsers({
       baseId: activeProjectId.value!,
-      page: currentPage.value,
       ...(!userSearchText.value ? {} : ({ searchText: userSearchText.value } as any)),
-      limit: 20,
+      force: true,
     })
 
     totalCollaborators.value = totalRows
     collaborators.value = [
-      ...collaborators.value,
-      ...users.map((user: any) => ({
-        ...user,
-        base_roles: user.roles,
-        roles: extractRolesObj(user.main_roles)?.[OrgUserRoles.SUPER_ADMIN]
-          ? OrgUserRoles.SUPER_ADMIN
-          : user.roles ??
-            (user.workspace_roles
-              ? WorkspaceRolesToProjectRoles[user.workspace_roles as WorkspaceUserRoles] ?? ProjectRoles.NO_ACCESS
-              : ProjectRoles.NO_ACCESS),
-      })),
+      ...users
+        .filter((u: any) => !u?.deleted)
+        .map((user: any) => ({
+          ...user,
+          base_roles: user.roles,
+          roles: extractRolesObj(user.main_roles)?.[OrgUserRoles.SUPER_ADMIN]
+            ? OrgUserRoles.SUPER_ADMIN
+            : user.roles ??
+              (user.workspace_roles
+                ? WorkspaceRolesToProjectRoles[user.workspace_roles as WorkspaceUserRoles] ?? ProjectRoles.NO_ACCESS
+                : ProjectRoles.NO_ACCESS),
+        })),
     ]
   } catch (e: any) {
     message.error(await extractSdkResponseErrorMsg(e))
   }
 }
 
-const loadListData = async ($state: any) => {
-  const prevUsersCount = collaborators.value?.length || 0
-  if (collaborators.value?.length === totalCollaborators.value) {
-    $state.complete()
-    return
-  }
-  $state.loading()
-  // const oldPagesCount = currentPage.value || 0
-
-  await loadCollaborators()
-
-  if (prevUsersCount === collaborators.value?.length) {
-    $state.complete()
-    return
-  }
-  $state.loaded()
-}
-
 const updateCollaborator = async (collab: any, roles: ProjectRoles) => {
   try {
     if (
@@ -115,29 +94,6 @@ const updateCollaborator = async (collab: any, roles: ProjectRoles) => {
   }
 }
 
-watchDebounced(
-  userSearchText,
-  async () => {
-    isSearching.value = true
-
-    currentPage.value = 0
-    totalCollaborators.value = 0
-    collaborators.value = []
-
-    try {
-      await loadCollaborators()
-    } catch (e: any) {
-      message.error(await extractSdkResponseErrorMsg(e))
-    } finally {
-      isSearching.value = false
-    }
-  },
-  {
-    debounce: 300,
-    maxWait: 600,
-  },
-)
-
 onMounted(async () => {
   isLoading.value = true
   try {
@@ -156,6 +112,10 @@ onMounted(async () => {
     isLoading.value = false
   }
 })
+
+const filteredCollaborators = computed(() =>
+  collaborators.value.filter((collab) => collab.email.toLowerCase().includes(userSearchText.value.toLowerCase())),
+)
 </script>
 
 <template>
@@ -177,7 +137,7 @@ onMounted(async () => {
       </div>
 
       <div
-        v-else-if="!collaborators?.length"
+        v-else-if="!filteredCollaborators?.length"
         class="nc-collaborators-list w-full h-full flex flex-col items-center justify-center mt-36"
       >
         <Empty description="$t('title.noMembersFound')" />
@@ -186,13 +146,13 @@ onMounted(async () => {
         <div class="flex flex-col rounded-lg overflow-hidden border-1 max-w-350 max-h-[calc(100%-8rem)]">
           <div class="flex flex-row bg-gray-50 min-h-12 items-center border-b-1">
             <div class="text-gray-700 users-email-grid">{{ $t('objects.users') }}</div>
-            <div class="text-gray-700 date-joined-grid">{{ $t('title.dateJoined') }}</div>
             <div class="text-gray-700 user-access-grid">{{ $t('general.access') }}</div>
+            <div class="text-gray-700 date-joined-grid">{{ $t('title.dateJoined') }}</div>
           </div>
 
           <div class="flex flex-col nc-scrollbar-md">
             <div
-              v-for="(collab, i) of collaborators"
+              v-for="(collab, i) of filteredCollaborators"
               :key="i"
               class="user-row flex flex-row border-b-1 py-1 min-h-14 items-center"
             >
@@ -202,7 +162,6 @@ onMounted(async () => {
                   {{ collab.email }}
                 </span>
               </div>
-              <div class="date-joined-grid">{{ timeAgo(collab.created_at) }}</div>
               <div class="user-access-grid">
                 <template v-if="accessibleRoles.includes(collab.roles)">
                   <RolesSelector
@@ -221,20 +180,19 @@ onMounted(async () => {
                   <RolesBadge :role="collab.roles" />
                 </template>
               </div>
+              <div class="date-joined-grid">
+                <NcTooltip class="max-w-full">
+                  <template #title>
+                    {{ parseStringDateTime(collab.created_at) }}
+                  </template>
+                  <span>
+                    {{ timeAgo(collab.created_at) }}
+                  </span>
+                </NcTooltip>
+              </div>
             </div>
           </div>
         </div>
-
-        <InfiniteLoading v-bind="$attrs" @infinite="loadListData">
-          <template #spinner>
-            <div class="flex flex-row w-full justify-center mt-2">
-              <GeneralLoader />
-            </div>
-          </template>
-          <template #complete>
-            <span></span>
-          </template>
-        </InfiniteLoading>
       </div>
     </template>
   </div>
@@ -258,12 +216,11 @@ onMounted(async () => {
 }
 
 .date-joined-grid {
-  @apply flex items-start;
-  width: calc(50% - 10rem);
+  @apply w-1/4 flex items-start;
 }
 
 .user-access-grid {
-  @apply w-40;
+  @apply w-1/4 flex justify-start;
 }
 
 .user-row {
diff --git a/packages/nc-gui/components/project/View.vue b/packages/nc-gui/components/project/View.vue
index 0571b7e67c..5ecfe7182a 100644
--- a/packages/nc-gui/components/project/View.vue
+++ b/packages/nc-gui/components/project/View.vue
@@ -5,9 +5,7 @@ import { isEeUI } from '#imports'
 
 const basesStore = useBases()
 
-const { getProjectUsers } = basesStore
-
-const { openedProject, activeProjectId, baseUserCount } = storeToRefs(basesStore)
+const { openedProject, activeProjectId, basesUser } = storeToRefs(basesStore)
 const { activeTables } = storeToRefs(useTablesStore())
 const { activeWorkspace, workspaceUserCount } = storeToRefs(useWorkspace())
 
@@ -32,24 +30,9 @@ const { isMobileMode } = useGlobal()
 
 const baseSettingsState = ref('')
 
-const userCount = isEeUI ? workspaceUserCount : baseUserCount
-
-const updateBaseUserCount = async () => {
-  if (!baseUserCount || !isUIAllowed('newUser')) return
-
-  try {
-    const { totalRows } = await getProjectUsers({
-      baseId: activeProjectId.value!,
-      page: 1,
-      searchText: undefined,
-      limit: 20,
-    })
-
-    baseUserCount.value = totalRows
-  } catch (e: any) {
-    message.error(await extractSdkResponseErrorMsg(e))
-  }
-}
+const userCount = computed(() =>
+  isEeUI ? workspaceUserCount : activeProjectId.value ? basesUser.value.get(activeProjectId.value)?.length : 0,
+)
 
 watch(
   () => route.value.query?.page,
@@ -82,16 +65,6 @@ watch(projectPageTab, () => {
   }
 })
 
-watch(
-  () => route.value.params.baseId,
-  (newVal, oldVal) => {
-    if (newVal && oldVal === undefined) {
-      updateBaseUserCount()
-    }
-  },
-  { immediate: true },
-)
-
 watch(
   () => openedProject.value?.title,
   () => {
diff --git a/packages/nc-gui/components/smartsheet/ApiSnippet.vue b/packages/nc-gui/components/smartsheet/ApiSnippet.vue
index ea776cf76b..7c0ad8ff08 100644
--- a/packages/nc-gui/components/smartsheet/ApiSnippet.vue
+++ b/packages/nc-gui/components/smartsheet/ApiSnippet.vue
@@ -84,7 +84,7 @@ const selectedLangName = ref(langs[0].name)
 const apiUrl = computed(
   () =>
     new URL(
-      `/api/v1/db/data/noco/${base.value.id}/${meta.value?.title}/views/${view.value?.title}`,
+      `/api/v1/db/data/noco/${base.value.id}/${meta.value?.id}/views/${view.value?.id}`,
       (appInfo.value && appInfo.value.ncSiteUrl) || '/',
     ).href,
 )
diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue
index 2ec83fdf3d..36acdc221e 100644
--- a/packages/nc-gui/components/smartsheet/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/Cell.vue
@@ -21,7 +21,6 @@ import {
   isDate,
   isDateTime,
   isDecimal,
-  isDrawerExist,
   isDuration,
   isEmail,
   isFloat,
@@ -40,6 +39,7 @@ import {
   isTextArea,
   isTime,
   isURL,
+  isUser,
   isYear,
   provide,
   ref,
@@ -204,7 +204,6 @@ onUnmounted(() => {
         'h-10': isForm && !isSurveyForm && !isAttachment(column) && !props.virtual,
         'nc-grid-numeric-cell-left': (isForm && isNumericField && isExpandedFormOpen) || isEditColumnMenu,
         '!min-h-30 resize-y': isTextArea(column) && (isForm || isSurveyForm),
-        '!border-2 !border-brand-500': props.editEnabled && (isSurveyForm || isForm) && !isDrawerExist(),
       },
     ]"
     @keydown.enter.exact="navigate(NavigateDir.NEXT, $event)"
@@ -245,6 +244,7 @@ onUnmounted(() => {
         <LazyCellPhoneNumber v-else-if="isPhoneNumber(column)" v-model="vModel" />
         <LazyCellPercent v-else-if="isPercent(column)" v-model="vModel" />
         <LazyCellCurrency v-else-if="isCurrency(column)" v-model="vModel" @save="emit('save')" />
+        <LazyCellUser v-else-if="isUser(column)" v-model="vModel" :row-index="props.rowIndex" />
         <LazyCellDecimal v-else-if="isDecimal(column)" v-model="vModel" />
         <LazyCellFloat v-else-if="isFloat(column, abstractType)" v-model="vModel" />
         <LazyCellText v-else-if="isString(column, abstractType)" v-model="vModel" />
diff --git a/packages/nc-gui/components/smartsheet/DivDataCell.vue b/packages/nc-gui/components/smartsheet/DivDataCell.vue
index 6c9cfe4693..9796cdec03 100644
--- a/packages/nc-gui/components/smartsheet/DivDataCell.vue
+++ b/packages/nc-gui/components/smartsheet/DivDataCell.vue
@@ -7,7 +7,16 @@ provide(CurrentCellInj, el)
 </script>
 
 <template>
-  <div ref="el" class="select-none">
+  <div ref="el" class="select-none nc-data-cell">
     <slot />
   </div>
 </template>
+
+<style lang="scss" scoped>
+.nc-data-cell:focus-within {
+  @apply !border-1 !border-brand-500 !rounded-lg !shadow-none !ring-0;
+}
+.nc-data-cell {
+  @apply border-1 border-gray-200 overflow-hidden rounded-lg;
+}
+</style>
diff --git a/packages/nc-gui/components/smartsheet/Kanban.vue b/packages/nc-gui/components/smartsheet/Kanban.vue
index a0ce7c4859..0024ad4c65 100644
--- a/packages/nc-gui/components/smartsheet/Kanban.vue
+++ b/packages/nc-gui/components/smartsheet/Kanban.vue
@@ -402,10 +402,10 @@ const getRowId = (row: RowType) => {
   >
     <div
       ref="kanbanContainerRef"
-      class="nc-kanban-container flex mt-4 pb-4 px-4 overflow-y-hidden w-full nc-scrollbar-x-md"
+      class="nc-kanban-container flex mt-4 pb-4 px-4 overflow-y-hidden w-full nc-scrollbar-x-lg"
       :style="{
-        minHeight: 'calc(100vh - var(--topbar-height) - 3.5rem)',
-        maxHeight: 'calc(100vh - var(--topbar-height) - 3.5rem)',
+        minHeight: 'calc(100vh - var(--topbar-height) - 4.1rem)',
+        maxHeight: 'calc(100vh - var(--topbar-height) - 4.1rem)',
       }"
     >
       <div v-if="isViewDataLoading" class="flex flex-row min-h-full gap-x-2">
diff --git a/packages/nc-gui/components/smartsheet/Toolbar.vue b/packages/nc-gui/components/smartsheet/Toolbar.vue
index 4e5f7ca4aa..72cf647e2c 100644
--- a/packages/nc-gui/components/smartsheet/Toolbar.vue
+++ b/packages/nc-gui/components/smartsheet/Toolbar.vue
@@ -52,7 +52,7 @@ const { allowCSVDownload } = useSharedView()
       </template>
 
       <LazySmartsheetToolbarSearchData
-        v-if="(isGrid || isGallery || isKanban) && !isPublic"
+        v-if="isGrid || isGallery || isKanban"
         :class="{
           'shrink': !isMobileMode,
           'w-full': isMobileMode,
diff --git a/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue b/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue
index 65794cbc78..bed26bf19c 100644
--- a/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue
@@ -30,6 +30,13 @@ onMounted(() => {
     vModel.value.meta.precision = precisionFormats[0]
   }
 })
+
+// update datatype precision when precision is less than the new value
+// avoid downgrading precision if the new value is less than the current precision
+// to avoid fractional part data loss(eg. 1.2345 -> 1.23)
+const onPrecisionChange = (value: number) => {
+  vModel.value.dtxs = Math.max(value, vModel.value.dtxs)
+}
 </script>
 
 <template>
@@ -38,6 +45,7 @@ onMounted(() => {
       v-if="vModel.meta?.precision"
       v-model:value="vModel.meta.precision"
       dropdown-class-name="nc-dropdown-decimal-format"
+      @change="onPrecisionChange"
     >
       <a-select-option v-for="(format, i) of precisionFormats" :key="i" :value="format">
         <div class="flex gap-2 w-full justify-between items-center">
diff --git a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
index 13a777368a..92576bc44a 100644
--- a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
+++ b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
@@ -34,6 +34,13 @@ const updateCdfValue = (cdf: string | null) => {
 onMounted(() => {
   updateCdfValue(vModel.value?.cdf ? vModel.value.cdf : null)
 })
+
+watch(
+  () => vModel.value.cdf,
+  (newValue) => {
+    cdfValue.value = newValue
+  },
+)
 </script>
 
 <template>
@@ -58,7 +65,7 @@ onMounted(() => {
         :is="iconMap.close"
         v-if="![UITypes.Year, UITypes.SingleSelect, UITypes.MultiSelect].includes(vModel.uidt)"
         class="w-4 h-4 cursor-pointer rounded-full !text-black-500 text-gray-500 cursor-pointer hover:bg-gray-50"
-        @click="cdfValue = null"
+        @click="updateCdfValue(null)"
       />
     </div>
   </div>
diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index 91d52439cb..8e03ad9746 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -81,6 +81,10 @@ const columnToValidate = [UITypes.Email, UITypes.URL, UITypes.PhoneNumber]
 
 const onlyNameUpdateOnEditColumns = [UITypes.LinkToAnotherRecord, UITypes.Lookup, UITypes.Rollup, UITypes.Links]
 
+// To close column type dropdown on escape and
+// close modal only when the type popup is close
+const isColumnTypeOpen = ref(false)
+
 const geoDataToggleCondition = (t: { name: UITypes }) => {
   if (!appInfo.value.ee) return true
 
@@ -199,6 +203,8 @@ onMounted(() => {
 })
 
 const handleEscape = (event: KeyboardEvent): void => {
+  if (isColumnTypeOpen.value) return
+
   if (event.key === 'Escape') emit('cancel')
 }
 
@@ -206,6 +212,16 @@ const isFieldsTab = computed(() => {
   return openedViewsTab.value === 'field'
 })
 
+const onDropdownChange = (value: boolean) => {
+  if (value) {
+    isColumnTypeOpen.value = value
+  } else {
+    setTimeout(() => {
+      isColumnTypeOpen.value = value
+    }, 300)
+  }
+}
+
 if (props.fromTableExplorer) {
   watch(
     formState,
@@ -224,7 +240,7 @@ if (props.fromTableExplorer) {
       'bg-white': !props.fromTableExplorer,
       'w-[400px]': !props.embedMode,
       '!w-146': isTextArea(formState) && formState.meta?.richMode,
-      '!w-[600px]': formState.uidt === UITypes.Formula && !props.embedMode,
+      '!w-116 overflow-visible': formState.uidt === UITypes.Formula && !props.embedMode,
       '!w-[500px]': formState.uidt === UITypes.Attachment && !props.embedMode && !appInfo.ee,
       'shadow-lg border-1 border-gray-200 shadow-gray-300 rounded-xl p-6': !embedMode,
     }"
@@ -275,6 +291,7 @@ if (props.fromTableExplorer) {
               class="nc-column-type-input !rounded"
               :disabled="isKanban || readOnly"
               dropdown-class-name="nc-dropdown-column-type border-1 !rounded-md border-gray-200"
+              @dropdown-visible-change="onDropdownChange"
               @change="onUidtOrIdTypeChange"
               @dblclick="showDeprecated = !showDeprecated"
             >
@@ -323,6 +340,7 @@ if (props.fromTableExplorer) {
           <LazySmartsheetColumnLinkOptions v-if="isEdit && formState.uidt === UITypes.Links" v-model:value="formState" />
           <LazySmartsheetColumnPercentOptions v-if="formState.uidt === UITypes.Percent" v-model:value="formState" />
           <LazySmartsheetColumnSpecificDBTypeOptions v-if="formState.uidt === UITypes.SpecificDBType" />
+          <LazySmartsheetColumnUserOptions v-if="formState.uidt === UITypes.User" v-model:value="formState" :is-edit="isEdit" />
           <SmartsheetColumnSelectOptions
             v-if="formState.uidt === UITypes.SingleSelect || formState.uidt === UITypes.MultiSelect"
             v-model:value="formState"
diff --git a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
index f87585f490..bb9191caf2 100644
--- a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
@@ -2,34 +2,28 @@
 import type { Ref } from 'vue'
 import type { ListItem as AntListItem } from 'ant-design-vue'
 import jsep from 'jsep'
-import type { ColumnType, FormulaType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
 import {
+  FormulaError,
   UITypes,
-  isLinksOrLTAR,
-  isNumericCol,
-  isSystemColumn,
   jsepCurlyHook,
   substituteColumnIdWithAliasInFormula,
-  validateDateWithUnknownFormat,
+  validateFormulaAndExtractTreeWithType,
 } from 'nocodb-sdk'
+import type { ColumnType, FormulaType } from 'nocodb-sdk'
 import {
   MetaInj,
   NcAutocompleteTree,
   computed,
   formulaList,
-  formulaTypes,
   formulas,
   getUIDTIcon,
   getWordUntilCaret,
   iconMap,
   inject,
   insertAtCursor,
-  isDate,
   nextTick,
   onMounted,
   ref,
-  storeToRefs,
-  useBase,
   useColumnCreateStoreOrThrow,
   useDebounceFn,
   useI18n,
@@ -52,59 +46,40 @@ const { setAdditionalValidations, validateInfos, sqlUi, column } = useColumnCrea
 
 const { t } = useI18n()
 
-const baseStore = useBase()
-
-const { tables } = storeToRefs(baseStore)
-
 const { predictFunction: _predictFunction } = useNocoEe()
 
-enum JSEPNode {
-  COMPOUND = 'Compound',
-  IDENTIFIER = 'Identifier',
-  MEMBER_EXP = 'MemberExpression',
-  LITERAL = 'Literal',
-  THIS_EXP = 'ThisExpression',
-  CALL_EXP = 'CallExpression',
-  UNARY_EXP = 'UnaryExpression',
-  BINARY_EXP = 'BinaryExpression',
-  ARRAY_EXP = 'ArrayExpression',
-}
-
 const meta = inject(MetaInj, ref())
 
 const supportedColumns = computed(
   () => meta?.value?.columns?.filter((col) => !uiTypesNotSupportedInFormulas.includes(col.uidt as UITypes)) || [],
 )
-const { metas } = useMetas()
+const { getMeta } = useMetas()
 
-const refTables = computed(() => {
-  if (!tables.value || !tables.value.length || !meta.value || !meta.value.columns) {
-    return []
-  }
-
-  const _refTables = meta.value.columns
-    .filter((column) => isLinksOrLTAR(column) && !column.system && column.source_id === meta.value?.source_id)
-    .map((column) => ({
-      col: column.colOptions,
-      column,
-      ...tables.value.find((table) => table.id === (column.colOptions as LinkToAnotherRecordType).fk_related_model_id),
-    }))
-    .filter((table) => (table.col as LinkToAnotherRecordType)?.fk_related_model_id === table.id && !table.mm)
-  return _refTables as Required<TableType & { column: ColumnType; col: Required<LinkToAnotherRecordType> }>[]
-})
+const suggestionPreviewed = ref<Record<any, string> | undefined>()
 
 const validators = {
   formula_raw: [
     {
       validator: (_: any, formula: any) => {
-        return new Promise<void>((resolve, reject) => {
-          if (!formula?.trim()) return reject(new Error('Required'))
-          const res = parseAndValidateFormula(formula)
-          if (res !== true) {
-            return reject(new Error(res))
+        return (async () => {
+          if (!formula?.trim()) throw new Error('Required')
+
+          try {
+            await validateFormulaAndExtractTreeWithType({
+              column: column.value,
+              formula,
+              columns: supportedColumns.value,
+              clientOrSqlUi: sqlUi.value,
+              getMeta,
+            })
+          } catch (e: any) {
+            if (e instanceof FormulaError && e.extra?.key) {
+              throw new Error(t(e.extra.key, e.extra))
+            }
+
+            throw new Error(e.message)
           }
-          resolve()
-        })
+        })()
       },
     },
   ],
@@ -120,6 +95,8 @@ const formulaRef = ref()
 
 const sugListRef = ref()
 
+const variableListRef = ref<(typeof AntListItem)[]>([])
+
 const sugOptionsRef = ref<(typeof AntListItem)[]>([])
 
 const wordToComplete = ref<string | undefined>('')
@@ -143,6 +120,7 @@ const suggestionsList = computed(() => {
         description: formulas[fn].description,
         syntax: formulas[fn].syntax,
         examples: formulas[fn].examples,
+        docsUrl: formulas[fn].docsUrl,
       })),
     ...supportedColumns.value
       .filter((c) => {
@@ -176,521 +154,13 @@ const acTree = computed(() => {
   return ref
 })
 
-function parseAndValidateFormula(formula: string) {
-  try {
-    const parsedTree = jsep(formula)
-    const metaErrors = validateAgainstMeta(parsedTree)
-    if (metaErrors.size) {
-      return [...metaErrors].join(', ')
-    }
-    return true
-  } catch (e: any) {
-    return e.message
-  }
-}
-
-function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = new Set()) {
-  if (parsedTree.type === JSEPNode.CALL_EXP) {
-    const calleeName = parsedTree.callee.name.toUpperCase()
-    // validate function name
-    if (!availableFunctions.includes(calleeName)) {
-      errors.add(t('msg.formula.functionNotAvailable', { function: calleeName }))
-    }
-    // validate arguments
-    const validation = formulas[calleeName] && formulas[calleeName].validation
-    if (validation && validation.args) {
-      if (validation.args.rqd !== undefined && validation.args.rqd !== parsedTree.arguments.length) {
-        errors.add(t('msg.formula.requiredArgumentsFormula', { requiredArguments: validation.args.rqd, calleeName }))
-      } else if (validation.args.min !== undefined && validation.args.min > parsedTree.arguments.length) {
-        errors.add(t('msg.formula.minRequiredArgumentsFormula', { minRequiredArguments: validation.args.min, calleeName }))
-      } else if (validation.args.max !== undefined && validation.args.max < parsedTree.arguments.length) {
-        errors.add(t('msg.formula.maxRequiredArgumentsFormula', { maxRequiredArguments: validation.args.max, calleeName }))
-      }
-    }
-    parsedTree.arguments.map((arg: Record<string, any>) => validateAgainstMeta(arg, errors))
-
-    // validate data type
-    if (parsedTree.callee.type === JSEPNode.IDENTIFIER) {
-      const expectedType = formulas[calleeName.toUpperCase()].type
-      if (expectedType === formulaTypes.NUMERIC) {
-        if (calleeName === 'WEEKDAY') {
-          // parsedTree.arguments[0] = date
-          validateAgainstType(
-            parsedTree.arguments[0],
-            formulaTypes.DATE,
-            (v: any) => {
-              if (!validateDateWithUnknownFormat(v)) {
-                typeErrors.add(t('msg.formula.firstParamWeekDayHaveDate'))
-              }
-            },
-            typeErrors,
-          )
-          // parsedTree.arguments[1] = startDayOfWeek (optional)
-          validateAgainstType(
-            parsedTree.arguments[1],
-            formulaTypes.STRING,
-            (v: any) => {
-              if (
-                typeof v !== 'string' ||
-                !['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'].includes(v.toLowerCase())
-              ) {
-                typeErrors.add(t('msg.formula.secondParamWeekDayHaveDate'))
-              }
-            },
-            typeErrors,
-          )
-        } else {
-          parsedTree.arguments.map((arg: Record<string, any>) => validateAgainstType(arg, expectedType, null, typeErrors))
-        }
-      } else if (expectedType === formulaTypes.DATE) {
-        if (calleeName === 'DATEADD') {
-          // parsedTree.arguments[0] = date
-          validateAgainstType(
-            parsedTree.arguments[0],
-            formulaTypes.DATE,
-            (v: any) => {
-              if (!validateDateWithUnknownFormat(v)) {
-                typeErrors.add(t('msg.formula.firstParamDateAddHaveDate'))
-              }
-            },
-            typeErrors,
-          )
-          // parsedTree.arguments[1] = numeric
-          validateAgainstType(
-            parsedTree.arguments[1],
-            formulaTypes.NUMERIC,
-            (v: any) => {
-              if (typeof v !== 'number') {
-                typeErrors.add(t('msg.formula.secondParamDateAddHaveNumber'))
-              }
-            },
-            typeErrors,
-          )
-          // parsedTree.arguments[2] = ["day" | "week" | "month" | "year"]
-          validateAgainstType(
-            parsedTree.arguments[2],
-            formulaTypes.STRING,
-            (v: any) => {
-              if (!['day', 'week', 'month', 'year'].includes(v)) {
-                typeErrors.add(typeErrors.add(t('msg.formula.thirdParamDateAddHaveDate')))
-              }
-            },
-            typeErrors,
-          )
-        } else if (calleeName === 'DATETIME_DIFF') {
-          // parsedTree.arguments[0] = date
-          validateAgainstType(
-            parsedTree.arguments[0],
-            formulaTypes.DATE,
-            (v: any) => {
-              if (!validateDateWithUnknownFormat(v)) {
-                typeErrors.add(t('msg.formula.firstParamDateDiffHaveDate'))
-              }
-            },
-            typeErrors,
-          )
-          // parsedTree.arguments[1] = date
-          validateAgainstType(
-            parsedTree.arguments[1],
-            formulaTypes.DATE,
-            (v: any) => {
-              if (!validateDateWithUnknownFormat(v)) {
-                typeErrors.add(t('msg.formula.secondParamDateDiffHaveDate'))
-              }
-            },
-            typeErrors,
-          )
-          // parsedTree.arguments[2] = ["milliseconds" | "ms" | "seconds" | "s" | "minutes" | "m" | "hours" | "h" | "days" | "d" | "weeks" | "w" | "months" | "M" | "quarters" | "Q" | "years" | "y"]
-          validateAgainstType(
-            parsedTree.arguments[2],
-            formulaTypes.STRING,
-            (v: any) => {
-              if (
-                ![
-                  'milliseconds',
-                  'ms',
-                  'seconds',
-                  's',
-                  'minutes',
-                  'm',
-                  'hours',
-                  'h',
-                  'days',
-                  'd',
-                  'weeks',
-                  'w',
-                  'months',
-                  'M',
-                  'quarters',
-                  'Q',
-                  'years',
-                  'y',
-                ].includes(v)
-              ) {
-                typeErrors.add(t('msg.formula.thirdParamDateDiffHaveDate'))
-              }
-            },
-            typeErrors,
-          )
-        }
-      }
-    }
-
-    errors = new Set([...errors, ...typeErrors])
-  } else if (parsedTree.type === JSEPNode.IDENTIFIER) {
-    if (supportedColumns.value.filter((c) => !column || column.value?.id !== c.id).every((c) => c.title !== parsedTree.name)) {
-      errors.add(
-        t('msg.formula.columnNotAvailable', {
-          columnName: parsedTree.name,
-        }),
-      )
-    }
-
-    // check circular reference
-    // e.g. formula1 -> formula2 -> formula1 should return circular reference error
-
-    // get all formula columns excluding itself
-    const formulaPaths = supportedColumns.value
-      .filter((c) => c.id !== column.value?.id && c.uidt === UITypes.Formula)
-      .reduce((res: Record<string, any>[], c: Record<string, any>) => {
-        // in `formula`, get all the (unique) target neighbours
-        // i.e. all column id (e.g. cl_xxxxxxxxxxxxxx) with formula type
-        const neighbours = [
-          ...new Set(
-            (c.colOptions.formula.match(/cl_\w{14}/g) || []).filter(
-              (colId: string) =>
-                supportedColumns.value.filter((col: ColumnType) => col.id === colId && col.uidt === UITypes.Formula).length,
-            ),
-          ),
-        ]
-        if (neighbours.length > 0) {
-          // e.g. formula column 1 -> [formula column 2, formula column3]
-          res.push({ [c.id]: neighbours })
-        }
-        return res
-      }, [])
-    // include target formula column (i.e. the one to be saved if applicable)
-    const targetFormulaCol = supportedColumns.value.find(
-      (c: ColumnType) => c.title === parsedTree.name && c.uidt === UITypes.Formula,
-    )
-
-    if (targetFormulaCol && column.value?.id) {
-      formulaPaths.push({
-        [column.value?.id as string]: [targetFormulaCol.id],
-      })
-    }
-    const vertices = formulaPaths.length
-    if (vertices > 0) {
-      // perform kahn's algo for cycle detection
-      const adj = new Map()
-      const inDegrees = new Map()
-      // init adjacency list & indegree
-
-      for (const [_, v] of Object.entries(formulaPaths)) {
-        const src = Object.keys(v)[0]
-        const neighbours = v[src]
-        inDegrees.set(src, inDegrees.get(src) || 0)
-        for (const neighbour of neighbours) {
-          adj.set(src, (adj.get(src) || new Set()).add(neighbour))
-          inDegrees.set(neighbour, (inDegrees.get(neighbour) || 0) + 1)
-        }
-      }
-      const queue: string[] = []
-      // put all vertices with in-degree = 0 (i.e. no incoming edges) to queue
-      inDegrees.forEach((inDegree, col) => {
-        if (inDegree === 0) {
-          // in-degree = 0 means we start traversing from this node
-          queue.push(col)
-        }
-      })
-      // init count of visited vertices
-      let visited = 0
-      // BFS
-      while (queue.length !== 0) {
-        // remove a vertex from the queue
-        const src = queue.shift()
-        // if this node has neighbours, increase visited by 1
-        const neighbours = adj.get(src) || new Set()
-        if (neighbours.size > 0) {
-          visited += 1
-        }
-        // iterate each neighbouring nodes
-        neighbours.forEach((neighbour: string) => {
-          // decrease in-degree of its neighbours by 1
-          inDegrees.set(neighbour, inDegrees.get(neighbour) - 1)
-          // if in-degree becomes 0
-          if (inDegrees.get(neighbour) === 0) {
-            // then put the neighboring node to the queue
-            queue.push(neighbour)
-          }
-        })
-      }
-      // vertices not same as visited = cycle found
-      if (vertices !== visited) {
-        errors.add(t('msg.formula.cantSaveCircularReference'))
-      }
-    }
-  } else if (parsedTree.type === JSEPNode.BINARY_EXP) {
-    if (!availableBinOps.includes(parsedTree.operator)) {
-      errors.add(t('msg.formula.operationNotAvailable', { operation: parsedTree.operator }))
-    }
-    validateAgainstMeta(parsedTree.left, errors)
-    validateAgainstMeta(parsedTree.right, errors)
-  } else if (parsedTree.type === JSEPNode.LITERAL || parsedTree.type === JSEPNode.UNARY_EXP) {
-    // do nothing
-  } else if (parsedTree.type === JSEPNode.COMPOUND) {
-    if (parsedTree.body.length) {
-      errors.add(t('msg.formula.cantSaveFieldFormulaInvalid'))
-    }
-  } else {
-    errors.add(t('msg.formula.cantSaveFieldFormulaInvalid'))
-  }
-  return errors
-}
-
-function validateAgainstType(parsedTree: any, expectedType: string, func: any, typeErrors = new Set()) {
-  if (parsedTree === false || typeof parsedTree === 'undefined') {
-    return typeErrors
-  }
-  if (parsedTree.type === JSEPNode.LITERAL) {
-    if (typeof func === 'function') {
-      func(parsedTree.value)
-    } else if (expectedType === formulaTypes.NUMERIC) {
-      if (typeof parsedTree.value !== 'number') {
-        typeErrors.add(t('msg.formula.numericTypeIsExpected'))
-      }
-    } else if (expectedType === formulaTypes.STRING) {
-      if (typeof parsedTree.value !== 'string') {
-        typeErrors.add(t('msg.formula.stringTypeIsExpected'))
-      }
-    }
-  } else if (parsedTree.type === JSEPNode.IDENTIFIER) {
-    const col = supportedColumns.value.find((c) => c.title === parsedTree.name)
-
-    if (col === undefined) {
-      return
-    }
-
-    if (col.uidt === UITypes.Formula) {
-      const foundType = getRootDataType(jsep(col.colOptions?.formula_raw))
-      if (foundType === 'N/A') {
-        typeErrors.add(t('msg.formula.notSupportedToReferenceColumn', { columnName: col.title }))
-      } else if (expectedType !== foundType) {
-        typeErrors.add(
-          t('msg.formula.typeIsExpectedButFound', {
-            type: expectedType,
-            found: foundType,
-          }),
-        )
-      }
-    } else {
-      switch (col.uidt) {
-        // string
-        case UITypes.SingleLineText:
-        case UITypes.LongText:
-        case UITypes.MultiSelect:
-        case UITypes.SingleSelect:
-        case UITypes.PhoneNumber:
-        case UITypes.Email:
-        case UITypes.URL:
-          if (expectedType !== formulaTypes.STRING) {
-            typeErrors.add(
-              t('msg.formula.columnWithTypeFoundButExpected', {
-                columnName: parsedTree.name,
-                columnType: formulaTypes.STRING,
-                expectedType,
-              }),
-            )
-          }
-          break
-
-        // numeric
-        case UITypes.Year:
-        case UITypes.Number:
-        case UITypes.Decimal:
-        case UITypes.Rating:
-        case UITypes.Count:
-        case UITypes.AutoNumber:
-        case UITypes.Currency:
-          if (expectedType !== formulaTypes.NUMERIC) {
-            typeErrors.add(
-              t('msg.formula.columnWithTypeFoundButExpected', {
-                columnName: parsedTree.name,
-                columnType: formulaTypes.NUMERIC,
-                expectedType,
-              }),
-            )
-          }
-          break
-
-        // date
-        case UITypes.Date:
-        case UITypes.DateTime:
-        case UITypes.CreateTime:
-        case UITypes.LastModifiedTime:
-          if (expectedType !== formulaTypes.DATE) {
-            typeErrors.add(
-              t('msg.formula.columnWithTypeFoundButExpected', {
-                columnName: parsedTree.name,
-                columnType: formulaTypes.DATE,
-                expectedType,
-              }),
-            )
-          }
-          break
-
-        case UITypes.Rollup: {
-          const rollupFunction = col.colOptions.rollup_function
-          if (['count', 'avg', 'sum', 'countDistinct', 'sumDistinct', 'avgDistinct'].includes(rollupFunction)) {
-            // these functions produce a numeric value, which can be used in numeric functions
-            if (expectedType !== formulaTypes.NUMERIC) {
-              typeErrors.add(
-                t('msg.formula.columnWithTypeFoundButExpected', {
-                  columnName: parsedTree.name,
-                  columnType: formulaTypes.NUMERIC,
-                  expectedType,
-                }),
-              )
-            }
-          } else {
-            // the value is based on the foreign rollup column type
-            const selectedTable = refTables.value.find((t) => t.column.id === col.colOptions.fk_relation_column_id)
-            const refTableColumns = metas.value[selectedTable.id].columns.filter(
-              (c: ColumnType) =>
-                vModel.value.fk_lookup_column_id === c.id ||
-                (!isSystemColumn(c) && c.id !== vModel.value.id && c.uidt !== UITypes.Links),
-            )
-            const childFieldColumn = refTableColumns.find(
-              (column: ColumnType) => column.id === col.colOptions.fk_rollup_column_id,
-            )
-            const abstractType = sqlUi.value.getAbstractType(childFieldColumn)
-
-            if (expectedType === formulaTypes.DATE && !isDate(childFieldColumn, sqlUi.value.getAbstractType(childFieldColumn))) {
-              typeErrors.add(
-                t('msg.formula.columnWithTypeFoundButExpected', {
-                  columnName: parsedTree.name,
-                  columnType: abstractType,
-                  expectedType,
-                }),
-              )
-            } else if (expectedType === formulaTypes.NUMERIC && !isNumericCol(childFieldColumn)) {
-              typeErrors.add(
-                t('msg.formula.columnWithTypeFoundButExpected', {
-                  columnName: parsedTree.name,
-                  columnType: abstractType,
-                  expectedType,
-                }),
-              )
-            }
-          }
-          break
-        }
-
-        // not supported
-        case UITypes.ForeignKey:
-        case UITypes.Attachment:
-        case UITypes.ID:
-        case UITypes.Time:
-        case UITypes.Percent:
-        case UITypes.Duration:
-        case UITypes.Lookup:
-        case UITypes.Barcode:
-        case UITypes.Button:
-        case UITypes.Checkbox:
-        case UITypes.Collaborator:
-        case UITypes.QrCode:
-        default:
-          typeErrors.add(t('msg.formula.notSupportedToReferenceColumn', { columnName: parsedTree.name }))
-          break
-      }
-    }
-  } else if (parsedTree.type === JSEPNode.UNARY_EXP || parsedTree.type === JSEPNode.BINARY_EXP) {
-    if (expectedType !== formulaTypes.NUMERIC) {
-      // parsedTree.name won't be available here
-      typeErrors.add(
-        t('msg.formula.typeIsExpectedButFound', {
-          type: formulaTypes.NUMERIC,
-          found: expectedType,
-        }),
-      )
-    }
-  } else if (parsedTree.type === JSEPNode.CALL_EXP) {
-    const calleeName = parsedTree.callee.name.toUpperCase()
-    if (formulas[calleeName]?.type && expectedType !== formulas[calleeName].type) {
-      typeErrors.add(
-        t('msg.formula.typeIsExpectedButFound', {
-          type: expectedType,
-          found: formulas[calleeName].type,
-        }),
-      )
-    }
-  }
-  return typeErrors
-}
+const suggestedFormulas = computed(() => {
+  return suggestion.value.filter((s) => s && s.type !== 'column')
+})
 
-function getRootDataType(parsedTree: any): any {
-  // given a parse tree, return the data type of it
-  if (parsedTree.type === JSEPNode.CALL_EXP) {
-    return formulas[parsedTree.callee.name.toUpperCase()].type
-  } else if (parsedTree.type === JSEPNode.IDENTIFIER) {
-    const col = supportedColumns.value.find((c) => c.title === parsedTree.name) as Record<string, any>
-    if (col?.uidt === UITypes.Formula) {
-      return getRootDataType(jsep(col?.formula_raw))
-    } else {
-      switch (col?.uidt) {
-        // string
-        case UITypes.SingleLineText:
-        case UITypes.LongText:
-        case UITypes.MultiSelect:
-        case UITypes.SingleSelect:
-        case UITypes.PhoneNumber:
-        case UITypes.Email:
-        case UITypes.URL:
-          return formulaTypes.STRING
-
-        // numeric
-        case UITypes.Year:
-        case UITypes.Number:
-        case UITypes.Decimal:
-        case UITypes.Rating:
-        case UITypes.Count:
-        case UITypes.AutoNumber:
-          return formulaTypes.NUMERIC
-
-        // date
-        case UITypes.Date:
-        case UITypes.DateTime:
-        case UITypes.CreateTime:
-        case UITypes.LastModifiedTime:
-          return formulaTypes.DATE
-
-        // not supported
-        case UITypes.ForeignKey:
-        case UITypes.Attachment:
-        case UITypes.ID:
-        case UITypes.Time:
-        case UITypes.Currency:
-        case UITypes.Percent:
-        case UITypes.Duration:
-        case UITypes.Rollup:
-        case UITypes.Lookup:
-        case UITypes.Barcode:
-        case UITypes.Button:
-        case UITypes.Checkbox:
-        case UITypes.Collaborator:
-        case UITypes.QrCode:
-        default:
-          return 'N/A'
-      }
-    }
-  } else if (parsedTree.type === JSEPNode.BINARY_EXP || parsedTree.type === JSEPNode.UNARY_EXP) {
-    return formulaTypes.NUMERIC
-  } else if (parsedTree.type === JSEPNode.LITERAL) {
-    return typeof parsedTree.value
-  } else {
-    return 'N/A'
-  }
-}
+const variableList = computed(() => {
+  return suggestion.value.filter((s) => s && s.type === 'column')
+})
 
 function isCurlyBracketBalanced() {
   // count number of opening curly brackets and closing curly brackets
@@ -739,6 +209,11 @@ function handleInput() {
   suggestion.value = acTree.value
     .complete(wordToComplete.value)
     ?.sort((x: Record<string, any>, y: Record<string, any>) => sortOrder[x.type] - sortOrder[y.type])
+
+  if (suggestion.value.length > 0 && suggestion.value[0].type !== 'column') {
+    suggestionPreviewed.value = suggestion.value[0]
+  }
+
   if (!isCurlyBracketBalanced()) {
     suggestion.value = suggestion.value.filter((v) => v.type === 'column')
   }
@@ -746,14 +221,21 @@ function handleInput() {
 }
 
 function selectText() {
-  if (suggestion.value && selected.value > -1 && selected.value < suggestion.value.length) {
-    appendText(suggestion.value[selected.value])
+  if (suggestion.value && selected.value > -1 && selected.value < suggestionsList.value.length) {
+    if (selected.value < suggestedFormulas.value.length) {
+      appendText(suggestedFormulas.value[selected.value])
+    } else {
+      appendText(variableList.value[selected.value + suggestedFormulas.value.length])
+    }
   }
+
+  selected.value = 0
 }
 
 function suggestionListUp() {
   if (suggestion.value) {
     selected.value = --selected.value > -1 ? selected.value : suggestion.value.length - 1
+    suggestionPreviewed.value = suggestedFormulas.value[selected.value]
     scrollToSelectedOption()
   }
 }
@@ -761,6 +243,8 @@ function suggestionListUp() {
 function suggestionListDown() {
   if (suggestion.value) {
     selected.value = ++selected.value % suggestion.value.length
+    suggestionPreviewed.value = suggestedFormulas.value[selected.value]
+
     scrollToSelectedOption()
   }
 }
@@ -769,9 +253,9 @@ function scrollToSelectedOption() {
   nextTick(() => {
     if (sugOptionsRef.value[selected.value]) {
       try {
-        sugListRef.value.$el.scrollTo({
-          top: sugOptionsRef.value[selected.value].$el.offsetTop,
-          behavior: 'smooth',
+        sugOptionsRef.value[selected.value].$el.scrollIntoView({
+          block: 'nearest',
+          inline: 'start',
         })
       } catch (e) {}
     }
@@ -796,15 +280,55 @@ setAdditionalValidations({
 onMounted(() => {
   jsep.plugins.register(jsepCurlyHook)
 })
-
-// const predictFunction = async () => {
-//   await _predictFunction(formState, meta, supportedColumns, suggestionsList, vModel)
-// }
 </script>
 
 <template>
-  <div class="formula-wrapper">
-    <a-form-item v-bind="validateInfos.formula_raw" :label="$t('datatype.Formula')">
+  <div class="formula-wrapper relative">
+    <div
+      v-if="suggestionPreviewed && suggestionPreviewed.type === 'function'"
+      class="absolute -left-91 w-84 top-0 bg-white z-10 pl-3 pt-3 border-1 shadow-md rounded-xl"
+    >
+      <div class="pr-3">
+        <div class="flex flex-row w-full justify-between pb-1 border-b-1">
+          <div class="flex items-center gap-x-1 font-semibold text-base">
+            <component :is="iconMap.function" class="text-lg" />
+            {{ suggestionPreviewed.text }}
+          </div>
+          <NcButton type="text" size="small" @click="suggestionPreviewed = undefined">
+            <GeneralIcon icon="close" />
+          </NcButton>
+        </div>
+      </div>
+      <div class="flex flex-col max-h-120 nc-scrollbar-md pr-2">
+        <div class="flex mt-3">{{ suggestionPreviewed.description }}</div>
+
+        <div class="text-gray-500 uppercase text-xs mt-3 mb-2">Syntax</div>
+        <div class="bg-white rounded-md py-1 px-2 border-1">{{ suggestionPreviewed.syntax }}</div>
+        <div class="text-gray-500 uppercase text-xs mt-3 mb-2">Examples</div>
+        <div
+          v-for="(example, index) of suggestionPreviewed.examples"
+          :key="example"
+          class="bg-gray-100 py-1 px-2"
+          :class="{
+            'border-t-1 border-gray-200': index !== 0,
+            'rounded-b-md': index === suggestionPreviewed.examples.length - 1 && suggestionPreviewed.examples.length !== 1,
+            'rounded-t-md': index === 0 && suggestionPreviewed.examples.length !== 1,
+            'rounded-md': suggestionPreviewed.examples.length === 1,
+          }"
+        >
+          {{ example }}
+        </div>
+      </div>
+      <div class="flex flex-row mt-1 mb-3 justify-end pr-3">
+        <a target="_blank" rel="noopener noreferrer" :href="suggestionPreviewed.docsUrl">
+          <NcButton type="text" class="!text-gray-400 !hover:text-gray-800 !text-xs"
+            >View in Docs
+            <GeneralIcon icon="openInNew" class="ml-1" />
+          </NcButton>
+        </a>
+      </div>
+    </div>
+    <a-form-item v-bind="validateInfos.formula_raw" class="!pb-1" :label="$t('datatype.Formula')">
       <!-- <GeneralIcon
         v-if="isEeUI"
         icon="magic"
@@ -815,7 +339,7 @@ onMounted(() => {
       <a-textarea
         ref="formulaRef"
         v-model:value="vModel.formula_raw"
-        class="mb-2 nc-formula-input"
+        class="nc-formula-input !rounded-md !my-1"
         @keydown.down.prevent="suggestionListDown"
         @keydown.up.prevent="suggestionListUp"
         @keydown.enter.prevent="selectText"
@@ -823,73 +347,90 @@ onMounted(() => {
       />
     </a-form-item>
 
-    <div class="text-gray-600 mt-2 mb-4 prose-sm">
-      {{
-        // As using {} in translation will be treated as placeholder, and this translation contain {} as part of th text
-        $t('msg.formula.hintStart', {
-          placeholder1: '{}',
-          placeholder2: '{column_name}',
-        })
-      }}
-      <a
-        class="prose-sm"
-        href="https://docs.nocodb.com/setup-and-usages/formulas#available-formula-features"
-        target="_blank"
-        rel="noopener"
-      >
-        {{ $t('msg.formula.hintEnd') }}
-      </a>
-    </div>
+    <div ref="sugListRef" class="h-[250px] overflow-auto nc-scrollbar-md">
+      <template v-if="suggestedFormulas.length > 0">
+        <div class="rounded-t-lg border-1 bg-gray-50 px-3 py-1 uppercase text-gray-600 text-xs">Formulas</div>
+
+        <a-list
+          :data-source="suggestedFormulas"
+          :locale="{ emptyText: $t('msg.formula.noSuggestedFormulaFound') }"
+          class="border-1 border-t-0 rounded-b-lg !mb-4"
+        >
+          <template #renderItem="{ item, index }">
+            <a-list-item
+              :ref="
+                (el) => {
+                  sugOptionsRef[index] = el
+                }
+              "
+              class="cursor-pointer !overflow-hidden hover:bg-gray-50"
+              :class="{
+                '!bg-gray-100': selected === index,
+              }"
+              @click.prevent.stop="appendText(item)"
+              @mouseenter="suggestionPreviewed = item"
+            >
+              <a-list-item-meta>
+                <template #title>
+                  <div class="flex items-center gap-x-1">
+                    <component :is="iconMap.function" v-if="item.type === 'function'" class="text-lg" />
+
+                    <component :is="iconMap.calculator" v-if="item.type === 'op'" class="text-lg" />
+
+                    <component :is="item.icon" v-if="item.type === 'column'" class="text-lg" />
+                    <span class="prose-sm text-gray-600">{{ item.text }}</span>
+                  </div>
+                </template>
+              </a-list-item-meta>
+            </a-list-item>
+          </template>
+        </a-list>
+      </template>
+
+      <template v-if="variableList.length > 0">
+        <div class="rounded-t-lg border-1 bg-gray-50 px-3 py-1 uppercase text-gray-600 text-xs">Fields</div>
+
+        <a-list
+          ref="variableListRef"
+          :data-source="variableList"
+          :locale="{ emptyText: $t('msg.formula.noSuggestedFormulaFound') }"
+          class="border-1 border-t-0 rounded-b-lg !overflow-hidden"
+        >
+          <template #renderItem="{ item, index }">
+            <a-list-item
+              :ref="
+                (el) => {
+                  sugOptionsRef[index + suggestedFormulas.length] = el
+                }
+              "
+              :class="{
+                '!bg-gray-100': selected === index + suggestedFormulas.length,
+              }"
+              class="cursor-pointer hover:bg-gray-50"
+              @click.prevent.stop="appendText(item)"
+            >
+              <a-list-item-meta>
+                <template #title>
+                  <div class="flex items-center gap-x-1">
+                    <component :is="item.icon" class="text-lg" />
 
-    <div class="h-[250px] overflow-auto scrollbar-thin-primary">
-      <a-list ref="sugListRef" :data-source="suggestion" :locale="{ emptyText: $t('msg.formula.noSuggestedFormulaFound') }">
-        <template #renderItem="{ item, index }">
-          <a-list-item
-            :ref="
-              (el) => {
-                sugOptionsRef[index] = el
-              }
-            "
-            class="cursor-pointer"
-            @click.prevent.stop="appendText(item)"
-          >
-            <a-list-item-meta>
-              <template #title>
-                <div class="flex">
-                  <a-col :span="6">
                     <span class="prose-sm text-gray-600">{{ item.text }}</span>
-                  </a-col>
-
-                  <a-col :span="18">
-                    <div v-if="item.type === 'function'" class="text-xs text-gray-500">
-                      {{ item.description }} <br /><br />
-                      {{ $t('labels.syntax') }}: <br />
-                      {{ item.syntax }} <br /><br />
-                      {{ $t('labels.examples') }}: <br />
-
-                      <div v-for="(example, idx) of item.examples" :key="idx">
-                        <div>({{ idx + 1 }}): {{ example }}</div>
-                      </div>
-                    </div>
-
-                    <div v-if="item.type === 'column'" class="float-right mr-5 -mt-2">
-                      <a-badge-ribbon :text="item.uidt" color="gray" />
-                    </div>
-                  </a-col>
-                </div>
-              </template>
-
-              <template #avatar>
-                <component :is="iconMap.function" v-if="item.type === 'function'" class="text-lg" />
-
-                <component :is="iconMap.calculator" v-if="item.type === 'op'" class="text-lg" />
-
-                <component :is="item.icon" v-if="item.type === 'column'" class="text-lg" />
-              </template>
-            </a-list-item-meta>
-          </a-list-item>
-        </template>
-      </a-list>
+                  </div>
+                </template>
+              </a-list-item-meta>
+            </a-list-item>
+          </template>
+        </a-list>
+      </template>
+      <div v-if="suggestion.length === 0">
+        <span class="text-gray-500">Empty</span>
+      </div>
     </div>
   </div>
 </template>
+
+<style lang="scss" scoped>
+:deep(.ant-list-item) {
+  @apply !pt-1.75 pb-0.75 !px-2;
+}
+</style>
diff --git a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
index d63a7c3100..f1170621f9 100644
--- a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, TableType, UITypes } from 'nocodb-sdk'
-import { isLinksOrLTAR, isNumericCol, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { getAvailableRollupForUiType, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import type { Ref } from '#imports'
 import {
   MetaInj,
@@ -102,31 +102,27 @@ const cellIcon = (column: ColumnType) =>
 
 const aggFunctionsList: Ref<Record<string, string>[]> = ref([])
 
+const allFunctions = [
+  { text: t('datatype.Count'), value: 'count' },
+  { text: t('general.min'), value: 'min' },
+  { text: t('general.max'), value: 'max' },
+  { text: t('general.avg'), value: 'avg' },
+  { text: t('general.sum'), value: 'sum' },
+  { text: t('general.countDistinct'), value: 'countDistinct' },
+  { text: t('general.sumDistinct'), value: 'sumDistinct' },
+  { text: t('general.avgDistinct'), value: 'avgDistinct' },
+]
+
 watch(
   () => vModel.value.fk_rollup_column_id,
   () => {
     const childFieldColumn = columns.value?.find((column: ColumnType) => column.id === vModel.value.fk_rollup_column_id)
-    const showNumericFunctions = isNumericCol(childFieldColumn)
-    const nonNumericFunctions = [
-      // functions for non-numeric types,
-      // e.g. count / min / max / countDistinct date field
-      { text: t('datatype.Count'), value: 'count' },
-      { text: t('general.min'), value: 'min' },
-      { text: t('general.max'), value: 'max' },
-      { text: t('general.countDistinct'), value: 'countDistinct' },
-    ]
-    const numericFunctions = showNumericFunctions
-      ? [
-          { text: t('general.avg'), value: 'avg' },
-          { text: t('general.sum'), value: 'sum' },
-          { text: t('general.sumDistinct'), value: 'sumDistinct' },
-          { text: t('general.avgDistinct'), value: 'avgDistinct' },
-        ]
-      : []
-
-    aggFunctionsList.value = [...nonNumericFunctions, ...numericFunctions]
-
-    if (!showNumericFunctions && ['avg', 'sum', 'sumDistinct', 'avgDistinct'].includes(vModel.value.rollup_function)) {
+
+    aggFunctionsList.value = allFunctions.filter((func) =>
+      getAvailableRollupForUiType(childFieldColumn?.uidt as UITypes).includes(func.value),
+    )
+
+    if (!aggFunctionsList.value.includes(vModel.value.rollup_function)) {
       // when the previous roll up function was numeric type and the current child field is non-numeric
       // reset rollup function with a non-numeric type
       vModel.value.rollup_function = aggFunctionsList.value[0].value
diff --git a/packages/nc-gui/components/smartsheet/column/UserOptions.vue b/packages/nc-gui/components/smartsheet/column/UserOptions.vue
new file mode 100644
index 0000000000..17ae2035e1
--- /dev/null
+++ b/packages/nc-gui/components/smartsheet/column/UserOptions.vue
@@ -0,0 +1,66 @@
+<script setup lang="ts">
+import { useVModel } from '#imports'
+
+const props = defineProps<{
+  value: any
+  isEdit: boolean
+}>()
+
+const emit = defineEmits(['update:value'])
+
+const vModel = useVModel(props, 'value', emit)
+
+const future = ref(false)
+
+const initialIsMulti = ref()
+
+const validators = {}
+
+const { setAdditionalValidations } = useColumnCreateStoreOrThrow()
+
+setAdditionalValidations({
+  ...validators,
+})
+
+// set default value
+vModel.value.meta = {
+  is_multi: false,
+  notify: false,
+  ...vModel.value.meta,
+}
+
+onMounted(() => {
+  initialIsMulti.value = vModel.value.meta.is_multi
+})
+
+const updateIsMulti = (e) => {
+  vModel.value.meta.is_multi = e.target.checked
+  if (!vModel.value.meta.is_multi) {
+    vModel.value.cdf = vModel.value.cdf?.split(',')[0] || null
+  }
+}
+</script>
+
+<template>
+  <div class="flex flex-col">
+    <div>
+      <a-checkbox
+        v-if="vModel.meta"
+        :checked="vModel.meta.is_multi"
+        class="ml-1 mb-1"
+        data-testid="user-column-allow-multiple"
+        @change="updateIsMulti"
+      >
+        <span class="text-[10px] text-gray-600">Allow adding multiple users</span>
+      </a-checkbox>
+    </div>
+    <div v-if="future">
+      <a-checkbox v-if="vModel.meta" v-model:checked="vModel.meta.notify" class="ml-1 mb-1">
+        <span class="text-[10px] text-gray-600">Notify users with base access when they're added</span>
+      </a-checkbox>
+    </div>
+    <div v-if="initialIsMulti && isEdit && !vModel.meta.is_multi" class="text-error text-[10px] mb-1 mt-2">
+      <span>Changing from multiple mode to single will retain only first user in each cell!!!</span>
+    </div>
+  </div>
+</template>
diff --git a/packages/nc-gui/components/smartsheet/details/Api.vue b/packages/nc-gui/components/smartsheet/details/Api.vue
index 8adf99d65e..f8683425aa 100644
--- a/packages/nc-gui/components/smartsheet/details/Api.vue
+++ b/packages/nc-gui/components/smartsheet/details/Api.vue
@@ -84,7 +84,7 @@ const selectedLangName = ref(langs[0].name)
 const apiUrl = computed(
   () =>
     new URL(
-      `/api/v1/db/data/noco/${base.value?.id}/${meta.value?.title}/views/${view.value?.title}`,
+      `/api/v1/db/data/noco/${base.value?.id}/${meta.value?.id}/views/${view.value?.id}`,
       (appInfo.value && appInfo.value.ncSiteUrl) || '/',
     ).href,
 )
@@ -118,9 +118,9 @@ const api = new Api({
 
 api.dbViewRow.list(
   "noco",
-  ${JSON.stringify(base.value?.title)},
-  ${JSON.stringify(meta.value?.title)},
-  ${JSON.stringify(view.value?.title)}, ${JSON.stringify(queryParams.value, null, 4)}).then(function (data) {
+  ${JSON.stringify(base.value?.id)},
+  ${JSON.stringify(meta.value?.id)},
+  ${JSON.stringify(view.value?.id)}, ${JSON.stringify(queryParams.value, null, 4)}).then(function (data) {
   console.log(data);
 }).catch(function (error) {
   console.error(error);
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 8e740a43fe..73d4b453a6 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -90,6 +90,8 @@ const { isUIAllowed } = useRoles()
 
 const readOnly = computed(() => !isUIAllowed('dataEdit') || isPublic.value)
 
+const expandedFormScrollWrapper = ref()
+
 const reloadTrigger = inject(ReloadRowDataHookInj, createEventHook())
 
 const { addOrEditStackRow } = useKanbanViewStoreOrThrow()
@@ -439,6 +441,13 @@ const preventModalStatus = computed({
 })
 
 const onIsExpandedUpdate = (v: boolean) => {
+  let isDropdownOpen = false
+  document.querySelectorAll('.ant-select-dropdown').forEach((el) => {
+    isDropdownOpen = isDropdownOpen || el.checkVisibility()
+  })
+
+  if (isDropdownOpen) return
+
   if (changedColumns.value.size === 0 && !isUnsavedFormExist.value) {
     isExpanded.value = v
   } else if (!v) {
@@ -451,6 +460,22 @@ const onIsExpandedUpdate = (v: boolean) => {
 const isReadOnlyVirtualCell = (column: ColumnType) => {
   return isRollup(column) || isFormula(column) || isBarcode(column) || isLookup(column) || isQrCode(column)
 }
+
+// Small hack. We need to scroll to the bottom of the form after its mounted and back to top.
+// So that tab to next row works properly, as otherwise browser will focus to save button
+// when we reach to the bottom of the visual scrollable area, not the actual bottom of the form
+watch([expandedFormScrollWrapper, isLoading], () => {
+  if (isMobileMode.value) return
+
+  if (expandedFormScrollWrapper.value && !isLoading.value) {
+    const height = expandedFormScrollWrapper.value.scrollHeight
+    expandedFormScrollWrapper.value.scrollTop = height
+
+    setTimeout(() => {
+      expandedFormScrollWrapper.value.scrollTop = 0
+    }, 125)
+  }
+})
 </script>
 
 <script lang="ts">
@@ -620,6 +645,7 @@ export default {
           }"
         >
           <div
+            ref="expandedFormScrollWrapper"
             class="flex flex-col flex-grow mt-2 h-full max-h-full nc-scrollbar-md pb-6 items-center w-full bg-white p-4 xs:p-0"
           >
             <div
@@ -658,7 +684,7 @@ export default {
                   <SmartsheetDivDataCell
                     v-if="col.title"
                     :ref="i ? null : (el: any) => (cellWrapperEl = el)"
-                    class="bg-white rounded-lg w-80 xs:w-full border-1 border-gray-200 overflow-hidden px-1 sm:min-h-[35px] xs:min-h-13 flex items-center relative"
+                    class="bg-white w-80 xs:w-full px-1 sm:min-h-[35px] xs:min-h-13 flex items-center relative"
                     :class="{
                       '!bg-gray-50 !px-0 !select-text': isReadOnlyVirtualCell(col),
                     }"
@@ -894,4 +920,8 @@ export default {
 :deep(.ant-select-selection-item) {
   @apply !xs:(mt-1.75 ml-1);
 }
+
+.nc-data-cell:focus-within {
+  @apply !border-1 !border-brand-500 !rounded-lg !shadow-none !ring-0;
+}
 </style>
diff --git a/packages/nc-gui/components/smartsheet/grid/GroupBy.vue b/packages/nc-gui/components/smartsheet/grid/GroupBy.vue
index a06811ecab..510c902cb2 100644
--- a/packages/nc-gui/components/smartsheet/grid/GroupBy.vue
+++ b/packages/nc-gui/components/smartsheet/grid/GroupBy.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import tinycolor from 'tinycolor2'
-import { UITypes } from 'nocodb-sdk'
+import dayjs from 'dayjs'
+import { UITypes, dateFormats, timeFormats } from 'nocodb-sdk'
 import Table from './Table.vue'
 import GroupBy from './GroupBy.vue'
 import GroupByTable from './GroupByTable.vue'
@@ -139,7 +140,7 @@ const onScroll = (e: Event) => {
 
 // a method to parse group key if grouped column type is LTAR or Lookup
 // in these 2 scenario it will return json array or `___` separated value
-const parseKey = (group) => {
+const parseKey = (group: Group) => {
   let key = group.key.toString()
 
   // parse json array key if it's a lookup or link to another record
@@ -151,11 +152,36 @@ const parseKey = (group) => {
       return key.split('___')
     }
   }
+
+  // show the groupBy dateTime field title format as like cell format
+  if (key && group.column?.uidt === UITypes.DateTime && dayjs(key).isValid()) {
+    const dateFormat = parseProp(group.column?.meta)?.date_format ?? dateFormats[0]
+    const timeFormat = parseProp(group.column?.meta)?.time_format ?? timeFormats[0]
+
+    const dateTimeFormat = `${dateFormat} ${timeFormat}`
+
+    return [dayjs(key).utc().local().format(dateTimeFormat)]
+  }
+
+  // show the groupBy time field title format as like cell format
+  if (key && group.column?.uidt === UITypes.Time && dayjs(key).isValid()) {
+    return [dayjs(key).format(timeFormats[0])]
+  }
+
+  if (key && group.column?.uidt === UITypes.User) {
+    try {
+      const parsedKey = JSON.parse(key)
+      return [parsedKey]
+    } catch {
+      return null
+    }
+  }
+
   return [key]
 }
 
 const shouldRenderCell = (column) =>
-  [UITypes.Lookup, UITypes.Attachment, UITypes.Barcode, UITypes.QrCode, UITypes.Links].includes(column?.uidt)
+  [UITypes.Lookup, UITypes.Attachment, UITypes.Barcode, UITypes.QrCode, UITypes.Links, UITypes.User].includes(column?.uidt)
 </script>
 
 <template>
diff --git a/packages/nc-gui/components/smartsheet/grid/GroupByTable.vue b/packages/nc-gui/components/smartsheet/grid/GroupByTable.vue
index 79a77191cc..296746fd20 100644
--- a/packages/nc-gui/components/smartsheet/grid/GroupByTable.vue
+++ b/packages/nc-gui/components/smartsheet/grid/GroupByTable.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 import Table from './Table.vue'
-import { IsGroupByInj, computed, ref } from '#imports'
+import { IsGroupByInj, computed, ref, rowDefaultData } from '#imports'
 import type { Group, Row } from '#imports'
 
 const props = defineProps<{
@@ -38,7 +38,7 @@ const view = inject(ActiveViewInj, ref())
 
 const reloadViewDataHook = inject(ReloadViewDataHookInj, createEventHook())
 
-function addEmptyRow(group: Group, addAfter?: number) {
+function addEmptyRow(group: Group, addAfter?: number, metaValue = meta.value) {
   if (group.nested || !group.rows) return
 
   addAfter = addAfter ?? group.rows.length
@@ -57,6 +57,7 @@ function addEmptyRow(group: Group, addAfter?: number) {
 
   group.rows.splice(addAfter, 0, {
     row: {
+      ...rowDefaultData(metaValue?.columns),
       ...setGroup,
     },
     oldRow: {},
diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue
index e15bce4ee1..f63a6a85d9 100644
--- a/packages/nc-gui/components/smartsheet/grid/Table.vue
+++ b/packages/nc-gui/components/smartsheet/grid/Table.vue
@@ -448,7 +448,8 @@ const closeAddColumnDropdown = (scrollToLastCol = false) => {
 }
 
 async function openNewRecordHandler() {
-  const newRow = addEmptyRow()
+  // skip update row when it is `New record form`
+  const newRow = addEmptyRow(dataRef.value.length, true)
   if (newRow) expandForm?.(newRow, undefined, true)
 }
 
@@ -697,8 +698,17 @@ function scrollToRow(row?: number) {
   scrollToCell?.()
 }
 
-function addEmptyRow(row?: number) {
+async function saveEmptyRow(rowObj: Row) {
+  await updateOrSaveRow?.(rowObj)
+}
+
+function addEmptyRow(row?: number, skipUpdate: boolean = false) {
   const rowObj = callAddEmptyRow?.(row)
+
+  if (!skipUpdate && rowObj) {
+    saveEmptyRow(rowObj)
+  }
+
   nextTick().then(() => {
     scrollToRow(row ?? dataRef.value.length - 1)
   })
@@ -781,7 +791,7 @@ onClickOutside(tableBodyEl, (e) => {
   // ignore unselecting if clicked inside or on the picker(Date, Time, DateTime, Year)
   // or single/multi select options
   const activePickerOrDropdownEl = document.querySelector(
-    '.nc-picker-datetime.active,.nc-dropdown-single-select-cell.active,.nc-dropdown-multi-select-cell.active,.nc-picker-date.active,.nc-picker-year.active,.nc-picker-time.active',
+    '.nc-picker-datetime.active,.nc-dropdown-single-select-cell.active,.nc-dropdown-multi-select-cell.active,.nc-dropdown-user-select-cell.active,.nc-picker-date.active,.nc-picker-year.active,.nc-picker-time.active',
   )
   if (
     e.target &&
@@ -995,7 +1005,13 @@ const showFillHandle = computed(
     !readOnly.value &&
     !editEnabled.value &&
     (!selectedRange.isEmpty() || (activeCell.row !== null && activeCell.col !== null)) &&
-    !dataRef.value[(isNaN(selectedRange.end.row) ? activeCell.row : selectedRange.end.row) ?? -1]?.rowMeta?.new,
+    !dataRef.value[(isNaN(selectedRange.end.row) ? activeCell.row : selectedRange.end.row) ?? -1]?.rowMeta?.new &&
+    activeCell.col !== null &&
+    !(
+      isLookup(fields.value[activeCell.col]) ||
+      isRollup(fields.value[activeCell.col]) ||
+      isFormula(fields.value[activeCell.col])
+    ),
 )
 
 watch(
@@ -1027,13 +1043,11 @@ eventBus.on(async (event, payload) => {
     addColumnDropdown.value = true
   }
   if (event === SmartsheetStoreEvents.CLEAR_NEW_ROW) {
-    const removed = removeRowIfNew?.(payload)
+    clearSelectedRange()
+    activeCell.row = null
+    activeCell.col = null
 
-    if (removed) {
-      clearSelectedRange()
-      activeCell.row = null
-      activeCell.col = null
-    }
+    removeRowIfNew?.(payload)
   }
 })
 
@@ -1258,7 +1272,10 @@ onKeyStroke('ArrowDown', onDown)
       ></div>
     </div>
     <div ref="gridWrapper" class="nc-grid-wrapper min-h-0 flex-1 relative" :class="gridWrapperClass">
-      <div v-show="isPaginationLoading" class="flex items-center justify-center absolute l-0 t-0 w-full h-full z-10 pb-10">
+      <div
+        v-show="isPaginationLoading"
+        class="flex items-center justify-center absolute l-0 t-0 w-full h-full z-10 pb-10 pointer-events-none"
+      >
         <div class="flex flex-col justify-center gap-2">
           <GeneralLoader size="xlarge" />
           <span class="text-center" v-html="loaderText"></span>
@@ -1486,7 +1503,6 @@ onKeyStroke('ArrowDown', onDown)
                     >
                       <div class="items-center flex gap-1 min-w-[60px]">
                         <div
-                          v-if="!readOnly || isMobileMode"
                           class="nc-row-no sm:min-w-4 text-xs text-gray-500"
                           :class="{ toggle: !readOnly, hidden: row.rowMeta.selected }"
                         >
@@ -1576,7 +1592,7 @@ onKeyStroke('ArrowDown', onDown)
                       @dblclick="makeEditable(row, columnObj)"
                       @contextmenu="showContextMenu($event, { row: rowIndex, col: colIndex })"
                     >
-                      <div v-if="!switchingTab" class="w-full h-full">
+                      <div v-if="!switchingTab" class="w-full">
                         <LazySmartsheetVirtualCell
                           v-if="isVirtualCol(columnObj) && columnObj.title"
                           v-model="row.row[columnObj.title]"
@@ -1698,7 +1714,7 @@ onKeyStroke('ArrowDown', onDown)
             </NcMenuItem>
 
             <NcMenuItem
-              v-if="contextMenuTarget"
+              v-if="contextMenuTarget && hasEditPermission"
               class="nc-base-menu-item"
               data-testid="context-menu-item-paste"
               :disabled="isSystemColumn(fields[contextMenuTarget.col])"
@@ -1721,6 +1737,7 @@ onKeyStroke('ArrowDown', onDown)
               "
               class="nc-base-menu-item"
               :disabled="isSystemColumn(fields[contextMenuTarget.col])"
+              data-testid="context-menu-item-clear"
               @click="clearCell(contextMenuTarget)"
             >
               <div v-e="['a:row:clear']" class="flex gap-2 items-center">
@@ -1734,6 +1751,7 @@ onKeyStroke('ArrowDown', onDown)
               v-else-if="contextMenuTarget && hasEditPermission"
               class="nc-base-menu-item"
               :disabled="isSystemColumn(fields[contextMenuTarget.col])"
+              data-testid="context-menu-item-clear"
               @click="clearSelectedRangeOfCells()"
             >
               <div v-e="['a:row:clear-range']" class="flex gap-2 items-center">
@@ -1741,17 +1759,16 @@ onKeyStroke('ArrowDown', onDown)
                 {{ $t('general.clear') }}
               </div>
             </NcMenuItem>
-            <NcDivider />
-            <NcMenuItem
-              v-if="contextMenuTarget && selectedRange.isSingleCell() && isUIAllowed('commentEdit') && !isMobileMode"
-              class="nc-base-menu-item"
-              @click="commentRow(contextMenuTarget.row)"
-            >
-              <div v-e="['a:row:comment']" class="flex gap-2 items-center">
-                <MdiMessageOutline class="h-4 w-4" />
-                {{ $t('general.comment') }}
-              </div>
-            </NcMenuItem>
+
+            <template v-if="contextMenuTarget && selectedRange.isSingleCell() && isUIAllowed('commentEdit') && !isMobileMode">
+              <NcDivider />
+              <NcMenuItem class="nc-base-menu-item" @click="commentRow(contextMenuTarget.row)">
+                <div v-e="['a:row:comment']" class="flex gap-2 items-center">
+                  <MdiMessageOutline class="h-4 w-4" />
+                  {{ $t('general.comment') }}
+                </div>
+              </NcMenuItem>
+            </template>
 
             <template v-if="hasEditPermission">
               <NcDivider v-if="!(!contextMenuClosing && !contextMenuTarget && data.some((r) => r.rowMeta.selected))" />
diff --git a/packages/nc-gui/components/smartsheet/grid/useColumnDrag.ts b/packages/nc-gui/components/smartsheet/grid/useColumnDrag.ts
index 9a9fa621bd..df2714b230 100644
--- a/packages/nc-gui/components/smartsheet/grid/useColumnDrag.ts
+++ b/packages/nc-gui/components/smartsheet/grid/useColumnDrag.ts
@@ -34,6 +34,9 @@ export const useColumnDrag = ({
     const lastCol = fields.value[fields.value.length - 1]
     const lastViewCol = gridViewCols.value[lastCol.id!]
 
+    // if nextToViewCol/toViewCol is null, return
+    if (nextToViewCol === null || lastViewCol === null) return
+
     const newOrder = nextToViewCol ? toViewCol.order! + (nextToViewCol.order! - toViewCol.order!) / 2 : lastViewCol.order! + 1
     const oldOrder = toBeReorderedViewCol.order
 
diff --git a/packages/nc-gui/components/smartsheet/header/CellIcon.ts b/packages/nc-gui/components/smartsheet/header/CellIcon.ts
index 9c4da211ce..8c270af2a9 100644
--- a/packages/nc-gui/components/smartsheet/header/CellIcon.ts
+++ b/packages/nc-gui/components/smartsheet/header/CellIcon.ts
@@ -31,6 +31,7 @@ import {
   isTextArea,
   isTime,
   isURL,
+  isUser,
   isYear,
   storeToRefs,
   toRef,
@@ -82,6 +83,11 @@ const renderIcon = (column: ColumnType, abstractType: any) => {
     return iconMap.percent
   } else if (isGeometry(column)) {
     return iconMap.calculator
+  } else if (isUser(column)) {
+    if ((column.meta as { is_multi: boolean; notify: boolean }).is_multi) {
+      return iconMap.phUsers
+    }
+    return iconMap.phUser
   } else if (isInt(column, abstractType) || isFloat(column, abstractType)) {
     return iconMap.number
   } else if (isString(column, abstractType)) {
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
index 10965c3d53..d172788f59 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
@@ -208,8 +208,17 @@ const filtersCount = computed(() => {
   }, 0)
 })
 
-const applyChanges = async (hookId?: string, _nested = false) => {
-  await sync(hookId, _nested)
+const applyChanges = async (hookId?: string, nested = false, isConditionSupported = true) => {
+  // if condition is not supported, delete all filters present
+  // it's used for bulk webhooks with filters since bulk webhooks don't support conditions at the moment
+  if (!isConditionSupported) {
+    // iterate in reverse order and delete all filters, reverse order is for getting the correct index
+    for (let i = filters.value.length - 1; i >= 0; i--) {
+      await deleteFilter(filters.value[i], i)
+    }
+  }
+
+  await sync(hookId, nested)
 
   if (!localNestedFilters.value?.length) return
 
diff --git a/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue b/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue
index 4014db8869..8f70e505e7 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue
@@ -21,6 +21,7 @@ import {
   isSingleSelect,
   isTextArea,
   isTime,
+  isUser,
   isYear,
   provide,
   ref,
@@ -42,6 +43,7 @@ import Decimal from '~/components/cell/Decimal.vue'
 import Integer from '~/components/cell/Integer.vue'
 import Float from '~/components/cell/Float.vue'
 import Text from '~/components/cell/Text.vue'
+import User from '~/components/cell/User.vue'
 
 interface Props {
   column: ColumnType
@@ -82,6 +84,7 @@ const checkTypeFunctions = {
   isFloat,
   isTextArea,
   isLinks: (col: ColumnType) => col.uidt === UITypes.Links,
+  isUser,
 }
 
 type FilterType = keyof typeof checkTypeFunctions
@@ -148,6 +151,7 @@ const componentMap: Partial<Record<FilterType, any>> = computed(() => {
     isInt: Integer,
     isFloat: Float,
     isLinks: Integer,
+    isUser: User,
   }
 })
 
@@ -171,6 +175,9 @@ const componentProps = computed(() => {
     case 'isDuration': {
       return { showValidationError: false }
     }
+    case 'isUser': {
+      return { forceMulti: true }
+    }
     default: {
       return {}
     }
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ViewInfo.vue b/packages/nc-gui/components/smartsheet/toolbar/ViewInfo.vue
index 7a9096fa8c..5c0f72aa25 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ViewInfo.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ViewInfo.vue
@@ -90,7 +90,7 @@ const openedBaseUrl = computed(() => {
           'max-w-none': isSharedBase && !isMobileMode,
         }"
       >
-        <NcTooltip class="truncate nc-active-table-title max-w-full">
+        <NcTooltip class="truncate nc-active-table-title max-w-full" show-on-truncate-only>
           <template #title>
             {{ activeTable?.title }}
           </template>
diff --git a/packages/nc-gui/components/tabs/auth/UserManagement.vue b/packages/nc-gui/components/tabs/auth/UserManagement.vue
index e177847863..2eb3ad358b 100644
--- a/packages/nc-gui/components/tabs/auth/UserManagement.vue
+++ b/packages/nc-gui/components/tabs/auth/UserManagement.vue
@@ -33,6 +33,8 @@ const { isUIAllowed } = useRoles()
 
 const { dashboardUrl } = useDashboard()
 
+const { clearBasesUser } = useBases()
+
 const users = ref<null | User[]>(null)
 
 const selectedUser = ref<null | User>(null)
@@ -84,6 +86,9 @@ const inviteUser = async (user: User) => {
 
     await api.auth.baseUserAdd(base.value.id, user as ProjectUserReqType)
 
+    // clear bases user state
+    clearBasesUser()
+
     // Successfully added user to base
     message.success(t('msg.success.userAddedToProject'))
     await loadUsers()
diff --git a/packages/nc-gui/components/template/Editor.vue b/packages/nc-gui/components/template/Editor.vue
index 3a39efc820..ded1508618 100644
--- a/packages/nc-gui/components/template/Editor.vue
+++ b/packages/nc-gui/components/template/Editor.vue
@@ -784,7 +784,10 @@ watch(modelRef, async () => {
 
             <template #bodyCell="{ column, record }">
               <template v-if="column.key === 'source_column'">
-                <span>{{ record.srcCn }}</span>
+                <NcTooltip class="truncate"
+                  ><template #title>{{ record.srcCn }}</template
+                  >{{ record.srcCn }}</NcTooltip
+                >
               </template>
 
               <template v-else-if="column.key === 'destination_column'">
@@ -1025,7 +1028,7 @@ watch(modelRef, async () => {
   }
 
   :deep(.template-form-row) > td {
-    @apply p-0 mb-0;
+    @apply p-1 mb-0 truncate max-w-50;
     .ant-form-item {
       @apply mb-0;
     }
diff --git a/packages/nc-gui/components/virtual-cell/BelongsTo.vue b/packages/nc-gui/components/virtual-cell/BelongsTo.vue
index 0049ec7fc7..67cbaa0d80 100644
--- a/packages/nc-gui/components/virtual-cell/BelongsTo.vue
+++ b/packages/nc-gui/components/virtual-cell/BelongsTo.vue
@@ -83,6 +83,14 @@ const belongsToColumn = computed(
   () =>
     relatedTableMeta.value?.columns?.find((c: any) => c.title === relatedTableDisplayValueProp.value) as ColumnType | undefined,
 )
+
+const plusBtnRef = ref<HTMLElement | null>(null)
+
+watch([listItemsDlg], () => {
+  if (!listItemsDlg.value) {
+    plusBtnRef.value?.focus()
+  }
+})
 </script>
 
 <template>
@@ -101,11 +109,14 @@ const belongsToColumn = computed(
 
     <div
       v-if="!readOnly && (isUIAllowed('dataEdit') || isForm) && !isUnderLookup"
-      class="flex justify-end gap-1 min-h-[30px] items-center"
+      ref="plusBtnRef"
+      class="flex justify-end group gap-1 min-h-[30px] items-center"
+      tabindex="0"
+      @keydown.enter.stop="listItemsDlg = true"
     >
       <GeneralIcon
         :icon="addIcon"
-        class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 select-none group-hover:(text-gray-500) nc-plus"
+        class="text-sm nc-action-icon group-focus:visible invisible text-gray-500/50 hover:text-gray-500 select-none group-hover:(text-gray-500) nc-plus"
         @click.stop="listItemsDlg = true"
       />
     </div>
@@ -121,7 +132,7 @@ const belongsToColumn = computed(
 
 <style scoped lang="scss">
 .nc-action-icon {
-  @apply hidden cursor-pointer;
+  @apply cursor-pointer;
 }
 
 .chips-wrapper:hover,
@@ -130,4 +141,10 @@ const belongsToColumn = computed(
     @apply inline-block;
   }
 }
+
+.chips-wrapper:hover {
+  .nc-action-icon {
+    @apply visible;
+  }
+}
 </style>
diff --git a/packages/nc-gui/components/virtual-cell/Formula.vue b/packages/nc-gui/components/virtual-cell/Formula.vue
index 164c0f3b48..7c32d4af85 100644
--- a/packages/nc-gui/components/virtual-cell/Formula.vue
+++ b/packages/nc-gui/components/virtual-cell/Formula.vue
@@ -2,7 +2,7 @@
 import { handleTZ } from 'nocodb-sdk'
 import type { ColumnType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
-import { CellValueInj, ColumnInj, computed, inject, renderValue, replaceUrlsWithLink, useBase } from '#imports'
+import { CellValueInj, ColumnInj, computed, inject, renderValue, replaceUrlsWithLink, useBase, useGlobal } from '#imports'
 
 // todo: column type doesn't have required property `error` - throws in typecheck
 const column = inject(ColumnInj) as Ref<ColumnType & { colOptions: { error: any } }>
@@ -11,6 +11,8 @@ const cellValue = inject(CellValueInj)
 
 const { isPg } = useBase()
 
+const { showNull } = useGlobal()
+
 const result = computed(() =>
   isPg(column.value.source_id) ? renderValue(handleTZ(cellValue?.value)) : renderValue(cellValue?.value),
 )
@@ -30,6 +32,8 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning, activ
       <span>ERR!</span>
     </a-tooltip>
 
+    <span v-else-if="cellValue === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
+
     <div v-else class="py-2" @dblclick="activateShowEditNonEditableFieldWarning">
       <div v-if="urls" v-html="urls" />
 
diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 9b93da6876..e8d6109f50 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -102,6 +102,21 @@ const openListDlg = () => {
 
   listItemsDlg.value = true
 }
+
+const plusBtnRef = ref<HTMLElement | null>(null)
+const childListDlgRef = ref<HTMLElement | null>(null)
+
+watch([childListDlg], () => {
+  if (!childListDlg.value) {
+    childListDlgRef.value?.focus()
+  }
+})
+
+watch([listItemsDlg], () => {
+  if (!listItemsDlg.value) {
+    plusBtnRef.value?.focus()
+  }
+})
 </script>
 
 <template>
@@ -109,21 +124,30 @@ const openListDlg = () => {
     <div class="block flex-shrink truncate">
       <component
         :is="isUnderLookup ? 'span' : 'a'"
+        ref="childListDlgRef"
         v-e="['c:cell:links:modal:open']"
         :title="textVal"
         class="text-center nc-datatype-link underline-transparent"
         :class="{ '!text-gray-300': !textVal }"
+        tabindex="0"
         @click.stop.prevent="openChildList"
+        @keydown.enter.stop.prevent="openChildList"
       >
         {{ textVal }}
       </component>
     </div>
     <div class="flex-grow" />
 
-    <div v-if="!isUnderLookup" class="!xs:hidden flex justify-end hidden group-hover:flex items-center">
+    <div
+      v-if="!isUnderLookup"
+      ref="plusBtnRef"
+      tabindex="0"
+      class="!xs:hidden flex group justify-end group-hover:flex items-center"
+      @keydown.enter.stop="openListDlg"
+    >
       <MdiPlus
         v-if="(!readOnly && isUIAllowed('dataEdit')) || isForm"
-        class="select-none !text-md text-gray-700 nc-action-icon nc-plus"
+        class="select-none !text-md text-gray-700 nc-action-icon nc-plus invisible group-hover:visible group-focus:visible"
         @click.stop="openListDlg"
       />
     </div>
diff --git a/packages/nc-gui/components/virtual-cell/Lookup.vue b/packages/nc-gui/components/virtual-cell/Lookup.vue
index 4b0a81d755..c869bd6f22 100644
--- a/packages/nc-gui/components/virtual-cell/Lookup.vue
+++ b/packages/nc-gui/components/virtual-cell/Lookup.vue
@@ -99,18 +99,19 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning, activ
 <template>
   <div
     class="h-full w-full nc-lookup-cell"
+    tabindex="-1"
     :style="{ height: rowHeight && rowHeight !== 1 ? `${rowHeight * 2}rem` : `2.85rem` }"
     @dblclick="activateShowEditNonEditableFieldWarning"
   >
     <div
-      class="h-full w-full flex gap-1 p-1"
+      class="h-full w-full flex gap-1"
       :class="{
         '!overflow-x-auto nc-cell-lookup-scroll nc-scrollbar-x-md !overflow-y-hidden': rowHeight === 1,
       }"
     >
       <template v-if="lookupColumn">
         <!-- Render virtual cell -->
-        <div v-if="isVirtualCol(lookupColumn)" class="flex">
+        <div v-if="isVirtualCol(lookupColumn)" class="flex h-full">
           <!-- If non-belongs-to LTAR column then pass the array value, else iterate and render -->
           <template
             v-if="
@@ -151,7 +152,7 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning, activ
               }"
             >
               <div
-                class="flex gap-1.5 w-full"
+                class="flex items-start gap-1.5 w-full h-full py-[3px]"
                 :class="{
                   'flex-wrap': rowHeight !== 1 && !isAttachment(lookupColumn),
                   '!overflow-x-auto nc-cell-lookup-scroll nc-scrollbar-x-md !overflow-y-hidden':
@@ -162,11 +163,12 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning, activ
                   v-for="(v, i) of arrValue"
                   :key="i"
                   :class="{
-                    'bg-gray-100 px-1 rounded-full min-h-7.5': !isAttachment(lookupColumn),
-                    'border-gray-200 rounded border-1 pt-0.75': ![
+                    'bg-gray-100 rounded-full': !isAttachment(lookupColumn),
+                    'border-gray-200 rounded border-1': ![
                       UITypes.Attachment,
                       UITypes.MultiSelect,
                       UITypes.SingleSelect,
+                      UITypes.User,
                     ].includes(lookupColumn.uidt),
                     'min-h-0 min-w-0': isAttachment(lookupColumn),
                   }"
@@ -177,10 +179,9 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning, activ
                     :edit-enabled="false"
                     :virtual="true"
                     :read-only="true"
-                    class=""
                     :class="{
                       'min-h-0 min-w-0': isAttachment(lookupColumn),
-                      '!max-w-40 !min-w-20 !w-auto px-2': !isAttachment(lookupColumn),
+                      '!min-w-20 !w-auto pl-2': !isAttachment(lookupColumn),
                     }"
                   />
                 </div>
diff --git a/packages/nc-gui/components/virtual-cell/QrCode.vue b/packages/nc-gui/components/virtual-cell/QrCode.vue
index b3ed330f66..aa240af9b8 100644
--- a/packages/nc-gui/components/virtual-cell/QrCode.vue
+++ b/packages/nc-gui/components/virtual-cell/QrCode.vue
@@ -77,25 +77,26 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning } = us
     </template>
     <img v-if="showQrCode" :src="qrCodeLarge" :alt="$t('title.qrCode')" />
   </a-modal>
-  <div v-if="tooManyCharsForQrCode" class="text-left text-wrap mt-2 text-[#e65100] text-[10px]">
-    {{ $t('labels.qrCodeValueTooLong') }}
-  </div>
   <div
-    class="pl-2 w-full flex"
+    v-if="showQrCode"
+    class="w-full flex"
     :class="{
-      'flex-start': isExpandedFormOpen,
+      'flex-start pl-2': isExpandedFormOpen,
       'justify-center': !isExpandedFormOpen,
     }"
   >
     <img
-      v-if="showQrCode && rowHeight"
-      :style="{ height: rowHeight ? `${rowHeight * 1.4}rem` : `1.4rem` }"
+      v-if="rowHeight"
+      :style="{ height: rowHeight ? `${rowHeight * 1.8}rem` : `1.8rem` }"
       :src="qrCode"
       :alt="$t('title.qrCode')"
       class="min-w-[1.4em]"
       @click="showQrModal"
     />
-    <img v-else-if="showQrCode" class="mx-auto min-w-[1.4em]" :src="qrCode" :alt="$t('title.qrCode')" @click="showQrModal" />
+    <img v-else class="mx-auto min-w-[1.4em]" :src="qrCode" :alt="$t('title.qrCode')" @click="showQrModal" />
+  </div>
+  <div v-if="tooManyCharsForQrCode" class="text-left text-wrap mt-2 text-[#e65100] text-xs">
+    {{ $t('labels.qrCodeValueTooLong') }}
   </div>
   <div v-if="showEditNonEditableFieldWarning" class="text-left text-wrap mt-2 text-[#e65100] text-xs">
     {{ $t('msg.warning.nonEditableFields.computedFieldUnableToClear') }}
diff --git a/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue b/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue
index 2c27509ecf..6ea1747351 100644
--- a/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue
+++ b/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue
@@ -55,17 +55,18 @@ const rowHeight = inject(RowHeightInj, ref(undefined))
   </a-modal>
   <div
     v-if="!tooManyCharsForBarcode"
-    class="flex ml-2 w-full items-center"
+    class="flex w-full items-center barcode-wrapper"
     :class="{
-      'justify-start': isExpandedFormOpen,
+      'justify-start ml-2': isExpandedFormOpen,
       'justify-center': !isExpandedFormOpen,
     }"
   >
     <JsBarcodeWrapper
       v-if="showBarcode && rowHeight"
       :barcode-value="barcodeValue"
+      tabindex="-1"
       :barcode-format="barcodeMeta.barcodeFormat"
-      :custom-style="{ height: rowHeight ? `${rowHeight * 1.4}rem` : `1.4rem`, width: 40 }"
+      :custom-style="{ height: rowHeight ? `${rowHeight * 1.8}rem` : `1.8rem` }"
       @on-click-barcode="showBarcodeModal"
     >
       <template #barcodeRenderError>
@@ -76,6 +77,7 @@ const rowHeight = inject(RowHeightInj, ref(undefined))
     </JsBarcodeWrapper>
     <JsBarcodeWrapper
       v-else-if="showBarcode"
+      tabindex="-1"
       :barcode-value="barcodeValue"
       :barcode-format="barcodeMeta.barcodeFormat"
       @on-click-barcode="showBarcodeModal"
@@ -98,3 +100,11 @@ const rowHeight = inject(RowHeightInj, ref(undefined))
     {{ $t('msg.warning.nonEditableFields.barcodeFieldsCannotBeDirectlyChanged') }}
   </div>
 </template>
+
+<style lang="scss" scoped>
+.barcode-wrapper {
+  & > div {
+    @apply max-w-8.2rem;
+  }
+}
+</style>
diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 9a767d8591..7095727353 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -403,6 +403,10 @@ async function loadPluginList() {
   }
 }
 
+const isConditionSupport = computed(() => {
+  return hookRef.eventOperation && !hookRef.eventOperation.includes('bulk')
+})
+
 async function saveHooks() {
   loading.value = true
   try {
@@ -446,7 +450,7 @@ async function saveHooks() {
     }
 
     if (filterRef.value) {
-      await filterRef.value.applyChanges(hookRef.id)
+      await filterRef.value.applyChanges(hookRef.id, false, isConditionSupport.value)
     }
 
     // Webhook details updated successfully
@@ -496,6 +500,9 @@ watch(
     if (props.hook) {
       setHook(props.hook)
       onEventChange()
+    } else {
+      // Set the default hook title only when creating a new hook.
+      hookRef.title = getDefaultHookName(hooks.value)
     }
   },
   { immediate: true },
@@ -509,7 +516,6 @@ onMounted(async () => {
   } else {
     hookRef.eventOperation = eventList.value[0].value.join(' ')
   }
-  hookRef.title = getDefaultHookName(hooks.value)
 
   onNotificationTypeChange()
 
@@ -770,8 +776,7 @@ onMounted(async () => {
               </a-form-item>
             </a-col>
           </a-row>
-
-          <a-row class="mb-5" type="flex">
+          <a-row v-show="isConditionSupport" class="mb-5" type="flex">
             <a-col :span="24">
               <div class="rounded-lg border-1 p-6">
                 <a-checkbox
@@ -790,6 +795,7 @@ onMounted(async () => {
                   :show-loading="false"
                   :hook-id="hookRef.id"
                   :web-hook="true"
+                  @update:filters-length="hookRef.condition = $event > 0"
                 />
               </div>
             </a-col>
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index bc654f4d09..470c281e73 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { OrderedWorkspaceRoles, WorkspaceUserRoles, timeAgo } from 'nocodb-sdk'
+import { OrderedWorkspaceRoles, WorkspaceUserRoles, parseStringDateTime, timeAgo } from 'nocodb-sdk'
 import { storeToRefs, useWorkspace } from '#imports'
 
 const { workspaceRoles, loadRoles } = useRoles()
@@ -59,9 +59,9 @@ onMounted(async () => {
     <div v-else class="nc-collaborators-list mt-6 h-full">
       <div class="flex flex-col rounded-lg overflow-hidden border-1 max-w-350 max-h-[calc(100%-8rem)]">
         <div class="flex flex-row bg-gray-50 min-h-12 items-center">
-          <div class="text-gray-700 users-email-grid w-3/8 ml-10">{{ $t('objects.users') }}</div>
-          <div class="text-gray-700 date-joined-grid w-2/8 mr-3 pl-1">{{ $t('title.dateJoined') }}</div>
+          <div class="text-gray-700 users-email-grid w-3/8 ml-10 mr-3">{{ $t('objects.users') }}</div>
           <div class="text-gray-700 user-access-grid w-2/8 mr-3">{{ $t('general.access') }}</div>
+          <div class="text-gray-700 date-joined-grid w-2/8 mr-3">{{ $t('title.dateJoined') }}</div>
           <div class="text-gray-700 user-access-grid w-1/8">Actions</div>
         </div>
 
@@ -77,7 +77,6 @@ onMounted(async () => {
                 {{ collab.email }}
               </span>
             </div>
-            <div class="date-joined-grid w-2/8">{{ timeAgo(collab.created_at) }}</div>
             <div class="user-access-grid w-2/8">
               <template v-if="accessibleRoles.includes(collab.roles)">
                 <div class="w-[30px]">
@@ -85,15 +84,25 @@ onMounted(async () => {
                     :role="collab.roles"
                     :roles="accessibleRoles"
                     :description="false"
-                    class="bg-[red]"
+                    class="cursor-pointer"
                     :on-role-change="(role: WorkspaceUserRoles) => updateCollaborator(collab, role)"
                   />
                 </div>
               </template>
               <template v-else>
-                <RolesBadge :role="collab.roles" />
+                <RolesBadge :role="collab.roles" class="cursor-default" />
               </template>
             </div>
+            <div class="date-joined-grid w-2/8 flex justify-start">
+              <NcTooltip class="max-w-full">
+                <template #title>
+                  {{ parseStringDateTime(collab.created_at) }}
+                </template>
+                <span>
+                  {{ timeAgo(collab.created_at) }}
+                </span>
+              </NcTooltip>
+            </div>
             <div class="w-1/8 pl-6">
               <NcDropdown v-if="collab.roles !== WorkspaceUserRoles.OWNER" :trigger="['click']">
                 <MdiDotsVertical
diff --git a/packages/nc-gui/composables/useData.ts b/packages/nc-gui/composables/useData.ts
index b306ec55cf..5a8e71c6a2 100644
--- a/packages/nc-gui/composables/useData.ts
+++ b/packages/nc-gui/composables/useData.ts
@@ -9,6 +9,7 @@ import {
   findIndexByPk,
   message,
   populateInsertObject,
+  rowDefaultData,
   rowPkData,
   storeToRefs,
   until,
@@ -53,9 +54,9 @@ export function useData(args: {
     },
   })
 
-  function addEmptyRow(addAfter = formattedData.value.length) {
+  function addEmptyRow(addAfter = formattedData.value.length, metaValue = meta.value) {
     formattedData.value.splice(addAfter, 0, {
-      row: {},
+      row: { ...rowDefaultData(metaValue?.columns) },
       oldRow: {},
       rowMeta: { new: true },
     })
@@ -240,6 +241,7 @@ export function useData(args: {
               col.uidt === UITypes.Barcode ||
               col.uidt === UITypes.Rollup ||
               col.uidt === UITypes.Checkbox ||
+              col.uidt === UITypes.User ||
               col.au ||
               col.cdf?.includes(' on update ')
             )
@@ -386,6 +388,8 @@ export function useData(args: {
               col.uidt === UITypes.QrCode ||
               col.uidt === UITypes.Barcode ||
               col.uidt === UITypes.Rollup ||
+              col.uidt === UITypes.Checkbox ||
+              col.uidt === UITypes.User ||
               col.au ||
               col.cdf?.includes(' on update ')
             )
diff --git a/packages/nc-gui/composables/useMultiSelect/convertCellData.ts b/packages/nc-gui/composables/useMultiSelect/convertCellData.ts
index 5044ef1798..1cca7d3ff5 100644
--- a/packages/nc-gui/composables/useMultiSelect/convertCellData.ts
+++ b/packages/nc-gui/composables/useMultiSelect/convertCellData.ts
@@ -195,6 +195,24 @@ export default function convertCellData(
 
       return validVals.join(',')
     }
+    case UITypes.User: {
+      let parsedVal
+      try {
+        try {
+          parsedVal = typeof value === 'string' ? JSON.parse(value) : value
+        } catch {
+          parsedVal = value
+        }
+      } catch (e) {
+        if (isMultiple) {
+          return null
+        } else {
+          throw new Error('Invalid user data')
+        }
+      }
+
+      return parsedVal || value
+    }
     case UITypes.LinkToAnotherRecord:
     case UITypes.Lookup:
     case UITypes.Rollup:
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index 35b3c0f20a..aed78faf02 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -2,7 +2,7 @@ import { computed } from 'vue'
 import dayjs from 'dayjs'
 import type { Ref } from 'vue'
 import type { MaybeRef } from '@vueuse/core'
-import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
+import type { ColumnType, LinkToAnotherRecordType, TableType, UserFieldRecordType } from 'nocodb-sdk'
 import { RelationTypes, UITypes, dateFormats, isDateMonthFormat, isSystemColumn, isVirtualCol, timeFormats } from 'nocodb-sdk'
 import { parse } from 'papaparse'
 import type { Cell } from './cellRange'
@@ -112,6 +112,16 @@ export function useMultiSelect(
       textToCopy = !!textToCopy
     }
 
+    if (columnObj.uidt === UITypes.User) {
+      if (textToCopy && Array.isArray(textToCopy)) {
+        textToCopy = textToCopy
+          .map((user: UserFieldRecordType) => {
+            return user.email
+          })
+          .join(', ')
+      }
+    }
+
     if (typeof textToCopy === 'object') {
       textToCopy = JSON.stringify(textToCopy)
     } else {
@@ -718,7 +728,15 @@ export function useMultiSelect(
               return message.info(t('msg.info.updateNotAllowedWithoutPK'))
             }
             if (isTypableInputColumn(columnObj) && makeEditable(rowObj, columnObj) && columnObj.title) {
-              rowObj.row[columnObj.title] = ''
+              if (columnObj.uidt === UITypes.LongText) {
+                if (rowObj.row[columnObj.title] === '<br />') {
+                  rowObj.row[columnObj.title] = e.key
+                } else {
+                  rowObj.row[columnObj.title] = rowObj.row[columnObj.title] ? rowObj.row[columnObj.title] + e.key : e.key
+                }
+              } else {
+                rowObj.row[columnObj.title] = ''
+              }
             }
             // editEnabled = true
           }
diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts
index ed2f24d400..5cf2fdc748 100644
--- a/packages/nc-gui/composables/useSharedView.ts
+++ b/packages/nc-gui/composables/useSharedView.ts
@@ -19,6 +19,10 @@ export function useSharedView() {
 
   const baseStore = useBase()
 
+  const basesStore = useBases()
+
+  const { basesUser } = storeToRefs(basesStore)
+
   const { base } = storeToRefs(baseStore)
 
   const appInfoDefaultLimit = appInfo.value.defaultLimit || 25
@@ -99,6 +103,10 @@ export function useSharedView() {
 
     const relatedMetas = { ...viewMeta.relatedMetas }
     Object.keys(relatedMetas).forEach((key) => setMeta(relatedMetas[key]))
+
+    if (viewMeta.users) {
+      basesUser.value.set(viewMeta.base_id, viewMeta.users)
+    }
   }
 
   const fetchSharedViewData = async (param: {
diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index b56f5fd920..545fb95b22 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -187,24 +187,32 @@ export function useViewData(
     controller.value = CancelToken.source()
 
     isPaginationLoading.value = true
+    let response
 
-    const response = !isPublic.value
-      ? await api.dbViewRow.list(
-          'noco',
-          base.value.id!,
-          metaId.value!,
-          viewMeta.value!.id!,
-          {
-            ...queryParams.value,
-            ...params,
-            ...(isUIAllowed('sortSync') ? {} : { sortArrJson: JSON.stringify(sorts.value) }),
-            ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }),
-            where: where?.value,
-          } as any,
-          { cancelToken: controller.value.token },
-        )
-      : await fetchSharedViewData({ sortsArr: sorts.value, filtersArr: nestedFilters.value })
-
+    try {
+      response = !isPublic.value
+        ? await api.dbViewRow.list(
+            'noco',
+            base.value.id!,
+            metaId.value!,
+            viewMeta.value!.id!,
+            {
+              ...queryParams.value,
+              ...params,
+              ...(isUIAllowed('sortSync') ? {} : { sortArrJson: JSON.stringify(sorts.value) }),
+              ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }),
+              where: where?.value,
+            } as any,
+            { cancelToken: controller.value.token },
+          )
+        : await fetchSharedViewData({ sortsArr: sorts.value, filtersArr: nestedFilters.value, where: where?.value })
+    } catch (error) {
+      // if the request is canceled, then do nothing
+      if (error.code === 'ERR_CANCELED') {
+        return
+      }
+      throw error
+    }
     formattedData.value = formatData(response.list)
     paginationData.value = response.pageInfo
     isPaginationLoading.value = false
@@ -311,8 +319,6 @@ export function useViewData(
   }
 
   const navigateToSiblingRow = async (dir: NavigateDir) => {
-    console.log('test')
-
     const expandedRowIndex = getExpandedRowIndex()
 
     // calculate next row index based on direction
diff --git a/packages/nc-gui/composables/useViewGroupBy.ts b/packages/nc-gui/composables/useViewGroupBy.ts
index 1c6ea8fddb..cfc35667dd 100644
--- a/packages/nc-gui/composables/useViewGroupBy.ts
+++ b/packages/nc-gui/composables/useViewGroupBy.ts
@@ -90,6 +90,12 @@ export const useViewGroupBy = (view: Ref<ViewType | undefined>, where?: Computed
       return value ? GROUP_BY_VARS.TRUE : GROUP_BY_VARS.FALSE
     }
 
+    if (col.uidt === UITypes.User) {
+      if (!value) {
+        return GROUP_BY_VARS.NULL
+      }
+    }
+
     // convert to JSON string if non-string value
     if (value && typeof value === 'object') {
       value = JSON.stringify(value)
@@ -155,6 +161,11 @@ export const useViewGroupBy = (view: Ref<ViewType | undefined>, where?: Computed
         acc += `${acc.length ? '~and' : ''}(${curr.title},${curr.key === GROUP_BY_VARS.TRUE ? 'checked' : 'notchecked'})`
       } else if ([UITypes.Date, UITypes.DateTime].includes(curr.column_uidt as UITypes)) {
         acc += `${acc.length ? '~and' : ''}(${curr.title},eq,exactDate,${curr.key})`
+      } else if (curr.column_uidt === UITypes.User) {
+        try {
+          const value = JSON.parse(curr.key)
+          acc += `${acc.length ? '~and' : ''}(${curr.title},gb_eq,${value.map((v: any) => v.id).join(',')})`
+        } catch (e) {}
       } else {
         acc += `${acc.length ? '~and' : ''}(${curr.title},gb_eq,${curr.key})`
       }
diff --git a/packages/nc-gui/lang/eu.json b/packages/nc-gui/lang/eu.json
index 4e7e2c46b5..c683c2fe78 100644
--- a/packages/nc-gui/lang/eu.json
+++ b/packages/nc-gui/lang/eu.json
@@ -2,26 +2,26 @@
   "dashboards": {
     "create_new_dashboard_project": "Create New Interface",
     "connect_data_sources": "Connect data sources",
-    "alert": "Alert",
+    "alert": "Alerta",
     "alert-message": "No databases have been connected. Connect database bases to build interfaces. Skip this step and add databases from the base home page later.",
     "select_database_projects_that_you_want_to_link_to_this_dashboard_projects": "Select Database Bases that you want to link to this Interface.",
     "create_interface": "Create interface",
     "project_name": "Base Name",
     "connect": "Connect",
     "buttonActionTypes": {
-      "open_external_url": "Open external link",
+      "open_external_url": "Ireki kanpoko lotura",
       "delete_record": "Delete record",
       "update_record": "Update record",
       "open_layout": "Open layout"
     },
     "widgets": {
-      "static_text": "Text",
-      "chart": "Chart",
-      "table": "Table",
-      "image": "Image",
+      "static_text": "Testua",
+      "chart": "Diagrama",
+      "table": "Taula",
+      "image": "Irudia",
       "map": "Map",
-      "button": "Button",
-      "number": "Number",
+      "button": "Botoia",
+      "number": "Zenbakia",
       "bar_chart": "Bar Chart",
       "line_chart": "Line Chart",
       "area_chart": "Area Chart",
@@ -39,7 +39,7 @@
     }
   },
   "general": {
-    "quit": "Quit",
+    "quit": "Irten",
     "home": "Hasiera",
     "load": "Kargatu",
     "open": "Ireki",
@@ -47,13 +47,13 @@
     "yes": "Bai",
     "no": "Ez",
     "ok": "Ados",
-    "back": "Back",
+    "back": "Itzuli",
     "and": "Eta",
     "or": "Edo",
     "add": "Gehitu",
     "edit": "Editatu",
-    "link": "Link",
-    "links": "Links",
+    "link": "Esteka",
+    "links": "Estekak",
     "remove": "Ezabatu",
     "import": "Import",
     "logout": "Log Out",
@@ -61,15 +61,15 @@
     "changeIcon": "Change Icon",
     "save": "Gorde",
     "available": "Available",
-    "abort": "Abort",
-    "saving": "Saving",
+    "abort": "Utzi",
+    "saving": "Gordetzen",
     "cancel": "Ezeztatu",
     "null": "Null",
     "escape": "Escape",
     "hex": "Hex",
-    "clear": "Clear",
+    "clear": "Garbitu",
     "slack": "Slack",
-    "comment": "Comment",
+    "comment": "Iruzkina",
     "microsoftTeams": "Microsoft Teams",
     "discord": "Discord",
     "matterMost": "Mattermost",
@@ -94,17 +94,17 @@
     "bulkInsert": "Bulk Insert",
     "bulkDelete": "Bulk Delete",
     "bulkUpdate": "Bulk Update",
-    "deleting": "Deleting",
+    "deleting": "Ezabatzen",
     "update": "Eguneratu",
     "rename": "Berrizendatu",
     "reload": "Birkargatu",
     "reset": "Berrezarri",
     "install": "Instalatu",
     "show": "Erakutsi",
-    "access": "Access",
-    "visibility": "Visibility",
+    "access": "Sarbidea",
+    "visibility": "Ikusgarritasuna",
     "hide": "Ezkutatu",
-    "deprecated": "Deprecated",
+    "deprecated": "Zaharkitua",
     "showAll": "Dena erakutsi",
     "hideAll": "Ezkutatu dena",
     "notFound": "Not found",
@@ -127,7 +127,7 @@
     "upload": "Igo",
     "download": "Deskargatu",
     "default": "Lehenetsia",
-    "base": "Source",
+    "base": "Iturria",
     "datasource": "Data Source",
     "more": "Gehiago",
     "less": "Gutxiago",
@@ -170,10 +170,10 @@
     "data": "Data",
     "source": "Source",
     "destination": "Destination",
-    "active": "Active",
-    "inactive": "Inactive",
+    "active": "Aktibo",
+    "inactive": "Ez aktibo",
     "linked": "linked",
-    "finish": "Finish",
+    "finish": "Amaitu",
     "min": "Min",
     "max": "Max",
     "avg": "Avg",
@@ -183,13 +183,13 @@
     "sumDistinct": "Sum Distinct",
     "avgDistinct": "Avg Distinct",
     "join": "Join",
-    "options": "Options",
+    "options": "Ezarpenak",
     "primaryValue": "Primary Value",
     "useSurveyMode": "Use Survey Mode",
     "shift": "Shift",
-    "enter": "Enter",
+    "enter": "Sartu",
     "seconds": "Seconds",
-    "paste": "Paste"
+    "paste": "Itsatsi"
   },
   "objects": {
     "workspace": "Workspace",
@@ -246,7 +246,7 @@
     "externalDb": "External Database"
   },
   "datatype": {
-    "ID": "ID",
+    "ID": "IDa",
     "ForeignKey": "Foreign Key",
     "SingleLineText": "Single Line Text",
     "LongText": "Testu luzea",
@@ -298,32 +298,32 @@
     "isNotNull": "is not null"
   },
   "title": {
-    "docs": "Docs",
+    "docs": "Dokumentuak",
     "forum": "Forum",
-    "parameter": "Parameter",
-    "headers": "Headers",
+    "parameter": "Parametroa",
+    "headers": "Goiburuak",
     "parameterName": "Parameter Name",
     "currencyLocale": "Currency Locale",
     "currencyCode": "Currency Code",
     "searchMembers": "Search Members",
-    "noMembersFound": "No members found",
+    "noMembersFound": "Ez da kiderik aurkitu",
     "dateJoined": "Date Joined",
     "tokenName": "Token name",
     "inDesktop": "in Desktop",
     "rowData": "Record data",
-    "creator": "Creator",
-    "qrCode": "QR Code",
-    "termsOfService": "Terms of Service",
+    "creator": "Sortzailea",
+    "qrCode": "QR kodea",
+    "termsOfService": "Zerbitzuaren baldintzak",
     "updateSelectedRows": "Update Selected Records",
     "noFiltersAdded": "No filters added",
     "editCards": "Edit Cards",
     "noFieldsFound": "No fields found",
     "displayValue": "Display Value",
     "expand": "Expand",
-    "hideAll": "Hide all",
+    "hideAll": "Ezkutatu dena",
     "hideSystemFields": "Hide system fields",
     "removeFile": "Remove File",
-    "hasMany": "Has Many",
+    "hasMany": "Hainbat ditu",
     "manyToMany": "Many to Many",
     "virtualRelation": "Virtual Relation",
     "linkMore": "Link More",
@@ -377,7 +377,7 @@
     "generateToken": "Sortu tokena",
     "APIsAndSupport": "APIak & laguntza",
     "helpCenter": "Laguntza gunea",
-    "noLabels": "No Labels",
+    "noLabels": "Etiketarik ez",
     "swaggerDocumentation": "Swagger Documentation",
     "quickImportFrom": "Quick Import From",
     "quickImport": "Quick Import",
@@ -396,10 +396,10 @@
     "addNewToken": "Add new token",
     "accountSettings": "Account Settings",
     "resetPasswordMenu": "Reset Password",
-    "tokens": "Tokens",
+    "tokens": "Tokenak",
     "userManagement": "User Management",
     "accountManagement": "Account management",
-    "licence": "Licence",
+    "licence": "Lizentzia",
     "allowAllMimeTypes": "Allow All Mime Types",
     "defaultView": "Default View",
     "relations": "Relations",
diff --git a/packages/nc-gui/lib/types.ts b/packages/nc-gui/lib/types.ts
index 7643f681ce..706d8fee46 100644
--- a/packages/nc-gui/lib/types.ts
+++ b/packages/nc-gui/lib/types.ts
@@ -126,6 +126,7 @@ type NcProject = BaseType & {
   edit?: boolean
   starred?: boolean
   uuid?: string
+  users?: User[]
 }
 
 interface UndoRedoAction {
diff --git a/packages/nc-gui/nuxt.config.ts b/packages/nc-gui/nuxt.config.ts
index c662cf8730..46f92228c6 100644
--- a/packages/nc-gui/nuxt.config.ts
+++ b/packages/nc-gui/nuxt.config.ts
@@ -4,7 +4,6 @@ import Icons from 'unplugin-icons/vite'
 import IconsResolver from 'unplugin-icons/resolver'
 import Components from 'unplugin-vue-components/vite'
 import { AntDesignVueResolver } from 'unplugin-vue-components/resolvers'
-import monacoEditorPlugin from 'vite-plugin-monaco-editor'
 import { NodeModulesPolyfillPlugin } from '@esbuild-plugins/node-modules-polyfill'
 import { FileSystemIconLoader } from 'unplugin-icons/loaders'
 
@@ -180,13 +179,6 @@ export default defineNuxtConfig({
           }),
         ],
       }),
-      monacoEditorPlugin({
-        languageWorkers: ['json'],
-        // customWorkers: [{ label: 'sql', entry: 'monaco-sql-languages/out/esm/sql/sql.worker.js' }],
-        customDistPath: (root: string, buildOutDir: string) => {
-          return `${buildOutDir}/` + `monacoeditorwork`
-        },
-      }),
       PurgeIcons({
         /* PurgeIcons Options */
         includedCollections: ['emojione'],
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index 971f1a9b7f..25f2681a4f 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -65,7 +65,7 @@
     "locale-codes": "^1.3.1",
     "monaco-editor": "^0.33.0",
     "monaco-sql-languages": "^0.11.0",
-    "nocodb-sdk": "0.202.10",
+    "nocodb-sdk": "workspace:^",
     "papaparse": "^5.4.1",
     "parse-github-url": "^1.0.2",
     "pinia": "^2.1.7",
@@ -106,26 +106,26 @@
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "@iconify-json/ant-design": "^1.1.13",
     "@iconify-json/bi": "^1.1.22",
-    "@iconify-json/carbon": "^1.1.26",
+    "@iconify-json/carbon": "^1.1.27",
     "@iconify-json/cil": "^1.1.8",
     "@iconify-json/clarity": "^1.1.12",
     "@iconify-json/eva": "^1.1.10",
     "@iconify-json/ic": "^1.1.17",
     "@iconify-json/ion": "^1.1.15",
     "@iconify-json/la": "^1.1.8",
-    "@iconify-json/logos": "^1.1.41",
-    "@iconify-json/lucide": "^1.1.145",
-    "@iconify-json/material-symbols": "^1.1.67",
-    "@iconify-json/mdi": "^1.1.61",
+    "@iconify-json/logos": "^1.1.42",
+    "@iconify-json/lucide": "^1.1.149",
+    "@iconify-json/material-symbols": "^1.1.68",
+    "@iconify-json/mdi": "^1.1.63",
     "@iconify-json/mi": "^1.1.8",
     "@iconify-json/ph": "^1.1.9",
-    "@iconify-json/ri": "^1.1.17",
-    "@iconify-json/simple-icons": "^1.1.84",
+    "@iconify-json/ri": "^1.1.18",
+    "@iconify-json/simple-icons": "^1.1.86",
     "@iconify-json/system-uicons": "^1.1.12",
     "@iconify-json/tabler": "^1.1.102",
     "@iconify-json/vscode-icons": "^1.1.32",
     "@intlify/unplugin-vue-i18n": "^0.12.3",
-    "@nuxt/image-edge": "1.1.0-28372028.a469898",
+    "@nuxt/image-edge": "1.1.0-28393680.ddd021d",
     "@types/d3-scale": "^4.0.8",
     "@types/dagre": "^0.7.52",
     "@types/file-saver": "^2.0.7",
@@ -143,7 +143,7 @@
     "@types/turndown": "^5.0.4",
     "@unocss/nuxt": "^0.51.13",
     "@vitest/ui": "^0.18.1",
-    "@vue/compiler-sfc": "^3.3.11",
+    "@vue/compiler-sfc": "^3.3.13",
     "@vue/test-utils": "^2.0.2",
     "@vueuse/nuxt": "^10.2.1",
     "@windicss/plugin-animations": "^1.0.9",
diff --git a/packages/nc-gui/pages/forgot-password.vue b/packages/nc-gui/pages/forgot-password.vue
index 1d65786aab..b41d19d458 100644
--- a/packages/nc-gui/pages/forgot-password.vue
+++ b/packages/nc-gui/pages/forgot-password.vue
@@ -23,12 +23,13 @@ const form = reactive({
 const formRules = {
   email: [
     // E-mail is required
-    { required: true, message: t('msg.error.signUpRules.emailReqd') },
+    { required: true, message: t('msg.error.signUpRules.emailRequired') },
     // E-mail must be valid format
     {
       validator: (_: unknown, v: string) => {
         return new Promise((resolve, reject) => {
-          if (validateEmail(v)) return resolve()
+          if (!v?.length || validateEmail(v)) return resolve()
+
           reject(new Error(t('msg.error.signUpRules.emailInvalid')))
         })
       },
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
index 912b6f7bf5..ee1ee5afee 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
@@ -27,8 +27,6 @@ const scannerIsReady = ref(false)
 
 const showCodeScannerOverlay = ref(false)
 
-const editEnabled = ref<boolean[]>([])
-
 const onLoaded = async () => {
   scannerIsReady.value = true
 }
@@ -168,10 +166,7 @@ const onDecode = async (scannedCodeValue: string) => {
                         :data-testid="`nc-form-input-cell-${field.label || field.title}`"
                         :class="`nc-form-input-${field.title?.replaceAll(' ', '')}`"
                         :column="field"
-                        :edit-enabled="editEnabled[index]"
-                        @click="editEnabled[index] = true"
-                        @cancel="editEnabled[index] = false"
-                        @update:edit-enabled="editEnabled[index] = $event"
+                        edit-enabled
                       />
                       <a-button
                         v-if="field.enable_scanner"
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
index 0c49a4c2c9..b1647936d1 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
@@ -47,8 +47,6 @@ const animationTarget = ref<AnimationTarget>(AnimationTarget.ArrowRight)
 
 const isAnimating = ref(false)
 
-const editEnabled = ref<boolean[]>([])
-
 const el = ref<HTMLDivElement>()
 
 provide(DropZoneRef, el)
@@ -299,10 +297,7 @@ onMounted(() => {
                 class="nc-input h-auto"
                 :data-testid="`nc-survey-form__input-${field.title.replaceAll(' ', '')}`"
                 :column="field"
-                :edit-enabled="editEnabled[index]"
-                @click="editEnabled[index] = true"
-                @cancel="editEnabled[index] = false"
-                @update:edit-enabled="editEnabled[index] = $event"
+                edit-enabled
               />
 
               <div class="flex flex-col gap-2 text-slate-500 dark:text-slate-300 text-[0.75rem] my-2 px-1">
diff --git a/packages/nc-gui/pages/signin.vue b/packages/nc-gui/pages/signin.vue
index 38e1af43a3..3a55a0a140 100644
--- a/packages/nc-gui/pages/signin.vue
+++ b/packages/nc-gui/pages/signin.vue
@@ -38,12 +38,12 @@ const form = reactive({
 const formRules: Record<string, RuleObject[]> = {
   email: [
     // E-mail is required
-    { required: true, message: t('msg.error.signUpRules.emailReqd') },
+    { required: true, message: t('msg.error.signUpRules.emailRequired') },
     // E-mail must be valid format
     {
       validator: (_: unknown, v: string) => {
         return new Promise((resolve, reject) => {
-          if (validateEmail(v)) return resolve()
+          if (!v?.length || validateEmail(v)) return resolve()
 
           reject(new Error(t('msg.error.signUpRules.emailInvalid')))
         })
diff --git a/packages/nc-gui/pages/signup/[[token]].vue b/packages/nc-gui/pages/signup/[[token]].vue
index e08aedc34a..00fefdc79c 100644
--- a/packages/nc-gui/pages/signup/[[token]].vue
+++ b/packages/nc-gui/pages/signup/[[token]].vue
@@ -44,12 +44,13 @@ const form = reactive({
 const formRules = {
   email: [
     // E-mail is required
-    { required: true, message: t('msg.error.signUpRules.emailReqd') },
+    { required: true, message: t('msg.error.signUpRules.emailRequired') },
     // E-mail must be valid format
     {
       validator: (_: unknown, v: string) => {
         return new Promise((resolve, reject) => {
           if (!v?.length || validateEmail(v)) return resolve()
+
           reject(new Error(t('msg.error.signUpRules.emailInvalid')))
         })
       },
diff --git a/packages/nc-gui/plugins/poller.ts b/packages/nc-gui/plugins/poller.ts
index db860be4f8..8ef0242465 100644
--- a/packages/nc-gui/plugins/poller.ts
+++ b/packages/nc-gui/plugins/poller.ts
@@ -1,7 +1,7 @@
 import type { Api as BaseAPI } from 'nocodb-sdk'
 import { defineNuxtPlugin } from '#imports'
 
-export default defineNuxtPlugin(async (nuxtApp) => {
+const pollPlugin = async (nuxtApp) => {
   const api: BaseAPI<any> = nuxtApp.$api as any
 
   // unsubscribe all if signed out
@@ -89,4 +89,10 @@ export default defineNuxtPlugin(async (nuxtApp) => {
   }
 
   nuxtApp.provide('poller', poller)
+}
+
+export default defineNuxtPlugin(async function (nuxtApp) {
+  if (!isEeUI) return await pollPlugin(nuxtApp)
 })
+
+export { pollPlugin }
diff --git a/packages/nc-gui/store/base.ts b/packages/nc-gui/store/base.ts
index 93ab4d3092..1e6913dad0 100644
--- a/packages/nc-gui/store/base.ts
+++ b/packages/nc-gui/store/base.ts
@@ -172,6 +172,10 @@ export const useBase = defineStore('baseStore', () => {
 
     await loadTables()
 
+    await basesStore.getBaseUsers({
+      baseId: base.value.id || baseId.value,
+    })
+
     // if (withTheme) setTheme(baseMeta.value?.theme)
 
     return baseLoadedHook.trigger(base.value)
diff --git a/packages/nc-gui/store/bases.ts b/packages/nc-gui/store/bases.ts
index b1a74e6857..4f3e82a3e5 100644
--- a/packages/nc-gui/store/bases.ts
+++ b/packages/nc-gui/store/bases.ts
@@ -12,7 +12,7 @@ export const useBases = defineStore('basesStore', () => {
   const bases = ref<Map<string, NcProject>>(new Map())
 
   const basesList = computed<NcProject[]>(() => Array.from(bases.value.values()).sort((a, b) => a.updated_at - b.updated_at))
-  const baseUserCount = ref<number | undefined>(undefined)
+  const basesUser = ref<Map<string, User[]>>(new Map())
 
   const router = useRouter()
   const route = router.currentRoute
@@ -48,33 +48,35 @@ export const useBases = defineStore('basesStore', () => {
 
   const isProjectsLoading = ref(false)
 
-  async function getProjectUsers({
-    baseId,
-    limit,
-    page,
-    searchText,
-  }: {
-    baseId: string
-    limit: number
-    page: number
-    searchText: string | undefined
-  }) {
+  async function getBaseUsers({ baseId, searchText, force = false }: { baseId: string; searchText?: string; force?: boolean }) {
+    if (!force && basesUser.value.has(baseId)) {
+      const users = basesUser.value.get(baseId)
+      return {
+        users,
+        totalRows: users?.length ?? 0,
+      }
+    }
+
     const response: any = await api.auth.baseUserList(baseId, {
       query: {
-        limit,
-        offset: (page - 1) * limit,
         query: searchText,
       },
     } as RequestParams)
 
     const totalRows = response.users.pageInfo.totalRows ?? 0
 
+    basesUser.value.set(baseId, response.users.list)
+
     return {
       users: response.users.list,
       totalRows,
     }
   }
 
+  const clearBasesUser = () => {
+    basesUser.value.clear()
+  }
+
   const createProjectUser = async (baseId: string, user: User) => {
     await api.auth.baseUserAdd(baseId, user as ProjectUserReqType)
   }
@@ -295,7 +297,6 @@ export const useBases = defineStore('basesStore', () => {
   return {
     bases,
     basesList,
-    baseUserCount,
     loadProjects,
     loadProject,
     getSqlUi,
@@ -312,13 +313,15 @@ export const useBases = defineStore('basesStore', () => {
     activeProjectId,
     openedProject,
     openedProjectBasesMap,
-    getProjectUsers,
+    getBaseUsers,
     createProjectUser,
     updateProjectUser,
     navigateToProject,
     removeProjectUser,
     navigateToFirstProjectOrHome,
     toggleStarred,
+    basesUser,
+    clearBasesUser,
   }
 })
 
diff --git a/packages/nc-gui/store/users.ts b/packages/nc-gui/store/users.ts
index d209429a41..4a7cad25b9 100644
--- a/packages/nc-gui/store/users.ts
+++ b/packages/nc-gui/store/users.ts
@@ -4,6 +4,7 @@ export const useUsers = defineStore('userStore', () => {
   const { api } = useApi()
   const { user } = useGlobal()
   const { loadRoles } = useRoles()
+  const basesStore = useBases()
 
   const updateUserProfile = async ({
     attrs,
@@ -20,6 +21,8 @@ export const useUsers = defineStore('userStore', () => {
       ...user.value,
       ...attrs,
     }
+
+    basesStore.clearBasesUser()
   }
 
   const loadCurrentUser = loadRoles
diff --git a/packages/nc-gui/utils/cell.ts b/packages/nc-gui/utils/cell.ts
index 9defa58cb2..e8abdfa64f 100644
--- a/packages/nc-gui/utils/cell.ts
+++ b/packages/nc-gui/utils/cell.ts
@@ -32,6 +32,7 @@ export const isGeoData = (column: ColumnType) => column.uidt === UITypes.GeoData
 export const isPercent = (column: ColumnType) => column.uidt === UITypes.Percent
 export const isSpecificDBType = (column: ColumnType) => column.uidt === UITypes.SpecificDBType
 export const isGeometry = (column: ColumnType) => column.uidt === UITypes.Geometry
+export const isUser = (column: ColumnType) => column.uidt === UITypes.User
 export const isAutoSaved = (column: ColumnType) =>
   [
     UITypes.SingleLineText,
diff --git a/packages/nc-gui/utils/columnUtils.ts b/packages/nc-gui/utils/columnUtils.ts
index a2be2c7e60..7beafc22c1 100644
--- a/packages/nc-gui/utils/columnUtils.ts
+++ b/packages/nc-gui/utils/columnUtils.ts
@@ -134,6 +134,10 @@ const uiTypes = [
     name: UITypes.SpecificDBType,
     icon: iconMap.specificDbType,
   },
+  {
+    name: UITypes.User,
+    icon: iconMap.account,
+  },
 ]
 
 const getUIDTIcon = (uidt: UITypes | string) => {
diff --git a/packages/nc-gui/utils/dataUtils.ts b/packages/nc-gui/utils/dataUtils.ts
index 505acca43b..b7fda18cb9 100644
--- a/packages/nc-gui/utils/dataUtils.ts
+++ b/packages/nc-gui/utils/dataUtils.ts
@@ -1,4 +1,4 @@
-import { RelationTypes, UITypes } from 'nocodb-sdk'
+import { RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
 import type { Row } from 'lib'
 import { isColumnRequiredAndNull } from './columnUtils'
@@ -86,3 +86,23 @@ export async function populateInsertObject({
 
   return { missingRequiredColumns, insertObj }
 }
+
+// a function to get default values of row
+export const rowDefaultData = (columns: ColumnType[] = []) => {
+  const defaultData: Record<string, string> = columns.reduce<Record<string, any>>((acc: Record<string, any>, col: ColumnType) => {
+    //  avoid setting default value for system col, virtual col, rollup, formula, barcode, qrcode, links, ltar
+    if (
+      !isSystemColumn(col) &&
+      !isVirtualCol(col) &&
+      !isLinksOrLTAR({ uidt: col.uidt! }) &&
+      ![UITypes.Rollup, UITypes.Lookup, UITypes.Formula, UITypes.Barcode, UITypes.QrCode].includes(col.uidt) &&
+      col?.cdf
+    ) {
+      const defaultValue = col.cdf
+      acc[col.title!] = typeof defaultValue === 'string' ? defaultValue.replace(/^'/, '').replace(/'$/, '') : defaultValue
+    }
+    return acc
+  }, {} as Record<string, any>)
+
+  return defaultData
+}
diff --git a/packages/nc-gui/utils/filterUtils.ts b/packages/nc-gui/utils/filterUtils.ts
index 9f091397da..28b3a093e7 100644
--- a/packages/nc-gui/utils/filterUtils.ts
+++ b/packages/nc-gui/utils/filterUtils.ts
@@ -70,6 +70,7 @@ const getLteText = (fieldUiType: UITypes) => {
 
 export const comparisonOpList = (
   fieldUiType: UITypes,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   dateFormat?: string,
 ): {
   text: string
@@ -77,203 +78,206 @@ export const comparisonOpList = (
   ignoreVal: boolean
   includedTypes?: UITypes[]
   excludedTypes?: UITypes[]
-}[] => {
-  const isDateMonth = dateFormat && isDateMonthFormat(dateFormat)
-  return [
-    {
-      text: 'is checked',
-      value: 'checked',
-      ignoreVal: true,
-      includedTypes: [UITypes.Checkbox],
-    },
-    {
-      text: 'is not checked',
-      value: 'notchecked',
-      ignoreVal: true,
-      includedTypes: [UITypes.Checkbox],
-    },
-    {
-      text: getEqText(fieldUiType),
-      value: 'eq',
-      ignoreVal: false,
-      excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.Attachment],
-    },
-    {
-      text: getNeqText(fieldUiType),
-      value: 'neq',
-      ignoreVal: false,
-      excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.Attachment],
-    },
-    {
-      text: getLikeText(fieldUiType),
-      value: 'like',
-      ignoreVal: false,
-      excludedTypes: [
-        UITypes.Checkbox,
-        UITypes.SingleSelect,
-        UITypes.MultiSelect,
-        UITypes.Collaborator,
-        UITypes.Date,
-        UITypes.DateTime,
-        UITypes.Time,
-        ...numericUITypes,
-      ],
-    },
-    {
-      text: getNotLikeText(fieldUiType),
-      value: 'nlike',
-      ignoreVal: false,
-      excludedTypes: [
-        UITypes.Checkbox,
-        UITypes.SingleSelect,
-        UITypes.MultiSelect,
-        UITypes.Collaborator,
-        UITypes.Date,
-        UITypes.DateTime,
-        UITypes.Time,
-        ...numericUITypes,
-      ],
-    },
-    {
-      text: 'is empty',
-      value: 'empty',
-      ignoreVal: true,
-      excludedTypes: [
-        UITypes.Checkbox,
-        UITypes.SingleSelect,
-        UITypes.MultiSelect,
-        UITypes.Collaborator,
-        UITypes.Attachment,
-        UITypes.LinkToAnotherRecord,
-        UITypes.Lookup,
-        UITypes.Date,
-        UITypes.DateTime,
-        UITypes.Time,
-        ...numericUITypes,
-      ],
-    },
-    {
-      text: 'is not empty',
-      value: 'notempty',
-      ignoreVal: true,
-      excludedTypes: [
-        UITypes.Checkbox,
-        UITypes.SingleSelect,
-        UITypes.MultiSelect,
-        UITypes.Collaborator,
-        UITypes.Attachment,
-        UITypes.LinkToAnotherRecord,
-        UITypes.Lookup,
-        UITypes.Date,
-        UITypes.DateTime,
-        UITypes.Time,
-        ...numericUITypes,
-      ],
-    },
-    {
-      text: 'is null',
-      value: 'null',
-      ignoreVal: true,
-      excludedTypes: [
-        ...numericUITypes,
-        UITypes.Checkbox,
-        UITypes.SingleSelect,
-        UITypes.MultiSelect,
-        UITypes.Collaborator,
-        UITypes.Attachment,
-        UITypes.LinkToAnotherRecord,
-        UITypes.Lookup,
-        UITypes.Date,
-        UITypes.DateTime,
-        UITypes.Time,
-      ],
-    },
-    {
-      text: 'is not null',
-      value: 'notnull',
-      ignoreVal: true,
-      excludedTypes: [
-        ...numericUITypes,
-        UITypes.Checkbox,
-        UITypes.SingleSelect,
-        UITypes.MultiSelect,
-        UITypes.Collaborator,
-        UITypes.Attachment,
-        UITypes.LinkToAnotherRecord,
-        UITypes.Lookup,
-        UITypes.Date,
-        UITypes.DateTime,
-        UITypes.Time,
-      ],
-    },
-    {
-      text: 'contains all of',
-      value: 'allof',
-      ignoreVal: false,
-      includedTypes: [UITypes.MultiSelect],
-    },
-    {
-      text: 'contains any of',
-      value: 'anyof',
-      ignoreVal: false,
-      includedTypes: [UITypes.MultiSelect, UITypes.SingleSelect],
-    },
-    {
-      text: 'does not contain all of',
-      value: 'nallof',
-      ignoreVal: false,
-      includedTypes: [UITypes.MultiSelect],
-    },
-    {
-      text: 'does not contain any of',
-      value: 'nanyof',
-      ignoreVal: false,
-      includedTypes: [UITypes.MultiSelect, UITypes.SingleSelect],
-    },
-    {
-      text: getGtText(fieldUiType),
-      value: 'gt',
-      ignoreVal: false,
-      includedTypes: [...numericUITypes, UITypes.Date, UITypes.DateTime, UITypes.Time],
-    },
-    {
-      text: getLtText(fieldUiType),
-      value: 'lt',
-      ignoreVal: false,
-      includedTypes: [...numericUITypes, UITypes.Date, UITypes.DateTime, UITypes.Time],
-    },
-    {
-      text: getGteText(fieldUiType),
-      value: 'gte',
-      ignoreVal: false,
-      includedTypes: [...numericUITypes, UITypes.Date, UITypes.DateTime, UITypes.Time],
-    },
-    {
-      text: getLteText(fieldUiType),
-      value: 'lte',
-      ignoreVal: false,
-      includedTypes: [...numericUITypes, UITypes.Date, UITypes.DateTime, UITypes.Time],
-    },
-    {
-      text: 'is within',
-      value: 'isWithin',
-      ignoreVal: true,
-      includedTypes: [...(isDateMonth ? [] : [UITypes.Date, UITypes.DateTime])],
-    },
-    {
-      text: 'is blank',
-      value: 'blank',
-      ignoreVal: true,
-      excludedTypes: [UITypes.Checkbox, UITypes.Links, UITypes.Rollup],
-    },
-    {
-      text: 'is not blank',
-      value: 'notblank',
-      ignoreVal: true,
-      excludedTypes: [UITypes.Checkbox, UITypes.Links, UITypes.Rollup],
-    },
-  ]
-}
+}[] => [
+  {
+    text: 'is checked',
+    value: 'checked',
+    ignoreVal: true,
+    includedTypes: [UITypes.Checkbox],
+  },
+  {
+    text: 'is not checked',
+    value: 'notchecked',
+    ignoreVal: true,
+    includedTypes: [UITypes.Checkbox],
+  },
+  {
+    text: getEqText(fieldUiType),
+    value: 'eq',
+    ignoreVal: false,
+    excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.Attachment, UITypes.User],
+  },
+  {
+    text: getNeqText(fieldUiType),
+    value: 'neq',
+    ignoreVal: false,
+    excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.Attachment, UITypes.User],
+  },
+  {
+    text: getLikeText(fieldUiType),
+    value: 'like',
+    ignoreVal: false,
+    excludedTypes: [
+      UITypes.Checkbox,
+      UITypes.SingleSelect,
+      UITypes.MultiSelect,
+      UITypes.User,
+      UITypes.Collaborator,
+      UITypes.Date,
+      UITypes.DateTime,
+      UITypes.Time,
+      ...numericUITypes,
+    ],
+  },
+  {
+    text: getNotLikeText(fieldUiType),
+    value: 'nlike',
+    ignoreVal: false,
+    excludedTypes: [
+      UITypes.Checkbox,
+      UITypes.SingleSelect,
+      UITypes.MultiSelect,
+      UITypes.User,
+      UITypes.Collaborator,
+      UITypes.Date,
+      UITypes.DateTime,
+      UITypes.Time,
+      ...numericUITypes,
+    ],
+  },
+  {
+    text: 'is empty',
+    value: 'empty',
+    ignoreVal: true,
+    excludedTypes: [
+      UITypes.Checkbox,
+      UITypes.SingleSelect,
+      UITypes.MultiSelect,
+      UITypes.User,
+      UITypes.Collaborator,
+      UITypes.Attachment,
+      UITypes.LinkToAnotherRecord,
+      UITypes.Lookup,
+      UITypes.Date,
+      UITypes.DateTime,
+      UITypes.Time,
+      ...numericUITypes,
+    ],
+  },
+  {
+    text: 'is not empty',
+    value: 'notempty',
+    ignoreVal: true,
+    excludedTypes: [
+      UITypes.Checkbox,
+      UITypes.SingleSelect,
+      UITypes.MultiSelect,
+      UITypes.User,
+      UITypes.Collaborator,
+      UITypes.Attachment,
+      UITypes.LinkToAnotherRecord,
+      UITypes.Lookup,
+      UITypes.Date,
+      UITypes.DateTime,
+      UITypes.Time,
+      ...numericUITypes,
+    ],
+  },
+  {
+    text: 'is null',
+    value: 'null',
+    ignoreVal: true,
+    excludedTypes: [
+      ...numericUITypes,
+      UITypes.Checkbox,
+      UITypes.SingleSelect,
+      UITypes.MultiSelect,
+      UITypes.User,
+      UITypes.Collaborator,
+      UITypes.Attachment,
+      UITypes.LinkToAnotherRecord,
+      UITypes.Lookup,
+      UITypes.Date,
+      UITypes.DateTime,
+      UITypes.Time,
+    ],
+  },
+  {
+    text: 'is not null',
+    value: 'notnull',
+    ignoreVal: true,
+    excludedTypes: [
+      ...numericUITypes,
+      UITypes.Checkbox,
+      UITypes.SingleSelect,
+      UITypes.MultiSelect,
+      UITypes.User,
+      UITypes.Collaborator,
+      UITypes.Attachment,
+      UITypes.LinkToAnotherRecord,
+      UITypes.Lookup,
+      UITypes.Date,
+      UITypes.DateTime,
+      UITypes.Time,
+    ],
+  },
+  {
+    text: 'contains all of',
+    value: 'allof',
+    ignoreVal: false,
+    includedTypes: [UITypes.MultiSelect, UITypes.User],
+  },
+  {
+    text: 'contains any of',
+    value: 'anyof',
+    ignoreVal: false,
+    includedTypes: [UITypes.MultiSelect, UITypes.SingleSelect, UITypes.User],
+  },
+  {
+    text: 'does not contain all of',
+    value: 'nallof',
+    ignoreVal: false,
+    includedTypes: [UITypes.MultiSelect, UITypes.User],
+  },
+  {
+    text: 'does not contain any of',
+    value: 'nanyof',
+    ignoreVal: false,
+    includedTypes: [UITypes.MultiSelect, UITypes.SingleSelect, UITypes.User],
+  },
+  {
+    text: getGtText(fieldUiType),
+    value: 'gt',
+    ignoreVal: false,
+    includedTypes: [...numericUITypes, UITypes.Date, UITypes.DateTime, UITypes.Time],
+  },
+  {
+    text: getLtText(fieldUiType),
+    value: 'lt',
+    ignoreVal: false,
+    includedTypes: [...numericUITypes, UITypes.Date, UITypes.DateTime, UITypes.Time],
+  },
+  {
+    text: getGteText(fieldUiType),
+    value: 'gte',
+    ignoreVal: false,
+    includedTypes: [...numericUITypes, UITypes.Date, UITypes.DateTime, UITypes.Time],
+  },
+  {
+    text: getLteText(fieldUiType),
+    value: 'lte',
+    ignoreVal: false,
+    includedTypes: [...numericUITypes, UITypes.Date, UITypes.DateTime, UITypes.Time],
+  },
+  {
+    text: 'is within',
+    value: 'isWithin',
+    ignoreVal: true,
+    includedTypes: [UITypes.Date, UITypes.DateTime],
+  },
+  {
+    text: 'is blank',
+    value: 'blank',
+    ignoreVal: true,
+    excludedTypes: [UITypes.Checkbox, UITypes.Links, UITypes.Rollup],
+  },
+  {
+    text: 'is not blank',
+    value: 'notblank',
+    ignoreVal: true,
+    excludedTypes: [UITypes.Checkbox, UITypes.Links, UITypes.Rollup],
+  },
+]
 
 export const comparisonSubOpList = (
   // TODO: type
diff --git a/packages/nc-gui/utils/formulaUtils.ts b/packages/nc-gui/utils/formulaUtils.ts
index 8449d27da7..ecc5c3aad4 100644
--- a/packages/nc-gui/utils/formulaUtils.ts
+++ b/packages/nc-gui/utils/formulaUtils.ts
@@ -1,624 +1,5 @@
 import type { Input as AntInput } from 'ant-design-vue'
-
-const formulaTypes = {
-  NUMERIC: 'numeric',
-  STRING: 'string',
-  DATE: 'date',
-  LOGICAL: 'logical',
-  COND_EXP: 'conditional_expression',
-}
-
-const formulas: Record<string, any> = {
-  AVG: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        min: 1,
-      },
-    },
-    description: 'Average of input parameters',
-    syntax: 'AVG(value1, [value2, ...])',
-    examples: ['AVG(10, 5) => 7.5', 'AVG({column1}, {column2})', 'AVG({column1}, {column2}, {column3})'],
-  },
-  ADD: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        min: 1,
-      },
-    },
-    description: 'Sum of input parameters',
-    syntax: 'ADD(value1, [value2, ...])',
-    examples: ['ADD(5, 5) => 10', 'ADD({column1}, {column2})', 'ADD({column1}, {column2}, {column3})'],
-  },
-  DATEADD: {
-    type: formulaTypes.DATE,
-    validation: {
-      args: {
-        rqd: 3,
-      },
-    },
-    description: 'Adds a "count" units to Datetime.',
-    syntax: 'DATEADD(date | datetime, value, ["day" | "week" | "month" | "year"])',
-    examples: [
-      'DATEADD({column1}, 2, "day")',
-      'DATEADD({column1}, -2, "day")',
-      'DATEADD({column1}, 2, "week")',
-      'DATEADD({column1}, -2, "week")',
-      'DATEADD({column1}, 2, "month")',
-      'DATEADD({column1}, -2, "month")',
-      'DATEADD({column1}, 2, "year")',
-      'DATEADD({column1}, -2, "year")',
-    ],
-  },
-  DATETIME_DIFF: {
-    type: formulaTypes.DATE,
-    validation: {
-      args: {
-        min: 2,
-        max: 3,
-      },
-    },
-    description: 'Calculate the difference of two given date / datetime in specified units.',
-    syntax:
-      'DATETIME_DIFF(date | datetime, date | datetime, ["milliseconds" | "ms" | "seconds" | "s" | "minutes" | "m" | "hours" | "h" | "days" | "d" | "weeks" | "w" | "months" | "M" | "quarters" | "Q" | "years" | "y"])',
-    examples: [
-      'DATEDIFF({column1}, {column2})',
-      'DATEDIFF({column1}, {column2}, "seconds")',
-      'DATEDIFF({column1}, {column2}, "s")',
-      'DATEDIFF({column1}, {column2}, "years")',
-      'DATEDIFF({column1}, {column2}, "y")',
-      'DATEDIFF({column1}, {column2}, "minutes")',
-      'DATEDIFF({column1}, {column2}, "m")',
-      'DATEDIFF({column1}, {column2}, "days")',
-      'DATEDIFF({column1}, {column2}, "d")',
-    ],
-  },
-  AND: {
-    type: formulaTypes.COND_EXP,
-    validation: {
-      args: {
-        min: 1,
-      },
-    },
-    description: 'TRUE if all expr evaluate to TRUE',
-    syntax: 'AND(expr1, [expr2, ...])',
-    examples: ['AND(5 > 2, 5 < 10) => 1', 'AND({column1} > 2, {column2} < 10)'],
-  },
-  OR: {
-    type: formulaTypes.COND_EXP,
-    validation: {
-      args: {
-        min: 1,
-      },
-    },
-    description: 'TRUE if at least one expr evaluates to TRUE',
-    syntax: 'OR(expr1, [expr2, ...])',
-    examples: ['OR(5 > 2, 5 < 10) => 1', 'OR({column1} > 2, {column2} < 10)'],
-  },
-  CONCAT: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        min: 1,
-      },
-    },
-    description: 'Concatenated string of input parameters',
-    syntax: 'CONCAT(str1, [str2, ...])',
-    examples: ['CONCAT("AA", "BB", "CC") => "AABBCC"', 'CONCAT({column1}, {column2}, {column3})'],
-  },
-  TRIM: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description: 'Remove trailing and leading whitespaces from input parameter',
-    syntax: 'TRIM(str)',
-    examples: ['TRIM("         HELLO WORLD  ") => "HELLO WORLD"', 'TRIM({column1})'],
-  },
-  UPPER: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description: 'Upper case converted string of input parameter',
-    syntax: 'UPPER(str)',
-    examples: ['UPPER("nocodb") => "NOCODB"', 'UPPER({column1})'],
-  },
-  LOWER: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description: 'Lower case converted string of input parameter',
-    syntax: 'LOWER(str)',
-    examples: ['LOWER("NOCODB") => "nocodb"', 'LOWER({column1})'],
-  },
-  LEN: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description: 'Input parameter character length',
-    syntax: 'LEN(value)',
-    examples: ['LEN("NocoDB") => 6', 'LEN({column1})'],
-  },
-  MIN: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        min: 1,
-      },
-    },
-    description: 'Minimum value amongst input parameters',
-    syntax: 'MIN(value1, [value2, ...])',
-    examples: ['MIN(1000, 2000) => 1000', 'MIN({column1}, {column2})'],
-  },
-  MAX: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        min: 1,
-      },
-    },
-    description: 'Maximum value amongst input parameters',
-    syntax: 'MAX(value1, [value2, ...])',
-    examples: ['MAX(1000, 2000) => 2000', 'MAX({column1}, {column2})'],
-  },
-  CEILING: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description: 'Rounded next largest integer value of input parameter',
-    syntax: 'CEILING(value)',
-    examples: ['CEILING(1.01) => 2', 'CEILING({column1})'],
-  },
-  FLOOR: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description: 'Rounded largest integer less than or equal to input parameter',
-    syntax: 'FLOOR(value)',
-    examples: ['FLOOR(3.1415) => 3', 'FLOOR({column1})'],
-  },
-  ROUND: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        min: 1,
-        max: 2,
-      },
-    },
-    description: 'Rounded number to a specified number of decimal places or the nearest integer if not specified',
-    syntax: 'ROUND(value, precision), ROUND(value)',
-    examples: ['ROUND(3.1415) => 3', 'ROUND(3.1415, 2) => 3.14', 'ROUND({column1}, 3)'],
-  },
-  MOD: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        rqd: 2,
-      },
-    },
-    description: 'Remainder after integer division of input parameters',
-    syntax: 'MOD(value1, value2)',
-    examples: ['MOD(1024, 1000) => 24', 'MOD({column}, 2)'],
-  },
-  REPEAT: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 2,
-      },
-    },
-    description: 'Specified copies of the input parameter string concatenated together',
-    syntax: 'REPEAT(str, count)',
-    examples: ['REPEAT("A", 5) => "AAAAA"', 'REPEAT({column}, 5)'],
-  },
-  LOG: {
-    type: formulaTypes.NUMERIC,
-    validation: {},
-    description: 'Logarithm of input parameter to the base (default = e) specified',
-    syntax: 'LOG([base], value)',
-    examples: ['LOG(2, 1024) => 10', 'LOG(2, {column1})'],
-  },
-  EXP: {
-    type: formulaTypes.NUMERIC,
-    validation: {},
-    description: 'Exponential value of input parameter (e ^ power)',
-    syntax: 'EXP(power)',
-    examples: ['EXP(1) => 2.718281828459045', 'EXP({column1})'],
-  },
-  POWER: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        rqd: 2,
-      },
-    },
-    description: 'base to the exponent power, as in base ^ exponent',
-    syntax: 'POWER(base, exponent)',
-    examples: ['POWER(2, 10) => 1024', 'POWER({column1}, 10)'],
-  },
-  SQRT: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description: 'Square root of the input parameter',
-    syntax: 'SQRT(value)',
-    examples: ['SQRT(100) => 10', 'SQRT({column1})'],
-  },
-  ABS: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description: 'Absolute value of the input parameter',
-    syntax: 'ABS(value)',
-    examples: ['ABS({column1})'],
-  },
-  NOW: {
-    type: formulaTypes.DATE,
-    validation: {
-      args: {
-        rqd: 0,
-      },
-    },
-    description: 'Returns the current time and day',
-    syntax: 'NOW()',
-    examples: ['NOW() => 2022-05-19 17:20:43'],
-  },
-  REPLACE: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 3,
-      },
-    },
-    description: 'String, after replacing all occurrences of srchStr with rplcStr',
-    syntax: 'REPLACE(str, srchStr, rplcStr)',
-    examples: ['REPLACE("AABBCC", "AA", "BB") => "BBBBCC"', 'REPLACE({column1}, {column2}, {column3})'],
-  },
-  SEARCH: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 2,
-      },
-    },
-    description: 'Index of srchStr specified if found, 0 otherwise',
-    syntax: 'SEARCH(str, srchStr)',
-    examples: ['SEARCH("HELLO WORLD", "WORLD") => 7', 'SEARCH({column1}, "abc")'],
-  },
-  INT: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description: 'Integer value of input parameter',
-    syntax: 'INT(value)',
-    examples: ['INT(3.1415) => 3', 'INT({column1})'],
-  },
-  RIGHT: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 2,
-      },
-    },
-    description: 'n characters from the end of input parameter',
-    syntax: 'RIGHT(str, n)',
-    examples: ['RIGHT("HELLO WORLD", 5) => WORLD', 'RIGHT({column1}, 3)'],
-  },
-  LEFT: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 2,
-      },
-    },
-    description: 'n characters from the beginning of input parameter',
-    syntax: 'LEFT(str, n)',
-    examples: ['LEFT({column1}, 2)', 'LEFT("ABCD", 2) => "AB"'],
-  },
-  SUBSTR: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        min: 2,
-        max: 3,
-      },
-    },
-    description: 'Substring of length n of input string from the postition specified',
-    syntax: '	SUBTR(str, position, [n])',
-    examples: ['SUBSTR("HELLO WORLD", 7) => WORLD', 'SUBSTR("HELLO WORLD", 7, 3) => WOR', 'SUBSTR({column1}, 7, 5)'],
-  },
-  MID: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 3,
-      },
-    },
-    description: 'Alias for SUBSTR',
-    syntax: 'MID(str, position, [count])',
-    examples: ['MID("NocoDB", 3, 2) => "co"', 'MID({column1}, 3, 2)'],
-  },
-  IF: {
-    type: formulaTypes.COND_EXP,
-    validation: {
-      args: {
-        min: 2,
-        max: 3,
-      },
-    },
-    description: 'SuccessCase if expr evaluates to TRUE, elseCase otherwise',
-    syntax: 'IF(expr, successCase, elseCase)',
-    examples: ['IF(5 > 1, "YES", "NO") => "YES"', 'IF({column} > 1, "YES", "NO")'],
-  },
-  SWITCH: {
-    type: formulaTypes.COND_EXP,
-    validation: {
-      args: {
-        min: 3,
-      },
-    },
-    description: 'Switch case value based on expr output',
-    syntax: 'SWITCH(expr, [pattern, value, ..., default])',
-    examples: [
-      'SWITCH(1, 1, "One", 2, "Two", "N/A") => "One""',
-      'SWITCH(2, 1, "One", 2, "Two", "N/A") => "Two"',
-      'SWITCH(3, 1, "One", 2, "Two", "N/A") => "N/A"',
-      'SWITCH({column1}, 1, "One", 2, "Two", "N/A")',
-    ],
-  },
-  URL: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description: 'Convert to a hyperlink if it is a valid URL',
-    syntax: 'URL(str)',
-    examples: ['URL("https://github.com/nocodb/nocodb")', 'URL({column1})'],
-  },
-  WEEKDAY: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        min: 1,
-        max: 2,
-      },
-    },
-    description: 'Returns the day of the week as an integer between 0 and 6 inclusive starting from Monday by default',
-    syntax: 'WEEKDAY(date, [startDayOfWeek])',
-    examples: ['WEEKDAY("2021-06-09")', 'WEEKDAY(NOW(), "sunday")'],
-  },
-
-  TRUE: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        max: 0,
-      },
-    },
-    description: 'Returns 1',
-    syntax: 'TRUE()',
-    examples: ['TRUE()'],
-  },
-
-  FALSE: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        max: 0,
-      },
-    },
-    description: 'Returns 0',
-    syntax: 'FALSE()',
-    examples: ['FALSE()'],
-  },
-
-  REGEX_MATCH: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 2,
-      },
-    },
-    description: 'Returns 1 if the input text matches a regular expression or 0 if it does not.',
-    syntax: 'REGEX_MATCH(string, regex)',
-    examples: ['REGEX_MATCH({title}, "abc.*")'],
-  },
-
-  REGEX_EXTRACT: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 2,
-      },
-    },
-    description: 'Returns the first match of a regular expression in a string.',
-    syntax: 'REGEX_EXTRACT(string, regex)',
-    examples: ['REGEX_EXTRACT({title}, "abc.*")'],
-  },
-  REGEX_REPLACE: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 3,
-      },
-    },
-    description: 'Replaces all matches of a regular expression in a string with a replacement string',
-    syntax: 'REGEX_MATCH(string, regex, replacement)',
-    examples: ['REGEX_EXTRACT({title}, "abc.*", "abcd")'],
-  },
-  BLANK: {
-    type: formulaTypes.STRING,
-    validation: {
-      args: {
-        rqd: 0,
-      },
-    },
-    description: 'Returns a blank value(null)',
-    syntax: 'BLANK()',
-    examples: ['BLANK()'],
-  },
-  XOR: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        min: 1,
-      },
-    },
-    description: 'Returns true if an odd number of arguments are true, and false otherwise.',
-    syntax: 'XOR(expression, [exp2, ...])',
-    examples: ['XOR(TRUE(), FALSE(), TRUE())'],
-  },
-  EVEN: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description: 'Returns the nearest even integer that is greater than or equal to the specified value',
-    syntax: 'EVEN(value)',
-    examples: ['EVEN({column})'],
-  },
-  ODD: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description: 'Returns the nearest odd integer that is greater than or equal to the specified value',
-    syntax: 'ODD(value)',
-    examples: ['ODD({column})'],
-  },
-  RECORD_ID: {
-    validation: {
-      args: {
-        rqd: 0,
-      },
-    },
-    description: 'Returns the record id of the current record',
-    syntax: 'RECORD_ID()',
-    examples: ['RECORD_ID()'],
-  },
-  COUNTA: {
-    validation: {
-      args: {
-        min: 1,
-      },
-    },
-    description: 'Counts the number of non-empty arguments',
-    syntax: 'COUNTA(value1, [value2, ...])',
-    examples: ['COUNTA({field1}, {field2})'],
-  },
-  COUNT: {
-    validation: {
-      args: {
-        min: 1,
-      },
-    },
-    description: 'Count the number of arguments that are numbers',
-    syntax: 'COUNT(value1, [value2, ...])',
-    examples: ['COUNT({field1}, {field2})'],
-  },
-  COUNTALL: {
-    validation: {
-      args: {
-        min: 1,
-      },
-    },
-    description: 'Counts the number of arguments',
-    syntax: 'COUNTALL(value1, [value2, ...])',
-    examples: ['COUNTALL({field1}, {field2})'],
-  },
-  ROUNDDOWN: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        min: 1,
-        max: 2,
-      },
-    },
-    description:
-      'Round down the value after the decimal point to the number of decimal places given by "precision"(default is 0)',
-    syntax: 'ROUNDDOWN(value, [precision])',
-    examples: ['ROUNDDOWN({field1})', 'ROUNDDOWN({field1}, 2)'],
-  },
-  ROUNDUP: {
-    type: formulaTypes.NUMERIC,
-    validation: {
-      args: {
-        min: 1,
-        max: 2,
-      },
-    },
-    description: 'Round up the value after the decimal point to the number of decimal places given by "precision"(default is 0)',
-    syntax: 'ROUNDUP(value, [precision])',
-    examples: ['ROUNDUP({field1})', 'ROUNDUP({field1}, 2)'],
-  },
-  VALUE: {
-    validation: {
-      args: {
-        rqd: 1,
-      },
-    },
-    description:
-      'Extract the numeric value from a string, if `%` or `-` is present, it will handle it accordingly and return the numeric value',
-    syntax: 'VALUE(value)',
-    examples: ['VALUE({field})', 'VALUE("abc10000%")', 'VALUE("$10000")'],
-  },
-  // Disabling these functions for now; these act as alias for CreatedAt & UpdatedAt fields;
-  // Issue: Error noticed if CreatedAt & UpdatedAt fields are removed from the table after creating these formulas
-  //
-  // CREATED_TIME: {
-  //   validation: {
-  //     args: {
-  //       rqd: 0,
-  //     },
-  //   },
-  //   description: 'Returns the created time of the current record if it exists',
-  //   syntax: 'CREATED_TIME()',
-  //   examples: ['CREATED_TIME()'],
-  // },
-  // LAST_MODIFIED_TIME: {
-  //   validation: {
-  //     args: {
-  //       rqd: 0,
-  //     },
-  //   },
-  //   description: 'Returns the last modified time of the current record if it exists',
-  //   syntax: ' LAST_MODIFIED_TIME()',
-  //   examples: [' LAST_MODIFIED_TIME()'],
-  // },
-}
+import { formulas } from 'nocodb-sdk'
 
 const formulaList = Object.keys(formulas)
 
@@ -671,4 +52,4 @@ function GetCaretPosition(ctrl: typeof AntInput) {
   return CaretPos
 }
 
-export { formulaList, formulas, formulaTypes, getWordUntilCaret, insertAtCursor }
+export { formulaList, formulas, getWordUntilCaret, insertAtCursor }
diff --git a/packages/nc-gui/utils/iconUtils.ts b/packages/nc-gui/utils/iconUtils.ts
index 4e828c7cd0..4d0b105c88 100644
--- a/packages/nc-gui/utils/iconUtils.ts
+++ b/packages/nc-gui/utils/iconUtils.ts
@@ -91,6 +91,9 @@ import Project from '~icons/nc-icons/project'
 import LookupIcon from '~icons/nc-icons/lookup'
 import FileImageIcon from '~icons/nc-icons/file-image'
 
+import PhUsers from '~icons/ph/users'
+import PhUser from '~icons/ph/user'
+
 // Roles
 import SuperAdmin from '~icons/nc-icons/super-admin'
 import Owner from '~icons/nc-icons/owner'
@@ -320,6 +323,8 @@ export const iconMap = {
   lock: h('span', { class: 'material-symbols' }, 'lock'),
   account: h('span', { class: 'material-symbols' }, 'person'),
   accountCircle: h('span', { class: 'material-symbols' }, 'account_circle'),
+  phUser: PhUser,
+  phUsers: PhUsers,
   users: NcUsers,
   cloudDownload: h('span', { class: 'material-symbols' }, 'cloud_download'),
   download: MsDownloadRounded,
diff --git a/packages/noco-docs/docs/020.getting-started/050.self-hosted/_category_.json b/packages/noco-docs/docs/020.getting-started/050.self-hosted/_category_.json
index 77734f8d78..de31bd5b4b 100644
--- a/packages/noco-docs/docs/020.getting-started/050.self-hosted/_category_.json
+++ b/packages/noco-docs/docs/020.getting-started/050.self-hosted/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "In Open Source",
   "collapsible": true,
-  "collapsed": false
+  "collapsed": false,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/020.getting-started/_category_.json b/packages/noco-docs/docs/020.getting-started/_category_.json
index 22b30093b7..896c27e12f 100644
--- a/packages/noco-docs/docs/020.getting-started/_category_.json
+++ b/packages/noco-docs/docs/020.getting-started/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Getting Started",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/030.workspaces/_category_.json b/packages/noco-docs/docs/030.workspaces/_category_.json
index 328e1a8ec8..b898046527 100644
--- a/packages/noco-docs/docs/030.workspaces/_category_.json
+++ b/packages/noco-docs/docs/030.workspaces/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Workspaces ☁",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/040.bases/_category_.json b/packages/noco-docs/docs/040.bases/_category_.json
index 7c9fdc0183..5de721ae92 100644
--- a/packages/noco-docs/docs/040.bases/_category_.json
+++ b/packages/noco-docs/docs/040.bases/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Bases",
   "collapsible": true,
-  "collapsed": false
+  "collapsed": false,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/050.tables/_category_.json b/packages/noco-docs/docs/050.tables/_category_.json
index 0653d57c8f..fdb6e348a1 100644
--- a/packages/noco-docs/docs/050.tables/_category_.json
+++ b/packages/noco-docs/docs/050.tables/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Tables",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/060.table-operations/_category_.json b/packages/noco-docs/docs/060.table-operations/_category_.json
index 79b5cdcc8f..4484195023 100644
--- a/packages/noco-docs/docs/060.table-operations/_category_.json
+++ b/packages/noco-docs/docs/060.table-operations/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Table operations",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/065.table-details/_category_.json b/packages/noco-docs/docs/065.table-details/_category_.json
index 3caf0fb1d6..324a70559e 100644
--- a/packages/noco-docs/docs/065.table-details/_category_.json
+++ b/packages/noco-docs/docs/065.table-details/_category_.json
@@ -1,5 +1,8 @@
 {
-  "label": "Table Details",
+  "label": "Table details",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/070.fields/040.field-types/010.text-based/025.rich-text.md b/packages/noco-docs/docs/070.fields/040.field-types/010.text-based/025.rich-text.md
new file mode 100644
index 0000000000..1c6c381fc5
--- /dev/null
+++ b/packages/noco-docs/docs/070.fields/040.field-types/010.text-based/025.rich-text.md
@@ -0,0 +1,137 @@
+---
+title: 'Rich text'
+description: 'This article explains how to create & work with a Rich text field.'
+tags: ['Fields', 'Field types', 'Text based types', 'Rich text']
+keywords: ['Fields', 'Field types', 'Text based types', 'Rich text', 'Create rich text field']
+---
+
+
+`Rich Text` field is text based field & is extension of `Long text` that allows you to add formatting to the text. You can add text formatting like bold, italic, underline, strikethrough, horizontal rule, ordered list, unordered list, code, quote, etc.
+
+## Create a `Rich Text` field
+1. Click on `+` icon to the right of `Fields header`
+2. On the dropdown modal, enter the field name (Optional).
+3. Select the field type as `Long text` from the dropdown.
+4. Enable `Rich Text` toggle field.
+5. Set default value for the field (Optional).
+6. Click on `Save Field` button.
+
+![image](/img/v2/fields/types/richtext.png)
+
+:::note
+- Specify default value without quotes.
+- Use `Enter` key to add new line.
+:::
+
+### Cell display
+`Rich Text` field is displayed as a single line text field in the table view. Click on the expand icon in the cell to view the full text.
+
+![image](/img/v2/fields/long-text-expand.png)
+![image](/img/v2/fields/long-text-expand-2.png)
+
+
+## Formatting options
+NocoDB supports markdown syntax for formatting the text. Following are the supported formatting options.
+
+### Heading
+To create a heading, prefix `#` symbol preceding your heading text. The number of # symbols employed will dictate the heading's hierarchy level and typeface size. Three levels of headings are supported.
+
+```
+# Heading 1
+## Heading 2
+### Heading 3
+```
+
+![image](/img/v2/fields/types/richtext-heading.png)
+
+### Text formatting
+You can emphasise text with bold, italic, strikethrough or underline formatting options. Table below shows syntax, keyboard shortcut, example & output for each formatting option.
+
+| Style | Syntax | Keyboard shortcut | Example | Output |
+| --- | --- | --- | --- | --- |
+| Bold | `**bold text**` | `Ctrl/Cmd + B` | `**This is bold text**` | **This is bold text** |
+| Italic | `*italicized text*` | `Ctrl/Cmd + I` | `*This is italicized text*` | *This is italicized text* |
+| Strikethrough | `~~strikethrough text~~` | `Ctrl/Cmd + Shift + X` | `~~This is strikethrough text~~` | ~~This is strikethrough text~~ |
+| Underline |  | `Ctrl/Cmd + U` | `This is underlined text` | <u>This is underlined text</u> |
+
+### Quote block
+You can quote text with a `>`
+
+```
+normal text
+> quoted text
+```
+
+normal text
+> quoted text
+
+### Code block
+Code block can be created by using (3 backticks) before & after the code. 
+````
+```
+This is a code block
+```
+````
+
+```
+This is a code block
+```
+
+### Link
+You can create an inline link by using `Link` menu option in the rich text toolbar
+
+![image](/img/v2/fields/types/richtext-links.png)
+
+### Bullet List
+You can create unordered list by using `Bulleted list` menu option in the rich text toolbar or by preceding the text with `-` `+` or `*` symbol.
+```
+- Item 1
+- Item 2
+
++ Item 1
++ Item 2
+
+* Item 1
+* Item 2
+```
+
+- Item 1
+- Item 2
+
++ Item 1
++ Item 2
+
+* Item 1
+* Item 2
+
+:::note
+You can create nested lists by using `tab` key & `shift + tab` key to indent & outdent the list items.
+:::
+
+### Numbered List
+You can create ordered list by using `Numbered list` menu option in the rich text toolbar or by preceding the text with `1.` symbol.
+```
+1. Item 1
+2. Item 2
+```
+1. Item 1
+2. Item 2
+
+### Task list
+You can create task lists by using `Task list` menu option in the rich text toolbar or by preceding the text with `[ ]` symbol. You can mark the task as completed by using `[x]` symbol.
+```
+[ ] Item 1
+[x] Item 2
+```
+- [ ] Item 1
+- [x] Item 2
+
+
+## Similar text based fields
+Following are the other text based fields available in NocoDB, custom-built for specific use cases.
+- [Single line text](010.single-line-text.md)
+- [URL](050.url.md)
+- [Email](030.email.md)
+- [Phone](040.phonenumber.md)
+
+
diff --git a/packages/noco-docs/docs/070.fields/040.field-types/010.text-based/_category_.json b/packages/noco-docs/docs/070.fields/040.field-types/010.text-based/_category_.json
index 5ccf790bb2..363e958738 100644
--- a/packages/noco-docs/docs/070.fields/040.field-types/010.text-based/_category_.json
+++ b/packages/noco-docs/docs/070.fields/040.field-types/010.text-based/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Text based",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/070.fields/040.field-types/020.numerical/_category_.json b/packages/noco-docs/docs/070.fields/040.field-types/020.numerical/_category_.json
index a87ab92780..5b5d927bd2 100644
--- a/packages/noco-docs/docs/070.fields/040.field-types/020.numerical/_category_.json
+++ b/packages/noco-docs/docs/070.fields/040.field-types/020.numerical/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Numerical",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/070.fields/040.field-types/030.select-based/_category_.json b/packages/noco-docs/docs/070.fields/040.field-types/030.select-based/_category_.json
index abdd06decb..a26e7f57b3 100644
--- a/packages/noco-docs/docs/070.fields/040.field-types/030.select-based/_category_.json
+++ b/packages/noco-docs/docs/070.fields/040.field-types/030.select-based/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Select based",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/070.fields/040.field-types/040.links-based/_category_.json b/packages/noco-docs/docs/070.fields/040.field-types/040.links-based/_category_.json
index cc5f68ea3e..13adfa3e46 100644
--- a/packages/noco-docs/docs/070.fields/040.field-types/040.links-based/_category_.json
+++ b/packages/noco-docs/docs/070.fields/040.field-types/040.links-based/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Links based",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/070.fields/040.field-types/050.custom-types/_category_.json b/packages/noco-docs/docs/070.fields/040.field-types/050.custom-types/_category_.json
index 46df59067d..8b89b30ae5 100644
--- a/packages/noco-docs/docs/070.fields/040.field-types/050.custom-types/_category_.json
+++ b/packages/noco-docs/docs/070.fields/040.field-types/050.custom-types/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Custom types",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/070.fields/040.field-types/060.formula/_category_.json b/packages/noco-docs/docs/070.fields/040.field-types/060.formula/_category_.json
index aa341462ac..af8a4d4aa3 100644
--- a/packages/noco-docs/docs/070.fields/040.field-types/060.formula/_category_.json
+++ b/packages/noco-docs/docs/070.fields/040.field-types/060.formula/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Formula",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/070.fields/040.field-types/070.date-time-based/_category_.json b/packages/noco-docs/docs/070.fields/040.field-types/070.date-time-based/_category_.json
index cf49d0d212..b76193561d 100644
--- a/packages/noco-docs/docs/070.fields/040.field-types/070.date-time-based/_category_.json
+++ b/packages/noco-docs/docs/070.fields/040.field-types/070.date-time-based/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Date Time based",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/070.fields/040.field-types/080.user-based/010.user.md b/packages/noco-docs/docs/070.fields/040.field-types/080.user-based/010.user.md
new file mode 100644
index 0000000000..b4d02fd244
--- /dev/null
+++ b/packages/noco-docs/docs/070.fields/040.field-types/080.user-based/010.user.md
@@ -0,0 +1,30 @@
+---
+title: 'User'
+description: 'This article explains how to create & work with a User field.'
+tags: ['Fields', 'Field types', 'User']
+keywords: ['Fields', 'Field types', 'User', 'Create User field']
+---
+
+`User` field type allows you to assign a user from your current workspace to a record. For example, you can create a `Task` table with a `User` field type to assign a task to a user. You can also configure the field to allow assigning multiple users to a record.
+
+## Create a User field
+1. Click on `+` icon to the right of `Fields header`
+2. On the dropdown modal, enter the field name (Optional).
+3. Select the field type as `User` from the dropdown.
+4. Configure `Allow adding multiple users` toggle field (Optional).
+5. Configure default value (Optional)
+6. Click on `Save Field` button.
+
+![image](/img/v2/fields/types/user-field.png)
+
+### Cell display
+`User` field display is quite identical to `Select` field. It is displayed as a dropdown in the table view. Click on the dropdown to select a user. If `Allow adding multiple users` is enabled, you can select multiple users from the dropdown.
+
+![image](/img/v2/fields/types/user-field-cell.png)
+
+:::note
+- If a user is removed from workspace, the user will be removed from the dropdown list. If such user was assigned to a record already, the user will be displayed as is.
+- To remove a user from a record, click on the `x` icon next to the user name.
+- If display name is not set for a user, the user's email address will be displayed.
+:::
+
diff --git a/packages/noco-docs/docs/070.fields/040.field-types/080.user-based/_category_.json b/packages/noco-docs/docs/070.fields/040.field-types/080.user-based/_category_.json
new file mode 100644
index 0000000000..68e858fb1e
--- /dev/null
+++ b/packages/noco-docs/docs/070.fields/040.field-types/080.user-based/_category_.json
@@ -0,0 +1,8 @@
+{
+  "label": "User based",
+  "collapsible": true,
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
+}
\ No newline at end of file
diff --git a/packages/noco-docs/docs/070.fields/040.field-types/_category_.json b/packages/noco-docs/docs/070.fields/040.field-types/_category_.json
index ad5c721a75..9d48b9a972 100644
--- a/packages/noco-docs/docs/070.fields/040.field-types/_category_.json
+++ b/packages/noco-docs/docs/070.fields/040.field-types/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Field types",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/070.fields/_category_.json b/packages/noco-docs/docs/070.fields/_category_.json
index eb37ef3b3b..f927241cea 100644
--- a/packages/noco-docs/docs/070.fields/_category_.json
+++ b/packages/noco-docs/docs/070.fields/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Fields",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/080.records/_category_.json b/packages/noco-docs/docs/080.records/_category_.json
index d3750b4b51..64eb9bba98 100644
--- a/packages/noco-docs/docs/080.records/_category_.json
+++ b/packages/noco-docs/docs/080.records/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Records",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/090.views/040.view-types/_category_.json b/packages/noco-docs/docs/090.views/040.view-types/_category_.json
index 8806df3d8d..ed65e9f9b4 100644
--- a/packages/noco-docs/docs/090.views/040.view-types/_category_.json
+++ b/packages/noco-docs/docs/090.views/040.view-types/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "View types",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/090.views/_category_.json b/packages/noco-docs/docs/090.views/_category_.json
index 0d5044846a..3048fbf7d7 100644
--- a/packages/noco-docs/docs/090.views/_category_.json
+++ b/packages/noco-docs/docs/090.views/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Views",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/100.data-sources/_category_.json b/packages/noco-docs/docs/100.data-sources/_category_.json
index 3810dd5bc8..45ea6ec509 100644
--- a/packages/noco-docs/docs/100.data-sources/_category_.json
+++ b/packages/noco-docs/docs/100.data-sources/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Data sources",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/110.roles-and-permissions/_category_.json b/packages/noco-docs/docs/110.roles-and-permissions/_category_.json
index 75fa64b102..a15f15f8a1 100644
--- a/packages/noco-docs/docs/110.roles-and-permissions/_category_.json
+++ b/packages/noco-docs/docs/110.roles-and-permissions/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Roles and permissions",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/120.collaboration/_category_.json b/packages/noco-docs/docs/120.collaboration/_category_.json
index 157b5f2d69..da2ca0073a 100644
--- a/packages/noco-docs/docs/120.collaboration/_category_.json
+++ b/packages/noco-docs/docs/120.collaboration/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Collaboration",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/130.automation/020.webhook/020.create-webhook.md b/packages/noco-docs/docs/130.automation/020.webhook/020.create-webhook.md
index 308dc83dd2..16f9c22e61 100644
--- a/packages/noco-docs/docs/130.automation/020.webhook/020.create-webhook.md
+++ b/packages/noco-docs/docs/130.automation/020.webhook/020.create-webhook.md
@@ -38,6 +38,13 @@ keywords: ['NocoDB webhook', 'create webhook']
 
 ![Configuring webhook](/img/v2/webhook/create-webhook-2.png)
 
+### Webhook with conditions
+In case of webhook with conditions, only records meeting the configured criteria will trigger webhook. For example, trigger webhook only when `Status` is `Complete`. You can also configure multiple conditions using `AND` or `OR` operators. For example, trigger webhook only when `Status` is `Complete` and `Priority` is `High`.
+
+Webhook will be triggered only when the configured condition wasn't met before the record was updated. For example, if you have configured webhook with condition `Status` `is` `Complete` and `Priority` `is` `High` and you update the record with `Status` `Complete` and `Priority` `Low` to `High`, webhook will be triggered. However, if you update any other fields of the record with `Status` `Complete` and `Priority` `High`, webhook won't be triggered.
+
+In summary, webhook will be triggered only when `Condition(old-record) = false` and `Condition(new-record) = true`.
+
 ### Webhook Response Sample
 
 <Tabs>
diff --git a/packages/noco-docs/docs/130.automation/020.webhook/_category_.json b/packages/noco-docs/docs/130.automation/020.webhook/_category_.json
index 4dd2b7ee65..05697bcb5b 100644
--- a/packages/noco-docs/docs/130.automation/020.webhook/_category_.json
+++ b/packages/noco-docs/docs/130.automation/020.webhook/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Webhook",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/130.automation/_category_.json b/packages/noco-docs/docs/130.automation/_category_.json
index 852cd4be0c..a6ae47c8b5 100644
--- a/packages/noco-docs/docs/130.automation/_category_.json
+++ b/packages/noco-docs/docs/130.automation/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Automation",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/140.account-settings/_category_.json b/packages/noco-docs/docs/140.account-settings/_category_.json
index 00e2f9de2c..8c7e14e4eb 100644
--- a/packages/noco-docs/docs/140.account-settings/_category_.json
+++ b/packages/noco-docs/docs/140.account-settings/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Account settings",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/docs/150.engineering/_category_.json b/packages/noco-docs/docs/150.engineering/_category_.json
index 6a0ff2129b..dc24e2503e 100644
--- a/packages/noco-docs/docs/150.engineering/_category_.json
+++ b/packages/noco-docs/docs/150.engineering/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Engineering",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/package-lock.json b/packages/noco-docs/package-lock.json
index 6af6e87a70..d82c4535cb 100644
--- a/packages/noco-docs/package-lock.json
+++ b/packages/noco-docs/package-lock.json
@@ -9,15 +9,15 @@
       "version": "1.1.0",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/plugin-client-redirects": "3.0.0",
-        "@docusaurus/plugin-ideal-image": "3.0.0",
-        "@docusaurus/plugin-sitemap": "3.0.0",
-        "@docusaurus/preset-classic": "3.0.0",
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/plugin-client-redirects": "3.0.1",
+        "@docusaurus/plugin-ideal-image": "3.0.1",
+        "@docusaurus/plugin-sitemap": "3.0.1",
+        "@docusaurus/preset-classic": "3.0.1",
         "@mdx-js/react": "^3.0.0",
         "clsx": "^1.2.1",
         "docusaurus-plugin-sass": "^0.2.5",
-        "docusaurus-theme-search-typesense": "^0.14.0",
+        "docusaurus-theme-search-typesense": "^0.14.1",
         "nc-analytics": "^0.0.7",
         "plugin-image-zoom": "github:flexanalytics/plugin-image-zoom",
         "prism-react-renderer": "^1.3.5",
@@ -26,7 +26,7 @@
         "sass": "^1.69.5"
       },
       "devDependencies": {
-        "@docusaurus/module-type-aliases": "3.0.0",
+        "@docusaurus/module-type-aliases": "3.0.1",
         "@tsconfig/docusaurus": "^1.0.7",
         "typescript": "^4.9.5"
       },
@@ -2172,12 +2172,12 @@
       }
     },
     "node_modules/@docusaurus/core": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-3.0.0.tgz",
-      "integrity": "sha512-bHWtY55tJTkd6pZhHrWz1MpWuwN4edZe0/UWgFF7PW/oJeDZvLSXKqwny3L91X1/LGGoypBGkeZn8EOuKeL4yQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-3.0.1.tgz",
+      "integrity": "sha512-CXrLpOnW+dJdSv8M5FAJ3JBwXtL6mhUWxFA8aS0ozK6jBG/wgxERk5uvH28fCeFxOGbAT9v1e9dOMo1X2IEVhQ==",
       "dependencies": {
-        "@babel/core": "^7.22.9",
-        "@babel/generator": "^7.22.9",
+        "@babel/core": "^7.23.3",
+        "@babel/generator": "^7.23.3",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-transform-runtime": "^7.22.9",
         "@babel/preset-env": "^7.22.9",
@@ -2186,13 +2186,13 @@
         "@babel/runtime": "^7.22.6",
         "@babel/runtime-corejs3": "^7.22.6",
         "@babel/traverse": "^7.22.8",
-        "@docusaurus/cssnano-preset": "3.0.0",
-        "@docusaurus/logger": "3.0.0",
-        "@docusaurus/mdx-loader": "3.0.0",
+        "@docusaurus/cssnano-preset": "3.0.1",
+        "@docusaurus/logger": "3.0.1",
+        "@docusaurus/mdx-loader": "3.0.1",
         "@docusaurus/react-loadable": "5.5.2",
-        "@docusaurus/utils": "3.0.0",
-        "@docusaurus/utils-common": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/utils-common": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "@slorber/static-site-generator-webpack-plugin": "^4.0.7",
         "@svgr/webpack": "^6.5.1",
         "autoprefixer": "^10.4.14",
@@ -2240,7 +2240,6 @@
         "tslib": "^2.6.0",
         "update-notifier": "^6.0.2",
         "url-loader": "^4.1.1",
-        "wait-on": "^7.0.1",
         "webpack": "^5.88.1",
         "webpack-bundle-analyzer": "^4.9.0",
         "webpack-dev-server": "^4.15.1",
@@ -2259,9 +2258,9 @@
       }
     },
     "node_modules/@docusaurus/cssnano-preset": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-3.0.0.tgz",
-      "integrity": "sha512-FHiRfwmVvIVdIGsHcijUOaX7hMn0mugVYB7m4GkpYI6Mi56zwQV4lH5p7DxcW5CUYNWMVxz2loWSCiWEm5ikwA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-3.0.1.tgz",
+      "integrity": "sha512-wjuXzkHMW+ig4BD6Ya1Yevx9UJadO4smNZCEljqBoQfIQrQskTswBs7lZ8InHP7mCt273a/y/rm36EZhqJhknQ==",
       "dependencies": {
         "cssnano-preset-advanced": "^5.3.10",
         "postcss": "^8.4.26",
@@ -2273,9 +2272,9 @@
       }
     },
     "node_modules/@docusaurus/logger": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/logger/-/logger-3.0.0.tgz",
-      "integrity": "sha512-6eX0eOfioMQCk+qgCnHvbLLuyIAA+r2lSID6d6JusiLtDKmYMfNp3F4yyE8bnb0Abmzt2w68XwptEFYyALSAXw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/logger/-/logger-3.0.1.tgz",
+      "integrity": "sha512-I5L6Nk8OJzkVA91O2uftmo71LBSxe1vmOn9AMR6JRCzYeEBrqneWMH02AqMvjJ2NpMiviO+t0CyPjyYV7nxCWQ==",
       "dependencies": {
         "chalk": "^4.1.2",
         "tslib": "^2.6.0"
@@ -2285,11 +2284,11 @@
       }
     },
     "node_modules/@docusaurus/lqip-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/lqip-loader/-/lqip-loader-3.0.0.tgz",
-      "integrity": "sha512-nBHyGTaXynpKnSaV0d72Bi4+sjacZmEErFw1DlTht1mixik4AmyinkfLVOnzqLZIkptYT3QT56sXwW83TpPGKg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/lqip-loader/-/lqip-loader-3.0.1.tgz",
+      "integrity": "sha512-hFSu8ltYo0ZnWBWmjMhSprOr6nNKG01YdMDxH/hahBfyaNDCkZU4o7mQNgUW845lvYdp6bhjyW31WJwBjOnLqw==",
       "dependencies": {
-        "@docusaurus/logger": "3.0.0",
+        "@docusaurus/logger": "3.0.1",
         "file-loader": "^6.2.0",
         "lodash": "^4.17.21",
         "sharp": "^0.32.3",
@@ -2300,15 +2299,15 @@
       }
     },
     "node_modules/@docusaurus/mdx-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-3.0.0.tgz",
-      "integrity": "sha512-JkGge6WYDrwjNgMxwkb6kNQHnpISt5L1tMaBWFDBKeDToFr5Kj29IL35MIQm0RfrnoOfr/29RjSH4aRtvlAR0A==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-3.0.1.tgz",
+      "integrity": "sha512-ldnTmvnvlrONUq45oKESrpy+lXtbnTcTsFkOTIDswe5xx5iWJjt6eSa0f99ZaWlnm24mlojcIGoUWNCS53qVlQ==",
       "dependencies": {
         "@babel/parser": "^7.22.7",
         "@babel/traverse": "^7.22.8",
-        "@docusaurus/logger": "3.0.0",
-        "@docusaurus/utils": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+        "@docusaurus/logger": "3.0.1",
+        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "@mdx-js/mdx": "^3.0.0",
         "@slorber/remark-comment": "^1.0.0",
         "escape-html": "^1.0.3",
@@ -2340,12 +2339,12 @@
       }
     },
     "node_modules/@docusaurus/module-type-aliases": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-3.0.0.tgz",
-      "integrity": "sha512-CfC6CgN4u/ce+2+L1JdsHNyBd8yYjl4De2B2CBj2a9F7WuJ5RjV1ciuU7KDg8uyju+NRVllRgvJvxVUjCdkPiw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-3.0.1.tgz",
+      "integrity": "sha512-DEHpeqUDsLynl3AhQQiO7AbC7/z/lBra34jTcdYuvp9eGm01pfH1wTVq8YqWZq6Jyx0BgcVl/VJqtE9StRd9Ag==",
       "dependencies": {
         "@docusaurus/react-loadable": "5.5.2",
-        "@docusaurus/types": "3.0.0",
+        "@docusaurus/types": "3.0.1",
         "@types/history": "^4.7.11",
         "@types/react": "*",
         "@types/react-router-config": "*",
@@ -2359,15 +2358,15 @@
       }
     },
     "node_modules/@docusaurus/plugin-client-redirects": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-client-redirects/-/plugin-client-redirects-3.0.0.tgz",
-      "integrity": "sha512-JcZLod4lgPdbv/OpCbNwTc57u54d01dcWiDy/sBaxls/4HkDGdj6838oBPzbBdnCWrmasBIRz3JYLk+1GU0IOQ==",
-      "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/logger": "3.0.0",
-        "@docusaurus/utils": "3.0.0",
-        "@docusaurus/utils-common": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-client-redirects/-/plugin-client-redirects-3.0.1.tgz",
+      "integrity": "sha512-CoZapnHbV3j5jsHCa/zmKaa8+H+oagHBgg91dN5I8/3kFit/xtZPfRaznvDX49cHg2nSoV74B3VMAT+bvCmzFQ==",
+      "dependencies": {
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/logger": "3.0.1",
+        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/utils-common": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "eta": "^2.2.0",
         "fs-extra": "^11.1.1",
         "lodash": "^4.17.21",
@@ -2382,17 +2381,17 @@
       }
     },
     "node_modules/@docusaurus/plugin-content-blog": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.0.0.tgz",
-      "integrity": "sha512-iA8Wc3tIzVnROJxrbIsU/iSfixHW16YeW9RWsBw7hgEk4dyGsip9AsvEDXobnRq3lVv4mfdgoS545iGWf1Ip9w==",
-      "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/logger": "3.0.0",
-        "@docusaurus/mdx-loader": "3.0.0",
-        "@docusaurus/types": "3.0.0",
-        "@docusaurus/utils": "3.0.0",
-        "@docusaurus/utils-common": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.0.1.tgz",
+      "integrity": "sha512-cLOvtvAyaMQFLI8vm4j26svg3ktxMPSXpuUJ7EERKoGbfpJSsgtowNHcRsaBVmfuCsRSk1HZ/yHBsUkTmHFEsg==",
+      "dependencies": {
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/logger": "3.0.1",
+        "@docusaurus/mdx-loader": "3.0.1",
+        "@docusaurus/types": "3.0.1",
+        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/utils-common": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "cheerio": "^1.0.0-rc.12",
         "feed": "^4.2.2",
         "fs-extra": "^11.1.1",
@@ -2413,17 +2412,17 @@
       }
     },
     "node_modules/@docusaurus/plugin-content-docs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.0.0.tgz",
-      "integrity": "sha512-MFZsOSwmeJ6rvoZMLieXxPuJsA9M9vn7/mUZmfUzSUTeHAeq+fEqvLltFOxcj4DVVDTYlQhgWYd+PISIWgamKw==",
-      "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/logger": "3.0.0",
-        "@docusaurus/mdx-loader": "3.0.0",
-        "@docusaurus/module-type-aliases": "3.0.0",
-        "@docusaurus/types": "3.0.0",
-        "@docusaurus/utils": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.0.1.tgz",
+      "integrity": "sha512-dRfAOA5Ivo+sdzzJGXEu33yAtvGg8dlZkvt/NEJ7nwi1F2j4LEdsxtfX2GKeETB2fP6XoGNSQnFXqa2NYGrHFg==",
+      "dependencies": {
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/logger": "3.0.1",
+        "@docusaurus/mdx-loader": "3.0.1",
+        "@docusaurus/module-type-aliases": "3.0.1",
+        "@docusaurus/types": "3.0.1",
+        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "@types/react-router-config": "^5.0.7",
         "combine-promises": "^1.1.0",
         "fs-extra": "^11.1.1",
@@ -2442,15 +2441,15 @@
       }
     },
     "node_modules/@docusaurus/plugin-content-pages": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.0.0.tgz",
-      "integrity": "sha512-EXYHXK2Ea1B5BUmM0DgSwaOYt8EMSzWtYUToNo62Q/EoWxYOQFdWglYnw3n7ZEGyw5Kog4LHaRwlazAdmDomvQ==",
-      "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/mdx-loader": "3.0.0",
-        "@docusaurus/types": "3.0.0",
-        "@docusaurus/utils": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.0.1.tgz",
+      "integrity": "sha512-oP7PoYizKAXyEttcvVzfX3OoBIXEmXTMzCdfmC4oSwjG4SPcJsRge3mmI6O8jcZBgUPjIzXD21bVGWEE1iu8gg==",
+      "dependencies": {
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/mdx-loader": "3.0.1",
+        "@docusaurus/types": "3.0.1",
+        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "fs-extra": "^11.1.1",
         "tslib": "^2.6.0",
         "webpack": "^5.88.1"
@@ -2464,15 +2463,15 @@
       }
     },
     "node_modules/@docusaurus/plugin-debug": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-3.0.0.tgz",
-      "integrity": "sha512-gSV07HfQgnUboVEb3lucuVyv5pEoy33E7QXzzn++3kSc/NLEimkjXh3sSnTGOishkxCqlFV9BHfY/VMm5Lko5g==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-3.0.1.tgz",
+      "integrity": "sha512-09dxZMdATky4qdsZGzhzlUvvC+ilQ2hKbYF+wez+cM2mGo4qHbv8+qKXqxq0CQZyimwlAOWQLoSozIXU0g0i7g==",
       "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/types": "3.0.0",
-        "@docusaurus/utils": "3.0.0",
-        "@microlink/react-json-view": "^1.22.2",
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/types": "3.0.1",
+        "@docusaurus/utils": "3.0.1",
         "fs-extra": "^11.1.1",
+        "react-json-view-lite": "^1.2.0",
         "tslib": "^2.6.0"
       },
       "engines": {
@@ -2484,13 +2483,13 @@
       }
     },
     "node_modules/@docusaurus/plugin-google-analytics": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.0.0.tgz",
-      "integrity": "sha512-0zcLK8w+ohmSm1fjUQCqeRsjmQc0gflvXnaVA/QVVCtm2yCiBtkrSGQXqt4MdpD7Xq8mwo3qVd5nhIcvrcebqw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.0.1.tgz",
+      "integrity": "sha512-jwseSz1E+g9rXQwDdr0ZdYNjn8leZBnKPjjQhMBEiwDoenL3JYFcNW0+p0sWoVF/f2z5t7HkKA+cYObrUh18gg==",
       "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/types": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/types": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "tslib": "^2.6.0"
       },
       "engines": {
@@ -2502,13 +2501,13 @@
       }
     },
     "node_modules/@docusaurus/plugin-google-gtag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.0.0.tgz",
-      "integrity": "sha512-asEKavw8fczUqvXu/s9kG2m1epLnHJ19W6CCCRZEmpnkZUZKiM8rlkDiEmxApwIc2JDDbIMk+Y2TMkJI8mInbQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.0.1.tgz",
+      "integrity": "sha512-UFTDvXniAWrajsulKUJ1DB6qplui1BlKLQZjX4F7qS/qfJ+qkKqSkhJ/F4VuGQ2JYeZstYb+KaUzUzvaPK1aRQ==",
       "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/types": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/types": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "@types/gtag.js": "^0.0.12",
         "tslib": "^2.6.0"
       },
@@ -2521,13 +2520,13 @@
       }
     },
     "node_modules/@docusaurus/plugin-google-tag-manager": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.0.0.tgz",
-      "integrity": "sha512-lytgu2eyn+7p4WklJkpMGRhwC29ezj4IjPPmVJ8vGzcSl6JkR1sADTHLG5xWOMuci420xZl9dGEiLTQ8FjCRyA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.0.1.tgz",
+      "integrity": "sha512-IPFvuz83aFuheZcWpTlAdiiX1RqWIHM+OH8wS66JgwAKOiQMR3+nLywGjkLV4bp52x7nCnwhNk1rE85Cpy/CIw==",
       "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/types": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/types": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "tslib": "^2.6.0"
       },
       "engines": {
@@ -2539,16 +2538,16 @@
       }
     },
     "node_modules/@docusaurus/plugin-ideal-image": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-ideal-image/-/plugin-ideal-image-3.0.0.tgz",
-      "integrity": "sha512-CQhAhJkG944axdrJkBx5z4dRBG+Gj2ht1XnQH2Qou2mMLV05Dj1eQwav4Y0zW6xGNDS19SRprzBscjJEHnNPVA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-ideal-image/-/plugin-ideal-image-3.0.1.tgz",
+      "integrity": "sha512-IvAUpEIz6v1/fVz6UTdQY12pYIE5geNFtsuKpsULpMaotwYf3Gs7acXjQog4qquKkc65yV5zuvMj8BZMHEwLyQ==",
       "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/lqip-loader": "3.0.0",
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/lqip-loader": "3.0.1",
         "@docusaurus/responsive-loader": "^1.7.0",
-        "@docusaurus/theme-translations": "3.0.0",
-        "@docusaurus/types": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+        "@docusaurus/theme-translations": "3.0.1",
+        "@docusaurus/types": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "@slorber/react-ideal-image": "^0.0.12",
         "react-waypoint": "^10.3.0",
         "sharp": "^0.32.3",
@@ -2570,16 +2569,16 @@
       }
     },
     "node_modules/@docusaurus/plugin-sitemap": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.0.0.tgz",
-      "integrity": "sha512-cfcONdWku56Oi7Hdus2uvUw/RKRRlIGMViiHLjvQ21CEsEqnQ297MRoIgjU28kL7/CXD/+OiANSq3T1ezAiMhA==",
-      "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/logger": "3.0.0",
-        "@docusaurus/types": "3.0.0",
-        "@docusaurus/utils": "3.0.0",
-        "@docusaurus/utils-common": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.0.1.tgz",
+      "integrity": "sha512-xARiWnjtVvoEniZudlCq5T9ifnhCu/GAZ5nA7XgyLfPcNpHQa241HZdsTlLtVcecEVVdllevBKOp7qknBBaMGw==",
+      "dependencies": {
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/logger": "3.0.1",
+        "@docusaurus/types": "3.0.1",
+        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/utils-common": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "fs-extra": "^11.1.1",
         "sitemap": "^7.1.1",
         "tslib": "^2.6.0"
@@ -2593,23 +2592,23 @@
       }
     },
     "node_modules/@docusaurus/preset-classic": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-3.0.0.tgz",
-      "integrity": "sha512-90aOKZGZdi0+GVQV+wt8xx4M4GiDrBRke8NO8nWwytMEXNrxrBxsQYFRD1YlISLJSCiHikKf3Z/MovMnQpnZyg==",
-      "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/plugin-content-blog": "3.0.0",
-        "@docusaurus/plugin-content-docs": "3.0.0",
-        "@docusaurus/plugin-content-pages": "3.0.0",
-        "@docusaurus/plugin-debug": "3.0.0",
-        "@docusaurus/plugin-google-analytics": "3.0.0",
-        "@docusaurus/plugin-google-gtag": "3.0.0",
-        "@docusaurus/plugin-google-tag-manager": "3.0.0",
-        "@docusaurus/plugin-sitemap": "3.0.0",
-        "@docusaurus/theme-classic": "3.0.0",
-        "@docusaurus/theme-common": "3.0.0",
-        "@docusaurus/theme-search-algolia": "3.0.0",
-        "@docusaurus/types": "3.0.0"
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-3.0.1.tgz",
+      "integrity": "sha512-il9m9xZKKjoXn6h0cRcdnt6wce0Pv1y5t4xk2Wx7zBGhKG1idu4IFHtikHlD0QPuZ9fizpXspXcTzjL5FXc1Gw==",
+      "dependencies": {
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/plugin-content-blog": "3.0.1",
+        "@docusaurus/plugin-content-docs": "3.0.1",
+        "@docusaurus/plugin-content-pages": "3.0.1",
+        "@docusaurus/plugin-debug": "3.0.1",
+        "@docusaurus/plugin-google-analytics": "3.0.1",
+        "@docusaurus/plugin-google-gtag": "3.0.1",
+        "@docusaurus/plugin-google-tag-manager": "3.0.1",
+        "@docusaurus/plugin-sitemap": "3.0.1",
+        "@docusaurus/theme-classic": "3.0.1",
+        "@docusaurus/theme-common": "3.0.1",
+        "@docusaurus/theme-search-algolia": "3.0.1",
+        "@docusaurus/types": "3.0.1"
       },
       "engines": {
         "node": ">=18.0"
@@ -2655,30 +2654,30 @@
       }
     },
     "node_modules/@docusaurus/theme-classic": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-3.0.0.tgz",
-      "integrity": "sha512-wWOHSrKMn7L4jTtXBsb5iEJ3xvTddBye5PjYBnWiCkTAlhle2yMdc4/qRXW35Ot+OV/VXu6YFG8XVUJEl99z0A==",
-      "dependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/mdx-loader": "3.0.0",
-        "@docusaurus/module-type-aliases": "3.0.0",
-        "@docusaurus/plugin-content-blog": "3.0.0",
-        "@docusaurus/plugin-content-docs": "3.0.0",
-        "@docusaurus/plugin-content-pages": "3.0.0",
-        "@docusaurus/theme-common": "3.0.0",
-        "@docusaurus/theme-translations": "3.0.0",
-        "@docusaurus/types": "3.0.0",
-        "@docusaurus/utils": "3.0.0",
-        "@docusaurus/utils-common": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-3.0.1.tgz",
+      "integrity": "sha512-XD1FRXaJiDlmYaiHHdm27PNhhPboUah9rqIH0lMpBt5kYtsGjJzhqa27KuZvHLzOP2OEpqd2+GZ5b6YPq7Q05Q==",
+      "dependencies": {
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/mdx-loader": "3.0.1",
+        "@docusaurus/module-type-aliases": "3.0.1",
+        "@docusaurus/plugin-content-blog": "3.0.1",
+        "@docusaurus/plugin-content-docs": "3.0.1",
+        "@docusaurus/plugin-content-pages": "3.0.1",
+        "@docusaurus/theme-common": "3.0.1",
+        "@docusaurus/theme-translations": "3.0.1",
+        "@docusaurus/types": "3.0.1",
+        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/utils-common": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "@mdx-js/react": "^3.0.0",
-        "clsx": "^1.2.1",
+        "clsx": "^2.0.0",
         "copy-text-to-clipboard": "^3.2.0",
         "infima": "0.2.0-alpha.43",
         "lodash": "^4.17.21",
         "nprogress": "^0.2.0",
         "postcss": "^8.4.26",
-        "prism-react-renderer": "^2.1.0",
+        "prism-react-renderer": "^2.3.0",
         "prismjs": "^1.29.0",
         "react-router-dom": "^5.3.4",
         "rtlcss": "^4.1.0",
@@ -2693,36 +2692,44 @@
         "react-dom": "^18.0.0"
       }
     },
+    "node_modules/@docusaurus/theme-classic/node_modules/clsx": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
+      "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@docusaurus/theme-classic/node_modules/prism-react-renderer": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-2.2.0.tgz",
-      "integrity": "sha512-j4AN0VkEr72598+47xDvpzeYyeh/wPPRNTt9nJFZqIZUxwGKwYqYgt7RVigZ3ZICJWJWN84KEuMKPNyypyhNIw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-2.3.1.tgz",
+      "integrity": "sha512-Rdf+HzBLR7KYjzpJ1rSoxT9ioO85nZngQEoFIhL07XhtJHlCU3SOz0GJ6+qvMyQe0Se+BV3qpe6Yd/NmQF5Juw==",
       "dependencies": {
         "@types/prismjs": "^1.26.0",
-        "clsx": "^1.2.1"
+        "clsx": "^2.0.0"
       },
       "peerDependencies": {
         "react": ">=16.0.0"
       }
     },
     "node_modules/@docusaurus/theme-common": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-3.0.0.tgz",
-      "integrity": "sha512-PahRpCLRK5owCMEqcNtUeTMOkTUCzrJlKA+HLu7f+8osYOni617YurXvHASCsSTxurjXaLz/RqZMnASnqATxIA==",
-      "dependencies": {
-        "@docusaurus/mdx-loader": "3.0.0",
-        "@docusaurus/module-type-aliases": "3.0.0",
-        "@docusaurus/plugin-content-blog": "3.0.0",
-        "@docusaurus/plugin-content-docs": "3.0.0",
-        "@docusaurus/plugin-content-pages": "3.0.0",
-        "@docusaurus/utils": "3.0.0",
-        "@docusaurus/utils-common": "3.0.0",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-3.0.1.tgz",
+      "integrity": "sha512-cr9TOWXuIOL0PUfuXv6L5lPlTgaphKP+22NdVBOYah5jSq5XAAulJTjfe+IfLsEG4L7lJttLbhW7LXDFSAI7Ag==",
+      "dependencies": {
+        "@docusaurus/mdx-loader": "3.0.1",
+        "@docusaurus/module-type-aliases": "3.0.1",
+        "@docusaurus/plugin-content-blog": "3.0.1",
+        "@docusaurus/plugin-content-docs": "3.0.1",
+        "@docusaurus/plugin-content-pages": "3.0.1",
+        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/utils-common": "3.0.1",
         "@types/history": "^4.7.11",
         "@types/react": "*",
         "@types/react-router-config": "*",
-        "clsx": "^1.2.1",
+        "clsx": "^2.0.0",
         "parse-numeric-range": "^1.3.0",
-        "prism-react-renderer": "^2.1.0",
+        "prism-react-renderer": "^2.3.0",
         "tslib": "^2.6.0",
         "utility-types": "^3.10.0"
       },
@@ -2734,34 +2741,42 @@
         "react-dom": "^18.0.0"
       }
     },
+    "node_modules/@docusaurus/theme-common/node_modules/clsx": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
+      "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@docusaurus/theme-common/node_modules/prism-react-renderer": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-2.2.0.tgz",
-      "integrity": "sha512-j4AN0VkEr72598+47xDvpzeYyeh/wPPRNTt9nJFZqIZUxwGKwYqYgt7RVigZ3ZICJWJWN84KEuMKPNyypyhNIw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-2.3.1.tgz",
+      "integrity": "sha512-Rdf+HzBLR7KYjzpJ1rSoxT9ioO85nZngQEoFIhL07XhtJHlCU3SOz0GJ6+qvMyQe0Se+BV3qpe6Yd/NmQF5Juw==",
       "dependencies": {
         "@types/prismjs": "^1.26.0",
-        "clsx": "^1.2.1"
+        "clsx": "^2.0.0"
       },
       "peerDependencies": {
         "react": ">=16.0.0"
       }
     },
     "node_modules/@docusaurus/theme-search-algolia": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.0.0.tgz",
-      "integrity": "sha512-PyMUNIS9yu0dx7XffB13ti4TG47pJq3G2KE/INvOFb6M0kWh+wwCnucPg4WAOysHOPh+SD9fjlXILoLQstgEIA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.0.1.tgz",
+      "integrity": "sha512-DDiPc0/xmKSEdwFkXNf1/vH1SzJPzuJBar8kMcBbDAZk/SAmo/4lf6GU2drou4Ae60lN2waix+jYWTWcJRahSA==",
       "dependencies": {
         "@docsearch/react": "^3.5.2",
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/logger": "3.0.0",
-        "@docusaurus/plugin-content-docs": "3.0.0",
-        "@docusaurus/theme-common": "3.0.0",
-        "@docusaurus/theme-translations": "3.0.0",
-        "@docusaurus/utils": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/logger": "3.0.1",
+        "@docusaurus/plugin-content-docs": "3.0.1",
+        "@docusaurus/theme-common": "3.0.1",
+        "@docusaurus/theme-translations": "3.0.1",
+        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "algoliasearch": "^4.18.0",
         "algoliasearch-helper": "^3.13.3",
-        "clsx": "^1.2.1",
+        "clsx": "^2.0.0",
         "eta": "^2.2.0",
         "fs-extra": "^11.1.1",
         "lodash": "^4.17.21",
@@ -2776,10 +2791,18 @@
         "react-dom": "^18.0.0"
       }
     },
+    "node_modules/@docusaurus/theme-search-algolia/node_modules/clsx": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
+      "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@docusaurus/theme-translations": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-3.0.0.tgz",
-      "integrity": "sha512-p/H3+5LdnDtbMU+csYukA6601U1ld2v9knqxGEEV96qV27HsHfP63J9Ta2RBZUrNhQAgrwFzIc9GdDO8P1Baag==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-3.0.1.tgz",
+      "integrity": "sha512-6UrbpzCTN6NIJnAtZ6Ne9492vmPVX+7Fsz4kmp+yor3KQwA1+MCzQP7ItDNkP38UmVLnvB/cYk/IvehCUqS3dg==",
       "dependencies": {
         "fs-extra": "^11.1.1",
         "tslib": "^2.6.0"
@@ -2789,9 +2812,9 @@
       }
     },
     "node_modules/@docusaurus/types": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.0.0.tgz",
-      "integrity": "sha512-Qb+l/hmCOVemReuzvvcFdk84bUmUFyD0Zi81y651ie3VwMrXqC7C0E7yZLKMOsLj/vkqsxHbtkAuYMI89YzNzg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.0.1.tgz",
+      "integrity": "sha512-plyX2iU1tcUsF46uQ01pAd4JhexR7n0iiQ5MSnBFX6M6NSJgDYdru/i1/YNPKOnQHBoXGLHv0dNT6OAlDWNjrg==",
       "dependencies": {
         "@types/history": "^4.7.11",
         "@types/react": "*",
@@ -2808,11 +2831,11 @@
       }
     },
     "node_modules/@docusaurus/utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-3.0.0.tgz",
-      "integrity": "sha512-JwGjh5mtjG9XIAESyPxObL6CZ6LO/yU4OSTpq7Q0x+jN25zi/AMbvLjpSyZzWy+qm5uQiFiIhqFaOxvy+82Ekg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-3.0.1.tgz",
+      "integrity": "sha512-TwZ33Am0q4IIbvjhUOs+zpjtD/mXNmLmEgeTGuRq01QzulLHuPhaBTTAC/DHu6kFx3wDgmgpAlaRuCHfTcXv8g==",
       "dependencies": {
-        "@docusaurus/logger": "3.0.0",
+        "@docusaurus/logger": "3.0.1",
         "@svgr/webpack": "^6.5.1",
         "escape-string-regexp": "^4.0.0",
         "file-loader": "^6.2.0",
@@ -2843,9 +2866,9 @@
       }
     },
     "node_modules/@docusaurus/utils-common": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-3.0.0.tgz",
-      "integrity": "sha512-7iJWAtt4AHf4PFEPlEPXko9LZD/dbYnhLe0q8e3GRK1EXZyRASah2lznpMwB3lLmVjq/FR6ZAKF+E0wlmL5j0g==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-3.0.1.tgz",
+      "integrity": "sha512-W0AxD6w6T8g6bNro8nBRWf7PeZ/nn7geEWM335qHU2DDDjHuV4UZjgUGP1AQsdcSikPrlIqTJJbKzer1lRSlIg==",
       "dependencies": {
         "tslib": "^2.6.0"
       },
@@ -2862,12 +2885,12 @@
       }
     },
     "node_modules/@docusaurus/utils-validation": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-3.0.0.tgz",
-      "integrity": "sha512-MlIGUspB/HBW5CYgHvRhmkZbeMiUWKbyVoCQYvbGN8S19SSzVgzyy97KRpcjCOYYeEdkhmRCUwFBJBlLg3IoNQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-3.0.1.tgz",
+      "integrity": "sha512-ujTnqSfyGQ7/4iZdB4RRuHKY/Nwm58IIb+41s5tCXOv/MBU2wGAjOHq3U+AEyJ8aKQcHbxvTKJaRchNHYUVUQg==",
       "dependencies": {
-        "@docusaurus/logger": "3.0.0",
-        "@docusaurus/utils": "3.0.0",
+        "@docusaurus/logger": "3.0.1",
+        "@docusaurus/utils": "3.0.1",
         "joi": "^17.9.2",
         "js-yaml": "^4.1.0",
         "tslib": "^2.6.0"
@@ -3023,33 +3046,6 @@
         "react": ">=16"
       }
     },
-    "node_modules/@microlink/react-json-view": {
-      "version": "1.23.0",
-      "resolved": "https://registry.npmjs.org/@microlink/react-json-view/-/react-json-view-1.23.0.tgz",
-      "integrity": "sha512-HYJ1nsfO4/qn8afnAMhuk7+5a1vcjEaS8Gm5Vpr1SqdHDY0yLBJGpA+9DvKyxyVKaUkXzKXt3Mif9RcmFSdtYg==",
-      "dependencies": {
-        "flux": "~4.0.1",
-        "react-base16-styling": "~0.6.0",
-        "react-lifecycles-compat": "~3.0.4",
-        "react-textarea-autosize": "~8.3.2"
-      },
-      "peerDependencies": {
-        "react": ">= 15",
-        "react-dom": ">= 15"
-      }
-    },
-    "node_modules/@microlink/react-json-view/node_modules/flux": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/flux/-/flux-4.0.4.tgz",
-      "integrity": "sha512-NCj3XlayA2UsapRpM7va6wU1+9rE5FIL7qoMcmxWHRzbp0yujihMBm9BBHZ1MDIk5h5o2Bl6eGiCe8rYELAmYw==",
-      "dependencies": {
-        "fbemitter": "^3.0.0",
-        "fbjs": "^3.0.1"
-      },
-      "peerDependencies": {
-        "react": "^15.0.2 || ^16.0.0 || ^17.0.0"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3148,9 +3144,9 @@
       "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
     },
     "node_modules/@sindresorhus/is": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.2.tgz",
-      "integrity": "sha512-JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
       "engines": {
         "node": ">=10"
       },
@@ -4215,11 +4211,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
-    },
     "node_modules/astring": {
       "version": "1.8.6",
       "resolved": "https://registry.npmjs.org/astring/-/astring-1.8.6.tgz",
@@ -4228,11 +4219,6 @@
         "astring": "bin/astring"
       }
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
@@ -4372,11 +4358,6 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
-    "node_modules/base16": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz",
-      "integrity": "sha512-pNdYkNPiJUnEhnfXV56+sQy8+AaPcG3POZAUnwr4EeqCUZFz4u2PePbo3e5Gj4ziYPCWGUZT9RHisvJKnwFuBQ=="
-    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -5036,17 +5017,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/comma-separated-tokens": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
@@ -5333,14 +5303,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/cross-fetch": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
-      "dependencies": {
-        "node-fetch": "^2.6.12"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -5771,14 +5733,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -5911,15 +5865,15 @@
       }
     },
     "node_modules/docusaurus-theme-search-typesense": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/docusaurus-theme-search-typesense/-/docusaurus-theme-search-typesense-0.14.0.tgz",
-      "integrity": "sha512-ShXZQQaa7h1FvmWvau1EjYqHOHXmHleAd2A3cMW8vHZh4CtiwOux5YbAYr84uvSeR+AshWVpnGZ23swKBep+bw==",
-      "dependencies": {
-        "@docusaurus/logger": "3.0.0",
-        "@docusaurus/plugin-content-docs": "3.0.0",
-        "@docusaurus/theme-translations": "3.0.0",
-        "@docusaurus/utils": "3.0.0",
-        "@docusaurus/utils-validation": "3.0.0",
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/docusaurus-theme-search-typesense/-/docusaurus-theme-search-typesense-0.14.1.tgz",
+      "integrity": "sha512-Zdbs1qnVv5cqxzh5/zGbLQfX4UNQGo6wnRRkYTtCg1eMvK14kFn7oejCxvkvfmRZpeeWLTMBgKyV220Kv7kKFw==",
+      "dependencies": {
+        "@docusaurus/logger": "3.0.1",
+        "@docusaurus/plugin-content-docs": "3.0.1",
+        "@docusaurus/theme-translations": "3.0.1",
+        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/utils-validation": "3.0.1",
         "algoliasearch-helper": "^3.10.0",
         "clsx": "^1.2.1",
         "eta": "^2.0.0",
@@ -5934,8 +5888,8 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@docusaurus/core": "3.0.0",
-        "@docusaurus/theme-common": "3.0.0",
+        "@docusaurus/core": "3.0.1",
+        "@docusaurus/theme-common": "3.0.1",
         "react": "^18.0.0",
         "react-dom": "^18.0.0"
       }
@@ -6564,33 +6518,6 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/fbemitter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-3.0.0.tgz",
-      "integrity": "sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==",
-      "dependencies": {
-        "fbjs": "^3.0.0"
-      }
-    },
-    "node_modules/fbjs": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.5.tgz",
-      "integrity": "sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==",
-      "dependencies": {
-        "cross-fetch": "^3.1.5",
-        "fbjs-css-vars": "^1.0.0",
-        "loose-envify": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "promise": "^7.1.1",
-        "setimmediate": "^1.0.5",
-        "ua-parser-js": "^1.0.35"
-      }
-    },
-    "node_modules/fbjs-css-vars": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz",
-      "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ=="
-    },
     "node_modules/feed": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/feed/-/feed-4.2.2.tgz",
@@ -6892,19 +6819,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/form-data-encoder": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz",
@@ -7415,17 +7329,23 @@
       }
     },
     "node_modules/hast-util-to-jsx-runtime": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.2.0.tgz",
-      "integrity": "sha512-wSlp23N45CMjDg/BPW8zvhEi3R+8eRE1qFbjEyAUzMCzu2l1Wzwakq+Tlia9nkCtEl5mDxa7nKHsvYJ6Gfn21A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.0.tgz",
+      "integrity": "sha512-H/y0+IWPdsLLS738P8tDnrQ8Z+dj12zQQ6WC11TIM21C8WFVoIxcqWXf2H3hiTVZjF1AWqoimGwrTWecWrnmRQ==",
       "dependencies": {
+        "@types/estree": "^1.0.0",
         "@types/hast": "^3.0.0",
         "@types/unist": "^3.0.0",
         "comma-separated-tokens": "^2.0.0",
+        "devlop": "^1.0.0",
+        "estree-util-is-identifier-name": "^3.0.0",
         "hast-util-whitespace": "^3.0.0",
+        "mdast-util-mdx-expression": "^2.0.0",
+        "mdast-util-mdx-jsx": "^3.0.0",
+        "mdast-util-mdxjs-esm": "^2.0.0",
         "property-information": "^6.0.0",
         "space-separated-tokens": "^2.0.0",
-        "style-to-object": "^0.4.0",
+        "style-to-object": "^1.0.0",
         "unist-util-position": "^5.0.0",
         "vfile-message": "^4.0.0"
       },
@@ -7434,6 +7354,19 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/hast-util-to-jsx-runtime/node_modules/inline-style-parser": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.2.tgz",
+      "integrity": "sha512-EcKzdTHVe8wFVOGEYXiW9WmJXPjqi1T+234YpJr98RiFYKHV3cdy1+3mkTE+KHTHxFFLH51SfaGOoUdW+v7ViQ=="
+    },
+    "node_modules/hast-util-to-jsx-runtime/node_modules/style-to-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.5.tgz",
+      "integrity": "sha512-rDRwHtoDD3UMMrmZ6BzOW0naTjMsVZLIjsGleSKS/0Oz+cgCfAPRspaqJuE8rDzpKha/nEvnM0IF4seEAZUTKQ==",
+      "dependencies": {
+        "inline-style-parser": "0.2.2"
+      }
+    },
     "node_modules/hast-util-to-parse5": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-8.0.0.tgz",
@@ -8482,21 +8415,11 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "node_modules/lodash.curry": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz",
-      "integrity": "sha512-/u14pXGviLaweY5JI0IUzgzF2J6Ne8INyzAZjImcryjgkZ+ebruBxy2/JaOOkTqScddcYtakjhSaeemV8lR0tA=="
-    },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
-    "node_modules/lodash.flow": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz",
-      "integrity": "sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw=="
-    },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -10888,33 +10811,17 @@
       "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="
     },
     "node_modules/node-emoji": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.1.0.tgz",
-      "integrity": "sha512-tcsBm9C6FmPN5Wo7OjFi9lgMyJjvkAeirmjR/ax8Ttfqy4N8PoFic26uqFTIgayHPNI5FH4ltUvfh9kHzwcK9A==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.1.3.tgz",
+      "integrity": "sha512-E2WEOVsgs7O16zsURJ/eH8BqhF029wGpEOnv7Urwdo2wmQanOACwJQh0devF9D9RhoZru0+9JXIS0dBXIAz+lA==",
       "dependencies": {
-        "@sindresorhus/is": "^3.1.2",
+        "@sindresorhus/is": "^4.6.0",
         "char-regex": "^1.0.2",
         "emojilib": "^2.4.0",
         "skin-tone": "^2.0.0"
-      }
-    },
-    "node_modules/node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">=18"
       }
     },
     "node_modules/node-forge": {
@@ -12133,14 +12040,6 @@
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
-    "node_modules/promise": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-      "dependencies": {
-        "asap": "~2.0.3"
-      }
-    },
     "node_modules/prompts": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
@@ -12197,11 +12096,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
     "node_modules/pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -12230,11 +12124,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/pure-color": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/pure-color/-/pure-color-1.3.0.tgz",
-      "integrity": "sha512-QFADYnsVoBMw1srW7OVKEYjG+MbIa49s54w1MA1EDY6r2r/sTcKKYqRX1f4GYvnXP7eN/Pe9HFcX+hwzmrXRHA=="
-    },
     "node_modules/qs": {
       "version": "6.11.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
@@ -12363,17 +12252,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/react-base16-styling": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.6.0.tgz",
-      "integrity": "sha512-yvh/7CArceR/jNATXOKDlvTnPKPmGZz7zsenQ3jUwLzHkNUR0CvY3yGYJbWJ/nnxsL8Sgmt5cO3/SILVuPO6TQ==",
-      "dependencies": {
-        "base16": "^1.0.0",
-        "lodash.curry": "^4.0.1",
-        "lodash.flow": "^3.3.0",
-        "pure-color": "^1.2.0"
-      }
-    },
     "node_modules/react-dev-utils": {
       "version": "12.0.1",
       "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
@@ -12535,10 +12413,16 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "node_modules/react-lifecycles-compat": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    "node_modules/react-json-view-lite": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/react-json-view-lite/-/react-json-view-lite-1.2.1.tgz",
+      "integrity": "sha512-Itc0g86fytOmKZoIoJyGgvNqohWSbh3NXIKNgH6W6FT9PC1ck4xas1tT3Rr/b3UlFXyA9Jjaw9QSXdZy2JwGMQ==",
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "react": "^16.13.1 || ^17.0.0 || ^18.0.0"
+      }
     },
     "node_modules/react-loadable": {
       "name": "@docusaurus/react-loadable",
@@ -12616,22 +12500,6 @@
         "react": ">=15"
       }
     },
-    "node_modules/react-textarea-autosize": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.4.tgz",
-      "integrity": "sha512-CdtmP8Dc19xL8/R6sWvtknD/eCXkQr30dtvC4VmGInhRsfF8X/ihXCq6+9l9qbxmKRiq407/7z5fxE7cVWQNgQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.10.2",
-        "use-composed-ref": "^1.3.0",
-        "use-latest": "^1.2.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
     "node_modules/react-waypoint": {
       "version": "10.3.0",
       "resolved": "https://registry.npmjs.org/react-waypoint/-/react-waypoint-10.3.0.tgz",
@@ -13170,14 +13038,6 @@
         "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -13331,9 +13191,9 @@
       }
     },
     "node_modules/search-insights": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.11.0.tgz",
-      "integrity": "sha512-Uin2J8Bpm3xaZi9Y8QibSys6uJOFZ+REMrf42v20AA3FUDUrshKkMEP6liJbMAHCm71wO6ls4mwAf7a3gFVxLw==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.13.0.tgz",
+      "integrity": "sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==",
       "peer": true
     },
     "node_modules/section-matter": {
@@ -13584,11 +13444,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
-    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -14405,11 +14260,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
     "node_modules/trim-lines": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
@@ -14591,28 +14441,6 @@
         "@babel/runtime": "^7.17.2"
       }
     },
-    "node_modules/ua-parser-js": {
-      "version": "1.0.37",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz",
-      "integrity": "sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/faisalman"
-        }
-      ],
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
@@ -15003,43 +14831,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/use-composed-ref": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.3.0.tgz",
-      "integrity": "sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ==",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/use-isomorphic-layout-effect": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
-      "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/use-latest": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.1.tgz",
-      "integrity": "sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw==",
-      "dependencies": {
-        "use-isomorphic-layout-effect": "^1.1.1"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -15127,34 +14918,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/wait-on": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.2.0.tgz",
-      "integrity": "sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==",
-      "dependencies": {
-        "axios": "^1.6.1",
-        "joi": "^17.11.0",
-        "lodash": "^4.17.21",
-        "minimist": "^1.2.8",
-        "rxjs": "^7.8.1"
-      },
-      "bin": {
-        "wait-on": "bin/wait-on"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/wait-on/node_modules/axios": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
-      "dependencies": {
-        "follow-redirects": "^1.15.0",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
     "node_modules/watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
@@ -15184,11 +14947,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
     "node_modules/webpack": {
       "version": "5.89.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
@@ -15519,15 +15277,6 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
diff --git a/packages/noco-docs/package.json b/packages/noco-docs/package.json
index 96c5cb02ea..931ac83525 100644
--- a/packages/noco-docs/package.json
+++ b/packages/noco-docs/package.json
@@ -28,15 +28,15 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@docusaurus/core": "3.0.0",
-    "@docusaurus/plugin-client-redirects": "3.0.0",
-    "@docusaurus/plugin-ideal-image": "3.0.0",
-    "@docusaurus/plugin-sitemap": "3.0.0",
-    "@docusaurus/preset-classic": "3.0.0",
+    "@docusaurus/core": "3.0.1",
+    "@docusaurus/plugin-client-redirects": "3.0.1",
+    "@docusaurus/plugin-ideal-image": "3.0.1",
+    "@docusaurus/plugin-sitemap": "3.0.1",
+    "@docusaurus/preset-classic": "3.0.1",
     "@mdx-js/react": "^3.0.0",
     "clsx": "^1.2.1",
     "docusaurus-plugin-sass": "^0.2.5",
-    "docusaurus-theme-search-typesense": "^0.14.0",
+    "docusaurus-theme-search-typesense": "^0.14.1",
     "nc-analytics": "^0.0.7",
     "plugin-image-zoom": "github:flexanalytics/plugin-image-zoom",
     "prism-react-renderer": "^1.3.5",
@@ -45,7 +45,7 @@
     "sass": "^1.69.5"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.0.0",
+    "@docusaurus/module-type-aliases": "3.0.1",
     "@tsconfig/docusaurus": "^1.0.7",
     "typescript": "^4.9.5"
   },
diff --git a/packages/noco-docs/static/img/v2-unannotated/fields/types/richtext.png b/packages/noco-docs/static/img/v2-unannotated/fields/types/richtext.png
new file mode 100644
index 0000000000..073c838127
Binary files /dev/null and b/packages/noco-docs/static/img/v2-unannotated/fields/types/richtext.png differ
diff --git a/packages/noco-docs/static/img/v2-unannotated/fields/types/user-field.png b/packages/noco-docs/static/img/v2-unannotated/fields/types/user-field.png
new file mode 100644
index 0000000000..2aaf6381ef
Binary files /dev/null and b/packages/noco-docs/static/img/v2-unannotated/fields/types/user-field.png differ
diff --git a/packages/noco-docs/static/img/v2/fields/types/richtext-heading.png b/packages/noco-docs/static/img/v2/fields/types/richtext-heading.png
new file mode 100644
index 0000000000..d00067a8c9
Binary files /dev/null and b/packages/noco-docs/static/img/v2/fields/types/richtext-heading.png differ
diff --git a/packages/noco-docs/static/img/v2/fields/types/richtext-links.png b/packages/noco-docs/static/img/v2/fields/types/richtext-links.png
new file mode 100644
index 0000000000..f3e378fc11
Binary files /dev/null and b/packages/noco-docs/static/img/v2/fields/types/richtext-links.png differ
diff --git a/packages/noco-docs/static/img/v2/fields/types/richtext.png b/packages/noco-docs/static/img/v2/fields/types/richtext.png
new file mode 100644
index 0000000000..7c02c308fa
Binary files /dev/null and b/packages/noco-docs/static/img/v2/fields/types/richtext.png differ
diff --git a/packages/noco-docs/static/img/v2/fields/types/user-field-cell.png b/packages/noco-docs/static/img/v2/fields/types/user-field-cell.png
new file mode 100644
index 0000000000..d3b6c7bb88
Binary files /dev/null and b/packages/noco-docs/static/img/v2/fields/types/user-field-cell.png differ
diff --git a/packages/noco-docs/static/img/v2/fields/types/user-field.png b/packages/noco-docs/static/img/v2/fields/types/user-field.png
new file mode 100644
index 0000000000..58a3c4a7a4
Binary files /dev/null and b/packages/noco-docs/static/img/v2/fields/types/user-field.png differ
diff --git a/packages/noco-docs/versioned_docs/version-0.109.7/020.getting-started/_category_.json b/packages/noco-docs/versioned_docs/version-0.109.7/020.getting-started/_category_.json
index ec3ab8fa3d..17ae104d31 100644
--- a/packages/noco-docs/versioned_docs/version-0.109.7/020.getting-started/_category_.json
+++ b/packages/noco-docs/versioned_docs/version-0.109.7/020.getting-started/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Getting Started",
   "collapsible": true,
-  "collapsed": false
+  "collapsed": false,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/versioned_docs/version-0.109.7/030.setup-and-usages/_category_.json b/packages/noco-docs/versioned_docs/version-0.109.7/030.setup-and-usages/_category_.json
index 78f7ee90f0..c18f8e329d 100644
--- a/packages/noco-docs/versioned_docs/version-0.109.7/030.setup-and-usages/_category_.json
+++ b/packages/noco-docs/versioned_docs/version-0.109.7/030.setup-and-usages/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Product",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/versioned_docs/version-0.109.7/040.developer-resources/_category_.json b/packages/noco-docs/versioned_docs/version-0.109.7/040.developer-resources/_category_.json
index 03328ac62a..07c21132fb 100644
--- a/packages/noco-docs/versioned_docs/version-0.109.7/040.developer-resources/_category_.json
+++ b/packages/noco-docs/versioned_docs/version-0.109.7/040.developer-resources/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Developer Resources",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/noco-docs/versioned_docs/version-0.109.7/050.engineering/_category_.json b/packages/noco-docs/versioned_docs/version-0.109.7/050.engineering/_category_.json
index 6a0ff2129b..dc24e2503e 100644
--- a/packages/noco-docs/versioned_docs/version-0.109.7/050.engineering/_category_.json
+++ b/packages/noco-docs/versioned_docs/version-0.109.7/050.engineering/_category_.json
@@ -1,5 +1,8 @@
 {
   "label": "Engineering",
   "collapsible": true,
-  "collapsed": true
+  "collapsed": true,
+  "link": {
+    "type": "generated-index"
+  }
 }
\ No newline at end of file
diff --git a/packages/nocodb-sdk/jest.config.js b/packages/nocodb-sdk/jest.config.js
new file mode 100644
index 0000000000..b413e106db
--- /dev/null
+++ b/packages/nocodb-sdk/jest.config.js
@@ -0,0 +1,5 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+};
\ No newline at end of file
diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json
index 5635188f3b..1e04645a40 100644
--- a/packages/nocodb-sdk/package.json
+++ b/packages/nocodb-sdk/package.json
@@ -30,6 +30,7 @@
     "fix:prettier": "prettier \"src/**/*.ts\" --write",
     "fix:lint": "eslint src --ext .ts --fix",
     "test": "run-s build test:*",
+    "test:unit": "ENV_FILE=./config/.env.test jest",
     "test:lint": "eslint src --ext .ts",
     "test:prettier": "prettier \"src/**/*.ts\" --list-different",
     "test:spelling": "cspell \"{README.md,.github/*.md,src/**/*.ts}\"",
@@ -38,25 +39,27 @@
     "preinstall": "npx only-allow pnpm"
   },
   "dependencies": {
-    "axios": "^1.6.2",
+    "axios": "^1.6.3",
     "jsep": "^1.3.8",
     "dayjs": "^1.11.10"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "@typescript-eslint/parser": "^6.13.2",
+    "@typescript-eslint/eslint-plugin": "^6.14.0",
+    "@typescript-eslint/parser": "^6.14.0",
+    "@types/jest": "^29.5.11",
     "cspell": "^4.2.8",
     "eslint": "^8.54.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-functional": "^5.0.8",
-    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-prettier": "^4.2.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
     "rimraf": "^5.0.5",
     "tsc-alias": "^1.8.8",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "ts-jest": "^29.1.1"
   },
   "files": [
     "build/main",
@@ -70,4 +73,4 @@
   "prettier": {
     "singleQuote": true
   }
-}
\ No newline at end of file
+}
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 0a777d4326..548fbf00eb 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -463,7 +463,8 @@ export interface ColumnType {
     | 'URL'
     | 'Year'
     | 'QrCode'
-    | 'Links';
+    | 'Links'
+    | 'User';
   /** Is Unsigned? */
   un?: BoolType;
   /** Is unique? */
@@ -1780,7 +1781,8 @@ export interface NormalColumnRequestType {
     | 'URL'
     | 'Year'
     | 'QrCode'
-    | 'Links';
+    | 'Links'
+    | 'User';
   /** Is this column unique? */
   un?: BoolType;
   /** Is this column unique? */
@@ -2761,6 +2763,13 @@ export interface NotificationUpdateType {
   is_read?: boolean;
 }
 
+export interface UserFieldRecordType {
+  id: string;
+  display_name?: string;
+  email: string;
+  deleted?: boolean;
+}
+
 import type {
   AxiosInstance,
   AxiosRequestConfig,
@@ -3341,7 +3350,7 @@ export class Api<
       }),
 
     /**
- * @description Regenerate user refresh token
+ * @description Creates a new refresh token and JWT auth token for the user. The refresh token is sent as a cookie, while the JWT auth token is included in the response body.
  * 
  * @tags Auth
  * @name TokenRefresh
@@ -3349,7 +3358,7 @@ export class Api<
  * @request POST:/api/v1/auth/token/refresh
  * @response `200` `{
   \**
-   * New access token for user
+   * New JWT auth token for user
    * @example 96751db2d53fb834382b682268874a2ea9ee610e4d904e688d1513f11d3c30d62d36d9e05dec0d63
    *\
   token?: string,
@@ -3365,7 +3374,7 @@ export class Api<
       this.request<
         {
           /**
-           * New access token for user
+           * New JWT auth token for user
            * @example 96751db2d53fb834382b682268874a2ea9ee610e4d904e688d1513f11d3c30d62d36d9e05dec0d63
            */
           token?: string;
diff --git a/packages/nocodb-sdk/src/lib/UITypes.ts b/packages/nocodb-sdk/src/lib/UITypes.ts
index 40e6cb30f5..80f45d87ae 100644
--- a/packages/nocodb-sdk/src/lib/UITypes.ts
+++ b/packages/nocodb-sdk/src/lib/UITypes.ts
@@ -39,6 +39,7 @@ enum UITypes {
   QrCode = 'QrCode',
   Button = 'Button',
   Links = 'Links',
+  User = 'User',
 }
 
 export const numericUITypes = [
diff --git a/packages/nocodb-sdk/src/lib/dateTimeHelper.ts b/packages/nocodb-sdk/src/lib/dateTimeHelper.ts
index f6bd267134..7d98d29c75 100644
--- a/packages/nocodb-sdk/src/lib/dateTimeHelper.ts
+++ b/packages/nocodb-sdk/src/lib/dateTimeHelper.ts
@@ -77,6 +77,21 @@ export function parseStringDate(v: string, dateFormat: string) {
   return v;
 }
 
+export function parseStringDateTime(
+  v: string,
+  dateTimeFormat: string = `${dateFormats[0]} ${timeFormats[0]}`
+) {
+  const dayjsObj = dayjs(v).local();
+
+  if (dayjsObj.isValid()) {
+    v = dayjsObj.format(dateTimeFormat);
+  } else {
+    v = dayjs(v, dateTimeFormat).local().format(dateTimeFormat);
+  }
+
+  return v;
+}
+
 export function convertToTargetFormat(
   v: string,
   oldDataFormat,
diff --git a/packages/nocodb-sdk/src/lib/formulaHelpers.spec.ts b/packages/nocodb-sdk/src/lib/formulaHelpers.spec.ts
new file mode 100644
index 0000000000..da6c0e7294
--- /dev/null
+++ b/packages/nocodb-sdk/src/lib/formulaHelpers.spec.ts
@@ -0,0 +1,77 @@
+import {
+  FormulaDataTypes,
+  validateFormulaAndExtractTreeWithType,
+} from './formulaHelpers';
+import UITypes from './UITypes';
+
+describe('Formula parsing and type validation', () => {
+  it('Simple formula', async () => {
+    const result = await validateFormulaAndExtractTreeWithType({
+      formula: '1 + 2',
+      columns: [],
+      clientOrSqlUi: 'mysql2',
+      getMeta: async () => ({}),
+    });
+
+    expect(result.dataType).toEqual(FormulaDataTypes.NUMERIC);
+  });
+
+  it('Formula with IF condition', async () => {
+    const result = await validateFormulaAndExtractTreeWithType({
+      formula: 'IF({column}, "Found", BLANK())',
+      columns: [
+        {
+          id: 'cid',
+          title: 'column',
+          uidt: UITypes.Number,
+        },
+      ],
+      clientOrSqlUi: 'mysql2',
+      getMeta: async () => ({}),
+    });
+
+    expect(result.dataType).toEqual(FormulaDataTypes.STRING);
+  });
+  it('Complex formula', async () => {
+    const result = await validateFormulaAndExtractTreeWithType({
+      formula:
+        'SWITCH({column2},"value1",IF({column1}, "Found", BLANK()),"value2", 2)',
+      columns: [
+        {
+          id: 'id1',
+          title: 'column1',
+          uidt: UITypes.Number,
+        },
+        {
+          id: 'id2',
+          title: 'column2',
+          uidt: UITypes.SingleLineText,
+        },
+      ],
+      clientOrSqlUi: 'mysql2',
+      getMeta: async () => ({}),
+    });
+
+    expect(result.dataType).toEqual(FormulaDataTypes.STRING);
+
+    const result1 = await validateFormulaAndExtractTreeWithType({
+      formula: 'SWITCH({column2},"value1",IF({column1}, 1, 2),"value2", 2)',
+      columns: [
+        {
+          id: 'id1',
+          title: 'column1',
+          uidt: UITypes.Number,
+        },
+        {
+          id: 'id2',
+          title: 'column2',
+          uidt: UITypes.SingleLineText,
+        },
+      ],
+      clientOrSqlUi: 'mysql2',
+      getMeta: async () => ({}),
+    });
+
+    expect(result1.dataType).toEqual(FormulaDataTypes.NUMERIC);
+  });
+});
diff --git a/packages/nocodb-sdk/src/lib/formulaHelpers.ts b/packages/nocodb-sdk/src/lib/formulaHelpers.ts
index 5a28417d84..89689677d0 100644
--- a/packages/nocodb-sdk/src/lib/formulaHelpers.ts
+++ b/packages/nocodb-sdk/src/lib/formulaHelpers.ts
@@ -1,45 +1,73 @@
 import jsep from 'jsep';
 
-import { ColumnType } from './Api';
+import { ColumnType, LinkToAnotherRecordType, RollupType } from './Api';
+import UITypes from './UITypes';
+import dayjs from 'dayjs';
+import { MssqlUi, MysqlUi, PgUi, SnowflakeUi, SqlUiFactory } from './sqlUi';
+import { dateFormats } from './dateTimeHelper';
+
+// opening and closing string code
+const OCURLY_CODE = 123; // '{'
+const CCURLY_CODE = 125; // '}'
 
 export const jsepCurlyHook = {
   name: 'curly',
   init(jsep) {
-    jsep.hooks.add('gobble-token', function gobbleCurlyLiteral(env) {
-      const OCURLY_CODE = 123; // {
-      const CCURLY_CODE = 125; // }
-      let start = -1;
-      const { context } = env;
-      if (
-        !jsep.isIdentifierStart(context.code) &&
-        context.code === OCURLY_CODE
-      ) {
-        if (start == -1) {
-          start = context.index;
-        }
-        context.index += 1;
-        context.gobbleExpressions(CCURLY_CODE);
-        if (context.code === CCURLY_CODE) {
-          context.index += 1;
-          env.node = {
-            type: jsep.IDENTIFIER,
-            name: /{{(.*?)}}/.test(context.expr)
-              ? // start would be the position of the first curly bracket
-                // add 2 to point to the first character for expressions like {{col1}}
-                context.expr.slice(start + 2, context.index - 1)
-              : // start would be the position of the first curly bracket
-                // add 1 to point to the first character for expressions like {col1}
-                context.expr.slice(start + 1, context.index - 1),
-          };
-          return env.node;
-        } else {
-          context.throwError('Unclosed }');
+    // Match identifier in following pattern: {abc-cde}
+    jsep.hooks.add('gobble-token', function escapedIdentifier(env) {
+      // check if the current token is an opening curly bracket
+      if (this.code === OCURLY_CODE) {
+        const patternIndex = this.index;
+        // move to the next character until we find a closing curly bracket
+        while (this.index < this.expr.length) {
+          ++this.index;
+          if (this.code === CCURLY_CODE) {
+            let identifier = this.expr.slice(patternIndex, ++this.index);
+
+            // if starting with double curley brace then check for ending double curley brace
+            // if found include with the identifier
+            if (
+              identifier.startsWith('{{') &&
+              this.expr.slice(patternIndex, this.index + 1).endsWith('}')
+            ) {
+              identifier = this.expr.slice(patternIndex, ++this.index);
+            }
+            env.node = {
+              type: jsep.IDENTIFIER,
+              name: /^{{.*}}$/.test(identifier)
+                ? // start would be the position of the first curly bracket
+                  // add 2 to point to the first character for expressions like {{col1}}
+                  identifier.slice(2, -2)
+                : // start would be the position of the first curly bracket
+                  // add 1 to point to the first character for expressions like {col1}
+                  identifier.slice(1, -1),
+              raw: identifier,
+            };
+
+            // env.node = this.gobbleTokenProperty(env.node);
+            return env.node;
+          }
         }
+        this.throwError('Unclosed }');
       }
     });
   },
 } as jsep.IPlugin;
 
+function validateDateWithUnknownFormat(v: string) {
+  for (const format of dateFormats) {
+    if (dayjs(v, format, true).isValid() as any) {
+      return true;
+    }
+    for (const timeFormat of ['HH:mm', 'HH:mm:ss', 'HH:mm:ss.SSS']) {
+      if (dayjs(v, `${format} ${timeFormat}`, true).isValid() as any) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 export async function substituteColumnAliasWithIdInFormula(
   formula,
   columns: ColumnType[]
@@ -72,6 +100,21 @@ export async function substituteColumnAliasWithIdInFormula(
   return jsepTreeToFormula(parsedFormula);
 }
 
+export enum FormulaErrorType {
+  NOT_AVAILABLE = 'NOT_AVAILABLE',
+  NOT_SUPPORTED = 'NOT_SUPPORTED',
+  MIN_ARG = 'MIN_ARG',
+  MAX_ARG = 'MAX_ARG',
+  TYPE_MISMATCH = 'TYPE_MISMATCH',
+  INVALID_ARG = 'INVALID_ARG',
+  INVALID_ARG_TYPE = 'INVALID_ARG_TYPE',
+  INVALID_ARG_VALUE = 'INVALID_ARG_VALUE',
+  INVALID_ARG_COUNT = 'INVALID_ARG_COUNT',
+  CIRCULAR_REFERENCE = 'CIRCULAR_REFERENCE',
+  INVALID_FUNCTION_NAME = 'INVALID_FUNCTION_NAME',
+  INVALID_COLUMN = 'INVALID_COLUMN',
+}
+
 export function substituteColumnIdWithAliasInFormula(
   formula,
   columns: ColumnType[],
@@ -143,7 +186,7 @@ export function jsepTreeToFormula(node, isCallExpId = false) {
 
   if (node.type === 'Literal') {
     if (typeof node.value === 'string') {
-      return String.raw`"${escapeLiteral(node.value)}"`;
+      return String.raw`"${escapeLiteral(node.raw.slice(1, -1))}"`;
     }
     return '' + node.value;
   }
@@ -152,13 +195,17 @@ export function jsepTreeToFormula(node, isCallExpId = false) {
     return (
       jsepTreeToFormula(node.callee, true) +
       '(' +
-      node.arguments.map(jsepTreeToFormula).join(', ') +
+      node.arguments.map((argPt) => jsepTreeToFormula(argPt)).join(', ') +
       ')'
     );
   }
 
   if (node.type === 'ArrayExpression') {
-    return '[' + node.elements.map(jsepTreeToFormula).join(', ') + ']';
+    return (
+      '[' +
+      node.elements.map((elePt) => jsepTreeToFormula(elePt)).join(', ') +
+      ']'
+    );
   }
 
   if (node.type === 'Compound') {
@@ -181,11 +228,1700 @@ export function jsepTreeToFormula(node, isCallExpId = false) {
 function escapeLiteral(v: string) {
   return (
     v
-      // replace \ to \\
-      .replace(/\\/g, `\\\\`)
+      // replace \ to \\, escape only unescaped \
+      .replace(/([^\\]|^)\\(?!\\)/g, `$1\\\\`)
       // replace " to \"
-      .replace(/"/g, `\\"`)
+      .replace(/([^\\]|^)"/g, `$1\\"`)
       // replace ' to \'
-      .replace(/'/g, `\\'`)
+      .replace(/([^\\]|^)'/g, `$1\\'`)
   );
 }
+
+export enum FormulaDataTypes {
+  NUMERIC = 'numeric',
+  STRING = 'string',
+  DATE = 'date',
+  LOGICAL = 'logical',
+  COND_EXP = 'conditional_expression',
+  NULL = 'null',
+  BOOLEAN = 'boolean',
+  UNKNOWN = 'unknown',
+}
+
+export enum JSEPNode {
+  COMPOUND = 'Compound',
+  IDENTIFIER = 'Identifier',
+  MEMBER_EXP = 'MemberExpression',
+  LITERAL = 'Literal',
+  THIS_EXP = 'ThisExpression',
+  CALL_EXP = 'CallExpression',
+  UNARY_EXP = 'UnaryExpression',
+  BINARY_EXP = 'BinaryExpression',
+  ARRAY_EXP = 'ArrayExpression',
+}
+
+interface FormulaMeta {
+  validation?: {
+    args?: {
+      min?: number;
+      max?: number;
+      rqd?: number;
+
+      type?: FormulaDataTypes;
+    };
+    custom?: (args: FormulaDataTypes[], parseTree: any) => void;
+  };
+  description?: string;
+  syntax?: string;
+  examples?: string[];
+  returnType?: ((args: any[]) => FormulaDataTypes) | FormulaDataTypes;
+  docsUrl?: string;
+}
+
+export const formulas: Record<string, FormulaMeta> = {
+  AVG: {
+    validation: {
+      args: {
+        min: 1,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description: 'Average of input parameters',
+    syntax: 'AVG(value1, [value2, ...])',
+    examples: [
+      'AVG(10, 5) => 7.5',
+      'AVG({column1}, {column2})',
+      'AVG({column1}, {column2}, {column3})',
+    ],
+    returnType: FormulaDataTypes.NUMERIC,
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#avg',
+  },
+  ADD: {
+    validation: {
+      args: {
+        min: 1,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description: 'Sum of input parameters',
+    syntax: 'ADD(value1, [value2, ...])',
+    examples: [
+      'ADD(5, 5) => 10',
+      'ADD({column1}, {column2})',
+      'ADD({column1}, {column2}, {column3})',
+    ],
+    returnType: FormulaDataTypes.NUMERIC,
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#add',
+  },
+  DATEADD: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/date-functions#dateadd',
+    validation: {
+      args: {
+        rqd: 3,
+        type: FormulaDataTypes.DATE,
+      },
+      custom: (_argTypes: FormulaDataTypes[], parsedTree: any) => {
+        if (parsedTree.arguments[0].type === JSEPNode.LITERAL) {
+          if (!validateDateWithUnknownFormat(parsedTree.arguments[0].value)) {
+            throw new FormulaError(
+              FormulaErrorType.TYPE_MISMATCH,
+              { key: 'msg.formula.firstParamDateAddHaveDate' },
+              'First parameter of DATEADD should be a date'
+            );
+          }
+        }
+
+        if (parsedTree.arguments[1].type === JSEPNode.LITERAL) {
+          if (typeof parsedTree.arguments[1].value !== 'number') {
+            throw new FormulaError(
+              FormulaErrorType.TYPE_MISMATCH,
+              { key: 'msg.formula.secondParamDateAddHaveNumber' },
+              'Second parameter of DATEADD should be a number'
+            );
+          }
+        }
+        if (parsedTree.arguments[2].type === JSEPNode.LITERAL) {
+          if (
+            !['day', 'week', 'month', 'year'].includes(
+              parsedTree.arguments[2].value
+            )
+          ) {
+            throw new FormulaError(
+              FormulaErrorType.TYPE_MISMATCH,
+              { key: 'msg.formula.thirdParamDateAddHaveDate' },
+              "Third parameter of DATEADD should be one of 'day', 'week', 'month', 'year'"
+            );
+          }
+        }
+      },
+    },
+    description: 'Adds "count" units to Datetime.',
+    syntax:
+      'DATEADD(date | datetime, count, ["day" | "week" | "month" | "year"])',
+    examples: [
+      'DATEADD({column1}, 2, "day")',
+      'DATEADD({column1}, -2, "day")',
+      'DATEADD({column1}, 2, "week")',
+      'DATEADD({column1}, -2, "week")',
+      'DATEADD({column1}, 2, "month")',
+      'DATEADD({column1}, -2, "month")',
+      'DATEADD({column1}, 2, "year")',
+      'DATEADD({column1}, -2, "year")',
+    ],
+    returnType: FormulaDataTypes.DATE,
+  },
+  DATESTR: {
+    validation: {
+      args: {
+        rqd: 1,
+      },
+    },
+    syntax: 'DATESTR(date | datetime)',
+    description: 'Formats input field into a string in "YYYY-MM-DD" format',
+    examples: ['DATESTR({column1})'],
+    returnType: FormulaDataTypes.STRING,
+  },
+  DAY: {
+    validation: {
+      args: {
+        rqd: 1,
+      },
+    },
+    syntax: 'DAY(date | datetime)',
+    description: 'Extract day from a date field (1-31)',
+    examples: ['DAY({column1})'],
+    returnType: FormulaDataTypes.STRING,
+  },
+  MONTH: {
+    validation: {
+      args: {
+        rqd: 1,
+      },
+    },
+    syntax: 'MONTH(date | datetime)',
+    description: 'Extract month from a date field (1-12)',
+    examples: ['MONTH({column1})'],
+    returnType: FormulaDataTypes.STRING,
+  },
+  HOUR: {
+    validation: {
+      args: {
+        rqd: 1,
+      },
+    },
+    syntax: 'DAY(time | datetime)',
+    description: 'Extract hour from a time field (0-23)',
+    examples: ['HOUR({column1})'],
+    returnType: FormulaDataTypes.STRING,
+  },
+  DATETIME_DIFF: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/date-functions#datetime_diff',
+
+    validation: {
+      args: {
+        min: 2,
+        max: 3,
+        type: FormulaDataTypes.DATE,
+      },
+      custom: (_argTypes: FormulaDataTypes[], parsedTree: any) => {
+        if (parsedTree.arguments[0].type === JSEPNode.LITERAL) {
+          if (!validateDateWithUnknownFormat(parsedTree.arguments[0].value)) {
+            throw new FormulaError(
+              FormulaErrorType.TYPE_MISMATCH,
+              { key: 'msg.formula.firstParamDateDiffHaveDate' },
+              'First parameter of DATETIME_DIFF should be a date'
+            );
+          }
+        }
+
+        if (parsedTree.arguments[1].type === JSEPNode.LITERAL) {
+          if (!validateDateWithUnknownFormat(parsedTree.arguments[1].value)) {
+            throw new FormulaError(
+              FormulaErrorType.TYPE_MISMATCH,
+              { key: 'msg.formula.secondParamDateDiffHaveDate' },
+              'Second parameter of DATETIME_DIFF should be a date'
+            );
+          }
+        }
+        if (
+          parsedTree.arguments[2] &&
+          parsedTree.arguments[2].type === JSEPNode.LITERAL
+        ) {
+          if (
+            ![
+              'milliseconds',
+              'ms',
+              'seconds',
+              's',
+              'minutes',
+              'm',
+              'hours',
+              'h',
+              'days',
+              'd',
+              'weeks',
+              'w',
+              'months',
+              'M',
+              'quarters',
+              'Q',
+              'years',
+              'y',
+            ].includes(parsedTree.arguments[2].value)
+          ) {
+            throw new FormulaError(
+              FormulaErrorType.TYPE_MISMATCH,
+              { key: 'msg.formula.thirdParamDateDiffHaveDate' },
+              "Third parameter of DATETIME_DIFF should be one of 'milliseconds', 'ms', 'seconds', 's', 'minutes', 'm', 'hours', 'h', 'days', 'd', 'weeks', 'w', 'months', 'M', 'quarters', 'Q', 'years', 'y'"
+            );
+          }
+        }
+      },
+    },
+    description:
+      'Calculate the difference of two given date / datetime fields in specified units.',
+    syntax:
+      'DATETIME_DIFF(date | datetime, date | datetime, ["milliseconds" | "ms" | "seconds" | "s" | "minutes" | "m" | "hours" | "h" | "days" | "d" | "weeks" | "w" | "months" | "M" | "quarters" | "Q" | "years" | "y"])',
+    examples: [
+      'DATEDIFF({column1}, {column2})',
+      'DATEDIFF({column1}, {column2}, "seconds")',
+      'DATEDIFF({column1}, {column2}, "s")',
+      'DATEDIFF({column1}, {column2}, "years")',
+      'DATEDIFF({column1}, {column2}, "y")',
+      'DATEDIFF({column1}, {column2}, "minutes")',
+      'DATEDIFF({column1}, {column2}, "m")',
+      'DATEDIFF({column1}, {column2}, "days")',
+      'DATEDIFF({column1}, {column2}, "d")',
+    ],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  AND: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/conditional-expressions#and',
+
+    validation: {
+      args: {
+        min: 1,
+      },
+    },
+    description: 'Result is TRUE if all conditions are met',
+    syntax: 'AND(expr1, [expr2, ...])',
+    examples: ['AND(5 > 2, 5 < 10) => 1', 'AND({column1} > 2, {column2} < 10)'],
+    returnType: FormulaDataTypes.COND_EXP,
+  },
+  OR: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/conditional-expressions#or',
+
+    validation: {
+      args: {
+        min: 1,
+      },
+    },
+    description: 'Result is TRUE if at least one condition is met',
+    syntax: 'OR(expr1, [expr2, ...])',
+    examples: ['OR(5 > 2, 5 < 10) => 1', 'OR({column1} > 2, {column2} < 10)'],
+    returnType: FormulaDataTypes.COND_EXP,
+  },
+  CONCAT: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#concat',
+
+    validation: {
+      args: {
+        min: 1,
+      },
+    },
+    description: 'Concatenate input parameters into a single string',
+    syntax: 'CONCAT(str1, [str2, ...])',
+    examples: [
+      'CONCAT("AA", "BB", "CC") => "AABBCC"',
+      'CONCAT({column1}, {column2}, {column3})',
+    ],
+    returnType: FormulaDataTypes.STRING,
+  },
+  TRIM: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#trim',
+
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description: 'Remove trailing and leading whitespaces from input parameter',
+    syntax: 'TRIM(str)',
+    examples: [
+      'TRIM("         HELLO WORLD  ") => "HELLO WORLD"',
+      'TRIM({column1})',
+    ],
+    returnType: FormulaDataTypes.STRING,
+  },
+  UPPER: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#upper',
+
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description: 'Converts the input parameter to an upper-case string.',
+    syntax: 'UPPER(str)',
+    examples: ['UPPER("nocodb") => "NOCODB"', 'UPPER({column1})'],
+    returnType: FormulaDataTypes.STRING,
+  },
+  LOWER: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#lower',
+
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description: 'Converts the input parameter to an lower-case string.',
+    syntax: 'LOWER(str)',
+    examples: ['LOWER("NOCODB") => "nocodb"', 'LOWER({column1})'],
+    returnType: FormulaDataTypes.STRING,
+  },
+  LEN: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#len',
+
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description: 'Calculate the character length of the input parameter.',
+    syntax: 'LEN(value)',
+    examples: ['LEN("NocoDB") => 6', 'LEN({column1})'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  MIN: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#min',
+
+    validation: {
+      args: {
+        min: 1,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description: 'Find the minimum value among the input parameters.',
+    syntax: 'MIN(value1, [value2, ...])',
+    examples: ['MIN(1000, 2000) => 1000', 'MIN({column1}, {column2})'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  MAX: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#max',
+
+    validation: {
+      args: {
+        min: 1,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description: 'Find the maximum value among the input parameters.',
+    syntax: 'MAX(value1, [value2, ...])',
+    examples: ['MAX(1000, 2000) => 2000', 'MAX({column1}, {column2})'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  CEILING: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#ceiling',
+
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description:
+      'Rounds the input parameter to the next largest integer value.',
+    syntax: 'CEILING(value)',
+    examples: ['CEILING(1.01) => 2', 'CEILING({column1})'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  FLOOR: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#floor',
+
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description: 'Round down the input parameter to the nearest integer.',
+    syntax: 'FLOOR(value)',
+    examples: ['FLOOR(3.1415) => 3', 'FLOOR({column1})'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  ROUND: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#round',
+
+    validation: {
+      args: {
+        min: 1,
+        max: 2,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description:
+      'Rounds the number to a specified decimal places or the nearest integer if precision is not specified',
+    syntax: 'ROUND(value, precision), ROUND(value)',
+    examples: [
+      'ROUND(3.1415) => 3',
+      'ROUND(3.1415, 2) => 3.14',
+      'ROUND({column1}, 3)',
+    ],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  MOD: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#mod',
+
+    validation: {
+      args: {
+        rqd: 2,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description:
+      'Calculate the remainder resulting from integer division of input parameters.',
+    syntax: 'MOD(value1, value2)',
+    examples: ['MOD(1024, 1000) => 24', 'MOD({column}, 2)'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  REPEAT: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#repeat',
+
+    validation: {
+      args: {
+        rqd: 2,
+      },
+      custom(argTypes: FormulaDataTypes[], parsedTree) {
+        if (argTypes[1] !== FormulaDataTypes.NUMERIC) {
+          throw new FormulaError(
+            FormulaErrorType.INVALID_ARG,
+            {
+              key: 'msg.formula.numericTypeIsExpected',
+              calleeName: parsedTree.callee?.name?.toUpperCase(),
+            },
+            'Numeric type is expected'
+          );
+        }
+      },
+    },
+    description:
+      'Concatenate the specified number of copies of the input parameter string.',
+    syntax: 'REPEAT(str, count)',
+    examples: ['REPEAT("A", 5) => "AAAAA"', 'REPEAT({column}, 5)'],
+    returnType: FormulaDataTypes.STRING,
+  },
+  LOG: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#log',
+
+    validation: {
+      args: {
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description:
+      'Compute the logarithm of the input parameter to the specified base (default = e).',
+    syntax: 'LOG([base], value)',
+    examples: ['LOG(2, 1024) => 10', 'LOG(2, {column1})'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  EXP: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#exp',
+
+    validation: {
+      args: {
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description:
+      'Compute the exponential value of the input parameter (e raised to the power specified)',
+    syntax: 'EXP(power)',
+    examples: ['EXP(1) => 2.718281828459045', 'EXP({column1})'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  POWER: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#power',
+
+    validation: {
+      args: {
+        rqd: 2,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description: 'Compute base raised to the exponent power.',
+    syntax: 'POWER(base, exponent)',
+    examples: ['POWER(2, 10) => 1024', 'POWER({column1}, 10)'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  SQRT: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#sqrt',
+
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description: 'Calculate the square root of the input parameter.',
+    syntax: 'SQRT(value)',
+    examples: ['SQRT(100) => 10', 'SQRT({column1})'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  ABS: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#abs',
+
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description: 'Obtain the absolute value of the input parameter.',
+    syntax: 'ABS(value)',
+    examples: ['ABS({column1})'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  NOW: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/date-functions#now',
+
+    validation: {
+      args: {
+        rqd: 0,
+        type: FormulaDataTypes.DATE,
+      },
+    },
+    description: 'Retrieve the current time and day.',
+    syntax: 'NOW()',
+    examples: ['NOW() => 2022-05-19 17:20:43'],
+    returnType: FormulaDataTypes.DATE,
+  },
+  REPLACE: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#replace',
+
+    validation: {
+      args: {
+        rqd: 3,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description:
+      'Replace all occurrences of "searchStr" with "replaceStr" in the given string.',
+    syntax: 'REPLACE(str, searchStr, replaceStr)',
+    examples: [
+      'REPLACE("AABBCC", "AA", "BB") => "BBBBCC"',
+      'REPLACE({column1}, {column2}, {column3})',
+    ],
+    returnType: FormulaDataTypes.STRING,
+  },
+  SEARCH: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#search',
+
+    validation: {
+      args: {
+        rqd: 2,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description:
+      'Retrieve the index of the specified "searchStr" if found; otherwise, returns 0.',
+    syntax: 'SEARCH(str, searchStr)',
+    examples: [
+      'SEARCH("HELLO WORLD", "WORLD") => 7',
+      'SEARCH({column1}, "abc")',
+    ],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  INT: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#int',
+
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description: 'Obtain the integer value of the input parameter',
+    syntax: 'INT(value)',
+    examples: ['INT(3.1415) => 3', 'INT({column1})'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+  RIGHT: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#right',
+
+    validation: {
+      args: {
+        rqd: 2,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description: 'Retrieve the last n characters from the input string.',
+    syntax: 'RIGHT(str, n)',
+    examples: ['RIGHT("HELLO WORLD", 5) => WORLD', 'RIGHT({column1}, 3)'],
+    returnType: FormulaDataTypes.STRING,
+  },
+  LEFT: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#left',
+
+    validation: {
+      args: {
+        rqd: 2,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description: 'Retrieve the first n characters from the input string.',
+    syntax: 'LEFT(str, n)',
+    examples: ['LEFT({column1}, 2)', 'LEFT("ABCD", 2) => "AB"'],
+    returnType: FormulaDataTypes.STRING,
+  },
+  SUBSTR: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#substr',
+
+    validation: {
+      args: {
+        min: 2,
+        max: 3,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description:
+      'Extracts a substring of length "n" from the input string, starting from the specified position.',
+    syntax: '	SUBTR(str, position, [n])',
+    examples: [
+      'SUBSTR("HELLO WORLD", 7) => WORLD',
+      'SUBSTR("HELLO WORLD", 7, 3) => WOR',
+      'SUBSTR({column1}, 7, 5)',
+    ],
+    returnType: FormulaDataTypes.STRING,
+  },
+  MID: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#mid',
+
+    validation: {
+      args: {
+        rqd: 3,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description: 'Extracts a substring; an alias for SUBSTR.',
+    syntax: 'MID(str, position, [count])',
+    examples: ['MID("NocoDB", 3, 2) => "co"', 'MID({column1}, 3, 2)'],
+    returnType: FormulaDataTypes.STRING,
+  },
+  IF: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/conditional-expressions#if',
+
+    validation: {
+      args: {
+        min: 2,
+        max: 3,
+      },
+    },
+    description:
+      'Evaluate successCase if the expression is TRUE, else the failureCase.',
+    syntax: 'IF(expr, successCase, failureCase)',
+    examples: [
+      'IF(5 > 1, "YES", "NO") => "YES"',
+      'IF({column} > 1, "YES", "NO")',
+    ],
+    returnType: (argTypes: FormulaDataTypes[]) => {
+      // extract all return types except NULL, since null can be returned by any type
+      const returnValueTypes = new Set(
+        argTypes.slice(1).filter((type) => type !== FormulaDataTypes.NULL)
+      );
+      // if there are more than one return types or if there is a string return type
+      // return type as string else return the type
+      if (
+        returnValueTypes.size > 1 ||
+        returnValueTypes.has(FormulaDataTypes.STRING)
+      ) {
+        return FormulaDataTypes.STRING;
+      } else if (returnValueTypes.has(FormulaDataTypes.NUMERIC)) {
+        return FormulaDataTypes.NUMERIC;
+      } else if (returnValueTypes.has(FormulaDataTypes.BOOLEAN)) {
+        return FormulaDataTypes.BOOLEAN;
+      } else if (returnValueTypes.has(FormulaDataTypes.DATE)) {
+        return FormulaDataTypes.DATE;
+      }
+
+      // if none of the above conditions are met, return the first return argument type
+      return argTypes[1];
+    },
+  },
+  SWITCH: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/conditional-expressions#switch',
+
+    validation: {
+      args: {
+        min: 3,
+      },
+      custom: (_argTypes: any[], _parseTree) => {
+        // Todo: Add validation for switch
+      },
+    },
+    description:
+      'Evaluate case value based on expression output; if no match is found, evaluate default case.',
+    syntax: 'SWITCH(expr, [pattern, value, ..., default])',
+    examples: [
+      'SWITCH(1, 1, "One", 2, "Two", "N/A") => "One""',
+      'SWITCH(2, 1, "One", 2, "Two", "N/A") => "Two"',
+      'SWITCH(3, 1, "One", 2, "Two", "N/A") => "N/A"',
+      'SWITCH({column1}, 1, "One", 2, "Two", "N/A")',
+    ],
+    returnType: (argTypes: FormulaDataTypes[]) => {
+      // extract all return types except NULL, since null can be returned by any type
+      const returnValueTypes = new Set(
+        argTypes.slice(2).filter((_, i) => i % 2 === 0)
+      );
+
+      // if there are more than one return types or if there is a string return type
+      // return type as string else return the type
+      if (
+        returnValueTypes.size > 1 ||
+        returnValueTypes.has(FormulaDataTypes.STRING)
+      ) {
+        return FormulaDataTypes.STRING;
+      } else if (returnValueTypes.has(FormulaDataTypes.NUMERIC)) {
+        return FormulaDataTypes.NUMERIC;
+      } else if (returnValueTypes.has(FormulaDataTypes.BOOLEAN)) {
+        return FormulaDataTypes.BOOLEAN;
+      } else if (returnValueTypes.has(FormulaDataTypes.DATE)) {
+        return FormulaDataTypes.DATE;
+      }
+
+      // if none of the above conditions are met, return the first return argument type
+      return argTypes[1];
+    },
+  },
+  URL: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#url',
+
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description:
+      'Verify and convert to a hyperlink if the input is a valid URL.',
+    syntax: 'URL(str)',
+    examples: ['URL("https://github.com/nocodb/nocodb")', 'URL({column1})'],
+    returnType: FormulaDataTypes.STRING,
+  },
+  WEEKDAY: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/date-functions#weekday',
+
+    validation: {
+      args: {
+        min: 1,
+        max: 2,
+        type: FormulaDataTypes.NUMERIC,
+      },
+      custom(_argTypes: FormulaDataTypes[], parsedTree: any) {
+        if (parsedTree.arguments[0].type === JSEPNode.LITERAL) {
+          if (!validateDateWithUnknownFormat(parsedTree.arguments[0].value)) {
+            throw new FormulaError(
+              FormulaErrorType.TYPE_MISMATCH,
+              { key: 'msg.formula.firstParamWeekDayHaveDate' },
+              'First parameter of WEEKDAY should be a date'
+            );
+          }
+        }
+
+        // if second argument is present and literal then validate it
+        if (
+          parsedTree.arguments[1] &&
+          parsedTree.arguments[1].type === JSEPNode.LITERAL
+        ) {
+          const value = parsedTree.arguments[1].value;
+          if (
+            typeof value !== 'string' ||
+            ![
+              'sunday',
+              'monday',
+              'tuesday',
+              'wednesday',
+              'thursday',
+              'friday',
+              'saturday',
+            ].includes(value.toLowerCase())
+          ) {
+            throw new FormulaError(
+              FormulaErrorType.TYPE_MISMATCH,
+              { key: 'msg.formula.secondParamWeekDayHaveDate' },
+              'Second parameter of WEEKDAY should be day of week string'
+            );
+          }
+        }
+      },
+    },
+    description:
+      'Retrieve the day of the week as an integer (0-6), starting from Monday by default.',
+    syntax: 'WEEKDAY(date, [startDayOfWeek])',
+    examples: ['WEEKDAY("2021-06-09")', 'WEEKDAY(NOW(), "sunday")'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+
+  TRUE: {
+    validation: {
+      args: {
+        max: 0,
+      },
+    },
+    description: 'Returns 1',
+    syntax: 'TRUE()',
+    examples: ['TRUE()'],
+    returnType: FormulaDataTypes.NUMERIC,
+    // TODO: Add docs url
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/logical-functions#true',
+  },
+
+  FALSE: {
+    validation: {
+      args: {
+        max: 0,
+      },
+    },
+    description: 'Returns 0',
+    syntax: 'FALSE()',
+    examples: ['FALSE()'],
+    returnType: FormulaDataTypes.NUMERIC,
+    // TODO: Add docs url
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/logical-functions#false',
+  },
+
+  REGEX_MATCH: {
+    validation: {
+      args: {
+        rqd: 2,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description:
+      'Verifies whether the input text matches a regular expression, returning 1 for a match and 0 otherwise.',
+    syntax: 'REGEX_MATCH(string, regex)',
+    examples: ['REGEX_MATCH({title}, "abc.*")'],
+    returnType: FormulaDataTypes.NUMERIC,
+  },
+
+  REGEX_EXTRACT: {
+    validation: {
+      args: {
+        rqd: 2,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description:
+      'Retrieve the first match of a regular expression in a string.',
+    syntax: 'REGEX_EXTRACT(string, regex)',
+    examples: ['REGEX_EXTRACT({title}, "abc.*")'],
+    returnType: FormulaDataTypes.STRING,
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#regex_extract',
+  },
+  REGEX_REPLACE: {
+    validation: {
+      args: {
+        rqd: 3,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description:
+      'Replace all occurrences of a regular expression in a string with a specified replacement string.',
+    syntax: 'REGEX_MATCH(string, regex, replacement)',
+    examples: ['REGEX_EXTRACT({title}, "abc.*", "abcd")'],
+    returnType: FormulaDataTypes.STRING,
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#regex_replace',
+  },
+  BLANK: {
+    validation: {
+      args: {
+        rqd: 0,
+      },
+    },
+    description: 'Yields a null value.',
+    syntax: 'BLANK()',
+    examples: ['BLANK()'],
+    returnType: FormulaDataTypes.NULL,
+    // TODO: Add docs url
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/logical-functions#blank',
+  },
+  XOR: {
+    validation: {
+      args: {
+        min: 1,
+      },
+      // todo: validation for boolean
+    },
+    description:
+      'Verifies whether an odd number of arguments are true, returning true if so, and false otherwise.',
+    syntax: 'XOR(expression, [exp2, ...])',
+    examples: ['XOR(TRUE(), FALSE(), TRUE())'],
+    returnType: FormulaDataTypes.BOOLEAN,
+    // TODO: Add docs url
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/logical-functions#xor',
+  },
+  EVEN: {
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description:
+      'Rounds up the specified value to the nearest even integer that is greater than or equal to the specified value',
+    syntax: 'EVEN(value)',
+    examples: ['EVEN({column})'],
+    returnType: FormulaDataTypes.NUMERIC,
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#even',
+  },
+  ODD: {
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description:
+      'Rounds up the specified value to the nearest odd integer that is greater than or equal to the specified value',
+    syntax: 'ODD(value)',
+    examples: ['ODD({column})'],
+    returnType: FormulaDataTypes.NUMERIC,
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#odd',
+  },
+  RECORD_ID: {
+    validation: {
+      args: {
+        rqd: 0,
+      },
+    },
+    description: 'Retrieve the record ID of the current record.',
+    syntax: 'RECORD_ID()',
+    examples: ['RECORD_ID()'],
+
+    // todo: resolve return type based on the args
+    returnType: () => {
+      return FormulaDataTypes.STRING;
+    },
+  },
+  COUNTA: {
+    validation: {
+      args: {
+        min: 1,
+      },
+    },
+    description: 'Counts non-empty arguments',
+    syntax: 'COUNTA(value1, [value2, ...])',
+    examples: ['COUNTA({field1}, {field2})'],
+    returnType: FormulaDataTypes.NUMERIC,
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#counta',
+  },
+  COUNT: {
+    validation: {
+      args: {
+        min: 1,
+      },
+    },
+    description: 'Counts numerical arguments',
+    syntax: 'COUNT(value1, [value2, ...])',
+    examples: ['COUNT({field1}, {field2})'],
+    returnType: FormulaDataTypes.NUMERIC,
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#count',
+  },
+  COUNTALL: {
+    validation: {
+      args: {
+        min: 1,
+      },
+    },
+    description: 'Counts the number of arguments',
+    syntax: 'COUNTALL(value1, [value2, ...])',
+    examples: ['COUNTALL({field1}, {field2})'],
+    returnType: FormulaDataTypes.NUMERIC,
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#countall',
+  },
+  ROUNDDOWN: {
+    validation: {
+      args: {
+        min: 1,
+        max: 2,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description:
+      'Rounds down the value after the decimal point to the specified number of decimal places given by "precision" (default is 0).',
+    syntax: 'ROUNDDOWN(value, [precision])',
+    examples: ['ROUNDDOWN({field1})', 'ROUNDDOWN({field1}, 2)'],
+    returnType: FormulaDataTypes.NUMERIC,
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#rounddown',
+  },
+  ROUNDUP: {
+    validation: {
+      args: {
+        min: 1,
+        max: 2,
+        type: FormulaDataTypes.NUMERIC,
+      },
+    },
+    description:
+      'Rounds up the value after the decimal point to the specified number of decimal places given by "precision" (default is 0).',
+    syntax: 'ROUNDUP(value, [precision])',
+    examples: ['ROUNDUP({field1})', 'ROUNDUP({field1}, 2)'],
+    returnType: FormulaDataTypes.NUMERIC,
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#roundup',
+  },
+  VALUE: {
+    validation: {
+      args: {
+        rqd: 1,
+      },
+    },
+    description:
+      'Extracts the numeric value from a string, handling % or - appropriately, and returns the resulting numeric value.',
+    syntax: 'VALUE(value)',
+    examples: ['VALUE({field})', 'VALUE("abc10000%")', 'VALUE("$10000")'],
+    returnType: FormulaDataTypes.NUMERIC,
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/numeric-functions#value',
+  },
+  // Disabling these functions for now; these act as alias for CreatedAt & UpdatedAt fields;
+  // Issue: Error noticed if CreatedAt & UpdatedAt fields are removed from the table after creating these formulas
+  //
+  // CREATED_TIME: {
+  //   validation: {
+  //     args: {
+  //       rqd: 0,
+  //     },
+  //   },
+  //   description: 'Returns the created time of the current record if it exists',
+  //   syntax: 'CREATED_TIME()',
+  //   examples: ['CREATED_TIME()'],
+  // },
+  // LAST_MODIFIED_TIME: {
+  //   validation: {
+  //     args: {
+  //       rqd: 0,
+  //     },
+  //   },
+  //   description: 'Returns the last modified time of the current record if it exists',
+  //   syntax: ' LAST_MODIFIED_TIME()',
+  //   examples: [' LAST_MODIFIED_TIME()'],
+  // },
+};
+
+export class FormulaError extends Error {
+  public type: FormulaErrorType;
+  public extra: Record<string, any>;
+
+  constructor(
+    type: FormulaErrorType,
+    extra: {
+      [key: string]: any;
+    },
+    message: string = 'Formula Error'
+  ) {
+    super(message);
+    this.type = type;
+    this.extra = extra;
+  }
+}
+
+async function extractColumnIdentifierType({
+  col,
+  columns,
+  getMeta,
+  clientOrSqlUi,
+}: {
+  col: Record<string, any>;
+  columns: ColumnType[];
+  getMeta: (tableId: string) => Promise<any>;
+  clientOrSqlUi:
+    | 'mysql'
+    | 'pg'
+    | 'sqlite3'
+    | 'mssql'
+    | 'mysql2'
+    | 'oracledb'
+    | 'mariadb'
+    | 'sqlite'
+    | 'snowflake'
+    | typeof MysqlUi
+    | typeof MssqlUi
+    | typeof SnowflakeUi
+    | typeof PgUi;
+}) {
+  const res: {
+    dataType?: FormulaDataTypes;
+    errors?: Set<string>;
+    [p: string]: any;
+  } = {};
+  const sqlUI =
+    typeof clientOrSqlUi === 'string'
+      ? SqlUiFactory.create({ client: clientOrSqlUi })
+      : clientOrSqlUi;
+
+  switch (col?.uidt) {
+    // string
+    case UITypes.SingleLineText:
+    case UITypes.LongText:
+    case UITypes.MultiSelect:
+    case UITypes.SingleSelect:
+    case UITypes.PhoneNumber:
+    case UITypes.Email:
+    case UITypes.URL:
+      res.dataType = FormulaDataTypes.STRING;
+      break;
+    // numeric
+    case UITypes.Year:
+    case UITypes.Number:
+    case UITypes.Decimal:
+    case UITypes.Rating:
+    case UITypes.Count:
+    case UITypes.AutoNumber:
+      res.dataType = FormulaDataTypes.NUMERIC;
+      break;
+    // date
+    case UITypes.Date:
+    case UITypes.DateTime:
+    case UITypes.CreateTime:
+    case UITypes.LastModifiedTime:
+      res.dataType = FormulaDataTypes.DATE;
+      break;
+
+    case UITypes.Currency:
+    case UITypes.Percent:
+    case UITypes.Duration:
+    case UITypes.Links:
+      res.dataType = FormulaDataTypes.NUMERIC;
+      break;
+
+    case UITypes.Rollup:
+      {
+        const rollupFunction = col.colOptions.rollup_function;
+        if (
+          [
+            'count',
+            'avg',
+            'sum',
+            'countDistinct',
+            'sumDistinct',
+            'avgDistinct',
+          ].includes(rollupFunction)
+        ) {
+          // these functions produce a numeric value, which can be used in numeric functions
+          res.dataType = FormulaDataTypes.NUMERIC;
+        } else {
+          const relationColumnOpt = columns.find(
+            (column) =>
+              column.id === (<RollupType>col.colOptions).fk_relation_column_id
+          );
+
+          // the value is based on the foreign rollup column type
+          const refTableMeta = await getMeta(
+            (<LinkToAnotherRecordType>relationColumnOpt.colOptions)
+              .fk_related_model_id
+          );
+
+          const refTableColumns = refTableMeta.columns;
+          const childFieldColumn = refTableColumns.find(
+            (column: ColumnType) =>
+              column.id === col.colOptions.fk_rollup_column_id
+          );
+
+          // extract type and add to res
+          Object.assign(
+            res,
+            await extractColumnIdentifierType({
+              col: childFieldColumn,
+              columns: refTableColumns,
+              getMeta,
+              clientOrSqlUi,
+            })
+          );
+        }
+      }
+      break;
+
+    case UITypes.Attachment:
+      res.dataType = FormulaDataTypes.STRING;
+      break;
+    case UITypes.Checkbox:
+      res.dataType = FormulaDataTypes.NUMERIC;
+      break;
+    case UITypes.ID:
+    case UITypes.ForeignKey:
+    case UITypes.SpecificDBType:
+      {
+        if (sqlUI) {
+          const abstractType = sqlUI.getAbstractType(col);
+          if (['integer', 'float', 'decimal'].includes(abstractType)) {
+            res.dataType = FormulaDataTypes.NUMERIC;
+          } else if (['boolean'].includes(abstractType)) {
+            res.dataType = FormulaDataTypes.BOOLEAN;
+          } else if (
+            ['date', 'datetime', 'time', 'year'].includes(abstractType)
+          ) {
+            res.dataType = FormulaDataTypes.DATE;
+          } else {
+            res.dataType = FormulaDataTypes.STRING;
+          }
+        } else {
+          res.dataType = FormulaDataTypes.UNKNOWN;
+        }
+      }
+      break;
+    // not supported
+    case UITypes.Time:
+    case UITypes.Lookup:
+    case UITypes.Barcode:
+    case UITypes.Button:
+    case UITypes.Collaborator:
+    case UITypes.QrCode:
+    default:
+      res.dataType = FormulaDataTypes.UNKNOWN;
+      break;
+  }
+
+  return res;
+}
+
+export async function validateFormulaAndExtractTreeWithType({
+  formula,
+  column,
+  columns,
+  clientOrSqlUi,
+  getMeta,
+}: {
+  formula: string;
+  columns: ColumnType[];
+  clientOrSqlUi:
+    | 'mysql'
+    | 'pg'
+    | 'sqlite3'
+    | 'mssql'
+    | 'mysql2'
+    | 'oracledb'
+    | 'mariadb'
+    | 'sqlite'
+    | 'snowflake'
+    | typeof MysqlUi
+    | typeof MssqlUi
+    | typeof SnowflakeUi
+    | typeof PgUi;
+  column?: ColumnType;
+  getMeta: (tableId: string) => Promise<any>;
+}) {
+  const sqlUI =
+    typeof clientOrSqlUi === 'string'
+      ? SqlUiFactory.create({ client: clientOrSqlUi })
+      : clientOrSqlUi;
+
+  const colAliasToColMap = {};
+  const colIdToColMap = {};
+
+  for (const col of columns) {
+    colAliasToColMap[col.title] = col;
+    colIdToColMap[col.id] = col;
+  }
+
+  const validateAndExtract = async (parsedTree: any) => {
+    const res: {
+      dataType?: FormulaDataTypes;
+      errors?: Set<string>;
+      [key: string]: any;
+    } = { ...parsedTree };
+
+    if (parsedTree.type === JSEPNode.CALL_EXP) {
+      const calleeName = parsedTree.callee.name.toUpperCase();
+      // validate function name
+      if (
+        !formulas[calleeName] ||
+        sqlUI?.getUnsupportedFnList().includes(calleeName)
+      ) {
+        throw new FormulaError(
+          FormulaErrorType.INVALID_FUNCTION_NAME,
+          {},
+          `Function ${calleeName} is not available`
+        );
+      }
+
+      // validate arguments
+      const validation =
+        formulas[calleeName] && formulas[calleeName].validation;
+      if (validation && validation.args) {
+        if (
+          validation.args.rqd !== undefined &&
+          validation.args.rqd !== parsedTree.arguments.length
+        ) {
+          throw new FormulaError(
+            FormulaErrorType.INVALID_ARG,
+            {
+              key: 'msg.formula.requiredArgumentsFormula',
+              requiredArguments: validation.args.rqd,
+              calleeName,
+            },
+            'Required arguments missing'
+          );
+        } else if (
+          validation.args.min !== undefined &&
+          validation.args.min > parsedTree.arguments.length
+        ) {
+          throw new FormulaError(
+            FormulaErrorType.MIN_ARG,
+            {
+              key: 'msg.formula.minRequiredArgumentsFormula',
+              minRequiredArguments: validation.args.min,
+              calleeName,
+            },
+            'Minimum arguments required'
+          );
+        } else if (
+          validation.args.max !== undefined &&
+          validation.args.max < parsedTree.arguments.length
+        ) {
+          throw new FormulaError(
+            FormulaErrorType.INVALID_ARG,
+            {
+              key: 'msg.formula.maxRequiredArgumentsFormula',
+              maxRequiredArguments: validation.args.max,
+              calleeName,
+            },
+            'Maximum arguments missing'
+          );
+        }
+      }
+      // get args type and validate
+      const validateResult = (res.arguments = await Promise.all(
+        parsedTree.arguments.map((arg) => {
+          return validateAndExtract(arg);
+        })
+      ));
+
+      const argTypes = validateResult.map((v: any) => v.dataType);
+
+      // if validation function is present, call it
+      if (formulas[calleeName].validation?.custom) {
+        formulas[calleeName].validation?.custom(argTypes, parsedTree);
+      }
+      // validate against expected arg types if present
+      else if (formulas[calleeName].validation?.args?.type) {
+        const expectedArgType = formulas[calleeName].validation.args.type;
+
+        for (const argPt of validateResult) {
+          if (
+            argPt.dataType !== expectedArgType &&
+            argPt.dataType !== FormulaDataTypes.NULL &&
+            argPt.dataType !== FormulaDataTypes.UNKNOWN
+          ) {
+            if (argPt.type === JSEPNode.IDENTIFIER) {
+              const name =
+                columns?.find(
+                  (c) => c.id === argPt.name || c.title === argPt.name
+                )?.title || argPt.name;
+
+              throw new FormulaError(
+                FormulaErrorType.INVALID_ARG,
+                {
+                  key: 'msg.formula.columnWithTypeFoundButExpected',
+                  columnName: name,
+                  columnType: argPt.dataType,
+                  expectedType: expectedArgType,
+                },
+                `Field ${name} with ${argPt.dataType} type is found but ${expectedArgType} type is expected`
+              );
+            } else {
+              let key = '',
+                message = 'Invalid argument type';
+
+              if (expectedArgType === FormulaDataTypes.NUMERIC) {
+                key = 'msg.formula.numericTypeIsExpected';
+                message = 'Numeric type is expected';
+              } else if (expectedArgType === FormulaDataTypes.STRING) {
+                key = 'msg.formula.stringTypeIsExpected';
+                message = 'String type is expected';
+              } else if (expectedArgType === FormulaDataTypes.BOOLEAN) {
+                key = 'msg.formula.booleanTypeIsExpected';
+                message = 'Boolean type is expected';
+              } else if (expectedArgType === FormulaDataTypes.DATE) {
+                key = 'msg.formula.dateTypeIsExpected';
+                message = 'Date type is expected';
+              }
+
+              throw new FormulaError(
+                FormulaErrorType.INVALID_ARG,
+                {
+                  key,
+                  calleeName,
+                },
+                message
+              );
+            }
+          }
+        }
+      }
+
+      if (typeof formulas[calleeName].returnType === 'function') {
+        res.dataType = (formulas[calleeName].returnType as any)?.(
+          argTypes
+        ) as FormulaDataTypes;
+      } else if (formulas[calleeName].returnType) {
+        res.dataType = formulas[calleeName].returnType as FormulaDataTypes;
+      }
+    } else if (parsedTree.type === JSEPNode.IDENTIFIER) {
+      const col = (colIdToColMap[parsedTree.name] ||
+        colAliasToColMap[parsedTree.name]) as Record<string, any>;
+
+      if (!col) {
+        throw new FormulaError(
+          FormulaErrorType.INVALID_COLUMN,
+          {
+            key: 'msg.formula.columnNotAvailable',
+            columnName: parsedTree.name,
+          },
+          `Invalid column name/id ${JSON.stringify(parsedTree.name)} in formula`
+        );
+      }
+
+      res.name = col.id;
+
+      if (col?.uidt === UITypes.Formula) {
+        if (column) {
+          // check for circular reference when column is present(only available when calling root formula)
+          checkForCircularFormulaRef(column, parsedTree, columns);
+        }
+        const formulaRes =
+          col.colOptions?.parsed_tree ||
+          (await validateFormulaAndExtractTreeWithType(
+            // formula may include double curly brackets in previous version
+            // convert to single curly bracket here for compatibility
+            {
+              formula: col.colOptions.formula
+                .replaceAll('{{', '{')
+                .replaceAll('}}', '}'),
+              columns,
+              clientOrSqlUi,
+              getMeta,
+            }
+          ));
+
+        res.dataType = (formulaRes as any)?.dataType;
+      } else {
+        // extract type and add to res
+        Object.assign(
+          res,
+          await extractColumnIdentifierType({
+            col,
+            columns,
+            getMeta,
+            clientOrSqlUi,
+          })
+        );
+      }
+    } else if (parsedTree.type === JSEPNode.LITERAL) {
+      if (typeof parsedTree.value === 'number') {
+        res.dataType = FormulaDataTypes.NUMERIC;
+      } else if (typeof parsedTree.value === 'string') {
+        res.dataType = FormulaDataTypes.STRING;
+      } else if (typeof parsedTree.value === 'boolean') {
+        res.dataType = FormulaDataTypes.BOOLEAN;
+      } else {
+        res.dataType = FormulaDataTypes.STRING;
+      }
+    } else if (parsedTree.type === JSEPNode.UNARY_EXP) {
+      // only support -ve values
+      if (
+        ['-'].includes(parsedTree.operator) &&
+        parsedTree.argument.type === JSEPNode.LITERAL &&
+        typeof parsedTree.argument.value === 'number'
+      ) {
+        res.dataType = FormulaDataTypes.NUMERIC;
+      } else {
+        throw new FormulaError(
+          FormulaErrorType.NOT_SUPPORTED,
+          {},
+          `Unary expression '${parsedTree.operator}' is not supported`
+        );
+      }
+    } else if (parsedTree.type === JSEPNode.BINARY_EXP) {
+      res.left = await validateAndExtract(parsedTree.left);
+      res.right = await validateAndExtract(parsedTree.right);
+
+      if (['==', '<', '>', '<=', '>=', '!='].includes(parsedTree.operator)) {
+        res.dataType = FormulaDataTypes.COND_EXP;
+      } else if (parsedTree.operator === '+') {
+        res.dataType = FormulaDataTypes.NUMERIC;
+        // if any side is string/date/other type, then the result will be concatenated string
+        // e.g. 1 + '2' = '12'
+        if (
+          [res.left, res.right].some(
+            (r) =>
+              ![
+                FormulaDataTypes.NUMERIC,
+                FormulaDataTypes.BOOLEAN,
+                FormulaDataTypes.NULL,
+                FormulaDataTypes.UNKNOWN,
+              ].includes(r.dataType)
+          )
+        ) {
+          res.dataType = FormulaDataTypes.STRING;
+        }
+      } else {
+        res.dataType = FormulaDataTypes.NUMERIC;
+      }
+    }
+
+    return res;
+  };
+
+  // register jsep curly hook
+  jsep.plugins.register(jsepCurlyHook);
+  const parsedFormula = jsep(formula);
+  const result = await validateAndExtract(parsedFormula);
+  return result;
+}
+
+function checkForCircularFormulaRef(formulaCol, parsedTree, columns) {
+  // check circular reference
+  // e.g. formula1 -> formula2 -> formula1 should return circular reference error
+
+  // get all formula columns excluding itself
+  const formulaPaths = columns
+    .filter((c) => c.id !== formulaCol?.id && c.uidt === UITypes.Formula)
+    .reduce((res: Record<string, any>[], c: Record<string, any>) => {
+      // in `formula`, get all the (unique) target neighbours
+      // i.e. all column id (e.g. cxxxxxxxxxxxxxx) with formula type
+      const neighbours = [
+        ...new Set(
+          (c.colOptions.formula.match(/c_?\w{14,15}/g) || []).filter(
+            (colId: string) =>
+              columns.filter(
+                (col: ColumnType) =>
+                  col.id === colId && col.uidt === UITypes.Formula
+              ).length
+          )
+        ),
+      ];
+      if (neighbours.length > 0) {
+        // e.g. formula column 1 -> [formula column 2, formula column3]
+        res.push({ [c.id]: neighbours });
+      }
+      return res;
+    }, []);
+
+  // include target formula column (i.e. the one to be saved if applicable)
+  const targetFormulaCol = columns.find(
+    (c: ColumnType) => c.title === parsedTree.name && c.uidt === UITypes.Formula
+  );
+
+  if (targetFormulaCol && formulaCol?.id) {
+    formulaPaths.push({
+      [formulaCol?.id as string]: [targetFormulaCol.id],
+    });
+  }
+  const vertices = formulaPaths.length;
+  if (vertices > 0) {
+    // perform kahn's algo for cycle detection
+    const adj = new Map();
+    const inDegrees = new Map();
+    // init adjacency list & indegree
+
+    for (const [_, v] of Object.entries(formulaPaths)) {
+      const src = Object.keys(v)[0];
+      const neighbours = v[src];
+      inDegrees.set(src, inDegrees.get(src) || 0);
+      for (const neighbour of neighbours) {
+        adj.set(src, (adj.get(src) || new Set()).add(neighbour));
+        inDegrees.set(neighbour, (inDegrees.get(neighbour) || 0) + 1);
+      }
+    }
+    const queue: string[] = [];
+    // put all vertices with in-degree = 0 (i.e. no incoming edges) to queue
+    inDegrees.forEach((inDegree, col) => {
+      if (inDegree === 0) {
+        // in-degree = 0 means we start traversing from this node
+        queue.push(col);
+      }
+    });
+    // init count of visited vertices
+    let visited = 0;
+    // BFS
+    while (queue.length !== 0) {
+      // remove a vertex from the queue
+      const src = queue.shift();
+      // if this node has neighbours, increase visited by 1
+      const neighbours = adj.get(src) || new Set();
+      if (neighbours.size > 0) {
+        visited += 1;
+      }
+      // iterate each neighbouring nodes
+      neighbours.forEach((neighbour: string) => {
+        // decrease in-degree of its neighbours by 1
+        inDegrees.set(neighbour, inDegrees.get(neighbour) - 1);
+        // if in-degree becomes 0
+        if (inDegrees.get(neighbour) === 0) {
+          // then put the neighboring node to the queue
+          queue.push(neighbour);
+        }
+      });
+    }
+    // vertices not same as visited = cycle found
+    if (vertices !== visited) {
+      throw new FormulaError(
+        FormulaErrorType.CIRCULAR_REFERENCE,
+        {
+          key: 'msg.formula.cantSaveCircularReference',
+        },
+        'Circular reference detected'
+      );
+    }
+  }
+}
diff --git a/packages/nocodb-sdk/src/lib/helperFunctions.ts b/packages/nocodb-sdk/src/lib/helperFunctions.ts
index 3d05053702..ff2086adb4 100644
--- a/packages/nocodb-sdk/src/lib/helperFunctions.ts
+++ b/packages/nocodb-sdk/src/lib/helperFunctions.ts
@@ -1,4 +1,4 @@
-import UITypes from './UITypes';
+import UITypes, { isNumericCol } from './UITypes';
 import { RolesObj, RolesType } from './globals';
 
 // import {RelationTypes} from "./globals";
@@ -45,6 +45,45 @@ const stringifyRolesObj = (roles?: RolesObj | null): string => {
   return rolesArr.join(',');
 };
 
+const getAvailableRollupForUiType = (type: string) => {
+  if (isNumericCol(type as UITypes)) {
+    return [
+      'sum',
+      'count',
+      'min',
+      'max',
+      'avg',
+      'countDistinct',
+      'sumDistinct',
+      'avgDistinct',
+    ];
+  } else if ([UITypes.Date, UITypes.DateTime].includes(type as UITypes)) {
+    return ['count', 'min', 'max', 'countDistinct'];
+  } else if (
+    [
+      UITypes.SingleLineText,
+      UITypes.LongText,
+      UITypes.User,
+      UITypes.Email,
+      UITypes.PhoneNumber,
+      UITypes.URL,
+    ].includes(type as UITypes)
+  ) {
+    return ['count'];
+  } else {
+    return [
+      'sum',
+      'count',
+      'min',
+      'max',
+      'avg',
+      'countDistinct',
+      'sumDistinct',
+      'avgDistinct',
+    ];
+  }
+};
+
 export {
   filterOutSystemColumns,
   getSystemColumnsIds,
@@ -52,4 +91,5 @@ export {
   isSystemColumn,
   extractRolesObj,
   stringifyRolesObj,
+  getAvailableRollupForUiType,
 };
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
index 630805770c..2600945349 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
@@ -919,6 +919,7 @@ export class MssqlUi {
       'COUNT',
       'ROUNDDOWN',
       'ROUNDUP',
+      'DATESTR',
     ];
   }
 }
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts
index b6c5ca0199..1fcf85e641 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts
@@ -1289,6 +1289,6 @@ export class MysqlUi {
   }
 
   static getUnsupportedFnList() {
-    return ['COUNTA', 'COUNT'];
+    return ['COUNTA', 'COUNT', 'DATESTR'];
   }
 }
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts
index fb4ee5ac1a..b32bc730f9 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts
@@ -948,6 +948,7 @@ export class OracleUi {
       'COUNT',
       'ROUNDDOWN',
       'ROUNDUP',
+      'DATESTR',
     ];
   }
 }
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
index 676a912274..6a5998d298 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
@@ -980,6 +980,7 @@ export class SnowflakeUi {
       'VALUE',
       'COUNTA',
       'COUNT',
+      'DATESTR',
     ];
   }
 }
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts
index bb616eee5d..d5f08d6093 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts
@@ -882,7 +882,10 @@ export class SqliteUi {
       'COUNT',
       'ROUNDDOWN',
       'ROUNDUP',
-
+      'DATESTR',
+      'DAY',
+      'MONTH',
+      'HOUR',
     ];
   }
 }
diff --git a/packages/nocodb-sdk/tsconfig.json b/packages/nocodb-sdk/tsconfig.json
index 8af501e5e0..86fdaa2404 100644
--- a/packages/nocodb-sdk/tsconfig.json
+++ b/packages/nocodb-sdk/tsconfig.json
@@ -38,7 +38,7 @@
     // "emitDecoratorMetadata": true /* Enables experimental support for emitting type metadata for decorators. */,
 
     "lib": ["es2017","dom"],
-    "types": [],
+    "types": ["jest"],
     "typeRoots": ["node_modules/@types", "src/types"],
     "baseUrl": "./src",
     "paths": {
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index a87b9b03a4..5172aaf59a 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -76,7 +76,7 @@
     "auto-bind": "^4.0.0",
     "aws-kcl": "^2.2.2",
     "aws-sdk": "^2.1455.0",
-    "axios": "^1.6.2",
+    "axios": "^1.6.3",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.20.2",
     "boxen": "^5.1.2",
@@ -137,7 +137,7 @@
     "ncp": "^2.0.0",
     "nestjs-kafka": "^1.0.6",
     "nestjs-throttler-storage-redis": "^0.3.3",
-    "nocodb-sdk": "0.202.10",
+    "nocodb-sdk": "workspace:^",
     "nodemailer": "^6.4.10",
     "object-hash": "^3.0.0",
     "object-sizeof": "^2.6.3",
@@ -229,4 +229,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/nocodb/src/cache/CacheMgr.ts b/packages/nocodb/src/cache/CacheMgr.ts
index 21f8300b2d..81e0654bfa 100644
--- a/packages/nocodb/src/cache/CacheMgr.ts
+++ b/packages/nocodb/src/cache/CacheMgr.ts
@@ -21,6 +21,7 @@ export default abstract class CacheMgr {
     scope: string,
     subListKeys: string[],
     list: any[],
+    props?: string[],
   ): Promise<boolean>;
   public abstract deepDel(
     scope: string,
diff --git a/packages/nocodb/src/cache/NocoCache.ts b/packages/nocodb/src/cache/NocoCache.ts
index 9dda63a4c1..bd24c9fc6c 100644
--- a/packages/nocodb/src/cache/NocoCache.ts
+++ b/packages/nocodb/src/cache/NocoCache.ts
@@ -86,9 +86,10 @@ export default class NocoCache {
     scope: string,
     subListKeys: string[],
     list: any[],
+    props: string[] = [],
   ): Promise<boolean> {
     if (this.cacheDisabled) return Promise.resolve(true);
-    return this.client.setList(scope, subListKeys, list);
+    return this.client.setList(scope, subListKeys, list, props);
   }
 
   public static async deepDel(
diff --git a/packages/nocodb/src/cache/RedisCacheMgr.ts b/packages/nocodb/src/cache/RedisCacheMgr.ts
index dc03ed9a9c..c7d4f89357 100644
--- a/packages/nocodb/src/cache/RedisCacheMgr.ts
+++ b/packages/nocodb/src/cache/RedisCacheMgr.ts
@@ -185,6 +185,7 @@ export default class RedisCacheMgr extends CacheMgr {
     scope: string,
     subListKeys: string[],
     list: any[],
+    props: string[] = [],
   ): Promise<boolean> {
     // remove null from arrays
     subListKeys = subListKeys.filter((k) => k);
@@ -203,11 +204,18 @@ export default class RedisCacheMgr extends CacheMgr {
       (await this.get(listKey, CacheGetType.TYPE_ARRAY)) || [];
     for (const o of list) {
       // construct key for Get
-      // e.g. nc:<orgs>:<scope>:<model_id_1>
       let getKey = `${this.prefix}:${scope}:${o.id}`;
-      // special case - MODEL_ROLE_VISIBILITY
-      if (scope === CacheScope.MODEL_ROLE_VISIBILITY) {
-        getKey = `${this.prefix}:${scope}:${o.fk_view_id}:${o.role}`;
+      if (props.length) {
+        const propValues = props.map((p) => o[p]);
+        // e.g. nc:<orgs>:<scope>:<prop_value_1>:<prop_value_2>
+        getKey = `${this.prefix}:${scope}:${propValues.join(':')}`;
+      } else {
+        // e.g. nc:<orgs>:<scope>:<model_id_1>
+        getKey = `${this.prefix}:${scope}:${o.id}`;
+        // special case - MODEL_ROLE_VISIBILITY
+        if (scope === CacheScope.MODEL_ROLE_VISIBILITY) {
+          getKey = `${this.prefix}:${scope}:${o.fk_view_id}:${o.role}`;
+        }
       }
       // set Get Key
       log(`RedisCacheMgr::setList: setting key ${getKey}`);
@@ -276,8 +284,13 @@ export default class RedisCacheMgr extends CacheMgr {
         ? `${this.prefix}:${scope}:list`
         : `${this.prefix}:${scope}:${subListKeys.join(':')}:list`;
     log(`RedisCacheMgr::appendToList: append key ${key} to ${listKey}`);
-    let list = (await this.get(listKey, CacheGetType.TYPE_ARRAY)) || [];
-    if (list.length && list.includes('NONE')) {
+    let list = await this.get(listKey, CacheGetType.TYPE_ARRAY);
+
+    if (!list || !list.length) {
+      return false;
+    }
+
+    if (list.includes('NONE')) {
       list = [];
       await this.del(listKey);
     }
diff --git a/packages/nocodb/src/cache/RedisMockCacheMgr.ts b/packages/nocodb/src/cache/RedisMockCacheMgr.ts
index 1e28b36627..7295d83aa5 100644
--- a/packages/nocodb/src/cache/RedisMockCacheMgr.ts
+++ b/packages/nocodb/src/cache/RedisMockCacheMgr.ts
@@ -185,6 +185,7 @@ export default class RedisMockCacheMgr extends CacheMgr {
     scope: string,
     subListKeys: string[],
     list: any[],
+    props: string[] = [],
   ): Promise<boolean> {
     // remove null from arrays
     subListKeys = subListKeys.filter((k) => k);
@@ -203,11 +204,18 @@ export default class RedisMockCacheMgr extends CacheMgr {
       (await this.get(listKey, CacheGetType.TYPE_ARRAY)) || [];
     for (const o of list) {
       // construct key for Get
-      // e.g. nc:<orgs>:<scope>:<model_id_1>
       let getKey = `${this.prefix}:${scope}:${o.id}`;
-      // special case - MODEL_ROLE_VISIBILITY
-      if (scope === CacheScope.MODEL_ROLE_VISIBILITY) {
-        getKey = `${this.prefix}:${scope}:${o.fk_view_id}:${o.role}`;
+      if (props.length) {
+        const propValues = props.map((p) => o[p]);
+        // e.g. nc:<orgs>:<scope>:<prop_value_1>:<prop_value_2>
+        getKey = `${this.prefix}:${scope}:${propValues.join(':')}`;
+      } else {
+        // e.g. nc:<orgs>:<scope>:<model_id_1>
+        getKey = `${this.prefix}:${scope}:${o.id}`;
+        // special case - MODEL_ROLE_VISIBILITY
+        if (scope === CacheScope.MODEL_ROLE_VISIBILITY) {
+          getKey = `${this.prefix}:${scope}:${o.fk_view_id}:${o.role}`;
+        }
       }
       // set Get Key
       log(`RedisMockCacheMgr::setList: setting key ${getKey}`);
@@ -276,8 +284,13 @@ export default class RedisMockCacheMgr extends CacheMgr {
         ? `${this.prefix}:${scope}:list`
         : `${this.prefix}:${scope}:${subListKeys.join(':')}:list`;
     log(`RedisMockCacheMgr::appendToList: append key ${key} to ${listKey}`);
-    let list = (await this.get(listKey, CacheGetType.TYPE_ARRAY)) || [];
-    if (list.length && list[0] === 'NONE') {
+    let list = await this.get(listKey, CacheGetType.TYPE_ARRAY);
+
+    if (!list || !list.length) {
+      return false;
+    }
+
+    if (list[0] === 'NONE') {
       list = [];
       await this.del(listKey);
     }
diff --git a/packages/nocodb/src/controllers/base-users.controller.ts b/packages/nocodb/src/controllers/base-users.controller.ts
index 4fdb903970..05197e702f 100644
--- a/packages/nocodb/src/controllers/base-users.controller.ts
+++ b/packages/nocodb/src/controllers/base-users.controller.ts
@@ -11,7 +11,7 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { Request } from 'express';
-import { ProjectUserReqType } from 'nocodb-sdk';
+import { ProjectRoles, ProjectUserReqType } from 'nocodb-sdk';
 import { GlobalGuard } from '~/guards/global/global.guard';
 import { BaseUsersService } from '~/services/base-users/base-users.service';
 import { NcError } from '~/helpers/catchError';
@@ -27,12 +27,19 @@ export class BaseUsersController {
     '/api/v1/db/meta/projects/:baseId/users',
     '/api/v2/meta/bases/:baseId/users',
   ])
-  @Acl('userList')
+  @Acl('baseUserList')
   async userList(@Param('baseId') baseId: string, @Req() req: Request) {
+    const baseRoles = Object.keys(req.user?.base_roles ?? {});
+    const mode =
+      baseRoles.includes(ProjectRoles.OWNER) ||
+      baseRoles.includes(ProjectRoles.CREATOR)
+        ? 'full'
+        : 'viewer';
+
     return {
       users: await this.baseUsersService.userList({
         baseId,
-        query: req.query,
+        mode,
       }),
     };
   }
diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index 5255844ad7..793b5fe85d 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -33,6 +33,7 @@ import type {
   QrCodeColumn,
   RollupColumn,
   SelectOption,
+  User,
 } from '~/models';
 import type { SortType } from 'nocodb-sdk';
 import formulaQueryBuilderv2 from '~/db/formulav2/formulaQueryBuilderv2';
@@ -45,6 +46,7 @@ import { NcError } from '~/helpers/catchError';
 import getAst from '~/helpers/getAst';
 import {
   Audit,
+  BaseUser,
   Column,
   Filter,
   Model,
@@ -706,11 +708,34 @@ class BaseModelSqlv2 {
         continue;
       }
 
-      qb.orderBy(
-        groupByColumns[sort.fk_column_id].id,
-        sort.direction,
-        sort.direction === 'desc' ? 'LAST' : 'FIRST',
-      );
+      const column = groupByColumns[sort.fk_column_id];
+
+      if (column.uidt === UITypes.User) {
+        const baseUsers = await BaseUser.getUsersList({
+          base_id: column.base_id,
+        });
+
+        // create nested replace statement for each user
+        const finalStatement = baseUsers.reduce((acc, user) => {
+          const qb = this.dbDriver.raw(`REPLACE(${acc}, ?, ?)`, [
+            user.id,
+            user.display_name || user.email,
+          ]);
+          return qb.toQuery();
+        }, this.dbDriver.raw(`??`, [column.column_name]).toQuery());
+
+        qb.orderBy(
+          sanitize(this.dbDriver.raw(finalStatement)),
+          sort.direction,
+          sort.direction === 'desc' ? 'LAST' : 'FIRST',
+        );
+      } else {
+        qb.orderBy(
+          column.id,
+          sort.direction,
+          sort.direction === 'desc' ? 'LAST' : 'FIRST',
+        );
+      }
     }
 
     // group by using the column aliases
@@ -2304,7 +2329,7 @@ class BaseModelSqlv2 {
         await this.beforeInsert(insertObj, trx, cookie);
       }
 
-      await this.prepareAttachmentData(insertObj);
+      await this.prepareNocoData(insertObj);
 
       let response;
       // const driver = trx ? trx : this.dbDriver;
@@ -2547,7 +2572,7 @@ class BaseModelSqlv2 {
 
       await this.beforeUpdate(data, trx, cookie);
 
-      await this.prepareAttachmentData(updateObj);
+      await this.prepareNocoData(updateObj);
 
       const prevData = await this.readByPk(
         id,
@@ -3015,7 +3040,7 @@ class BaseModelSqlv2 {
             }
           }
 
-          await this.prepareAttachmentData(insertObj);
+          await this.prepareNocoData(insertObj);
 
           // prepare nested link data for insert only if it is single record insertion
           if (isSingleRecordInsertion) {
@@ -3153,7 +3178,7 @@ class BaseModelSqlv2 {
           continue;
         }
         if (!raw) {
-          await this.prepareAttachmentData(d);
+          await this.prepareNocoData(d);
 
           const oldRecord = await this.readByPk(pkValues);
           if (!oldRecord) {
@@ -3821,9 +3846,6 @@ class BaseModelSqlv2 {
       return;
     }
 
-    const options = await column
-      .getColOptions<{ options: SelectOption[] }>()
-      .then(({ options }) => options.map((opt) => opt.title));
     const columnTitle = column.title;
     const columnName = column.column_name;
     const columnValue =
@@ -3832,6 +3854,13 @@ class BaseModelSqlv2 {
       return;
     }
 
+    const options = await column
+      .getColOptions<{ options: SelectOption[] }>()
+      .then(
+        (selectOptionsMeta) =>
+          selectOptionsMeta?.options?.map((opt) => opt.title) || [],
+      );
+
     // if multi select, then split the values
     const columnValueArr =
       column.uidt === UITypes.MultiSelect
@@ -4376,12 +4405,14 @@ class BaseModelSqlv2 {
       skipDateConversion?: boolean;
       skipAttachmentConversion?: boolean;
       skipSubstitutingColumnIds?: boolean;
+      skipUserConversion?: boolean;
       raw?: boolean; // alias for skipDateConversion and skipAttachmentConversion
       first?: boolean;
     } = {
       skipDateConversion: false,
       skipAttachmentConversion: false,
       skipSubstitutingColumnIds: false,
+      skipUserConversion: false,
       raw: false,
       first: false,
     },
@@ -4390,6 +4421,7 @@ class BaseModelSqlv2 {
       options.skipDateConversion = true;
       options.skipAttachmentConversion = true;
       options.skipSubstitutingColumnIds = true;
+      options.skipUserConversion = true;
     }
 
     if (options.first && typeof qb !== 'string') {
@@ -4422,6 +4454,11 @@ class BaseModelSqlv2 {
       data = this.convertDateFormat(data, childTable);
     }
 
+    // update user fields
+    if (!options.skipUserConversion) {
+      data = await this.convertUserFormat(data, childTable);
+    }
+
     if (!options.skipSubstitutingColumnIds) {
       data = await this.substituteColumnIdsWithColumnTitles(data, childTable);
     }
@@ -4515,6 +4552,84 @@ class BaseModelSqlv2 {
     return data;
   }
 
+  protected async convertUserFormat(
+    data: Record<string, any>,
+    childTable?: Model,
+  ) {
+    // user is stored as id within the database
+    // convertUserFormat is used to convert the response in id to user object in API response
+    if (data) {
+      if (childTable && !childTable?.columns) {
+        await childTable.getColumns();
+      } else if (!this.model?.columns) {
+        await this.model.getColumns();
+      }
+
+      const userColumns = [];
+
+      const columns = childTable ? childTable.columns : this.model.columns;
+
+      for (const col of columns) {
+        if (col.uidt === UITypes.Lookup) {
+          if ((await this.getNestedUidt(col)) === UITypes.User) {
+            userColumns.push(col);
+          }
+        } else {
+          if (col.uidt === UITypes.User) {
+            userColumns.push(col);
+          }
+        }
+      }
+
+      if (userColumns.length) {
+        const baseUsers = await BaseUser.getUsersList({
+          base_id: childTable ? childTable.base_id : this.model.base_id,
+        });
+
+        if (Array.isArray(data)) {
+          data = await Promise.all(
+            data.map((d) => this._convertUserFormat(userColumns, baseUsers, d)),
+          );
+        } else {
+          data = await this._convertUserFormat(userColumns, baseUsers, data);
+        }
+      }
+    }
+    return data;
+  }
+
+  protected _convertUserFormat(
+    userColumns: Record<string, any>[],
+    baseUsers: Partial<User>[],
+    d: Record<string, any>,
+  ) {
+    try {
+      if (d) {
+        for (const col of userColumns) {
+          if (d[col.id] && d[col.id].length) {
+            d[col.id] = d[col.id].split(',');
+          } else {
+            d[col.id] = null;
+          }
+
+          if (d[col.id]?.length) {
+            d[col.id] = d[col.id].map((fid) => {
+              const { id, email, display_name } = baseUsers.find(
+                (u) => u.id === fid,
+              );
+              return {
+                id,
+                email,
+                display_name: display_name?.length ? display_name : null,
+              };
+            });
+          }
+        }
+      }
+    } catch {}
+    return d;
+  }
+
   protected async _convertAttachmentType(
     attachmentColumns: Record<string, any>[],
     d: Record<string, any>,
@@ -5136,7 +5251,14 @@ class BaseModelSqlv2 {
             if (childRows.length !== childIds.length) {
               const missingIds = childIds.filter(
                 (id) =>
-                  !childRows.find((r) => r[parentColumn.column_name] === id),
+                  !childRows.find(
+                    (r) =>
+                      r[parentColumn.column_name] ===
+                      (typeof id === 'object'
+                        ? id[parentTable.primaryKey.title] ||
+                          id[parentTable.primaryKey.column_name]
+                        : id),
+                  ),
               );
 
               NcError.unprocessableEntity(
@@ -5175,9 +5297,28 @@ class BaseModelSqlv2 {
         {
           // validate Ids
           {
-            const childRowsQb = this.dbDriver(childTn)
-              .select(childTable.primaryKey.column_name)
-              .whereIn(childTable.primaryKey.column_name, childIds);
+            const childRowsQb = this.dbDriver(childTn).select(
+              childTable.primaryKey.column_name,
+            );
+
+            if (parentTable.primaryKeys.length > 1) {
+              childRowsQb.where((qb) => {
+                for (const childId of childIds) {
+                  qb.orWhere(_wherePk(parentTable.primaryKeys, childId));
+                }
+              });
+            } else if (typeof childIds[0] === 'object') {
+              childRowsQb.whereIn(
+                parentTable.primaryKey.column_name,
+                childIds.map(
+                  (c) =>
+                    c[parentTable.primaryKey.title] ||
+                    c[parentTable.primaryKey.column_name],
+                ),
+              );
+            } else {
+              childRowsQb.whereIn(parentTable.primaryKey.column_name, childIds);
+            }
 
             const childRows = await this.execAndParse(childRowsQb, null, {
               raw: true,
@@ -5186,7 +5327,14 @@ class BaseModelSqlv2 {
             if (childRows.length !== childIds.length) {
               const missingIds = childIds.filter(
                 (id) =>
-                  !childRows.find((r) => r[parentColumn.column_name] === id),
+                  !childRows.find(
+                    (r) =>
+                      r[parentColumn.column_name] ===
+                      (typeof id === 'object'
+                        ? id[parentTable.primaryKey.title] ||
+                          id[parentTable.primaryKey.column_name]
+                        : id),
+                  ),
               );
 
               NcError.unprocessableEntity(
@@ -5353,8 +5501,12 @@ class BaseModelSqlv2 {
     }
   }
 
-  prepareAttachmentData(data) {
-    if (this.model.columns.some((c) => c.uidt === UITypes.Attachment)) {
+  async prepareNocoData(data) {
+    if (
+      this.model.columns.some((c) =>
+        [UITypes.Attachment, UITypes.User].includes(c.uidt),
+      )
+    ) {
       for (const column of this.model.columns) {
         if (column.uidt === UITypes.Attachment) {
           if (data[column.column_name]) {
@@ -5371,6 +5523,113 @@ class BaseModelSqlv2 {
               }
             }
           }
+        } else if (column.uidt === UITypes.User) {
+          if (data[column.column_name]) {
+            const userIds = [];
+
+            if (typeof data[column.column_name] === 'string') {
+              try {
+                data[column.column_name] = JSON.parse(data[column.column_name]);
+              } catch (e) {}
+            }
+
+            const baseUsers = await BaseUser.getUsersList({
+              base_id: this.model.base_id,
+              include_ws_deleted: false,
+            });
+
+            if (typeof data[column.column_name] === 'string') {
+              const users = data[column.column_name]
+                .split(',')
+                .map((u) => u.trim());
+              for (const user of users) {
+                try {
+                  if (user.length === 0) continue;
+                  if (user.includes('@')) {
+                    const u = baseUsers.find((u) => u.email === user);
+                    if (!u) {
+                      NcError.unprocessableEntity(
+                        `User with email '${user}' is not part of this workspace`,
+                      );
+                    }
+                    userIds.push(u.id);
+                  } else {
+                    const u = baseUsers.find((u) => u.id === user);
+                    if (!u) {
+                      NcError.unprocessableEntity(
+                        `User with id '${user}' is not part of this workspace`,
+                      );
+                    }
+                    userIds.push(u.id);
+                  }
+                } catch (e) {
+                  NcError.unprocessableEntity(e.message);
+                }
+              }
+            } else {
+              const users: { id?: string; email?: string }[] = Array.isArray(
+                data[column.column_name],
+              )
+                ? data[column.column_name]
+                : [data[column.column_name]];
+              for (const userObj of users) {
+                const user = extractProps(userObj, ['id', 'email']);
+                try {
+                  if ('id' in user) {
+                    const u = baseUsers.find((u) => u.id === user.id);
+                    if (!u) {
+                      NcError.unprocessableEntity(
+                        `User with id '${user.id}' is not part of this workspace`,
+                      );
+                    }
+                    userIds.push(u.id);
+                  } else if ('email' in user) {
+                    // skip null input
+                    if (!user.email) continue;
+                    // trim extra spaces
+                    user.email = user.email.trim();
+                    // skip empty input
+                    if (user.email.length === 0) continue;
+                    const u = baseUsers.find((u) => u.email === user.email);
+                    if (!u) {
+                      NcError.unprocessableEntity(
+                        `User with email '${user.email}' is not part of this workspace`,
+                      );
+                    }
+                    userIds.push(u.id);
+                  } else {
+                    NcError.unprocessableEntity('Invalid user object');
+                  }
+                } catch (e) {
+                  NcError.unprocessableEntity(e.message);
+                }
+              }
+            }
+
+            if (userIds.length === 0) {
+              data[column.column_name] = null;
+            } else {
+              const userSet = new Set(userIds);
+
+              if (userSet.size !== userIds.length) {
+                NcError.unprocessableEntity(
+                  'Duplicate users not allowed for user field',
+                );
+              }
+
+              if (column.meta?.is_multi) {
+                data[column.column_name] = userIds.join(',');
+              } else {
+                if (userIds.length > 1) {
+                  NcError.unprocessableEntity(
+                    `Multiple users not allowed for '${column.title}'`,
+                  );
+                } else {
+                  data[column.column_name] = userIds[0];
+                }
+              }
+            }
+          }
         }
       }
     }
@@ -5654,7 +5913,7 @@ function getCompositePk(primaryKeys: Column[], row) {
   return primaryKeys.map((c) => row[c.title]).join('___');
 }
 
-function haveFormulaColumn(columns: Column[]) {
+export function haveFormulaColumn(columns: Column[]) {
   return columns.some((c) => c.uidt === UITypes.Formula);
 }
 
diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts
index a7889e8beb..f31a313b1a 100644
--- a/packages/nocodb/src/db/conditionV2.ts
+++ b/packages/nocodb/src/db/conditionV2.ts
@@ -13,7 +13,7 @@ import type Column from '~/models/Column';
 import type LookupColumn from '~/models/LookupColumn';
 import type RollupColumn from '~/models/RollupColumn';
 import type FormulaColumn from '~/models/FormulaColumn';
-import type { BarcodeColumn, QrCodeColumn } from '~/models';
+import { type BarcodeColumn, BaseUser, type QrCodeColumn } from '~/models';
 import { NcError } from '~/helpers/catchError';
 import formulaQueryBuilderv2 from '~/db/formulav2/formulaQueryBuilderv2';
 import genRollupSelectv2 from '~/db/genRollupSelectv2';
@@ -447,6 +447,86 @@ const parseConditionV2 = async (
         alias,
         builder,
       );
+    } else if (
+      column.uidt === UITypes.User &&
+      ['like', 'nlike'].includes(filter.comparison_op)
+    ) {
+      const baseUsers = await BaseUser.getUsersList({
+        base_id: column.base_id,
+      });
+      return (qb: Knex.QueryBuilder) => {
+        const users = baseUsers.filter((user) => {
+          const filterVal = filter.value.toLowerCase();
+
+          if (filterVal.startsWith('%') && filterVal.endsWith('%')) {
+            return (user.display_name || user.email)
+              .toLowerCase()
+              .includes(filterVal.substring(1, filterVal.length - 1));
+          } else if (filterVal.startsWith('%')) {
+            return (user.display_name || user.email)
+              .toLowerCase()
+              .endsWith(filterVal.substring(1));
+          } else if (filterVal.endsWith('%')) {
+            return (user.display_name || user.email)
+              .toLowerCase()
+              .startsWith(filterVal.substring(0, filterVal.length - 1));
+          }
+
+          return (user.display_name || user.email)
+            .toLowerCase()
+            .includes(filterVal.toLowerCase());
+        });
+
+        // create nested replace statement for each user
+        const finalStatement = users.reduce((acc, user) => {
+          const qb = knex.raw(`REPLACE(${acc}, ?, ?)`, [
+            user.id,
+            user.display_name || user.email,
+          ]);
+          return qb.toQuery();
+        }, knex.raw(`??`, [column.column_name]).toQuery());
+
+        let val = filter.value;
+        if (filter.comparison_op === 'like') {
+          val =
+            (val + '').startsWith('%') || (val + '').endsWith('%')
+              ? val
+              : `%${val}%`;
+          if (qb?.client?.config?.client === 'pg') {
+            qb = qb.where(knex.raw(`(${finalStatement}) ilike ?`, [val]));
+          } else {
+            qb = qb.where(knex.raw(`(${finalStatement}) like ?`, [val]));
+          }
+        } else {
+          if (!val) {
+            // val is empty -> all values including NULL but empty strings
+            qb.whereNot(column.column_name, '');
+            qb.orWhereNull(column.column_name);
+          } else {
+            val = val.startsWith('%') || val.endsWith('%') ? val : `%${val}%`;
+
+            qb.where((nestedQb) => {
+              if (qb?.client?.config?.client === 'pg') {
+                nestedQb.whereNot(
+                  knex.raw(`(${finalStatement}) ilike ?`, [val]),
+                );
+              } else {
+                nestedQb.whereNot(
+                  knex.raw(`(${finalStatement}) like ?`, [val]),
+                );
+              }
+              if (val !== '%%') {
+                // if value is not empty, empty or null should be included
+                nestedQb.orWhere(column.column_name, '');
+                nestedQb.orWhereNull(column.column_name);
+              } else {
+                // if value is empty, then only null is included
+                nestedQb.orWhereNull(column.column_name);
+              }
+            });
+          }
+        }
+      };
     } else {
       if (
         filter.comparison_op === 'empty' ||
diff --git a/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts b/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts
index 390c733025..665f6bd6d9 100644
--- a/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts
+++ b/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts
@@ -1,23 +1,27 @@
 import jsep from 'jsep';
 import {
+  FormulaDataTypes,
   jsepCurlyHook,
   UITypes,
   validateDateWithUnknownFormat,
+  validateFormulaAndExtractTreeWithType,
 } from 'nocodb-sdk';
+import { Logger } from '@nestjs/common';
 import mapFunctionName from '../mapFunctionName';
 import genRollupSelectv2 from '../genRollupSelectv2';
-import type Column from '~/models/Column';
-import type Model from '~/models/Model';
 import type RollupColumn from '~/models/RollupColumn';
 import type LinkToAnotherRecordColumn from '~/models/LinkToAnotherRecordColumn';
 import type LookupColumn from '~/models/LookupColumn';
 import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2';
+import type Column from '~/models/Column';
+import Model from '~/models/Model';
 import NocoCache from '~/cache/NocoCache';
 import { CacheGetType, CacheScope } from '~/utils/globals';
 import { convertDateFormatForConcat } from '~/helpers/formulaFnHelper';
 import FormulaColumn from '~/models/FormulaColumn';
+import { Base, BaseUser } from '~/models';
 
-// todo: switch function based on database
+const logger = new Logger('FormulaQueryBuilderv2');
 
 // @ts-ignore
 const getAggregateFn: (fnName: string) => (args: { qb; knex?; cn }) => any = (
@@ -59,17 +63,56 @@ async function _formulaQueryBuilder(
   model: Model,
   aliasToColumn: Record<string, () => Promise<{ builder: any }>> = {},
   tableAlias?: string,
+  parsedTree?: any,
+  column: Column = null,
 ) {
   const knex = baseModelSqlv2.dbDriver;
 
-  // formula may include double curly brackets in previous version
-  // convert to single curly bracket here for compatibility
-  const tree = jsep(_tree.replaceAll('{{', '{').replaceAll('}}', '}'));
+  const columns = await model.getColumns();
+
+  let tree = parsedTree;
+  if (!tree) {
+    // formula may include double curly brackets in previous version
+    // convert to single curly bracket here for compatibility
+    // const _tree1 = jsep(_tree.replaceAll('{{', '{').replaceAll('}}', '}'));
+    tree = await validateFormulaAndExtractTreeWithType({
+      formula: _tree.replaceAll('{{', '{').replaceAll('}}', '}'),
+      columns,
+      column,
+      clientOrSqlUi: baseModelSqlv2.clientType as
+        | 'mysql'
+        | 'pg'
+        | 'sqlite3'
+        | 'mssql'
+        | 'mysql2'
+        | 'oracledb'
+        | 'mariadb'
+        | 'sqlite'
+        | 'snowflake',
+      getMeta: async (modelId) => {
+        const model = await Model.get(modelId);
+        await model.getColumns();
+        return model;
+      },
+    });
+
+    // populate and save parsedTree to column if not exist
+    if (column) {
+      FormulaColumn.update(column.id, { parsed_tree: tree }).then(
+        () => {
+          // ignore
+        },
+        (err) => {
+          logger.error(err);
+        },
+      );
+    }
+  }
 
   const columnIdToUidt = {};
 
   // todo: improve - implement a common solution for filter, sort, formula, etc
-  for (const col of await model.getColumns()) {
+  for (const col of columns) {
     columnIdToUidt[col.id] = col.uidt;
     if (col.id in aliasToColumn) continue;
     switch (col.uidt) {
@@ -84,6 +127,7 @@ async function _formulaQueryBuilder(
               model,
               { ...aliasToColumn, [col.id]: null },
               tableAlias,
+              formulOption.getParsedTree(),
             );
             builder.sql = '(' + builder.sql + ')';
             return {
@@ -404,6 +448,7 @@ async function _formulaQueryBuilder(
                     '',
                     lookupModel,
                     aliasToColumn,
+                    formulaOption.getParsedTree(),
                   );
                   if (isMany) {
                     const qb = selectQb;
@@ -637,6 +682,26 @@ async function _formulaQueryBuilder(
             Promise.resolve({ builder: col.column_name });
         }
         break;
+      case UITypes.User:
+        {
+          const base = await Base.get(model.base_id);
+          const baseUsers = await BaseUser.getUsersList({
+            base_id: base.id,
+          });
+
+          // create nested replace statement for each user
+          const finalStatement = baseUsers.reduce((acc, user) => {
+            const qb = knex.raw(`REPLACE(${acc}, ?, ?)`, [user.id, user.email]);
+            return qb.toQuery();
+          }, knex.raw(`??`, [col.column_name]).toQuery());
+
+          aliasToColumn[col.id] = async (): Promise<any> => {
+            return {
+              builder: knex.raw(finalStatement).wrap('(', ')'),
+            };
+          };
+        }
+        break;
       default:
         aliasToColumn[col.id] = () =>
           Promise.resolve({ builder: col.column_name });
@@ -792,8 +857,85 @@ async function _formulaQueryBuilder(
         );
       }
 
+      // if operator is + and expected return type is string, convert to concat
+      if (pt.operator === '+' && pt.dataType === FormulaDataTypes.STRING) {
+        return fn(
+          {
+            type: 'CallExpression',
+            arguments: [pt.left, pt.right],
+            callee: {
+              type: 'Identifier',
+              name: 'CONCAT',
+            },
+          },
+          alias,
+          prevBinaryOp,
+        );
+      }
+
+      // if operator is == or !=, then handle comparison with BLANK which should accept NULL and empty string
+      if (pt.operator === '==' || pt.operator === '!=') {
+        if (pt.left.callee?.name !== pt.right.callee?.name) {
+          // if left/right is BLANK, accept both NULL and empty string
+          for (const operand of ['left', 'right']) {
+            if (
+              pt[operand].type === 'CallExpression' &&
+              pt[operand].callee.name === 'BLANK'
+            ) {
+              const isString =
+                pt[operand === 'left' ? 'right' : 'left'].dataType ===
+                FormulaDataTypes.STRING;
+              let calleeName;
+
+              if (pt.operator === '==') {
+                calleeName = isString ? 'ISBLANK' : 'ISNULL';
+              } else {
+                calleeName = isString ? 'ISNOTBLANK' : 'ISNOTNULL';
+              }
+
+              return fn(
+                {
+                  type: 'CallExpression',
+                  arguments: [operand === 'left' ? pt.right : pt.left],
+                  callee: {
+                    type: 'Identifier',
+                    name: calleeName,
+                  },
+                },
+                alias,
+                prevBinaryOp,
+              );
+            }
+          }
+        }
+      }
+
       if (pt.operator === '==') {
         pt.operator = '=';
+        // if left/right is of different type, convert to string and compare
+        if (
+          pt.left.dataType !== pt.right.dataType &&
+          [pt.left.dataType, pt.right.dataType].every(
+            (type) => type !== FormulaDataTypes.NULL,
+          )
+        ) {
+          pt.left = {
+            type: 'CallExpression',
+            arguments: [pt.left],
+            callee: {
+              type: 'Identifier',
+              name: 'STRING',
+            },
+          };
+          pt.right = {
+            type: 'CallExpression',
+            arguments: [pt.right],
+            callee: {
+              type: 'Identifier',
+              name: 'STRING',
+            },
+          };
+        }
       }
 
       if (pt.operator === '/') {
@@ -922,11 +1064,22 @@ async function _formulaQueryBuilder(
       }
       return { builder: query };
     } else if (pt.type === 'UnaryExpression') {
-      const query = knex.raw(
-        `${pt.operator}${(
-          await fn(pt.argument, null, pt.operator)
-        ).builder.toQuery()}${colAlias}`,
-      );
+      let query;
+      if (
+        (pt.operator === '-' || pt.operator === '+') &&
+        pt.dataType === FormulaDataTypes.NUMERIC
+      ) {
+        query = knex.raw('?', [
+          (pt.operator === '-' ? -1 : 1) * pt.argument.value,
+        ]);
+      } else {
+        query = knex.raw(
+          `${pt.operator}${(
+            await fn(pt.argument, null, pt.operator)
+          ).builder.toQuery()}${colAlias}`,
+        );
+      }
+
       if (prevBinaryOp && pt.operator !== prevBinaryOp) {
         query.wrap('(', ')');
       }
@@ -947,23 +1100,29 @@ export default async function formulaQueryBuilderv2(
   aliasToColumn = {},
   tableAlias?: string,
   validateFormula = false,
+  parsedTree?: any,
 ) {
   const knex = baseModelSqlv2.dbDriver;
   // register jsep curly hook once only
   jsep.plugins.register(jsepCurlyHook);
-  // generate qb
-  const qb = await _formulaQueryBuilder(
-    baseModelSqlv2,
-    _tree,
-    alias,
-    model,
-    aliasToColumn,
-    tableAlias,
-  );
-
-  if (!validateFormula) return qb;
-
+  let qb;
   try {
+    // generate qb
+    qb = await _formulaQueryBuilder(
+      baseModelSqlv2,
+      _tree,
+      alias,
+      model,
+      aliasToColumn,
+      tableAlias,
+      parsedTree ??
+        (await column
+          ?.getColOptions<FormulaColumn>()
+          .then((formula) => formula?.getParsedTree())),
+    );
+
+    if (!validateFormula) return qb;
+
     // dry run qb.builder to see if it will break the grid view or not
     // if so, set formula error and show empty selectQb instead
     await baseModelSqlv2.execAndParse(
@@ -985,6 +1144,8 @@ export default async function formulaQueryBuilderv2(
       }
     }
   } catch (e) {
+    if (!validateFormula) throw e;
+
     console.error(e);
     if (column) {
       const formula = await column.getColOptions<FormulaColumn>();
diff --git a/packages/nocodb/src/db/functionMappings/commonFns.ts b/packages/nocodb/src/db/functionMappings/commonFns.ts
index 547f65796e..376086d65c 100644
--- a/packages/nocodb/src/db/functionMappings/commonFns.ts
+++ b/packages/nocodb/src/db/functionMappings/commonFns.ts
@@ -1,33 +1,135 @@
+import { FormulaDataTypes } from 'nocodb-sdk';
 import type { MapFnArgs } from '../mapFunctionName';
 import { NcError } from '~/helpers/catchError';
 
+async function treatArgAsConditionalExp(
+  args: MapFnArgs,
+  argument = args.pt?.arguments?.[0],
+) {
+  const condArg = (await args.fn(argument)).builder.toQuery();
+
+  let cond = condArg;
+
+  // based on the data type of the argument, we need to handle the condition
+  // if string - value is not null and not empty then true
+  // if number - value is not null and not 0 then true
+  // if boolean - value is not null and not false then true
+  // if date - value is not null then true
+  switch (argument.dataType as FormulaDataTypes) {
+    case FormulaDataTypes.NUMERIC:
+      cond = `(${condArg}) IS NOT NULL AND (${condArg}) != 0`;
+      break;
+    case FormulaDataTypes.STRING:
+      cond = `(${condArg}) IS NOT NULL AND (${condArg}) != ''`;
+      break;
+    case FormulaDataTypes.BOOLEAN:
+      cond = `(${condArg}) IS NOT NULL AND (${condArg}) != false`;
+      break;
+    case FormulaDataTypes.DATE:
+      cond = `(${condArg}) IS NOT NULL`;
+      break;
+  }
+  return { builder: args.knex.raw(cond) };
+}
+
 export default {
-  // todo: handle default case
   SWITCH: async (args: MapFnArgs) => {
     const count = Math.floor((args.pt.arguments.length - 1) / 2);
     let query = '';
 
+    const returnArgsType = new Set(
+      args.pt.arguments
+        .filter(
+          (type, i) => i > 1 && i % 2 === 0 && type !== FormulaDataTypes.NULL,
+        )
+        .map((type) => type.dataType),
+    );
+
+    // if else case present then push that to types
+    if (args.pt.arguments.length % 2 === 0) {
+      returnArgsType.add(
+        args.pt.arguments[args.pt.arguments.length - 1].dataType,
+      );
+    }
+
     const switchVal = (await args.fn(args.pt.arguments[0])).builder.toQuery();
 
+    // used it for null value check
+    let elseValPrefix = '';
+
     for (let i = 0; i < count; i++) {
-      query += args.knex
-        .raw(
-          `\n\tWHEN ${(
-            await args.fn(args.pt.arguments[i * 2 + 1])
-          ).builder.toQuery()} THEN ${(
-            await args.fn(args.pt.arguments[i * 2 + 2])
-          ).builder.toQuery()}`,
-        )
-        .toQuery();
+      let val;
+      // cast to string if the return value types are different
+      if (returnArgsType.size > 1) {
+        val = (
+          await args.fn({
+            type: 'CallExpression',
+            arguments: [args.pt.arguments[i * 2 + 2]],
+            callee: {
+              type: 'Identifier',
+              name: 'STRING',
+            },
+          } as any)
+        ).builder.toQuery();
+      } else {
+        val = (await args.fn(args.pt.arguments[i * 2 + 2])).builder.toQuery();
+      }
+
+      if (
+        args.pt.arguments[i * 2 + 1].type === 'CallExpression' &&
+        args.pt.arguments[i * 2 + 1].callee?.name === 'BLANK'
+      ) {
+        elseValPrefix += args.knex
+          .raw(
+            `\n\tWHEN ${switchVal} IS NULL ${
+              args.pt.arguments[i * 2 + 1].dataType === FormulaDataTypes.STRING
+                ? `OR ${switchVal} = ''`
+                : ''
+            } THEN ${val}`,
+          )
+          .toQuery();
+      } else if (
+        args.pt.arguments[i * 2 + 1].dataType === FormulaDataTypes.NULL
+      ) {
+        elseValPrefix += args.knex
+          .raw(`\n\tWHEN ${switchVal} IS NULL THEN ${val}`)
+          .toQuery();
+      } else {
+        query += args.knex
+          .raw(
+            `\n\tWHEN ${(
+              await args.fn(args.pt.arguments[i * 2 + 1])
+            ).builder.toQuery()} THEN ${val}`,
+          )
+          .toQuery();
+      }
     }
     if (args.pt.arguments.length % 2 === 0) {
-      query += args.knex
-        .raw(
-          `\n\tELSE ${(
-            await args.fn(args.pt.arguments[args.pt.arguments.length - 1])
-          ).builder.toQuery()}`,
-        )
-        .toQuery();
+      let val;
+      // cast to string if the return value types are different
+      if (returnArgsType.size > 1) {
+        val = (
+          await args.fn({
+            type: 'CallExpression',
+            arguments: [args.pt.arguments[args.pt.arguments.length - 1]],
+            callee: {
+              type: 'Identifier',
+              name: 'STRING',
+            },
+          } as any)
+        ).builder.toQuery();
+      } else {
+        val = (
+          await args.fn(args.pt.arguments[args.pt.arguments.length - 1])
+        ).builder.toQuery();
+      }
+      if (elseValPrefix) {
+        query += `\n\tELSE (CASE ${elseValPrefix} ELSE ${val} END)`;
+      } else {
+        query += `\n\tELSE ${val}`;
+      }
+    } else if (elseValPrefix) {
+      query += `\n\tELSE (CASE ${elseValPrefix} END)`;
     }
     return {
       builder: args.knex.raw(
@@ -36,24 +138,52 @@ export default {
     };
   },
   IF: async (args: MapFnArgs) => {
-    let query = args.knex
-      .raw(
-        `\n\tWHEN ${(
-          await args.fn(args.pt.arguments[0])
-        ).builder.toQuery()} THEN ${(
-          await args.fn(args.pt.arguments[1])
-        ).builder.toQuery()}`,
-      )
-      .toQuery();
+    const cond = (await treatArgAsConditionalExp(args)).builder;
+    let thenArg;
+    let elseArg;
+    const returnArgsType = new Set(
+      [args.pt.arguments[1].dataType, args.pt.arguments[2].dataType].filter(
+        (type) => type !== FormulaDataTypes.NULL,
+      ),
+    );
+    // cast to string if the return value types are different
+    if (returnArgsType.size > 1) {
+      thenArg = (
+        await args.fn({
+          type: 'CallExpression',
+          arguments: [args.pt.arguments[1]],
+          callee: {
+            type: 'Identifier',
+            name: 'STRING',
+          },
+        } as any)
+      ).builder;
+      elseArg = (
+        await args.fn({
+          type: 'CallExpression',
+          arguments: [args.pt.arguments[2]],
+          callee: {
+            type: 'Identifier',
+            name: 'STRING',
+          },
+        } as any)
+      ).builder;
+    } else {
+      thenArg = (await args.fn(args.pt.arguments[1])).builder.toQuery();
+      elseArg = (await args.fn(args.pt.arguments[2])).builder.toQuery();
+    }
+
+    let query = args.knex.raw(`\n\tWHEN ${cond} THEN ${thenArg}`).toQuery();
     if (args.pt.arguments[2]) {
-      query += args.knex
-        .raw(
-          `\n\tELSE ${(await args.fn(args.pt.arguments[2])).builder.toQuery()}`,
-        )
-        .toQuery();
+      query += args.knex.raw(`\n\tELSE ${elseArg}`).toQuery();
     }
     return { builder: args.knex.raw(`CASE ${query}\n END${args.colAlias}`) };
   },
+  // used only for casting to string internally, this one is dummy function
+  // and will work as fallback for dbs which don't support/implemented CAST
+  STRING(args: MapFnArgs) {
+    return args.fn(args.pt?.arguments?.[0]);
+  },
   AND: async (args: MapFnArgs) => {
     return {
       builder: args.knex.raw(
@@ -62,7 +192,7 @@ export default {
             `${(
               await Promise.all(
                 args.pt.arguments.map(async (ar) =>
-                  (await args.fn(ar)).builder.toQuery(),
+                  (await treatArgAsConditionalExp(args, ar)).builder.toQuery(),
                 ),
               )
             ).join(' AND ')}`,
@@ -80,7 +210,7 @@ export default {
             `${(
               await Promise.all(
                 args.pt.arguments.map(async (ar) =>
-                  (await args.fn(ar)).builder.toQuery(),
+                  (await treatArgAsConditionalExp(args, ar)).builder.toQuery(),
                 ),
               )
             ).join(' OR ')}`,
@@ -124,7 +254,7 @@ export default {
     const query = (await args.fn(args.pt.arguments[0])).builder;
     return {
       builder: args.knex.raw(
-        `CASE WHEN ${query} % 2 = 0 THEN CEIL(${query})\nELSE CEIL(${query} / 2.0) * 2\n END${args.colAlias}`,
+        `CASE WHEN ${query} >= 0 THEN CEIL((${query}) / 2.0) * 2 \n ELSE FLOOR((${query} + 2) / 2.0) * 2 - 2\n END${args.colAlias}`,
       ),
     };
   },
@@ -201,7 +331,7 @@ export default {
 
     return {
       builder: knex.raw(
-        `ROUND(FLOOR((${valueBuilder}) * POWER(10, ${precisionBuilder})) / POWER(10, ${precisionBuilder}))${colAlias}`,
+        `(FLOOR((${valueBuilder}) * POWER(10, ${precisionBuilder})) / POWER(10, ${precisionBuilder}))${colAlias}`,
       ),
     };
   },
@@ -215,8 +345,40 @@ export default {
 
     return {
       builder: knex.raw(
-        `ROUND(CEIL((${valueBuilder}) * POWER(10, ${precisionBuilder})) / POWER(10, ${precisionBuilder}))${colAlias}`,
+        `(CEIL((${valueBuilder}) * POWER(10, ${precisionBuilder})) / POWER(10, ${precisionBuilder}))${colAlias}`,
       ),
     };
   },
+  ISBLANK: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    const { builder: valueBuilder } = await fn(pt.arguments[0]);
+
+    return {
+      builder: knex.raw(
+        `(${valueBuilder} IS NULL OR ${valueBuilder} = '')${colAlias}`,
+      ),
+    };
+  },
+  ISNULL: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    const { builder: valueBuilder } = await fn(pt.arguments[0]);
+
+    return {
+      builder: knex.raw(`(${valueBuilder} IS NULL)${colAlias}`),
+    };
+  },
+  ISNOTBLANK: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    const { builder: valueBuilder } = await fn(pt.arguments[0]);
+
+    return {
+      builder: knex.raw(
+        `(${valueBuilder} IS NOT NULL AND ${valueBuilder} != '')${colAlias}`,
+      ),
+    };
+  },
+  ISNOTNULL: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    const { builder: valueBuilder } = await fn(pt.arguments[0]);
+
+    return {
+      builder: knex.raw(`(${valueBuilder} IS NOT NULL)${colAlias}`),
+    };
+  },
 };
diff --git a/packages/nocodb/src/db/functionMappings/mysql.ts b/packages/nocodb/src/db/functionMappings/mysql.ts
index 8026806876..93d798bde3 100644
--- a/packages/nocodb/src/db/functionMappings/mysql.ts
+++ b/packages/nocodb/src/db/functionMappings/mysql.ts
@@ -125,7 +125,9 @@ const mysql2 = {
     const source = (await fn(pt.arguments[0])).builder;
     const pattern = (await fn(pt.arguments[1])).builder;
     return {
-      builder: knex.raw(`REGEXP_SUBSTR(${source}, ${pattern}) ${colAlias}`),
+      builder: knex.raw(
+        `REGEXP_SUBSTR(${source}, ${pattern}, 1, 1, 'c') ${colAlias}`,
+      ),
     };
   },
   REGEX_REPLACE: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
@@ -134,7 +136,7 @@ const mysql2 = {
     const replacement = (await fn(pt.arguments[2])).builder;
     return {
       builder: knex.raw(
-        `REGEXP_REPLACE(${source}, ${pattern}, ${replacement}) ${colAlias}`,
+        `REGEXP_REPLACE(${source}, ${pattern}, ${replacement}, 1, 0, 'c') ${colAlias}`,
       ),
     };
   },
@@ -160,6 +162,15 @@ END) ${colAlias}`,
       ),
     };
   },
+  STRING: async (args: MapFnArgs) => {
+    return {
+      builder: args.knex.raw(
+        `CAST(${(await args.fn(args.pt.arguments[0])).builder} AS CHAR) ${
+          args.colAlias
+        }`,
+      ),
+    };
+  },
 };
 
 export default mysql2;
diff --git a/packages/nocodb/src/db/functionMappings/pg.ts b/packages/nocodb/src/db/functionMappings/pg.ts
index a26180ab34..f6fa76b3da 100644
--- a/packages/nocodb/src/db/functionMappings/pg.ts
+++ b/packages/nocodb/src/db/functionMappings/pg.ts
@@ -1,4 +1,5 @@
 import dayjs from 'dayjs';
+import { FormulaDataTypes } from 'nocodb-sdk';
 import commonFns from './commonFns';
 import type { MapFnArgs } from '../mapFunctionName';
 import { convertUnits } from '~/helpers/convertUnits';
@@ -57,9 +58,9 @@ const pg = {
   DATEADD: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
     return {
       builder: knex.raw(
-        `${(await fn(pt.arguments[0])).builder} + (${
-          (await fn(pt.arguments[1])).builder
-        } || 
+        `(${(await fn(pt.arguments[0])).builder})${
+          pt.arguments[0].dataType !== FormulaDataTypes.DATE ? '::DATE' : ''
+        } + (${(await fn(pt.arguments[1])).builder} || 
       '${String((await fn(pt.arguments[2])).builder).replace(
         /["']/g,
         '',
@@ -134,6 +135,42 @@ const pg = {
       ),
     };
   },
+  DATESTR: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    return {
+      builder: knex.raw(
+        `TO_CHAR((${
+          (await fn(pt?.arguments[0])).builder
+        }), 'YYYY-MM-DD')::text ${colAlias}`,
+      ),
+    };
+  },
+  DAY: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    return {
+      builder: knex.raw(
+        `EXTRACT('Day' FROM ((${
+          (await fn(pt?.arguments[0])).builder
+        })::TIMESTAMP)) ${colAlias}`,
+      ),
+    };
+  },
+  MONTH: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    return {
+      builder: knex.raw(
+        `EXTRACT('Month' FROM ((${
+          (await fn(pt?.arguments[0])).builder
+        })::TIMESTAMP)) ${colAlias}`,
+      ),
+    };
+  },
+  HOUR: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    return {
+      builder: knex.raw(
+        `EXTRACT('Hour' FROM ((${
+          (await fn(pt?.arguments[0])).builder
+        })::TIMESTAMP)) ${colAlias}`,
+      ),
+    };
+  },
   AND: async (args: MapFnArgs) => {
     return {
       builder: args.knex.raw(
@@ -191,15 +228,17 @@ const pg = {
   },
   REGEX_MATCH: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
     const source = (await fn(pt.arguments[0])).builder;
+
     const pattern = (await fn(pt.arguments[1])).builder;
     return {
       builder: knex.raw(
-        `CASE WHEN (${source}::TEXT ~ ${pattern}::TEXT) THEN 1 ELSE 0 END ${colAlias}`,
+        `CASE WHEN REGEXP_MATCH(${source}::TEXT, ${pattern}::TEXT) IS NULL THEN 0 ELSE 1 END ${colAlias}`,
       ),
     };
   },
   REGEX_EXTRACT: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
     const source = (await fn(pt.arguments[0])).builder;
+
     const pattern = (await fn(pt.arguments[1])).builder;
     return {
       builder: knex.raw(
@@ -212,6 +251,7 @@ const pg = {
   REGEX_REPLACE: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
     const source = (await fn(pt.arguments[0])).builder;
     const pattern = (await fn(pt.arguments[1])).builder;
+
     const replacement = (await fn(pt.arguments[2])).builder;
     return {
       builder: knex.raw(
@@ -263,11 +303,11 @@ const pg = {
 
     return {
       builder: knex.raw(
-        `ROUND(CASE 
+        `CASE 
   WHEN ${value} IS NULL OR REGEXP_REPLACE(${value}::TEXT, '[^\\d.]+', '', 'g') IN ('.', '') OR LENGTH(REGEXP_REPLACE(${value}::TEXT, '[^.]+', '', 'g')) > 1 THEN NULL
   WHEN LENGTH(REGEXP_REPLACE(${value}::TEXT, '[^%]', '','g')) > 0 THEN POW(-1, LENGTH(REGEXP_REPLACE(${value}::TEXT, '[^-]','', 'g'))) * (REGEXP_REPLACE(${value}::TEXT, '[^\\d.]+', '', 'g'))::NUMERIC / 100
   ELSE POW(-1, LENGTH(REGEXP_REPLACE(${value}::TEXT, '[^-]', '', 'g'))) * (REGEXP_REPLACE(${value}::TEXT, '[^\\d.]+', '', 'g'))::NUMERIC
-END) ${colAlias}`,
+END ${colAlias}`,
       ),
     };
   },
@@ -281,7 +321,7 @@ END) ${colAlias}`,
 
     return {
       builder: knex.raw(
-        `ROUND((FLOOR((${valueBuilder}) * POWER(10, ${precisionBuilder})) / POWER(10, ${precisionBuilder})::numeric(30,${precisionBuilder})))${colAlias}`,
+        `(FLOOR((${valueBuilder}) * POWER(10, ${precisionBuilder})) / POWER(10, ${precisionBuilder})::numeric(30,${precisionBuilder}))${colAlias}`,
       ),
     };
   },
@@ -295,7 +335,16 @@ END) ${colAlias}`,
 
     return {
       builder: knex.raw(
-        `ROUND((CEIL((${valueBuilder}) * POWER(10, ${precisionBuilder})) / POWER(10, ${precisionBuilder}))::numeric(30,${precisionBuilder}))${colAlias}`,
+        `(CEIL((${valueBuilder}) * POWER(10, ${precisionBuilder})) / POWER(10, ${precisionBuilder})::numeric(30,${precisionBuilder}))${colAlias}`,
+      ),
+    };
+  },
+  STRING: async (args: MapFnArgs) => {
+    return {
+      builder: args.knex.raw(
+        `(${(await args.fn(args.pt.arguments[0])).builder})::text ${
+          args.colAlias
+        }`,
       ),
     };
   },
diff --git a/packages/nocodb/src/db/functionMappings/sqlite.ts b/packages/nocodb/src/db/functionMappings/sqlite.ts
index a1d6689549..f271354393 100644
--- a/packages/nocodb/src/db/functionMappings/sqlite.ts
+++ b/packages/nocodb/src/db/functionMappings/sqlite.ts
@@ -45,7 +45,11 @@ const sqlite3 = {
       ),
     };
   },
-  NOW: 'DATE',
+  NOW: (args: MapFnArgs) => {
+    return {
+      builder: args.knex.raw(`DATETIME('now', 'localtime')${args.colAlias}`),
+    };
+  },
   SEARCH: 'INSTR',
   async INT(args: MapFnArgs) {
     return {
diff --git a/packages/nocodb/src/db/sortV2.ts b/packages/nocodb/src/db/sortV2.ts
index 2ef008fb12..2ea15e3fe3 100644
--- a/packages/nocodb/src/db/sortV2.ts
+++ b/packages/nocodb/src/db/sortV2.ts
@@ -6,7 +6,7 @@ import { NcError } from '~/helpers/catchError';
 import formulaQueryBuilderv2 from '~/db/formulav2/formulaQueryBuilderv2';
 import genRollupSelectv2 from '~/db/genRollupSelectv2';
 import { sanitize } from '~/helpers/sqlSanitize';
-import { Sort } from '~/models';
+import { Base, BaseUser, Sort } from '~/models';
 import generateLookupSelectQuery from '~/db/generateLookupSelectQuery';
 
 export default async function sortV2(
@@ -138,6 +138,29 @@ export default async function sortV2(
         }
         break;
       }
+      case UITypes.User: {
+        const base = await Base.get(model.base_id);
+        const baseUsers = await BaseUser.getUsersList({
+          base_id: base.id,
+        });
+
+        // create nested replace statement for each user
+        const finalStatement = baseUsers.reduce((acc, user) => {
+          const qb = knex.raw(`REPLACE(${acc}, ?, ?)`, [
+            user.id,
+            user.display_name || user.email,
+          ]);
+          return qb.toQuery();
+        }, knex.raw(`??`, [column.column_name]).toQuery());
+
+        qb.orderBy(
+          sanitize(knex.raw(finalStatement)),
+          sort.direction || 'asc',
+          nulls,
+        );
+
+        break;
+      }
       default:
         qb.orderBy(
           sanitize(column.column_name),
diff --git a/packages/nocodb/src/db/sql-client/lib/KnexClient.ts b/packages/nocodb/src/db/sql-client/lib/KnexClient.ts
index f617f5b981..0bf39481df 100644
--- a/packages/nocodb/src/db/sql-client/lib/KnexClient.ts
+++ b/packages/nocodb/src/db/sql-client/lib/KnexClient.ts
@@ -3044,7 +3044,12 @@ class KnexClient extends SqlClient {
       if (/^\w+\(\)$/.test(value)) return value;
 
       // if value is a CURRENT_TIMESTAMP, return as is
-      if (/^CURRENT_TIMESTAMP[\w ]*$/.test(value.toUpperCase())) return value;
+      if (
+        /^\s*current_timestamp(?:\(\))?(?:\s+on\s+update\s+current_timestamp(?:\(\))?)?\s*$/i.test(
+          value,
+        )
+      )
+        return value;
 
       // if value wrapped in single/double quotes, then extract value and sanitise
       const m = value.match(/^(['"])(.*)\1$/);
diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index 6a14089d53..1bbe23a5c7 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -1,5 +1,5 @@
 import { customAlphabet } from 'nanoid';
-import { UITypes } from 'nocodb-sdk';
+import { getAvailableRollupForUiType, UITypes } from 'nocodb-sdk';
 import { pluralize, singularize } from 'inflection';
 import type { RollupColumn } from '~/models';
 import type {
@@ -135,6 +135,18 @@ export async function validateRollupPayload(payload: ColumnReqType | Column) {
     )
   )
     throw new Error('Rollup column not found in related table');
+
+  if (
+    !getAvailableRollupForUiType(relatedColumn.uidt).includes(
+      (payload as RollupColumnReqType).rollup_function,
+    )
+  ) {
+    throw new Error(
+      `Rollup function (${
+        (payload as RollupColumnReqType).rollup_function
+      }) not available for type (${relatedColumn.uidt})`,
+    );
+  }
 }
 
 export async function validateLookupPayload(
diff --git a/packages/nocodb/src/helpers/formulaHelpers.ts b/packages/nocodb/src/helpers/formulaHelpers.ts
index e69de29bb2..3dd0b525df 100644
--- a/packages/nocodb/src/helpers/formulaHelpers.ts
+++ b/packages/nocodb/src/helpers/formulaHelpers.ts
@@ -0,0 +1,35 @@
+import jsep from 'jsep';
+import { UITypes } from 'nocodb-sdk';
+import type FormulaColumn from '../models/FormulaColumn';
+import type { Column } from '~/models';
+
+export async function getFormulasReferredTheColumn({
+  column,
+  columns,
+}: {
+  column: Column;
+  columns: Column[];
+}): Promise<Column[]> {
+  const fn = (pt) => {
+    if (pt.type === 'CallExpression') {
+      return pt.arguments.some((arg) => fn(arg));
+    } else if (pt.type === 'Literal') {
+    } else if (pt.type === 'Identifier') {
+      return [column.id, column.title].includes(pt.name);
+    } else if (pt.type === 'BinaryExpression') {
+      return fn(pt.left) || fn(pt.right);
+    }
+  };
+
+  return columns.reduce(async (columnsPromise, c) => {
+    const columns = await columnsPromise;
+    if (c.uidt !== UITypes.Formula) return columns;
+
+    const formula = await c.getColOptions<FormulaColumn>();
+
+    if (fn(jsep(formula.formula))) {
+      columns.push(c);
+    }
+    return columns;
+  }, Promise.resolve([]));
+}
diff --git a/packages/nocodb/src/helpers/initAdminFromEnv.ts b/packages/nocodb/src/helpers/initAdminFromEnv.ts
index 5990fb7d09..4f68d8db28 100644
--- a/packages/nocodb/src/helpers/initAdminFromEnv.ts
+++ b/packages/nocodb/src/helpers/initAdminFromEnv.ts
@@ -169,11 +169,6 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
                 existingUserWithNewEmail.id,
               );
 
-              // clear cache
-              await NocoCache.delAll(
-                CacheScope.USER,
-                `${existingUserWithNewEmail.email}___*`,
-              );
               await NocoCache.del(
                 `${CacheScope.USER}:${existingUserWithNewEmail.id}`,
               );
@@ -237,11 +232,6 @@ export default async function initAdminFromEnv(_ncMeta = Noco.ncMeta) {
           // check user account already present with the new admin email
           const existingUserWithNewEmail = await User.getByEmail(email, ncMeta);
           if (existingUserWithNewEmail?.id) {
-            // clear cache
-            await NocoCache.delAll(
-              CacheScope.USER,
-              `${existingUserWithNewEmail.email}___*`,
-            );
             await NocoCache.del(
               `${CacheScope.USER}:${existingUserWithNewEmail.id}`,
             );
diff --git a/packages/nocodb/src/helpers/syncMigration.ts b/packages/nocodb/src/helpers/syncMigration.ts
index c90ca1326a..e0868f21f2 100644
--- a/packages/nocodb/src/helpers/syncMigration.ts
+++ b/packages/nocodb/src/helpers/syncMigration.ts
@@ -2,7 +2,7 @@ import type { Base, Source } from '~/models';
 import KnexMigratorv2 from '~/db/sql-migrator/lib/KnexMigratorv2';
 
 export default async function syncMigration(base: Base): Promise<void> {
-  for (const source of await base.getBases()) {
+  for (const source of await base.getSources()) {
     try {
       /* create sql-migrator */
       const migrator = new KnexMigratorv2(base);
diff --git a/packages/nocodb/src/helpers/webhookHelpers.ts b/packages/nocodb/src/helpers/webhookHelpers.ts
index 44118a8729..725a153b06 100644
--- a/packages/nocodb/src/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/helpers/webhookHelpers.ts
@@ -301,9 +301,26 @@ export async function invokeWebhook(
     }
 
     if (hook.condition && !testHook) {
+      const filters = testFilters || (await hook.getFilters());
+
       if (isBulkOperation) {
         const filteredData = [];
-        for (const data of newData) {
+        for (let i = 0; i < newData.length; i++) {
+          const data = newData[i];
+
+          // disable until we have a way to extract prevData for bulk operations
+          // const pData = prevData[i] ? prevData[i] : null;
+          //
+          // // if condition is satisfied for prevData then return
+          // // if filters are not defined then skip the check
+          // if (
+          //   pData &&
+          //   filters.length &&
+          //   (await validateCondition(filters, pData))
+          // ) {
+          //   continue;
+          // }
+
           if (
             await validateCondition(
               testFilters || (await hook.getFilters()),
@@ -312,12 +329,21 @@ export async function invokeWebhook(
           ) {
             filteredData.push(data);
           }
-          if (!filteredData.length) {
-            return;
-          }
-          newData = filteredData;
         }
+        if (!filteredData.length) {
+          return;
+        }
+        newData = filteredData;
       } else {
+        // if condition is satisfied for prevData then return
+        // if filters are not defined then skip the check
+        if (
+          prevData &&
+          filters.length &&
+          (await validateCondition(filters, prevData))
+        ) {
+          return;
+        }
         if (
           !(await validateCondition(
             testFilters || (await hook.getFilters()),
diff --git a/packages/nocodb/src/meta/meta.service.ts b/packages/nocodb/src/meta/meta.service.ts
index e0c5af96f5..40548db54d 100644
--- a/packages/nocodb/src/meta/meta.service.ts
+++ b/packages/nocodb/src/meta/meta.service.ts
@@ -912,7 +912,7 @@ export class MetaService {
     );
   }
 
-  private now(): any {
+  public now(): any {
     return dayjs()
       .utc()
       .format(this.isMySQL() ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ');
diff --git a/packages/nocodb/src/meta/migrations/XcMigrationSourcev2.ts b/packages/nocodb/src/meta/migrations/XcMigrationSourcev2.ts
index 6dedcf2843..643f5c4d0a 100644
--- a/packages/nocodb/src/meta/migrations/XcMigrationSourcev2.ts
+++ b/packages/nocodb/src/meta/migrations/XcMigrationSourcev2.ts
@@ -24,6 +24,7 @@ import * as nc_034_erd_filter_and_notification from '~/meta/migrations/v2/nc_034
 import * as nc_035_add_username_to_users from '~/meta/migrations/v2/nc_035_add_username_to_users';
 import * as nc_036_base_deleted from '~/meta/migrations/v2/nc_036_base_deleted';
 import * as nc_037_rename_project_and_base from '~/meta/migrations/v2/nc_037_rename_project_and_base';
+import * as nc_038_formula_parsed_tree_column from '~/meta/migrations/v2/nc_038_formula_parsed_tree_column';
 
 // Create a custom migration source class
 export default class XcMigrationSourcev2 {
@@ -59,6 +60,7 @@ export default class XcMigrationSourcev2 {
       'nc_035_add_username_to_users',
       'nc_036_base_deleted',
       'nc_037_rename_project_and_base',
+      'nc_038_formula_parsed_tree_column',
     ]);
   }
 
@@ -120,6 +122,8 @@ export default class XcMigrationSourcev2 {
         return nc_036_base_deleted;
       case 'nc_037_rename_project_and_base':
         return nc_037_rename_project_and_base;
+      case 'nc_038_formula_parsed_tree_column':
+        return nc_038_formula_parsed_tree_column;
     }
   }
 }
diff --git a/packages/nocodb/src/meta/migrations/v2/nc_038_formula_parsed_tree_column.ts b/packages/nocodb/src/meta/migrations/v2/nc_038_formula_parsed_tree_column.ts
new file mode 100644
index 0000000000..5e50af058c
--- /dev/null
+++ b/packages/nocodb/src/meta/migrations/v2/nc_038_formula_parsed_tree_column.ts
@@ -0,0 +1,16 @@
+import type { Knex } from 'knex';
+import { MetaTable } from '~/utils/globals';
+
+const up = async (knex: Knex) => {
+  await knex.schema.alterTable(MetaTable.COL_FORMULA, (table) => {
+    table.text('parsed_tree');
+  });
+};
+
+const down = async (knex: Knex) => {
+  await knex.schema.alterTable(MetaTable.COL_FORMULA, (table) => {
+    table.dropColumn('parsed_tree');
+  });
+};
+
+export { up, down };
diff --git a/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts b/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
index f9f2133336..e0a6428c50 100644
--- a/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
+++ b/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
@@ -222,7 +222,7 @@ export class AclMiddleware implements NestInterceptor {
         : getUserRoleForScope(req.user, scope);
 
     if (!userScopeRole) {
-      NcError.forbidden('Unauthorized access');
+      NcError.forbidden("You don't have permission to access this resource");
     }
 
     // assign owner role to super admin for all bases
diff --git a/packages/nocodb/src/models/Base.ts b/packages/nocodb/src/models/Base.ts
index eb4363d7c9..61fc986e84 100644
--- a/packages/nocodb/src/models/Base.ts
+++ b/packages/nocodb/src/models/Base.ts
@@ -117,7 +117,7 @@ export default class Base implements BaseType {
     );
     const castedProjectList = baseList.map((m) => this.castType(m));
 
-    await Promise.all(castedProjectList.map((base) => base.getBases(ncMeta)));
+    await Promise.all(castedProjectList.map((base) => base.getSources(ncMeta)));
 
     return castedProjectList;
   }
@@ -147,7 +147,7 @@ export default class Base implements BaseType {
     return this.castType(baseData);
   }
 
-  async getBases(ncMeta = Noco.ncMeta): Promise<Source[]> {
+  async getSources(ncMeta = Noco.ncMeta): Promise<Source[]> {
     return (this.sources = await Source.list({ baseId: this.id }, ncMeta));
   }
 
@@ -182,10 +182,11 @@ export default class Base implements BaseType {
       }
     }
     if (baseData) {
-      const base = new Base(baseData);
-      await base.getBases(ncMeta);
+      const base = this.castType(baseData);
 
-      return this.castType(base);
+      await base.getSources(ncMeta);
+
+      return base;
     }
     return null;
   }
@@ -209,8 +210,6 @@ export default class Base implements BaseType {
       await NocoCache.del(`${CacheScope.PROJECT}:ref:${o.id}`);
     }
 
-    await NocoCache.delAll(CacheScope.USER_PROJECT, '*');
-
     await NocoCache.del(CacheScope.INSTANCE_META);
 
     // remove item in cache list
@@ -296,8 +295,6 @@ export default class Base implements BaseType {
     let base = await this.get(baseId);
     const users = await BaseUser.getUsersList({
       base_id: baseId,
-      offset: 0,
-      limit: 1000,
     });
 
     for (const user of users) {
@@ -320,8 +317,6 @@ export default class Base implements BaseType {
       await NocoCache.del(`${CacheScope.PROJECT}:ref:${base.id}`);
     }
 
-    await NocoCache.delAll(CacheScope.USER_PROJECT, '*');
-
     await NocoCache.deepDel(
       CacheScope.PROJECT,
       `${CacheScope.PROJECT}:${baseId}`,
@@ -359,7 +354,9 @@ export default class Base implements BaseType {
 
   static async getWithInfoByTitle(title: string, ncMeta = Noco.ncMeta) {
     const base = await this.getByTitle(title, ncMeta);
-    if (base) await base.getBases(ncMeta);
+    if (base) {
+      await base.getSources(ncMeta);
+    }
 
     return base;
   }
@@ -441,7 +438,9 @@ export default class Base implements BaseType {
     // parse meta
     base.meta = parseMetaProp(base);
 
-    if (base) await base.getBases(ncMeta);
+    if (base) {
+      await base.getSources(ncMeta);
+    }
 
     return base;
   }
@@ -449,7 +448,7 @@ export default class Base implements BaseType {
   static async clearConnectionPool(baseId: string, ncMeta = Noco.ncMeta) {
     const base = await this.get(baseId, ncMeta);
     if (base) {
-      const sources = await base.getBases(ncMeta);
+      const sources = await base.getSources(ncMeta);
       for (const source of sources) {
         await NcConnectionMgrv2.deleteAwait(source);
       }
diff --git a/packages/nocodb/src/models/BaseUser.ts b/packages/nocodb/src/models/BaseUser.ts
index d88ef7ceb2..eed09a5151 100644
--- a/packages/nocodb/src/models/BaseUser.ts
+++ b/packages/nocodb/src/models/BaseUser.ts
@@ -1,6 +1,6 @@
 import { ProjectRoles } from 'nocodb-sdk';
 import type { BaseType } from 'nocodb-sdk';
-import User from '~/models/User';
+import type User from '~/models/User';
 import Base from '~/models/Base';
 import {
   // CacheDelDirection,
@@ -44,10 +44,15 @@ export default class BaseUser {
       true,
     );
 
-    // reset all user bases cache
-    await NocoCache.delAll(CacheScope.USER_PROJECT, `${baseUser.fk_user_id}:*`);
+    const res = await this.get(base_id, fk_user_id, ncMeta);
 
-    return this.get(base_id, fk_user_id, ncMeta);
+    await NocoCache.appendToList(
+      CacheScope.BASE_USER,
+      [base_id],
+      `${CacheScope.BASE_USER}:${base_id}:${fk_user_id}`,
+    );
+
+    return res;
   }
 
   // public static async update(id, user: Partial<BaseUser>, ncMeta = Noco.ncMeta) {
@@ -58,18 +63,45 @@ export default class BaseUser {
       baseId &&
       userId &&
       (await NocoCache.get(
-        `${CacheScope.PROJECT_USER}:${baseId}:${userId}`,
+        `${CacheScope.BASE_USER}:${baseId}:${userId}`,
         CacheGetType.TYPE_OBJECT,
       ));
-    if (!baseUser) {
-      baseUser = await ncMeta.metaGet2(null, null, MetaTable.PROJECT_USERS, {
-        fk_user_id: userId,
-        base_id: baseId,
+    if (!baseUser || !baseUser.roles) {
+      const queryBuilder = ncMeta
+        .knex(MetaTable.USERS)
+        .select(
+          `${MetaTable.USERS}.id`,
+          `${MetaTable.USERS}.email`,
+          `${MetaTable.USERS}.display_name`,
+          `${MetaTable.USERS}.invite_token`,
+          `${MetaTable.USERS}.roles as main_roles`,
+          `${MetaTable.USERS}.created_at as created_at`,
+          `${MetaTable.PROJECT_USERS}.base_id`,
+          `${MetaTable.PROJECT_USERS}.roles as roles`,
+        );
+
+      queryBuilder.leftJoin(MetaTable.PROJECT_USERS, function () {
+        this.on(
+          `${MetaTable.PROJECT_USERS}.fk_user_id`,
+          '=',
+          `${MetaTable.USERS}.id`,
+        ).andOn(
+          `${MetaTable.PROJECT_USERS}.base_id`,
+          '=',
+          ncMeta.knex.raw('?', [baseId]),
+        );
       });
-      await NocoCache.set(
-        `${CacheScope.PROJECT_USER}:${baseId}:${userId}`,
-        baseUser,
-      );
+
+      queryBuilder.where(`${MetaTable.USERS}.id`, userId);
+
+      baseUser = await queryBuilder.first();
+
+      if (baseUser) {
+        await NocoCache.set(
+          `${CacheScope.BASE_USER}:${baseId}:${userId}`,
+          baseUser,
+        );
+      }
     }
     return this.castType(baseUser);
   }
@@ -77,48 +109,61 @@ export default class BaseUser {
   public static async getUsersList(
     {
       base_id,
-      limit = 25,
-      offset = 0,
-      query,
+      mode = 'full',
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      include_ws_deleted = true,
     }: {
       base_id: string;
-      limit: number;
-      offset: number;
-      query?: string;
+      mode?: 'full' | 'viewer';
+      include_ws_deleted?: boolean;
     },
     ncMeta = Noco.ncMeta,
   ): Promise<(Partial<User> & BaseUser)[]> {
-    const queryBuilder = ncMeta
-      .knex(MetaTable.USERS)
-      .select(
-        `${MetaTable.USERS}.id`,
-        `${MetaTable.USERS}.email`,
-        `${MetaTable.USERS}.invite_token`,
-        `${MetaTable.USERS}.roles as main_roles`,
-        `${MetaTable.USERS}.created_at as created_at`,
-        `${MetaTable.PROJECT_USERS}.base_id`,
-        `${MetaTable.PROJECT_USERS}.roles as roles`,
-      )
-      .offset(offset)
-      .limit(limit);
+    const cachedList = await NocoCache.getList(CacheScope.BASE_USER, [base_id]);
+    let { list: baseUsers } = cachedList;
+    const { isNoneList } = cachedList;
+    if (!isNoneList && !baseUsers.length) {
+      const queryBuilder = ncMeta
+        .knex(MetaTable.USERS)
+        .select(
+          `${MetaTable.USERS}.id`,
+          `${MetaTable.USERS}.email`,
+          `${MetaTable.USERS}.display_name`,
+          ...(mode === 'full'
+            ? [
+                `${MetaTable.USERS}.invite_token`,
+                `${MetaTable.USERS}.roles as main_roles`,
+                `${MetaTable.USERS}.created_at as created_at`,
+                `${MetaTable.PROJECT_USERS}.base_id`,
+                `${MetaTable.PROJECT_USERS}.roles as roles`,
+              ]
+            : []),
+        );
 
-    if (query) {
-      queryBuilder.where('email', 'like', `%${query.toLowerCase?.()}%`);
-    }
+      queryBuilder.leftJoin(MetaTable.PROJECT_USERS, function () {
+        this.on(
+          `${MetaTable.PROJECT_USERS}.fk_user_id`,
+          '=',
+          `${MetaTable.USERS}.id`,
+        ).andOn(
+          `${MetaTable.PROJECT_USERS}.base_id`,
+          '=',
+          ncMeta.knex.raw('?', [base_id]),
+        );
+      });
 
-    queryBuilder.leftJoin(MetaTable.PROJECT_USERS, function () {
-      this.on(
-        `${MetaTable.PROJECT_USERS}.fk_user_id`,
-        '=',
-        `${MetaTable.USERS}.id`,
-      ).andOn(
-        `${MetaTable.PROJECT_USERS}.base_id`,
-        '=',
-        ncMeta.knex.raw('?', [base_id]),
-      );
-    });
+      baseUsers = await queryBuilder;
+
+      baseUsers = baseUsers.map((baseUser) => {
+        baseUser.base_id = base_id;
+        return this.castType(baseUser);
+      });
 
-    const baseUsers = await queryBuilder;
+      await NocoCache.setList(CacheScope.BASE_USER, [base_id], baseUsers, [
+        'base_id',
+        'id',
+      ]);
+    }
 
     return baseUsers;
   }
@@ -161,26 +206,14 @@ export default class BaseUser {
     ncMeta = Noco.ncMeta,
   ) {
     // get existing cache
-    const key = `${CacheScope.PROJECT_USER}:${baseId}:${userId}`;
+    const key = `${CacheScope.BASE_USER}:${baseId}:${userId}`;
     const o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT);
     if (o) {
       o.roles = roles;
       // set cache
       await NocoCache.set(key, o);
     }
-    // update user cache
-    const user = await User.get(userId);
-    if (user) {
-      const email = user.email;
-      for (const key of [`${CacheScope.USER}:${email}___${baseId}`]) {
-        const o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT);
-        if (o) {
-          o.roles = roles;
-          // set cache
-          await NocoCache.set(key, o);
-        }
-      }
-    }
+
     // set meta
     return await ncMeta.metaUpdate(
       null,
@@ -204,76 +237,38 @@ export default class BaseUser {
   ) {
     const updateObj = extractProps(baseUser, ['starred', 'hidden', 'order']);
 
-    // get existing cache
-    const key = `${CacheScope.PROJECT_USER}:${baseId}:${userId}`;
-    const o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT);
-    if (o) {
-      Object.assign(o, updateObj);
-      // set cache
-      await NocoCache.set(key, o);
-    }
-    // update user cache
-    const user = await User.get(userId);
-    if (user) {
-      const email = user.email;
-      for (const key of [
-        `${CacheScope.USER}:${email}`,
-        `${CacheScope.USER}:${email}___${baseId}`,
-      ]) {
-        const o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT);
-        if (o) {
-          Object.assign(o, updateObj);
-          // set cache
-          await NocoCache.set(key, o);
-        }
-      }
-    }
+    const key = `${CacheScope.BASE_USER}:${baseId}:${userId}`;
+
     // set meta
-    return await ncMeta.metaUpdate(
+    await ncMeta.metaUpdate(null, null, MetaTable.PROJECT_USERS, updateObj, {
+      fk_user_id: userId,
+      base_id: baseId,
+    });
+
+    // delete cache
+    await NocoCache.del(key);
+
+    // cache and return
+    return await this.get(baseId, userId, ncMeta);
+  }
+
+  static async delete(baseId: string, userId: string, ncMeta = Noco.ncMeta) {
+    // delete meta
+    const response = await ncMeta.metaDelete(
       null,
       null,
       MetaTable.PROJECT_USERS,
-      updateObj,
       {
         fk_user_id: userId,
         base_id: baseId,
       },
     );
-  }
 
-  static async delete(baseId: string, userId: string, ncMeta = Noco.ncMeta) {
-    const { email } = await ncMeta.metaGet2(null, null, MetaTable.USERS, {
-      id: userId,
-    });
-    if (email) {
-      await NocoCache.delAll(CacheScope.USER, `${email}*`);
-    }
+    // delete list cache to refresh list
+    await NocoCache.del(`${CacheScope.BASE_USER}:${baseId}:${userId}`);
+    await NocoCache.del(`${CacheScope.BASE_USER}:${baseId}:list`);
 
-    // remove base from user base list cache
-    const cachedList = await NocoCache.getList(CacheScope.USER_PROJECT, [
-      userId,
-    ]);
-    let { list: cachedProjectList } = cachedList;
-    const { isNoneList } = cachedList;
-    if (!isNoneList && cachedProjectList?.length) {
-      cachedProjectList = cachedProjectList.filter((p) => p.id !== baseId);
-      // delete the whole list first so that the old one won't be included
-      await NocoCache.del(`${CacheScope.USER_PROJECT}:${userId}:list`);
-      if (cachedProjectList.length > 0) {
-        // set the updated list (i.e. excluding the to-be-deleted base id)
-        await NocoCache.setList(
-          CacheScope.USER_PROJECT,
-          [userId],
-          cachedProjectList,
-        );
-      }
-    }
-
-    await NocoCache.del(`${CacheScope.PROJECT_USER}:${baseId}:${userId}`);
-    return await ncMeta.metaDelete(null, null, MetaTable.PROJECT_USERS, {
-      fk_user_id: userId,
-      base_id: baseId,
-    });
+    return response;
   }
 
   static async getProjectsIdList(
@@ -290,18 +285,7 @@ export default class BaseUser {
     params: any,
     ncMeta = Noco.ncMeta,
   ): Promise<BaseType[]> {
-    // let baseList: BaseType[];
-
-    // todo: pagination
-    // todo: caching based on filter type
-    //   = await NocoCache.getList(CacheScope.USER_PROJECT, [
-    //   userId,
-    // ]);
-
-    // if (baseList.length) {
-    //   return baseList;
-    // }
-
+    // TODO implement CacheScope.USER_BASE
     const qb = ncMeta
       .knex(MetaTable.PROJECT)
       .select(`${MetaTable.PROJECT}.id`)
@@ -373,15 +357,13 @@ export default class BaseUser {
       for (const base of baseList) {
         base.meta = parseMetaProp(base);
       }
-
-      await NocoCache.setList(CacheScope.USER_PROJECT, [userId], baseList);
     }
 
     const castedProjectList = baseList
       .filter((p) => !params?.type || p.type === params.type)
       .map((m) => Base.castType(m));
 
-    await Promise.all(castedProjectList.map((base) => base.getBases(ncMeta)));
+    await Promise.all(castedProjectList.map((base) => base.getSources(ncMeta)));
 
     return castedProjectList;
   }
diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index 484ae6579b..6b4b07805d 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -3,6 +3,7 @@ import {
   isLinksOrLTAR,
   UITypes,
 } from 'nocodb-sdk';
+import { Logger } from '@nestjs/common';
 import type { ColumnReqType, ColumnType } from 'nocodb-sdk';
 import FormulaColumn from '~/models/FormulaColumn';
 import LinkToAnotherRecordColumn from '~/models/LinkToAnotherRecordColumn';
@@ -28,6 +29,7 @@ import {
 } from '~/utils/globals';
 import NocoCache from '~/cache/NocoCache';
 import { parseMetaProp, stringifyMetaProp } from '~/utils/modelUtils';
+import { getFormulasReferredTheColumn } from '~/helpers/formulaHelpers';
 
 const selectColors = [
   '#cfdffe',
@@ -42,6 +44,8 @@ const selectColors = [
   '#eeeeee',
 ];
 
+const logger = new Logger('Column');
+
 export default class Column<T = any> implements ColumnType {
   public fk_model_id: string;
   public base_id: string;
@@ -308,6 +312,7 @@ export default class Column<T = any> implements ColumnType {
             fk_column_id: colId,
             formula: column.formula,
             formula_raw: column.formula_raw,
+            parsed_tree: column.parsed_tree,
           },
           ncMeta,
         );
@@ -713,7 +718,11 @@ export default class Column<T = any> implements ColumnType {
             title: col?.title,
           })
         )
-          await FormulaColumn.update(formulaCol.id, formula, ncMeta);
+          await FormulaColumn.update(
+            formulaCol.id,
+            formula as FormulaColumn & { parsed_tree?: any },
+            ncMeta,
+          );
       }
     }
 
@@ -1154,6 +1163,26 @@ export default class Column<T = any> implements ColumnType {
 
     // on column update, delete any optimised single query cache
     await NocoCache.delAll(CacheScope.SINGLE_QUERY, `${oldCol.fk_model_id}:*`);
+
+    const updatedColumn = await Column.get({ colId });
+
+    // invalidate formula parsed-tree in which current column is used
+    // whenever a new request comes for that formula, it will be populated again
+    getFormulasReferredTheColumn({
+      column: updatedColumn,
+      columns: await Column.list({ fk_model_id: column.fk_model_id }),
+    })
+      .then(async (formulas) => {
+        for (const formula of formulas) {
+          await FormulaColumn.update(formula.id, {
+            parsed_tree: null,
+          });
+        }
+      })
+      // ignore the error and continue, if formula is no longer valid it will be captured in the next run
+      .catch((err) => {
+        logger.error(err);
+      });
   }
 
   static async updateAlias(
diff --git a/packages/nocodb/src/models/FormulaColumn.ts b/packages/nocodb/src/models/FormulaColumn.ts
index 955d480b11..c9bd744f73 100644
--- a/packages/nocodb/src/models/FormulaColumn.ts
+++ b/packages/nocodb/src/models/FormulaColumn.ts
@@ -2,19 +2,23 @@ import Noco from '~/Noco';
 import NocoCache from '~/cache/NocoCache';
 import { extractProps } from '~/helpers/extractProps';
 import { CacheGetType, CacheScope, MetaTable } from '~/utils/globals';
+import { parseMetaProp, stringifyMetaProp } from '~/utils/modelUtils';
 
 export default class FormulaColumn {
   formula: string;
   formula_raw: string;
   fk_column_id: string;
   error: string;
+  private parsed_tree?: any;
 
-  constructor(data: Partial<FormulaColumn>) {
-    Object.assign(this, data);
+  constructor(data: Partial<FormulaColumn> & { parsed_tree?: any }) {
+    const { parsed_tree, ...rest } = data;
+    this.parsed_tree = parsed_tree;
+    Object.assign(this, rest);
   }
 
   public static async insert(
-    formulaColumn: Partial<FormulaColumn>,
+    formulaColumn: Partial<FormulaColumn> & { parsed_tree?: any },
     ncMeta = Noco.ncMeta,
   ) {
     const insertObj = extractProps(formulaColumn, [
@@ -22,11 +26,16 @@ export default class FormulaColumn {
       'formula_raw',
       'formula',
       'error',
+      'parsed_tree',
     ]);
+
+    insertObj.parsed_tree = stringifyMetaProp(insertObj, 'parsed_tree');
+
     await ncMeta.metaInsert2(null, null, MetaTable.COL_FORMULA, insertObj);
 
     return this.read(formulaColumn.fk_column_id, ncMeta);
   }
+
   public static async read(columnId: string, ncMeta = Noco.ncMeta) {
     let column =
       columnId &&
@@ -41,7 +50,10 @@ export default class FormulaColumn {
         MetaTable.COL_FORMULA,
         { fk_column_id: columnId },
       );
-      await NocoCache.set(`${CacheScope.COL_FORMULA}:${columnId}`, column);
+      if (column) {
+        column.parsed_tree = parseMetaProp(column, 'parsed_tree');
+        await NocoCache.set(`${CacheScope.COL_FORMULA}:${columnId}`, column);
+      }
     }
 
     return column ? new FormulaColumn(column) : null;
@@ -51,7 +63,7 @@ export default class FormulaColumn {
 
   static async update(
     id: string,
-    formula: Partial<FormulaColumn>,
+    formula: Partial<FormulaColumn> & { parsed_tree?: any },
     ncMeta = Noco.ncMeta,
   ) {
     const updateObj = extractProps(formula, [
@@ -59,7 +71,9 @@ export default class FormulaColumn {
       'formula_raw',
       'fk_column_id',
       'error',
+      'parsed_tree',
     ]);
+
     // get existing cache
     const key = `${CacheScope.COL_FORMULA}:${id}`;
     let o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT);
@@ -68,7 +82,13 @@ export default class FormulaColumn {
       // set cache
       await NocoCache.set(key, o);
     }
+    if ('parsed_tree' in updateObj)
+      updateObj.parsed_tree = stringifyMetaProp(updateObj, 'parsed_tree');
     // set meta
     await ncMeta.metaUpdate(null, null, MetaTable.COL_FORMULA, updateObj, id);
   }
+
+  public getParsedTree() {
+    return this.parsed_tree;
+  }
 }
diff --git a/packages/nocodb/src/models/User.ts b/packages/nocodb/src/models/User.ts
index 936de4d2fe..c8402c7348 100644
--- a/packages/nocodb/src/models/User.ts
+++ b/packages/nocodb/src/models/User.ts
@@ -3,8 +3,13 @@ import { NcError } from '~/helpers/catchError';
 import Noco from '~/Noco';
 import { extractProps } from '~/helpers/extractProps';
 import NocoCache from '~/cache/NocoCache';
-import { CacheGetType, CacheScope, MetaTable } from '~/utils/globals';
-import { BaseUser } from '~/models';
+import {
+  CacheDelDirection,
+  CacheGetType,
+  CacheScope,
+  MetaTable,
+} from '~/utils/globals';
+import { Base, BaseUser } from '~/models';
 import { sanitiseUserObj } from '~/utils';
 
 export default class User implements UserType {
@@ -66,6 +71,16 @@ export default class User implements UserType {
 
     await NocoCache.del(CacheScope.INSTANCE_META);
 
+    // clear all base user related cache for instance
+    const bases = await Base.list({}, ncMeta);
+    for (const base of bases) {
+      await NocoCache.deepDel(
+        CacheScope.BASE_USER,
+        `${CacheScope.BASE_USER}:${base.id}:list`,
+        CacheDelDirection.PARENT_TO_CHILD,
+      );
+    }
+
     return this.get(id, ncMeta);
   }
 
@@ -106,25 +121,12 @@ export default class User implements UserType {
     // delete the email-based cache to avoid unexpected behaviour since we can update email as well
     await NocoCache.del(`${CacheScope.USER}:${existingUser.email}`);
 
-    // as <baseId> is unknown, delete user:<email>___<baseId> in cache
-    await NocoCache.delAll(CacheScope.USER, `${existingUser.email}___*`);
-
-    // get existing cache
-    const keys = [
-      // update user:<id>
-      `${CacheScope.USER}:${id}`,
-    ];
-    for (const key of keys) {
-      let o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT);
-      if (o) {
-        o = { ...o, ...updateObj };
-        // set cache
-        await NocoCache.set(key, o);
-      }
-    }
+    await ncMeta.metaUpdate(null, null, MetaTable.USERS, updateObj, id);
 
-    // set meta
-    return await ncMeta.metaUpdate(null, null, MetaTable.USERS, updateObj, id);
+    // clear all user related cache
+    await this.clearCache(id, ncMeta);
+
+    return this.get(id, ncMeta);
   }
 
   public static async getByEmail(_email: string, ncMeta = Noco.ncMeta) {
@@ -240,10 +242,7 @@ export default class User implements UserType {
     if (!user) NcError.badRequest('User not found');
 
     // clear all user related cache
-    await NocoCache.delAll(CacheScope.USER, `${userId}___*`);
-    await NocoCache.delAll(CacheScope.USER, `${user.email}___*`);
-    await NocoCache.del(`${CacheScope.USER}:${userId}`);
-    await NocoCache.del(`${CacheScope.USER}:${user.email}`);
+    await this.clearCache(userId, ncMeta);
 
     return await ncMeta.metaDelete(null, null, MetaTable.USERS, userId);
   }
@@ -283,4 +282,23 @@ export default class User implements UserType {
       base_roles: baseRoles ? baseRoles : null,
     } as any;
   }
+
+  protected static async clearCache(userId: string, ncMeta = Noco.ncMeta) {
+    const user = await this.get(userId, ncMeta);
+    if (!user) NcError.badRequest('User not found');
+
+    const bases = await BaseUser.getProjectsList(userId, {}, ncMeta);
+
+    for (const base of bases) {
+      await NocoCache.deepDel(
+        CacheScope.BASE_USER,
+        `${CacheScope.BASE_USER}:${base.id}:list`,
+        CacheDelDirection.PARENT_TO_CHILD,
+      );
+    }
+
+    // clear all user related cache
+    await NocoCache.del(`${CacheScope.USER}:${userId}`);
+    await NocoCache.del(`${CacheScope.USER}:${user.email}`);
+  }
 }
diff --git a/packages/nocodb/src/modules/datas/helpers.ts b/packages/nocodb/src/modules/datas/helpers.ts
index 2a72a7466b..0985811441 100644
--- a/packages/nocodb/src/modules/datas/helpers.ts
+++ b/packages/nocodb/src/modules/datas/helpers.ts
@@ -160,14 +160,26 @@ export async function serializeCellValue({
         }
       } catch {}
 
-      return (data || []).map(
-        (attachment) =>
-          `${encodeURI(attachment.title)}(${encodeURI(
-            attachment.signedPath
-              ? `${siteUrl}/${attachment.signedPath}`
-              : attachment.signedUrl,
-          )})`,
-      );
+      return (data || [])
+        .map(
+          (attachment) =>
+            `${encodeURI(attachment.title)}(${encodeURI(
+              attachment.signedPath
+                ? `${siteUrl}/${attachment.signedPath}`
+                : attachment.signedUrl,
+            )})`,
+        )
+        .join(', ');
+    }
+    case UITypes.User: {
+      let data = value;
+      try {
+        if (typeof value === 'string') {
+          data = JSON.parse(value);
+        }
+      } catch {}
+
+      return (data || []).map((user) => `${user.email}`).join(', ');
     }
     case UITypes.Lookup:
       {
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.controller.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.controller.ts
index 863989c980..73b68c142a 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.controller.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.controller.ts
@@ -53,7 +53,7 @@ export class DuplicateController {
       throw new Error(`Base not found for id '${sharedBaseId}'`);
     }
 
-    const source = (await base.getBases())[0];
+    const source = (await base.getSources())[0];
 
     if (!source) {
       throw new Error(`Source not found!`);
@@ -124,7 +124,7 @@ export class DuplicateController {
 
     const source = sourceId
       ? await Source.get(sourceId)
-      : (await base.getBases())[0];
+      : (await base.getSources())[0];
 
     if (!source) {
       throw new Error(`Source not found!`);
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
index 090f199688..ba9fcde42b 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
@@ -74,7 +74,7 @@ export class DuplicateProcessor {
         throw new Error(`Export failed for source '${source.id}'`);
       }
 
-      await dupProject.getBases();
+      await dupProject.getSources();
 
       const dupBase = dupProject.sources[0];
 
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
index 885d279989..e6712a3eab 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
@@ -88,7 +88,7 @@ export class ExportService {
                   `SELECT pg_get_serial_sequence('??', ?) as seq;`,
                   [baseModel.getTnPath(model.table_name), column.column_name],
                 );
-                if (seq.rows.length > 0) {
+                if (seq.rows.length > 0 && seq.rows[0].seq) {
                   const seqName = seq.rows[0].seq;
 
                   const res = await sqlClient.raw(
@@ -453,6 +453,17 @@ export class ExportService {
                   row[colId] = v;
                 }
                 break;
+              case UITypes.User:
+                if (v) {
+                  const userIds = [];
+                  for (const user of v as { id: string }[]) {
+                    userIds.push(user.id);
+                  }
+                  row[colId] = userIds.join(',');
+                } else {
+                  row[colId] = v;
+                }
+                break;
               case UITypes.Formula:
               case UITypes.Lookup:
               case UITypes.Rollup:
diff --git a/packages/nocodb/src/schema/swagger-v2.json b/packages/nocodb/src/schema/swagger-v2.json
index 3da8c674a9..7467bf61ae 100644
--- a/packages/nocodb/src/schema/swagger-v2.json
+++ b/packages/nocodb/src/schema/swagger-v2.json
@@ -12126,7 +12126,8 @@
               "URL",
               "Year",
               "QrCode",
-              "Links"
+              "Links",
+              "User"
             ],
             "type": "string"
           },
@@ -15343,7 +15344,8 @@
               "URL",
               "Year",
               "QrCode",
-              "Links"
+              "Links",
+              "User"
             ],
             "type": "string",
             "description": "UI Data Type"
diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index 09247f5a6f..a2fde486d3 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -679,7 +679,7 @@
                   "properties": {
                     "token": {
                       "type": "string",
-                      "description": "New access token for user",
+                      "description": "New JWT auth token for user",
                       "example": "96751db2d53fb834382b682268874a2ea9ee610e4d904e688d1513f11d3c30d62d36d9e05dec0d63"
                     }
                   }
@@ -698,7 +698,7 @@
             "$ref": "#/components/responses/BadRequest"
           }
         },
-        "description": "Regenerate user refresh token",
+        "description": "Creates a new refresh token and JWT auth token for the user. The refresh token is sent as a cookie, while the JWT auth token is included in the response body.",
         "tags": [
           "Auth"
         ],
@@ -17343,7 +17343,8 @@
               "URL",
               "Year",
               "QrCode",
-              "Links"
+              "Links",
+              "User"
             ],
             "type": "string"
           },
@@ -20563,7 +20564,8 @@
               "URL",
               "Year",
               "QrCode",
-              "Links"
+              "Links",
+              "User"
             ],
             "type": "string",
             "description": "UI Data Type"
@@ -23862,6 +23864,27 @@
             "type": "boolean"
           }
         }
+      },
+      "UserFieldRecord": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "required": true
+          },
+          "display_name": {
+            "type": "string",
+            "required": false
+          },
+          "email": {
+            "type": "string",
+            "required": true
+          },
+          "deleted": {
+            "type": "boolean",
+            "required": false
+          }
+        }
       }
     },
     "responses": {
diff --git a/packages/nocodb/src/services/api-docs/swagger/getSwaggerColumnMetas.ts b/packages/nocodb/src/services/api-docs/swagger/getSwaggerColumnMetas.ts
index dd5967d56a..7aaa525bd4 100644
--- a/packages/nocodb/src/services/api-docs/swagger/getSwaggerColumnMetas.ts
+++ b/packages/nocodb/src/services/api-docs/swagger/getSwaggerColumnMetas.ts
@@ -8,7 +8,7 @@ export default async (
   base: Base,
   ncMeta = Noco.ncMeta,
 ): Promise<SwaggerColumn[]> => {
-  const dbType = await base.getBases().then((b) => b?.[0]?.type);
+  const dbType = await base.getSources().then((b) => b?.[0]?.type);
   return Promise.all(
     columns.map(async (c) => {
       const field: SwaggerColumn = {
diff --git a/packages/nocodb/src/services/api-docs/swaggerV2/getSwaggerColumnMetas.ts b/packages/nocodb/src/services/api-docs/swaggerV2/getSwaggerColumnMetas.ts
index 660c1d45be..299e031c0f 100644
--- a/packages/nocodb/src/services/api-docs/swaggerV2/getSwaggerColumnMetas.ts
+++ b/packages/nocodb/src/services/api-docs/swaggerV2/getSwaggerColumnMetas.ts
@@ -8,7 +8,7 @@ export default async (
   base: Base,
   ncMeta = Noco.ncMeta,
 ): Promise<SwaggerColumn[]> => {
-  const dbType = await base.getBases().then((b) => b?.[0]?.type);
+  const dbType = await base.getSources().then((b) => b?.[0]?.type);
   return Promise.all(
     columns.map(async (c) => {
       const field: SwaggerColumn = {
diff --git a/packages/nocodb/src/services/base-users/base-users.service.ts b/packages/nocodb/src/services/base-users/base-users.service.ts
index b7d7899523..f7025be205 100644
--- a/packages/nocodb/src/services/base-users/base-users.service.ts
+++ b/packages/nocodb/src/services/base-users/base-users.service.ts
@@ -11,7 +11,6 @@ import * as ejs from 'ejs';
 import validator from 'validator';
 import type { ProjectUserReqType, UserType } from 'nocodb-sdk';
 import type { NcRequest } from '~/interface/config';
-import NocoCache from '~/cache/NocoCache';
 import { validatePayload } from '~/helpers';
 import Noco from '~/Noco';
 import { AppHooksService } from '~/services/app-hooks/app-hooks.service';
@@ -20,8 +19,7 @@ import NcPluginMgrv2 from '~/helpers/NcPluginMgrv2';
 import { PagedResponseImpl } from '~/helpers/PagedResponse';
 import { randomTokenString } from '~/helpers/stringHelpers';
 import { Base, BaseUser, User } from '~/models';
-
-import { CacheGetType, CacheScope, MetaTable } from '~/utils/globals';
+import { MetaTable } from '~/utils/globals';
 import { extractProps } from '~/helpers/extractProps';
 import { getProjectRolePower } from '~/utils/roleHelper';
 
@@ -29,20 +27,15 @@ import { getProjectRolePower } from '~/utils/roleHelper';
 export class BaseUsersService {
   constructor(protected appHooksService: AppHooksService) {}
 
-  async userList(param: { baseId: string; query: any }) {
-    return new PagedResponseImpl(
-      await BaseUser.getUsersList({
-        ...param.query,
-        base_id: param.baseId,
-      }),
-      {
-        ...param.query,
-        count: await BaseUser.getUsersCount({
-          base_id: param.baseId,
-          ...param.query,
-        }),
-      },
-    );
+  async userList(param: { baseId: string; mode?: 'full' | 'viewer' }) {
+    const baseUsers = await BaseUser.getUsersList({
+      base_id: param.baseId,
+      mode: param.mode,
+    });
+
+    return new PagedResponseImpl(baseUsers, {
+      count: baseUsers.length,
+    });
   }
 
   async userInvite(param: {
@@ -112,7 +105,7 @@ export class BaseUsersService {
           return NcError.badRequest('Invalid base id');
         }
 
-        if (baseUser) {
+        if (baseUser && baseUser.roles) {
           NcError.badRequest(
             `${user.email} with role ${baseUser.roles} already exists in this base`,
           );
@@ -131,19 +124,6 @@ export class BaseUsersService {
           ip: param.req.clientIp,
           req: param.req,
         });
-
-        const cachedUser = await NocoCache.get(
-          `${CacheScope.USER}:${email}___${param.baseId}`,
-          CacheGetType.TYPE_OBJECT,
-        );
-
-        if (cachedUser) {
-          cachedUser.roles = param.baseUser.roles || 'editor';
-          await NocoCache.set(
-            `${CacheScope.USER}:${email}___${param.baseId}`,
-            cachedUser,
-          );
-        }
       } else {
         try {
           // create new user with invite token
diff --git a/packages/nocodb/src/services/bases.service.ts b/packages/nocodb/src/services/bases.service.ts
index a9cadcb7ee..583cfff0f9 100644
--- a/packages/nocodb/src/services/bases.service.ts
+++ b/packages/nocodb/src/services/bases.service.ts
@@ -203,7 +203,7 @@ export class BasesService {
     await syncMigration(base);
 
     // populate metadata if existing table
-    for (const source of await base.getBases()) {
+    for (const source of await base.getSources()) {
       if (process.env.NC_CLOUD !== 'true' && !base.is_meta) {
         const info = await populateMeta(source, base);
 
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 09cecbd6e6..515f25056e 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -6,6 +6,7 @@ import {
   substituteColumnAliasWithIdInFormula,
   substituteColumnIdWithAliasInFormula,
   UITypes,
+  validateFormulaAndExtractTreeWithType,
 } from 'nocodb-sdk';
 import { pluralize, singularize } from 'inflection';
 import hash from 'object-hash';
@@ -43,7 +44,14 @@ import {
 } from '~/helpers/getUniqueName';
 import mapDefaultDisplayValue from '~/helpers/mapDefaultDisplayValue';
 import validateParams from '~/helpers/validateParams';
-import { Column, FormulaColumn, KanbanView, Model, Source } from '~/models';
+import {
+  BaseUser,
+  Column,
+  FormulaColumn,
+  KanbanView,
+  Model,
+  Source,
+} from '~/models';
 import Noco from '~/Noco';
 import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2';
 import { MetaTable } from '~/utils/globals';
@@ -184,6 +192,7 @@ export class ColumnsService {
     let colBody = { ...param.column } as Column & {
       formula?: string;
       formula_raw?: string;
+      parsed_tree?: any;
     };
     if (
       [
@@ -208,6 +217,17 @@ export class ColumnsService {
             colBody.formula_raw || colBody.formula,
             table.columns,
           );
+          colBody.parsed_tree = await validateFormulaAndExtractTreeWithType({
+            formula: colBody.formula || colBody.formula_raw,
+            columns: table.columns,
+            column,
+            clientOrSqlUi: source.type,
+            getMeta: async (modelId) => {
+              const model = await Model.get(modelId);
+              await model.getColumns();
+              return model;
+            },
+          });
 
           try {
             const baseModel = await reuseOrSave('baseModel', reuse, async () =>
@@ -227,6 +247,7 @@ export class ColumnsService {
               {},
               null,
               true,
+              colBody.parsed_tree,
             );
           } catch (e) {
             console.error(e);
@@ -931,6 +952,17 @@ export class ColumnsService {
                       ]);
                     await FormulaColumn.update(c.id, {
                       formula_raw: new_formula_raw,
+                      parsed_tree: await validateFormulaAndExtractTreeWithType({
+                        formula: new_formula_raw,
+                        columns: table.columns,
+                        column,
+                        clientOrSqlUi: source.type,
+                        getMeta: async (modelId) => {
+                          const model = await Model.get(modelId);
+                          await model.getColumns();
+                          return model;
+                        },
+                      }),
                     });
                   }
                 }
@@ -952,6 +984,393 @@ export class ColumnsService {
       await Column.update(param.columnId, {
         ...colBody,
       });
+    } else if (colBody.uidt === UITypes.User) {
+      // handle default value for user column
+      if (colBody.cdf) {
+        const baseUsers = await BaseUser.getUsersList({
+          base_id: source.base_id,
+          include_ws_deleted: false,
+        });
+
+        const emailOrIds = colBody.cdf.split(',');
+        const emailsNotPresent = emailOrIds.filter((el) => {
+          return !baseUsers.find((user) => user.id === el || user.email === el);
+        });
+
+        if (emailsNotPresent.length) {
+          NcError.badRequest(
+            `The following default users are not part of workspace: ${emailsNotPresent.join(
+              ', ',
+            )}`,
+          );
+        }
+
+        const ids = emailOrIds.map((el) => {
+          const user = baseUsers.find(
+            (user) => user.id === el || user.email === el,
+          );
+          return user.id;
+        });
+
+        colBody.cdf = ids.join(',');
+      }
+
+      if (column.uidt === UITypes.User) {
+        // multi user to single user
+        if (
+          colBody.meta?.is_multi === false &&
+          column.meta?.is_multi === true
+        ) {
+          const baseModel = await reuseOrSave('baseModel', reuse, async () =>
+            Model.getBaseModelSQL({
+              id: table.id,
+              dbDriver: await reuseOrSave('dbDriver', reuse, async () =>
+                NcConnectionMgrv2.get(source),
+              ),
+            }),
+          );
+
+          const dbDriver = await reuseOrSave('dbDriver', reuse, async () =>
+            NcConnectionMgrv2.get(source),
+          );
+          const driverType = dbDriver.clientType();
+
+          // MultiSelect to SingleSelect
+          if (driverType === 'mysql' || driverType === 'mysql2') {
+            await sqlClient.raw(
+              `UPDATE ?? SET ?? = SUBSTRING_INDEX(??, ',', 1) WHERE ?? LIKE '%,%';`,
+              [
+                baseModel.getTnPath(table.table_name),
+                column.column_name,
+                column.column_name,
+                column.column_name,
+              ],
+            );
+          } else if (driverType === 'pg') {
+            await sqlClient.raw(`UPDATE ?? SET ?? = split_part(??, ',', 1);`, [
+              baseModel.getTnPath(table.table_name),
+              column.column_name,
+              column.column_name,
+            ]);
+          } else if (driverType === 'mssql') {
+            await sqlClient.raw(
+              `UPDATE ?? SET ?? = LEFT(cast(?? as varchar(max)), CHARINDEX(',', ??) - 1) WHERE CHARINDEX(',', ??) > 0;`,
+              [
+                baseModel.getTnPath(table.table_name),
+                column.column_name,
+                column.column_name,
+                column.column_name,
+                column.column_name,
+              ],
+            );
+          } else if (driverType === 'sqlite3') {
+            await sqlClient.raw(
+              `UPDATE ?? SET ?? = substr(??, 1, instr(??, ',') - 1) WHERE ?? LIKE '%,%';`,
+              [
+                baseModel.getTnPath(table.table_name),
+                column.column_name,
+                column.column_name,
+                column.column_name,
+                column.column_name,
+              ],
+            );
+          }
+        }
+
+        colBody = await getColumnPropsFromUIDT(colBody, source);
+        const tableUpdateBody = {
+          ...table,
+          tn: table.table_name,
+          originalColumns: table.columns.map((c) => ({
+            ...c,
+            cn: c.column_name,
+            cno: c.column_name,
+          })),
+          columns: await Promise.all(
+            table.columns.map(async (c) => {
+              if (c.id === param.columnId) {
+                const res = {
+                  ...c,
+                  ...colBody,
+                  cn: colBody.column_name,
+                  cno: c.column_name,
+                  altered: Altered.UPDATE_COLUMN,
+                };
+
+                // update formula with new column name
+                if (c.column_name != colBody.column_name) {
+                  const formulas = await Noco.ncMeta
+                    .knex(MetaTable.COL_FORMULA)
+                    .where('formula', 'like', `%${c.id}%`);
+                  if (formulas) {
+                    const new_column = c;
+                    new_column.column_name = colBody.column_name;
+                    new_column.title = colBody.title;
+                    for (const f of formulas) {
+                      // the formula with column IDs only
+                      const formula = f.formula;
+                      // replace column IDs with alias to get the new formula_raw
+                      const new_formula_raw =
+                        substituteColumnIdWithAliasInFormula(formula, [
+                          new_column,
+                        ]);
+                      await FormulaColumn.update(c.id, {
+                        formula_raw: new_formula_raw,
+                      });
+                    }
+                  }
+                }
+                return Promise.resolve(res);
+              } else {
+                (c as any).cn = c.column_name;
+              }
+              return Promise.resolve(c);
+            }),
+          ),
+        };
+
+        const sqlMgr = await reuseOrSave('sqlMgr', reuse, async () =>
+          ProjectMgrv2.getSqlMgr({ id: source.base_id }),
+        );
+        await sqlMgr.sqlOpPlus(source, 'tableUpdate', tableUpdateBody);
+
+        await Column.update(param.columnId, {
+          ...colBody,
+        });
+      } else if (
+        [UITypes.SingleLineText, UITypes.Email].includes(column.uidt)
+      ) {
+        // email/text to user
+        const baseModel = await reuseOrSave('baseModel', reuse, async () =>
+          Model.getBaseModelSQL({
+            id: table.id,
+            dbDriver: await reuseOrSave('dbDriver', reuse, async () =>
+              NcConnectionMgrv2.get(source),
+            ),
+          }),
+        );
+
+        const baseUsers = await BaseUser.getUsersList({
+          base_id: column.base_id,
+        });
+
+        try {
+          const data = await baseModel.execAndParse(
+            sqlClient.knex
+              .raw('SELECT DISTINCT ?? FROM ??', [
+                column.column_name,
+                baseModel.getTnPath(table.table_name),
+              ])
+              .toQuery(),
+          );
+
+          let isMultiple = false;
+
+          const rows = data.map((el) => el[column.column_name]);
+          const emails = rows
+            .map((el) => {
+              const res = el.split(',').map((e) => e.trim());
+              if (res.length > 1) {
+                isMultiple = true;
+              }
+              return res;
+            })
+            .flat();
+
+          // check if emails are present baseUsers
+          const emailsNotPresent = emails.filter((el) => {
+            return !baseUsers.find((user) => user.email === el);
+          });
+
+          if (emailsNotPresent.length) {
+            NcError.badRequest(
+              `Some of the emails are not present in the database.`,
+            );
+          }
+
+          if (isMultiple) {
+            colBody.meta = {
+              is_multi: true,
+            };
+          }
+        } catch (e) {
+          NcError.badRequest('Some of the emails are present in the database.');
+        }
+
+        // create nested replace statement for each user
+        const setStatement = baseUsers.reduce((acc, user) => {
+          const qb = sqlClient.knex.raw(`REPLACE(${acc}, ?, ?)`, [
+            user.email,
+            user.id,
+          ]);
+          return qb.toQuery();
+        }, sqlClient.knex.raw(`??`, [column.column_name]).toQuery());
+
+        await sqlClient.raw(`UPDATE ?? SET ?? = ${setStatement};`, [
+          baseModel.getTnPath(table.table_name),
+          column.column_name,
+        ]);
+
+        colBody = await getColumnPropsFromUIDT(colBody, source);
+        const tableUpdateBody = {
+          ...table,
+          tn: table.table_name,
+          originalColumns: table.columns.map((c) => ({
+            ...c,
+            cn: c.column_name,
+            cno: c.column_name,
+          })),
+          columns: await Promise.all(
+            table.columns.map(async (c) => {
+              if (c.id === param.columnId) {
+                const res = {
+                  ...c,
+                  ...colBody,
+                  cn: colBody.column_name,
+                  cno: c.column_name,
+                  altered: Altered.UPDATE_COLUMN,
+                };
+
+                // update formula with new column name
+                if (c.column_name != colBody.column_name) {
+                  const formulas = await Noco.ncMeta
+                    .knex(MetaTable.COL_FORMULA)
+                    .where('formula', 'like', `%${c.id}%`);
+                  if (formulas) {
+                    const new_column = c;
+                    new_column.column_name = colBody.column_name;
+                    new_column.title = colBody.title;
+                    for (const f of formulas) {
+                      // the formula with column IDs only
+                      const formula = f.formula;
+                      // replace column IDs with alias to get the new formula_raw
+                      const new_formula_raw =
+                        substituteColumnIdWithAliasInFormula(formula, [
+                          new_column,
+                        ]);
+                      await FormulaColumn.update(c.id, {
+                        formula_raw: new_formula_raw,
+                      });
+                    }
+                  }
+                }
+                return Promise.resolve(res);
+              } else {
+                (c as any).cn = c.column_name;
+              }
+              return Promise.resolve(c);
+            }),
+          ),
+        };
+
+        const sqlMgr = await reuseOrSave('sqlMgr', reuse, async () =>
+          ProjectMgrv2.getSqlMgr({ id: source.base_id }),
+        );
+        await sqlMgr.sqlOpPlus(source, 'tableUpdate', tableUpdateBody);
+
+        await Column.update(param.columnId, {
+          ...colBody,
+        });
+      } else {
+        NcError.notImplemented(
+          `Updating ${column.uidt} => ${colBody.uidt} is not supported at the moment`,
+        );
+      }
+    } else if (column.uidt === UITypes.User) {
+      if ([UITypes.SingleLineText, UITypes.Email].includes(colBody.uidt)) {
+        // user to email/text
+        const baseModel = await reuseOrSave('baseModel', reuse, async () =>
+          Model.getBaseModelSQL({
+            id: table.id,
+            dbDriver: await reuseOrSave('dbDriver', reuse, async () =>
+              NcConnectionMgrv2.get(source),
+            ),
+          }),
+        );
+
+        const baseUsers = await BaseUser.getUsersList({
+          base_id: column.base_id,
+        });
+
+        // create nested replace statement for each user
+        const setStatement = baseUsers.reduce((acc, user) => {
+          const qb = sqlClient.knex.raw(`REPLACE(${acc}, ?, ?)`, [
+            user.id,
+            user.email,
+          ]);
+          return qb.toQuery();
+        }, sqlClient.knex.raw(`??`, [column.column_name]).toQuery());
+
+        await sqlClient.raw(`UPDATE ?? SET ?? = ${setStatement};`, [
+          baseModel.getTnPath(table.table_name),
+          column.column_name,
+        ]);
+
+        colBody = await getColumnPropsFromUIDT(colBody, source);
+        const tableUpdateBody = {
+          ...table,
+          tn: table.table_name,
+          originalColumns: table.columns.map((c) => ({
+            ...c,
+            cn: c.column_name,
+            cno: c.column_name,
+          })),
+          columns: await Promise.all(
+            table.columns.map(async (c) => {
+              if (c.id === param.columnId) {
+                const res = {
+                  ...c,
+                  ...colBody,
+                  cn: colBody.column_name,
+                  cno: c.column_name,
+                  altered: Altered.UPDATE_COLUMN,
+                };
+
+                // update formula with new column name
+                if (c.column_name != colBody.column_name) {
+                  const formulas = await Noco.ncMeta
+                    .knex(MetaTable.COL_FORMULA)
+                    .where('formula', 'like', `%${c.id}%`);
+                  if (formulas) {
+                    const new_column = c;
+                    new_column.column_name = colBody.column_name;
+                    new_column.title = colBody.title;
+                    for (const f of formulas) {
+                      // the formula with column IDs only
+                      const formula = f.formula;
+                      // replace column IDs with alias to get the new formula_raw
+                      const new_formula_raw =
+                        substituteColumnIdWithAliasInFormula(formula, [
+                          new_column,
+                        ]);
+                      await FormulaColumn.update(c.id, {
+                        formula_raw: new_formula_raw,
+                      });
+                    }
+                  }
+                }
+                return Promise.resolve(res);
+              } else {
+                (c as any).cn = c.column_name;
+              }
+              return Promise.resolve(c);
+            }),
+          ),
+        };
+
+        const sqlMgr = await reuseOrSave('sqlMgr', reuse, async () =>
+          ProjectMgrv2.getSqlMgr({ id: source.base_id }),
+        );
+        await sqlMgr.sqlOpPlus(source, 'tableUpdate', tableUpdateBody);
+
+        await Column.update(param.columnId, {
+          ...colBody,
+        });
+      } else {
+        NcError.notImplemented(
+          `Updating ${column.uidt} => ${colBody.uidt} is not supported at the moment`,
+        );
+      }
     } else {
       colBody = await getColumnPropsFromUIDT(colBody, source);
       const tableUpdateBody = {
@@ -992,6 +1411,17 @@ export class ColumnsService {
                       ]);
                     await FormulaColumn.update(c.id, {
                       formula_raw: new_formula_raw,
+                      parsed_tree: await validateFormulaAndExtractTreeWithType({
+                        formula: new_formula_raw,
+                        columns: table.columns,
+                        column,
+                        clientOrSqlUi: source.type,
+                        getMeta: async (modelId) => {
+                          const model = await Model.get(modelId);
+                          await model.getColumns();
+                          return model;
+                        },
+                      }),
                     });
                   }
                 }
@@ -1197,6 +1627,22 @@ export class ColumnsService {
           colBody.formula_raw || colBody.formula,
           table.columns,
         );
+        colBody.parsed_tree = await validateFormulaAndExtractTreeWithType({
+          // formula may include double curly brackets in previous version
+          // convert to single curly bracket here for compatibility
+          formula: colBody.formula,
+          column: {
+            ...colBody,
+            colOptions: colBody,
+          },
+          columns: table.columns,
+          clientOrSqlUi: source.type,
+          getMeta: async (modelId) => {
+            const model = await Model.get(modelId);
+            await model.getColumns();
+            return model;
+          },
+        });
 
         try {
           const baseModel = await reuseOrSave('baseModel', reuse, async () =>
@@ -1368,6 +1814,40 @@ export class ColumnsService {
             }
           }
 
+          if (colBody.uidt === UITypes.User) {
+            // handle default value for user column
+            if (colBody.cdf) {
+              const baseUsers = await BaseUser.getUsersList({
+                base_id: base.id,
+                include_ws_deleted: false,
+              });
+
+              const emailOrIds = colBody.cdf.split(',');
+              const emailsNotPresent = emailOrIds.filter((el) => {
+                return !baseUsers.find(
+                  (user) => user.id === el || user.email === el,
+                );
+              });
+
+              if (emailsNotPresent.length) {
+                NcError.badRequest(
+                  `The following default users are not part of workspace: ${emailsNotPresent.join(
+                    ', ',
+                  )}`,
+                );
+              }
+
+              const ids = emailOrIds.map((el) => {
+                const user = baseUsers.find(
+                  (user) => user.id === el || user.email === el,
+                );
+                return user.id;
+              });
+
+              colBody.cdf = ids.join(',');
+            }
+          }
+
           const tableUpdateBody = {
             ...table,
             tn: table.table_name,
diff --git a/packages/nocodb/src/services/public-metas.service.ts b/packages/nocodb/src/services/public-metas.service.ts
index c04a4a7a90..192d2f38a3 100644
--- a/packages/nocodb/src/services/public-metas.service.ts
+++ b/packages/nocodb/src/services/public-metas.service.ts
@@ -3,13 +3,14 @@ import { ErrorMessages, RelationTypes, UITypes } from 'nocodb-sdk';
 import { isLinksOrLTAR } from 'nocodb-sdk';
 import type { LinkToAnotherRecordColumn, LookupColumn } from '~/models';
 import { NcError } from '~/helpers/catchError';
-import { Base, Column, Model, Source, View } from '~/models';
+import { Base, BaseUser, Column, Model, Source, View } from '~/models';
 
 @Injectable()
 export class PublicMetasService {
   async viewMetaGet(param: { sharedViewUuid: string; password: string }) {
     const view: View & {
       relatedMetas?: { [ket: string]: Model };
+      users?: { id: string; display_name: string; email: string }[];
       client?: string;
     } = await View.getByUUID(param.sharedViewUuid);
 
@@ -68,6 +69,18 @@ export class PublicMetasService {
 
     view.relatedMetas = relatedMetas;
 
+    if (view.model.columns.some((c) => c.uidt === UITypes.User)) {
+      const baseUsers = await BaseUser.getUsersList({
+        base_id: view.model.base_id,
+      });
+
+      view.users = baseUsers.map((u) => ({
+        id: u.id,
+        display_name: u.display_name,
+        email: u.email,
+      }));
+    }
+
     return view;
   }
 
diff --git a/packages/nocodb/src/services/utils.service.ts b/packages/nocodb/src/services/utils.service.ts
index 2786ca4783..a21e6215a5 100644
--- a/packages/nocodb/src/services/utils.service.ts
+++ b/packages/nocodb/src/services/utils.service.ts
@@ -310,7 +310,7 @@ export class UtilsService {
                 // sorts count
                 Noco.ncMeta.metaCount(base.id, null, MetaTable.SORT),
                 // row count per base
-                base.getBases().then(async (sources) => {
+                base.getSources().then(async (sources) => {
                   return this.extractResultOrNull(
                     await Promise.allSettled(
                       sources.map(async (source) =>
diff --git a/packages/nocodb/src/utils/acl.ts b/packages/nocodb/src/utils/acl.ts
index 240367af4c..78e60cb544 100644
--- a/packages/nocodb/src/utils/acl.ts
+++ b/packages/nocodb/src/utils/acl.ts
@@ -120,6 +120,7 @@ const permissionScopes = {
     'nestedDataList',
     'nestedDataLink',
     'nestedDataUnlink',
+    'baseUserList',
 
     // Base API Tokens
     'baseApiTokenList',
@@ -184,6 +185,7 @@ const rolePermissions:
       swaggerJson: true,
 
       nestedDataList: true,
+      baseUserList: true,
     },
   },
   [ProjectRoles.COMMENTER]: {
diff --git a/packages/nocodb/src/utils/common/NcConnectionMgrv2.ts b/packages/nocodb/src/utils/common/NcConnectionMgrv2.ts
index 70a783b866..aca16dd7c2 100644
--- a/packages/nocodb/src/utils/common/NcConnectionMgrv2.ts
+++ b/packages/nocodb/src/utils/common/NcConnectionMgrv2.ts
@@ -69,12 +69,16 @@ export default class NcConnectionMgrv2 {
         typeCast(field, next) {
           const res = next();
 
-          // mysql `bit` datatype returns value as Buffer, convert it to integer number
-          if (field.type == 'BIT' && res && res instanceof Buffer) {
-            return parseInt(
-              [...res].map((v) => ('00' + v.toString(16)).slice(-2)).join(''),
-              16,
-            );
+          // mysql - convert all other buffer values to hex string
+          // if `bit` datatype then convert it to integer number
+          if (res && res instanceof Buffer) {
+            const hex = [...res]
+              .map((v) => ('00' + v.toString(16)).slice(-2))
+              .join('');
+            if (field.type == 'BIT') {
+              return parseInt(hex, 16);
+            }
+            return hex;
           }
 
           // mysql `decimal` datatype returns value as string, convert it to float number
diff --git a/packages/nocodb/src/utils/globals.ts b/packages/nocodb/src/utils/globals.ts
index 2c6efb1acd..0a4e570951 100644
--- a/packages/nocodb/src/utils/globals.ts
+++ b/packages/nocodb/src/utils/globals.ts
@@ -149,11 +149,11 @@ export enum CacheScope {
   AUDIT = 'audit',
   HOOK = 'hook',
   PLUGIN = 'plugin',
-  PROJECT_USER = 'baseUser',
+  BASE_USER = 'baseUser',
   MODEL_ROLE_VISIBILITY = 'modelRoleVisibility',
   API_TOKEN = 'apiToken',
   INSTANCE_META = 'instanceMeta',
-  USER_PROJECT = 'userProject',
+  USER_BASE = 'userBase',
   DASHBOARD_PROJECT_DB_PROJECT_LINKING = 'dashboardProjectDBProjectLinking',
   SINGLE_QUERY = 'singleQuery',
   JOBS = 'nc_jobs',
diff --git a/packages/nocodb/tests/unit/factory/column.ts b/packages/nocodb/tests/unit/factory/column.ts
index 21740b1bc9..f3dae4e62a 100644
--- a/packages/nocodb/tests/unit/factory/column.ts
+++ b/packages/nocodb/tests/unit/factory/column.ts
@@ -157,6 +157,25 @@ const customColumns = function (type: string, options: any = {}) {
           dtxp: "'jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec'",
         },
       ];
+    case 'userBased':
+      return [
+        {
+          column_name: 'Id',
+          title: 'Id',
+          uidt: UITypes.ID,
+        },
+        {
+          column_name: 'userFieldSingle',
+          title: 'userFieldSingle',
+          uidt: UITypes.User,
+        },
+        {
+          column_name: 'userFieldMulti',
+          title: 'userFieldMulti',
+          uidt: UITypes.User,
+          meta: { is_multi: true },
+        },
+      ];
     case 'custom':
       return [{ title: 'Id', column_name: 'Id', uidt: UITypes.ID }, ...options];
   }
@@ -194,7 +213,7 @@ const createRollupColumn = async (
     relatedTableColumnTitle: string;
   },
 ) => {
-  const childBases = await base.getBases();
+  const childBases = await base.getSources();
   const childTable = await Model.getByIdOrName({
     base_id: base.id,
     source_id: childBases[0].id!,
@@ -243,7 +262,7 @@ const createLookupColumn = async (
     relationColumnId?: string;
   },
 ) => {
-  const childBases = await base.getBases();
+  const childBases = await base.getSources();
   const childTable = await Model.getByIdOrName({
     base_id: base.id,
     source_id: childBases[0].id!,
@@ -386,6 +405,23 @@ const updateViewColumn = async (
   return updatedColumn;
 };
 
+const updateColumn = async (
+  context,
+  { table, column, attr }: { column: Column; table: Model; attr: any },
+) => {
+  const res = await request(context.app)
+    .patch(`/api/v2/meta/columns/${column.id}`)
+    .set('xc-auth', context.token)
+    .send({
+      ...attr,
+    });
+
+  const updatedColumn: Column = (await table.getColumns()).find(
+    (column) => column.id === column.id,
+  );
+  return updatedColumn;
+};
+
 export {
   customColumns,
   defaultColumns,
@@ -396,4 +432,5 @@ export {
   createLookupColumn,
   createLtarColumn,
   updateViewColumn,
+  updateColumn,
 };
diff --git a/packages/nocodb/tests/unit/factory/row.ts b/packages/nocodb/tests/unit/factory/row.ts
index 3d0140ac5a..c34ece9088 100644
--- a/packages/nocodb/tests/unit/factory/row.ts
+++ b/packages/nocodb/tests/unit/factory/row.ts
@@ -224,7 +224,7 @@ const listRow = async ({
     sortArr?: Sort[];
   };
 }) => {
-  const sources = await base.getBases();
+  const sources = await base.getSources();
   const baseModel = await Model.getBaseModelSQL({
     id: table.id,
     dbDriver: await NcConnectionMgrv2.get(sources[0]!),
diff --git a/packages/nocodb/tests/unit/factory/table.ts b/packages/nocodb/tests/unit/factory/table.ts
index 9ccd7232ba..5cebc0ae09 100644
--- a/packages/nocodb/tests/unit/factory/table.ts
+++ b/packages/nocodb/tests/unit/factory/table.ts
@@ -27,7 +27,7 @@ const getTable = async ({
   base: Base;
   name: string;
 }) => {
-  const sources = await base.getBases();
+  const sources = await base.getSources();
   return await Model.getByIdOrName({
     base_id: base.id,
     source_id: sources[0].id!,
@@ -36,7 +36,7 @@ const getTable = async ({
 };
 
 const getAllTables = async ({ base }: { base: Base }) => {
-  const sources = await base.getBases();
+  const sources = await base.getSources();
   const tables = await Model.list({
     base_id: base.id,
     source_id: sources[0].id!,
diff --git a/packages/nocodb/tests/unit/init/cleanupMeta.ts b/packages/nocodb/tests/unit/init/cleanupMeta.ts
index 418c054b15..0ba32f8065 100644
--- a/packages/nocodb/tests/unit/init/cleanupMeta.ts
+++ b/packages/nocodb/tests/unit/init/cleanupMeta.ts
@@ -11,7 +11,7 @@ const dropTablesAllNonExternalProjects = async () => {
     bases
       .filter((base) => base.is_meta)
       .map(async (base) => {
-        await base.getBases();
+        await base.getSources();
         const source = base.sources && base.sources[0];
         if (!source) return;
 
diff --git a/packages/nocodb/tests/unit/init/index.ts b/packages/nocodb/tests/unit/init/index.ts
index 7067bbceba..f467f51d47 100644
--- a/packages/nocodb/tests/unit/init/index.ts
+++ b/packages/nocodb/tests/unit/init/index.ts
@@ -26,7 +26,7 @@ const serverInit = async () => {
 
 const isFirstTimeRun = () => !server;
 
-export default async function (forceReset = false) {
+export default async function (forceReset = false, roles = 'editor') {
   const { default: TestDbMngr } = await import('../TestDbMngr');
 
   if (isFirstTimeRun()) {
@@ -39,7 +39,7 @@ export default async function (forceReset = false) {
   // }
   await cleanupMeta();
 
-  const { token } = await createUser({ app: server }, { roles: 'editor' });
+  const { token } = await createUser({ app: server }, { roles });
 
   const extra: any = {};
 
diff --git a/packages/nocodb/tests/unit/rest/index.test.ts b/packages/nocodb/tests/unit/rest/index.test.ts
index 0eb63c4506..f14c76c4e3 100644
--- a/packages/nocodb/tests/unit/rest/index.test.ts
+++ b/packages/nocodb/tests/unit/rest/index.test.ts
@@ -10,6 +10,7 @@ import attachmentTests from './tests/attachment.test';
 import filterTest from './tests/filter.test';
 import newDataApisTest from './tests/newDataApis.test';
 import groupByTest from './tests/groupby.test';
+import formulaTests from './tests/formula.test';
 
 let workspaceTest = () => {};
 if (process.env.EE === 'true') {
@@ -31,6 +32,7 @@ function restTests() {
   newDataApisTest();
   groupByTest();
   workspaceTest();
+  formulaTests();
 
   // Enable for dashboard feature
   // widgetTest();
diff --git a/packages/nocodb/tests/unit/rest/tests/formula.test.ts b/packages/nocodb/tests/unit/rest/tests/formula.test.ts
new file mode 100644
index 0000000000..c00167cb80
--- /dev/null
+++ b/packages/nocodb/tests/unit/rest/tests/formula.test.ts
@@ -0,0 +1,125 @@
+import 'mocha';
+import { UITypes } from 'nocodb-sdk';
+import { expect } from 'chai';
+import init from '../../init';
+import { createProject } from '../../factory/base';
+import { createTable } from '../../factory/table';
+import { createBulkRows, listRow, rowMixedValue } from '../../factory/row';
+import { updateColumn } from '../../factory/column';
+import type Model from '../../../../src/models/Model';
+import type Base from '~/models/Base';
+
+let context;
+let base: Base;
+let table: Model;
+let columns: any[];
+let unfilteredRecords: any[] = [];
+
+function formulaRegExpBased() {
+  // prepare data for test cases
+  beforeEach(async function () {
+    context = await init();
+    base = await createProject(context);
+    table = await createTable(context, base, {
+      table_name: 'sampleTable',
+      title: 'sampleTable',
+      columns: [
+        {
+          column_name: 'Id',
+          title: 'Id',
+          uidt: UITypes.ID,
+        },
+        {
+          column_name: 'Title',
+          title: 'Title',
+          uidt: UITypes.SingleLineText,
+        },
+        {
+          column_name: 'formula',
+          title: 'formula',
+          uidt: UITypes.Formula,
+          formula: '20',
+        },
+      ],
+    });
+
+    columns = await table.getColumns();
+
+    const rowAttributes = [];
+    for (let i = 0; i < 100; i++) {
+      const row = {
+        Title: rowMixedValue(columns[1], i),
+      };
+      rowAttributes.push(row);
+    }
+
+    await createBulkRows(context, {
+      base,
+      table,
+      values: rowAttributes,
+    });
+    unfilteredRecords = await listRow({ base, table });
+
+    // verify length of unfiltered records to be 800
+    expect(unfilteredRecords.length).to.equal(100);
+  });
+
+  it('Type: REGEX_MATCH ', async () => {
+    // if not pg or mysql, skip regex test since it is not implemented for other databases
+    if (!['pg', 'mysql2', 'mysql'].includes(base.sources[0].type)) {
+      return;
+    }
+
+    const formulaList = [
+      `REGEX_MATCH("123-45-6789", "\\d{3}-\\d{2}-\\d{4}")`,
+      'REGEX_MATCH("123-45-6789", "\\d{3}-\\d{2}-\\d{4}")',
+      'REGEX_MATCH("123-45-6789", "\\d{3}-\\d{2}-\\d{4}")',
+      'REGEX_MATCH("ABC-45-6789", "\\w{3}-\\d{2}-\\d{4}")',
+      'REGEX_MATCH("123-XY-6789", "\\d{3}-\\D{2}-\\d{4}")',
+      'REGEX_MATCH("123-45-$#@!", "123-45-[\\s\\S]{4}")',
+      'REGEX_MATCH("123456789", "1?2?3?-?4?5-?6?7?8?9?")',
+      'REGEX_MATCH("123-456789", "\\d{3}-?\\d{2}-?\\d{4}")',
+      'REGEX_MATCH("123-45-6789", "123-\\d{2}-6789")',
+      'REGEX_MATCH("abc123", "[a-z]{3}\\d{3}")',
+      'REGEX_MATCH("A1B2C3", "[A-Z]\\d[A-Z]\\d[A-Z]\\d")',
+      'REGEX_MATCH("hello123world", "\\w{5}\\d{3}\\w{5}")',
+      'REGEX_MATCH("email@example.com", "[a-zA-Z]+@[a-zA-Z]+\\.[a-zA-Z]+")',
+      'REGEX_MATCH("2023-12-14", "\\d{4}-\\d{2}-\\d{2}")',
+      'REGEX_MATCH("USD 100.50", "USD \\d+\\.\\d{2}")',
+      'REGEX_MATCH("http://www.example.com", "https?://[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}")',
+      'REGEX_MATCH("555-1234", "\\d{3}-\\d{4}")',
+      'REGEX_MATCH("username123", "[a-zA-Z]+\\d{3}")',
+      'REGEX_MATCH("apple, orange, banana", "\\w+, \\w+, \\w+")',
+      'REGEX_MATCH("aaaabbcc", "(\\w{2})\\1")',
+      'REGEX_MATCH("1234567890", "\\d{10}")',
+      'REGEX_MATCH("12.34", "\\d+\\.\\d{2}")',
+      'REGEX_MATCH("123 Main St, City", "\\d+ [a-zA-Z]+ St, [a-zA-Z]+")',
+      'REGEX_MATCH("X1Y2Z3", "[A-Z]\\d[A-Z]\\d[A-Z]\\d")',
+      'REGEX_MATCH("555-555-5555", "\\d{3}-\\d{3}-\\d{4}")',
+      'REGEX_MATCH("password123", "^(?=.*\\d)(?=.*[a-zA-Z]).{8,}$")',
+      'REGEX_MATCH("12345", "^[0-9]{5}$")',
+      'REGEX_MATCH("abc123!@#", "[a-zA-Z0-9!@#]+")',
+      'REGEX_MATCH("12-December-2023", "\\d{2}-[a-zA-Z]+-\\d{4}")',
+    ];
+
+    for (let i = 0; i < formulaList.length; i++) {
+      await updateColumn(context, {
+        table,
+        column: columns[2],
+        attr: {
+          formula: formulaList[i],
+          formula_raw: formulaList[i],
+          title: 'formula',
+          uidt: UITypes.Formula,
+        },
+      });
+
+      unfilteredRecords = await listRow({ base, table });
+      expect(unfilteredRecords[0].formula).to.equal(1);
+    }
+  });
+}
+
+export default function () {
+  describe('Formula: REGEXP based', formulaRegExpBased);
+}
diff --git a/packages/nocodb/tests/unit/rest/tests/newDataApis.test.ts b/packages/nocodb/tests/unit/rest/tests/newDataApis.test.ts
index 5a05eb24bd..793f8180dc 100644
--- a/packages/nocodb/tests/unit/rest/tests/newDataApis.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/newDataApis.test.ts
@@ -82,7 +82,7 @@
  */
 
 import 'mocha';
-import { UITypes, ViewTypes } from 'nocodb-sdk';
+import {UITypes, ViewTypes, WorkspaceUserRoles} from 'nocodb-sdk';
 import { expect } from 'chai';
 import request from 'supertest';
 import init from '../../init';
@@ -98,6 +98,7 @@ import {
 import { createView, updateView } from '../../factory/view';
 
 import { isPg } from '../../init/db';
+import { defaultUserArgs } from '../../factory/user';
 import type { ColumnType } from 'nocodb-sdk';
 import type Base from '~/models/Base';
 import type Model from '../../../../src/models/Model';
@@ -2731,6 +2732,248 @@ function linkBased() {
   });
 }
 
+function userFieldBased() {
+  // prepare data for test cases
+  beforeEach(async function () {
+    context = await init(false, 'creator');
+    base = await createProject(context);
+    table = await createTable(context, base, {
+      table_name: 'userBased',
+      title: 'userBased',
+      columns: customColumns('userBased'),
+    });
+
+    // retrieve column meta
+    columns = await table.getColumns();
+
+    // add users to workspace
+    const users = [
+      'a@nocodb.com',
+      'b@nocodb.com',
+      'c@nocodb.com',
+      'd@nocodb.com',
+      'e@nocodb.com',
+    ];
+    for (const email of users) {
+      await addUsers(email);
+    }
+    const userList = await getUsers();
+    userList[userList.length] = { email: null };
+    userList[userList.length] = { email: '' };
+
+    // build records
+    const rowAttributes = [];
+    for (let i = 0; i < 400; i++) {
+      const row = {
+        userFieldSingle: [{ email: userList[i % userList.length].email }],
+        userFieldMulti: [
+          { email: userList[i % userList.length].email },
+          { email: userList[(i + 1) % userList.length].email },
+        ],
+      };
+      rowAttributes.push(row);
+    }
+
+    // insert records
+    await createBulkRows(context, {
+      base,
+      table,
+      values: rowAttributes,
+    });
+
+    // retrieve inserted records
+    insertedRecords = await listRow({ base, table });
+
+    // verify length of unfiltered records to be 400
+    expect(insertedRecords.length).to.equal(400);
+  });
+
+  async function addUsers(email) {
+    const response = await request(context.app)
+      .post('/api/v1/auth/user/signup')
+      .send({ email, password: defaultUserArgs.password })
+      .expect(200);
+
+    const token = response.body.token;
+    expect(token).to.be.a('string');
+
+    // invite users to workspace
+    if (process.env.EE === 'true') {
+      let rsp = await request(context.app)
+        .post(`/api/v1/workspaces/${context.fk_workspace_id}/invitations`)
+        .set('xc-auth', context.token)
+        .send({ email, roles: WorkspaceUserRoles.VIEWER });
+      console.log(rsp);
+    }
+  }
+
+  async function getUsers() {
+    const response = await request(context.app)
+      .get(`/api/v2/meta/bases/${base.id}/users`)
+      .set('xc-auth', context.token);
+
+    expect(response.body).to.have.keys(['users']);
+    expect(response.body.users.list).to.have.length(6);
+    return response.body.users.list;
+  }
+
+  it('List records', async function () {
+    // retrieve inserted records
+    insertedRecords = await listRow({ base, table });
+
+    // verify length of unfiltered records to be 400
+    expect(insertedRecords.length).to.equal(400);
+    expect(insertedRecords[0].userFieldSingle[0]).to.have.keys([
+      'email',
+      'id',
+      'display_name',
+    ]);
+    expect(insertedRecords[0].userFieldMulti[0]).to.have.keys([
+      'email',
+      'id',
+      'display_name',
+    ]);
+  });
+
+  it('List: sort, ascending', async function () {
+    const sortColumn = columns.find((c) => c.title === 'userFieldSingle');
+    const rsp = await ncAxiosGet({
+      query: { sort: 'userFieldSingle', limit: 400 },
+    });
+
+    expect(verifyColumnsInRsp(rsp.body.list[0], columns)).to.equal(true);
+    const sortedArray = rsp.body.list.map((r) => r[sortColumn.title]);
+    expect(sortedArray).to.deep.equal(
+      sortedArray.sort((a, b) => {
+        const emailA = a ? a[0]?.email?.toLowerCase() : '';
+        const emailB = b ? b[0]?.email?.toLowerCase() : '';
+
+        if (emailA < emailB) {
+          return -1;
+        }
+        if (emailA > emailB) {
+          return 1;
+        }
+
+        // Emails are equal, no change in order
+        return 0;
+      }),
+    );
+  });
+
+  it('List: filter, single', async function () {
+    const userList = await getUsers();
+    const rsp = await ncAxiosGet({
+      query: {
+        where: `(userFieldSingle,eq,${userList[2].id})`,
+        limit: 400,
+      },
+    });
+
+    expect(verifyColumnsInRsp(rsp.body.list[0], columns)).to.equal(true);
+    const filteredArray = rsp.body.list.map((r) => r.userFieldSingle);
+    expect(filteredArray).to.deep.equal(filteredArray.fill(userList[2]));
+  });
+
+  it('List: sort, ascending for user multi field', async function () {
+    const sortColumn = columns.find((c) => c.title === 'userFieldMulti');
+    const rsp = await ncAxiosGet({
+      query: { sort: 'userFieldMulti', limit: 400 },
+    });
+
+    expect(verifyColumnsInRsp(rsp.body.list[0], columns)).to.equal(true);
+    const sortedArray = rsp.body.list.map((r) => r[sortColumn.title]);
+    expect(sortedArray).to.deep.equal(
+      sortedArray.sort((a, b) => {
+        const emailA = a ? a[0]?.email?.toLowerCase() : '';
+        const emailB = b ? b[0]?.email?.toLowerCase() : '';
+
+        if (emailA < emailB) {
+          return -1;
+        }
+        if (emailA > emailB) {
+          return 1;
+        }
+
+        // Emails are equal, no change in order
+        return 0;
+      }),
+    );
+  });
+
+  it('List: filter, user multi field', async function () {
+    const userList = await getUsers();
+    const rsp = await ncAxiosGet({
+      query: {
+        where: `(userFieldMulti,anyof,${userList[2].id})`,
+        limit: 400,
+      },
+    });
+
+    expect(verifyColumnsInRsp(rsp.body.list[0], columns)).to.equal(true);
+    expect(rsp.body.list.length).to.equal(100);
+  });
+
+  it('Create record : using email', async function () {
+    const newRecord = {
+      userFieldSingle: 'a@nocodb.com',
+      userFieldMulti: 'a@nocodb.com,b@nocodb.com',
+    };
+    const rsp = await ncAxiosPost({ body: newRecord });
+    expect(rsp.body).to.deep.equal({ Id: 401 });
+
+    const record = await ncAxiosGet({
+      url: `/api/v2/tables/${table.id}/records/401`,
+    });
+    expect(record.body.Id).to.equal(401);
+    expect(record.body.userFieldSingle[0].email).to.equal('a@nocodb.com');
+    expect(record.body.userFieldMulti[0].email).to.equal('a@nocodb.com');
+    expect(record.body.userFieldMulti[1].email).to.equal('b@nocodb.com');
+  });
+
+  it('Create record : using ID', async function () {
+    const userList = await getUsers();
+
+    const id0 = userList.find((u) => u.email === 'test@example.com').id;
+    const id1 = userList.find((u) => u.email === 'a@nocodb.com').id;
+
+    const newRecord = {
+      userFieldSingle: id0,
+      userFieldMulti: `${id0},${id1}`,
+    };
+    const rsp = await ncAxiosPost({ body: newRecord });
+    expect(rsp.body).to.deep.equal({ Id: 401 });
+
+    const record = await ncAxiosGet({
+      url: `/api/v2/tables/${table.id}/records/401`,
+    });
+    expect(record.body.Id).to.equal(401);
+    expect(record.body.userFieldSingle[0].email).to.equal('test@example.com');
+    expect(record.body.userFieldMulti[0].email).to.equal('test@example.com');
+    expect(record.body.userFieldMulti[1].email).to.equal('a@nocodb.com');
+  });
+
+  it('Create record : duplicate ID', async function () {
+    const userList = await getUsers();
+
+    const newRecord1 = {
+      userFieldSingle: userList[0].id,
+      userFieldMulti: `${userList[0].id},${userList[0].id}`,
+    };
+    const rsp = await ncAxiosPost({ body: newRecord1, status: 422 });
+    expect(rsp.body.msg).to.equal('Duplicate users not allowed for user field');
+
+    const newRecord2 = {
+      userFieldSingle: `${userList[0].id},${userList[1].id}`,
+      userFieldMulti: `${userList[0].id},${userList[1].id}`,
+    };
+    const rsp2 = await ncAxiosPost({ body: newRecord2, status: 422 });
+    expect(rsp2.body.msg).to.equal(
+      "Multiple users not allowed for 'userFieldSingle'",
+    );
+  });
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -2742,8 +2985,9 @@ export default function () {
   describe('Select based', selectBased);
   describe('Date based', dateBased);
   describe('Link based', linkBased);
+  describe('User field based', userFieldBased);
 
-  // based out of sakila db, for link based tests
+  // based out of Sakila db, for link based tests
   describe('General', generalDb);
 }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ccd9cbcda3..76b90bde85 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -29,16 +29,16 @@ importers:
     dependencies:
       '@braks/revue-draggable':
         specifier: ^0.4.3
-        version: 0.4.3(vue@3.3.11)
+        version: 0.4.3(vue@3.3.13)
       '@ckpack/vue-color':
         specifier: ^1.5.0
-        version: 1.5.0(vue@3.3.11)
+        version: 1.5.0(vue@3.3.13)
       '@iconify/vue':
         specifier: ^4.1.1
-        version: 4.1.1(vue@3.3.11)
+        version: 4.1.1(vue@3.3.13)
       '@pinia/nuxt':
         specifier: ^0.4.11
-        version: 0.4.11(vue@3.3.11)
+        version: 0.4.11(vue@3.3.13)
       '@tiptap/extension-link':
         specifier: 2.0.4
         version: 2.0.4(@tiptap/core@2.1.13)(@tiptap/pm@2.1.13)
@@ -59,28 +59,28 @@ importers:
         version: 2.1.13(@tiptap/pm@2.1.13)
       '@tiptap/vue-3':
         specifier: 2.0.4
-        version: 2.0.4(@tiptap/core@2.1.13)(@tiptap/pm@2.1.13)(vue@3.3.11)
+        version: 2.0.4(@tiptap/core@2.1.13)(@tiptap/pm@2.1.13)(vue@3.3.13)
       '@vue-flow/additional-components':
         specifier: ^1.3.3
-        version: 1.3.3(@vue-flow/core@1.26.0)(vue@3.3.11)
+        version: 1.3.3(@vue-flow/core@1.26.0)(vue@3.3.13)
       '@vue-flow/core':
         specifier: ^1.26.0
-        version: 1.26.0(vue@3.3.11)
+        version: 1.26.0(vue@3.3.13)
       '@vuelidate/core':
         specifier: ^2.0.3
-        version: 2.0.3(vue@3.3.11)
+        version: 2.0.3(vue@3.3.13)
       '@vuelidate/validators':
         specifier: ^2.0.4
-        version: 2.0.4(vue@3.3.11)
+        version: 2.0.4(vue@3.3.13)
       '@vueuse/core':
         specifier: ^10.2.1
-        version: 10.2.1(vue@3.3.11)
+        version: 10.2.1(vue@3.3.13)
       '@vueuse/integrations':
         specifier: ^10.2.1
-        version: 10.2.1(fuse.js@6.6.2)(jwt-decode@3.1.2)(qrcode@1.5.3)(sortablejs@1.15.1)(vue@3.3.11)
+        version: 10.2.1(fuse.js@6.6.2)(jwt-decode@3.1.2)(qrcode@1.5.3)(sortablejs@1.15.1)(vue@3.3.13)
       ant-design-vue:
         specifier: ^3.2.20
-        version: 3.2.20(vue@3.3.11)
+        version: 3.2.20(vue@3.3.13)
       chart.js:
         specifier: ^4.4.1
         version: 4.4.1
@@ -101,7 +101,7 @@ importers:
         version: 1.1.9
       emoji-mart-vue-fast:
         specifier: ^15.0.0
-        version: 15.0.0(vue@3.3.11)
+        version: 15.0.0(vue@3.3.13)
       file-saver:
         specifier: ^2.0.5
         version: 2.0.5
@@ -139,7 +139,7 @@ importers:
         specifier: ^0.11.0
         version: 0.11.0
       nocodb-sdk:
-        specifier: 0.202.10
+        specifier: workspace:^
         version: link:../nocodb-sdk
       papaparse:
         specifier: ^5.4.1
@@ -149,7 +149,7 @@ importers:
         version: 1.0.2
       pinia:
         specifier: ^2.1.7
-        version: 2.1.7(vue@3.3.11)
+        version: 2.1.7(vue@3.3.13)
       qrcode:
         specifier: ^1.5.3
         version: 1.5.3
@@ -188,22 +188,22 @@ importers:
         version: 1.0.3
       vue-chartjs:
         specifier: ^5.2.0
-        version: 5.2.0(chart.js@4.4.1)(vue@3.3.11)
+        version: 5.2.0(chart.js@4.4.1)(vue@3.3.13)
       vue-dompurify-html:
         specifier: ^3.0.0
-        version: 3.0.0(vue@3.3.11)
+        version: 3.0.0(vue@3.3.13)
       vue-github-button:
         specifier: ^3.1.0
         version: 3.1.0
       vue-i18n:
         specifier: ^9.2.2
-        version: 9.2.2(vue@3.3.11)
+        version: 9.2.2(vue@3.3.13)
       vue-qrcode-reader:
         specifier: 3.1.8
         version: 3.1.8
       vue3-calendar-heatmap:
         specifier: ^2.0.5
-        version: 2.0.5(tippy.js@6.3.7)(vue@3.3.11)
+        version: 2.0.5(tippy.js@6.3.7)(vue@3.3.13)
       vue3-contextmenu:
         specifier: ^0.2.12
         version: 0.2.12
@@ -212,10 +212,10 @@ importers:
         version: 1.0.6
       vue3-text-clamp:
         specifier: ^0.1.2
-        version: 0.1.2(resize-detector@0.3.0)(vue@3.3.11)
+        version: 0.1.2(resize-detector@0.3.0)(vue@3.3.13)
       vuedraggable:
         specifier: ^4.1.0
-        version: 4.1.0(vue@3.3.11)
+        version: 4.1.0(vue@3.3.13)
       xlsx:
         specifier: ^0.18.5
         version: 0.18.5
@@ -233,8 +233,8 @@ importers:
         specifier: ^1.1.22
         version: 1.1.22
       '@iconify-json/carbon':
-        specifier: ^1.1.26
-        version: 1.1.26
+        specifier: ^1.1.27
+        version: 1.1.27
       '@iconify-json/cil':
         specifier: ^1.1.8
         version: 1.1.8
@@ -254,17 +254,17 @@ importers:
         specifier: ^1.1.8
         version: 1.1.8
       '@iconify-json/logos':
-        specifier: ^1.1.41
-        version: 1.1.41
+        specifier: ^1.1.42
+        version: 1.1.42
       '@iconify-json/lucide':
-        specifier: ^1.1.145
-        version: 1.1.145
+        specifier: ^1.1.149
+        version: 1.1.149
       '@iconify-json/material-symbols':
-        specifier: ^1.1.67
-        version: 1.1.67
+        specifier: ^1.1.68
+        version: 1.1.68
       '@iconify-json/mdi':
-        specifier: ^1.1.61
-        version: 1.1.61
+        specifier: ^1.1.63
+        version: 1.1.63
       '@iconify-json/mi':
         specifier: ^1.1.8
         version: 1.1.8
@@ -272,11 +272,11 @@ importers:
         specifier: ^1.1.9
         version: 1.1.9
       '@iconify-json/ri':
-        specifier: ^1.1.17
-        version: 1.1.17
+        specifier: ^1.1.18
+        version: 1.1.18
       '@iconify-json/simple-icons':
-        specifier: ^1.1.84
-        version: 1.1.84
+        specifier: ^1.1.86
+        version: 1.1.86
       '@iconify-json/system-uicons':
         specifier: ^1.1.12
         version: 1.1.12
@@ -290,8 +290,8 @@ importers:
         specifier: ^0.12.3
         version: 0.12.3(vue-i18n@9.2.2)
       '@nuxt/image-edge':
-        specifier: 1.1.0-28372028.a469898
-        version: 1.1.0-28372028.a469898
+        specifier: 1.1.0-28393680.ddd021d
+        version: 1.1.0-28393680.ddd021d
       '@types/d3-scale':
         specifier: ^4.0.8
         version: 4.0.8
@@ -344,14 +344,14 @@ importers:
         specifier: ^0.18.1
         version: 0.18.1
       '@vue/compiler-sfc':
-        specifier: ^3.3.11
-        version: 3.3.11
+        specifier: ^3.3.13
+        version: 3.3.13
       '@vue/test-utils':
         specifier: ^2.0.2
-        version: 2.0.2(vue@3.3.11)
+        version: 2.0.2(vue@3.3.13)
       '@vueuse/nuxt':
         specifier: ^10.2.1
-        version: 10.2.1(nuxt@3.8.2)(vue@3.3.11)
+        version: 10.2.1(nuxt@3.8.2)(vue@3.3.13)
       '@windicss/plugin-animations':
         specifier: ^1.0.9
         version: 1.0.9
@@ -390,10 +390,10 @@ importers:
         version: 9.4.4(webpack@5.89.0)
       unplugin-icons:
         specifier: ^0.14.15
-        version: 0.14.15(@vue/compiler-sfc@3.3.11)
+        version: 0.14.15(@vue/compiler-sfc@3.3.13)
       unplugin-vue-components:
         specifier: ^0.22.12
-        version: 0.22.12(vue@3.3.11)
+        version: 0.22.12(vue@3.3.13)
       vite-plugin-monaco-editor:
         specifier: ^1.1.0
         version: 1.1.0(monaco-editor@0.33.0)
@@ -503,8 +503,8 @@ importers:
         specifier: ^2.1455.0
         version: 2.1455.0
       axios:
-        specifier: ^1.6.2
-        version: 1.6.2(debug@4.3.4)
+        specifier: ^1.6.3
+        version: 1.6.3(debug@4.3.4)
       bcryptjs:
         specifier: ^2.4.3
         version: 2.4.3
@@ -686,7 +686,7 @@ importers:
         specifier: ^0.3.3
         version: 0.3.3(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)(@nestjs/throttler@4.2.1)(ioredis@5.3.2)(reflect-metadata@0.1.14)
       nocodb-sdk:
-        specifier: 0.202.10
+        specifier: workspace:^
         version: link:../nocodb-sdk
       nodemailer:
         specifier: ^6.4.10
@@ -906,8 +906,8 @@ importers:
   packages/nocodb-sdk:
     dependencies:
       axios:
-        specifier: ^1.6.2
-        version: 1.6.2
+        specifier: ^1.6.3
+        version: 1.6.3
       dayjs:
         specifier: ^1.11.10
         version: 1.11.10
@@ -915,12 +915,15 @@ importers:
         specifier: ^1.3.8
         version: 1.3.8
     devDependencies:
+      '@types/jest':
+        specifier: ^29.5.11
+        version: 29.5.11
       '@typescript-eslint/eslint-plugin':
-        specifier: ^6.13.2
-        version: 6.13.2(@typescript-eslint/parser@6.13.2)(eslint@8.54.0)(typescript@5.3.2)
+        specifier: ^6.14.0
+        version: 6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.54.0)(typescript@5.3.2)
       '@typescript-eslint/parser':
-        specifier: ^6.13.2
-        version: 6.13.2(eslint@8.54.0)(typescript@5.3.2)
+        specifier: ^6.14.0
+        version: 6.14.0(eslint@8.54.0)(typescript@5.3.2)
       cspell:
         specifier: ^4.2.8
         version: 4.2.8
@@ -937,8 +940,8 @@ importers:
         specifier: ^5.0.8
         version: 5.0.8(eslint@8.54.0)(typescript@5.3.2)
       eslint-plugin-import:
-        specifier: ^2.29.0
-        version: 2.29.0(@typescript-eslint/parser@6.13.2)(eslint@8.54.0)
+        specifier: ^2.29.1
+        version: 2.29.1(@typescript-eslint/parser@6.14.0)(eslint@8.54.0)
       eslint-plugin-prettier:
         specifier: ^4.2.1
         version: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.54.0)(prettier@2.8.8)
@@ -951,6 +954,9 @@ importers:
       rimraf:
         specifier: ^5.0.5
         version: 5.0.5
+      ts-jest:
+        specifier: ^29.1.1
+        version: 29.1.1(@babel/core@7.23.3)(jest@29.5.0)(typescript@5.3.2)
       tsc-alias:
         specifier: ^1.8.8
         version: 1.8.8
@@ -1126,14 +1132,14 @@ packages:
     resolution: {integrity: sha512-4QBZg8ccyC6LPIRii7A0bZUk3+lEDCLnhB+FVsflGdcWPPmV+j3fire4AwwoqHV/BibgvBmR9ZIo4s867smv+g==}
     dev: false
 
-  /@ant-design/icons-vue@6.1.0(vue@3.3.11):
+  /@ant-design/icons-vue@6.1.0(vue@3.3.13):
     resolution: {integrity: sha512-EX6bYm56V+ZrKN7+3MT/ubDkvJ5rK/O2t380WFRflDcVFgsvl3NLH7Wxeau6R8DbrO5jWR6DSTC3B6gYFp77AA==}
     peerDependencies:
       vue: latest
     dependencies:
       '@ant-design/colors': 6.0.0
       '@ant-design/icons-svg': 4.3.1
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
   /@antfu/eslint-config-basic@0.26.3(@typescript-eslint/parser@5.62.0)(eslint@8.33.0):
@@ -1145,7 +1151,7 @@ packages:
       eslint-plugin-antfu: 0.26.3(eslint@8.33.0)
       eslint-plugin-eslint-comments: 3.2.0(eslint@8.33.0)
       eslint-plugin-html: 7.1.0
-      eslint-plugin-import: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.33.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint@8.33.0)
       eslint-plugin-jsonc: 2.9.0(eslint@8.33.0)
       eslint-plugin-markdown: 3.0.1(eslint@8.33.0)
       eslint-plugin-n: 15.7.0(eslint@8.33.0)
@@ -2875,7 +2881,7 @@ packages:
       '@babel/helper-compilation-targets': 7.22.15
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.3)
       '@babel/helpers': 7.23.2
-      '@babel/parser': 7.23.4
+      '@babel/parser': 7.23.5
       '@babel/template': 7.22.15
       '@babel/traverse': 7.23.4
       '@babel/types': 7.23.4
@@ -3047,13 +3053,6 @@ packages:
       chalk: 2.4.2
       js-tokens: 4.0.0
 
-  /@babel/parser@7.23.4:
-    resolution: {integrity: sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.23.4
-
   /@babel/parser@7.23.5:
     resolution: {integrity: sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==}
     engines: {node: '>=6.0.0'}
@@ -3276,7 +3275,7 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.23.4
-      '@babel/parser': 7.23.4
+      '@babel/parser': 7.23.5
       '@babel/types': 7.23.4
 
   /@babel/traverse@7.23.4:
@@ -3289,7 +3288,7 @@ packages:
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.23.4
+      '@babel/parser': 7.23.5
       '@babel/types': 7.23.4
       debug: 4.3.4(supports-color@5.5.0)
       globals: 11.12.0
@@ -3313,7 +3312,7 @@ packages:
     engines: {node: '>=8.9'}
     dev: false
 
-  /@braks/revue-draggable@0.4.3(vue@3.3.11):
+  /@braks/revue-draggable@0.4.3(vue@3.3.13):
     resolution: {integrity: sha512-wmsfNHJQgSX0HFA726r+cm6ixYs+z/KLxfg1cx6xZ1PBGeZsuQCACdNdoKckyr/IH8FgIbBoIH0/6QiSbW3tEQ==}
     peerDependencies:
       '@vue/composition-api': ^1.0.0-rc.1
@@ -3322,12 +3321,12 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      '@vueuse/core': 7.7.1(vue@3.3.11)
-      vue: 3.3.11
-      vue-demi: 0.14.6(vue@3.3.11)
+      '@vueuse/core': 7.7.1(vue@3.3.13)
+      vue: 3.3.13
+      vue-demi: 0.14.6(vue@3.3.13)
     dev: false
 
-  /@ckpack/vue-color@1.5.0(vue@3.3.11):
+  /@ckpack/vue-color@1.5.0(vue@3.3.13):
     resolution: {integrity: sha512-dj1zXVyay2m4LdlLJCQSdIS2FYwUl77BZqyKmUXiehyqjCP0bGYnPcL38lrShzYUc2FdkYQX8ANZZjRahd4PQw==}
     engines: {node: '>=12'}
     peerDependencies:
@@ -3335,7 +3334,7 @@ packages:
     dependencies:
       '@ctrl/tinycolor': 3.6.1
       material-colors: 1.2.6
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
   /@clickhouse/client@0.0.14:
@@ -4249,8 +4248,8 @@ packages:
       '@iconify/types': 2.0.0
     dev: true
 
-  /@iconify-json/carbon@1.1.26:
-    resolution: {integrity: sha512-0y6JstqPCsjEiUuyTTdHE7Wd9gGlxzH2dEfvKUJe5E741qRgLlIipVdBoCkOtbyAT92WEcU8BNfDaC585OCC8w==}
+  /@iconify-json/carbon@1.1.27:
+    resolution: {integrity: sha512-tJVXv9+D9cjU5HcaY+8J0awv9AL/Mjo9MWR/fxHfHFPP/iokjPBEgq4jOBDGNe8W0k/BTrVI3zpgZjLoi6RNGg==}
     dependencies:
       '@iconify/types': 2.0.0
     dev: true
@@ -4291,26 +4290,26 @@ packages:
       '@iconify/types': 2.0.0
     dev: true
 
-  /@iconify-json/logos@1.1.41:
-    resolution: {integrity: sha512-nq69aemSNSxsPh6hDx6QHQBZca6vQzTg6fUXdo996IQe41TNueyJrQXjdhaZr0jaqGEforuSPGLB16SMSZ+T2A==}
+  /@iconify-json/logos@1.1.42:
+    resolution: {integrity: sha512-/f+frtPm3m3Z30oy8Pk+QqRDkbmAiIaWGPl5CmsCXm15MVfvw9a/V/gD7WzdyuSGAZcFuQaqbHXj92y/n+2ifg==}
     dependencies:
       '@iconify/types': 2.0.0
     dev: true
 
-  /@iconify-json/lucide@1.1.145:
-    resolution: {integrity: sha512-sUBZyP7HjYZk0LhSHoj3R7QlGZszBHkoQeY1nB2ox6arJTfrX/30LarbhgMIxHWOBSUMv/KUJsRSZyY8yZtE+g==}
+  /@iconify-json/lucide@1.1.149:
+    resolution: {integrity: sha512-qbDGZN/MjTNzwXvM/uArh4YMJ7mLtUd5Ilz6ARiNYKsuSEN6d8YrNggjCN8endXM4aH9wnZLjkdvureXWU46TQ==}
     dependencies:
       '@iconify/types': 2.0.0
     dev: true
 
-  /@iconify-json/material-symbols@1.1.67:
-    resolution: {integrity: sha512-wGvPLGMfunJL0sGzRVjZ7TUng86d5JMKBlRnOhHU+lBYaeeJmbKWQOQ6aJPK0oxl0PJBnNctHDitXTDTobe4Ng==}
+  /@iconify-json/material-symbols@1.1.68:
+    resolution: {integrity: sha512-fFMMbdr3DJiQRvi6fKefJMLkrvKnW4x6a0lJwDKeRqgyVpxr1NGP3DCz4q7wWBXTpSTcBSPg4Mbfrdyg8J6R0Q==}
     dependencies:
       '@iconify/types': 2.0.0
     dev: true
 
-  /@iconify-json/mdi@1.1.61:
-    resolution: {integrity: sha512-WCDcJFm4VpE7a5fwesOM5DCLXrMrbYw1isoCtR2XzlJc2CvkrEx1JkfnINtA1Of4cyryfg7KrxKfvoSS0Bn7bQ==}
+  /@iconify-json/mdi@1.1.63:
+    resolution: {integrity: sha512-b07dRM5LYdwJqd/lm+1+JDNDNSWHvpZ7ujb73oJxx3lmK1J0giDS0BSc4yia0hixNV0Z2q/4GyxAu/A8XqDnbg==}
     dependencies:
       '@iconify/types': 2.0.0
     dev: true
@@ -4327,14 +4326,14 @@ packages:
       '@iconify/types': 2.0.0
     dev: true
 
-  /@iconify-json/ri@1.1.17:
-    resolution: {integrity: sha512-FN6dynUF7GjVsDU9twvzreN+3gpWiJwpD7FJelHFVPjHNW7U4CDAnw4mEWLaqscB7npJVXLidYKdI03Mh0apTQ==}
+  /@iconify-json/ri@1.1.18:
+    resolution: {integrity: sha512-/gm7OrzhX6iOklhSnhK102unCzA+5wB0OJzXPgvpMr19VOD+dkXzIxEAbGu5lhFCxgn5TJ2jJLc8DtvnZWsyrw==}
     dependencies:
       '@iconify/types': 2.0.0
     dev: true
 
-  /@iconify-json/simple-icons@1.1.84:
-    resolution: {integrity: sha512-Mg7XHuRaXgZKlr+bz+vjuwy4atREUuHxwkQWymNnmL8cP1g0LI5Euh0bEYIcfmgMi8UiJQ+ALVM7ZSoAEP2uHQ==}
+  /@iconify-json/simple-icons@1.1.86:
+    resolution: {integrity: sha512-rD5VlIgiOBPDcVQUCNbGu31WRYt+bj6bWFjH6+KEsxK/hDZTzylT5odF4Jo85PJUGZeJcGn18woE6P6I1Jiuxg==}
     dependencies:
       '@iconify/types': 2.0.0
     dev: true
@@ -4387,13 +4386,13 @@ packages:
       - supports-color
     dev: true
 
-  /@iconify/vue@4.1.1(vue@3.3.11):
+  /@iconify/vue@4.1.1(vue@3.3.13):
     resolution: {integrity: sha512-RL85Bm/DAe8y6rT6pux7D2FJSiUEM/TPfyK7GrbAOfTSwrhvwJW+S5yijdGcmtXouA8MtuH9C7l4hiSE4mLMjg==}
     peerDependencies:
       vue: latest
     dependencies:
       '@iconify/types': 2.0.0
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
   /@interactjs/actions@1.10.18(@interactjs/core@1.10.18)(@interactjs/utils@1.10.18):
@@ -4509,7 +4508,7 @@ packages:
       magic-string: 0.30.5
       mlly: 1.4.2
       source-map-js: 1.0.2
-      vue-i18n: 9.2.2(vue@3.3.11)
+      vue-i18n: 9.2.2(vue@3.3.13)
       yaml-eslint-parser: 0.3.2
     dev: true
 
@@ -4570,7 +4569,7 @@ packages:
       '@intlify/bundle-utils': 7.0.2(vue-i18n@9.2.2)
       '@intlify/shared': 9.3.0-beta.24
       '@rollup/pluginutils': 5.0.5(rollup@4.5.0)
-      '@vue/compiler-sfc': 3.3.11
+      '@vue/compiler-sfc': 3.3.13
       debug: 4.3.4(supports-color@5.5.0)
       fast-glob: 3.3.1
       js-yaml: 4.1.0
@@ -4579,7 +4578,7 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
       unplugin: 1.5.0
-      vue-i18n: 9.2.2(vue@3.3.11)
+      vue-i18n: 9.2.2(vue@3.3.13)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -5733,19 +5732,19 @@ packages:
       - xml2js
     dev: true
 
-  /@nuxt/image-edge@1.1.0-28372028.a469898:
-    resolution: {integrity: sha512-InbGjojR+mE/0YxUbxZlwvtcfPeX944MjElJMcaIidALSP9lbEgY+1MzzPNtytweol40/knRbvFOycUnhcKdgw==}
+  /@nuxt/image-edge@1.1.0-28393680.ddd021d:
+    resolution: {integrity: sha512-0ZK/id94zV3ayRmWqYSMYEg0nmkOj+97UNmlkCEvs/5CbHikZ7pJDvv6xBxDP2YLtqd2IODkGLPoRhd7nY4tlA==}
     engines: {node: ^14.16.0 || >=16.11.0}
     dependencies:
-      '@nuxt/kit': 3.8.2
+      '@nuxt/kit': 3.9.0
       consola: 3.2.3
       defu: 6.1.3
       h3: 1.9.0
       image-meta: 0.2.0
-      node-fetch-native: 1.4.1
+      node-fetch-native: 1.6.1
       ohash: 1.1.3
       pathe: 1.1.1
-      std-env: 3.6.0
+      std-env: 3.7.0
       ufo: 1.3.2
     optionalDependencies:
       ipx: 2.0.2
@@ -5873,6 +5872,33 @@ packages:
       - supports-color
     dev: true
 
+  /@nuxt/kit@3.9.0:
+    resolution: {integrity: sha512-XVFQihMTXM5y7Xj7EXbcDbUbxNkC8+ArQKArAH5PK1ulCWZWyP+VR94Gg2boo9vI2eNLTs+LquxnOtOHRQrg0A==}
+    engines: {node: ^14.18.0 || >=16.10.0}
+    dependencies:
+      '@nuxt/schema': 3.9.0
+      c12: 1.5.1
+      consola: 3.2.3
+      defu: 6.1.3
+      globby: 14.0.0
+      hash-sum: 2.0.0
+      ignore: 5.3.0
+      jiti: 1.21.0
+      knitwork: 1.0.0
+      mlly: 1.4.2
+      pathe: 1.1.1
+      pkg-types: 1.0.3
+      scule: 1.1.1
+      semver: 7.5.4
+      ufo: 1.3.2
+      unctx: 2.3.1
+      unimport: 3.7.0
+      untyped: 1.4.0
+    transitivePeerDependencies:
+      - rollup
+      - supports-color
+    dev: true
+
   /@nuxt/schema@3.4.0:
     resolution: {integrity: sha512-i04UuprxtMaBK1qCaAupJEIkUUJDt6vyMpBTJ0aajAxehL6O6xV3xqHB5iqDBmtOWlsRL8vGM+M/E/5E+lKuPg==}
     engines: {node: ^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0}
@@ -5952,6 +5978,26 @@ packages:
       - supports-color
     dev: true
 
+  /@nuxt/schema@3.9.0:
+    resolution: {integrity: sha512-NaRiq+g6XE4YOZLy7be2e6AmZCW0gfQWDM88TSfNr3Lypo+6PuY2VqzZLpSvOCNlW3CFj/kWtMdhool2BP0yIg==}
+    engines: {node: ^14.18.0 || >=16.10.0}
+    dependencies:
+      '@nuxt/ui-templates': 1.3.1
+      consola: 3.2.3
+      defu: 6.1.3
+      hookable: 5.5.3
+      pathe: 1.1.1
+      pkg-types: 1.0.3
+      scule: 1.1.1
+      std-env: 3.7.0
+      ufo: 1.3.2
+      unimport: 3.7.0
+      untyped: 1.4.0
+    transitivePeerDependencies:
+      - rollup
+      - supports-color
+    dev: true
+
   /@nuxt/telemetry@2.5.2:
     resolution: {integrity: sha512-kZ+rWq/5MZonMhp8KGFI5zMaR2VsiWpnlkOLJIuIX2WoJl0DkHvtxCtuFq2erAqMVruWLpKU+tgMC+1cno/QmA==}
     hasBin: true
@@ -5981,7 +6027,7 @@ packages:
   /@nuxt/ui-templates@1.3.1:
     resolution: {integrity: sha512-5gc02Pu1HycOVUWJ8aYsWeeXcSTPe8iX8+KIrhyEtEoOSkY0eMBuo0ssljB8wALuEmepv31DlYe5gpiRwkjESA==}
 
-  /@nuxt/vite-builder@3.8.2(eslint@8.33.0)(sass@1.69.5)(vue@3.3.11):
+  /@nuxt/vite-builder@3.8.2(eslint@8.33.0)(sass@1.69.5)(vue@3.3.13):
     resolution: {integrity: sha512-l/lzDDTbd3M89BpmWqjhVLgLVRqfkKp0tyYgV5seJQjj3SX+IeqI7k6k8+dMEifdeO34jUajVWptNpITXQryyg==}
     engines: {node: ^14.18.0 || >=16.10.0}
     peerDependencies:
@@ -5989,12 +6035,12 @@ packages:
     dependencies:
       '@nuxt/kit': 3.8.2
       '@rollup/plugin-replace': 5.0.5(rollup@4.5.0)
-      '@vitejs/plugin-vue': 4.5.0(vite@4.5.0)(vue@3.3.11)
-      '@vitejs/plugin-vue-jsx': 3.1.0(vite@4.5.0)(vue@3.3.11)
-      autoprefixer: 10.4.16(postcss@8.4.31)
+      '@vitejs/plugin-vue': 4.5.0(vite@4.5.0)(vue@3.3.13)
+      '@vitejs/plugin-vue-jsx': 3.1.0(vite@4.5.0)(vue@3.3.13)
+      autoprefixer: 10.4.16(postcss@8.4.32)
       clear: 0.1.0
       consola: 3.2.3
-      cssnano: 6.0.1(postcss@8.4.31)
+      cssnano: 6.0.1(postcss@8.4.32)
       defu: 6.1.3
       esbuild: 0.19.7
       escape-string-regexp: 5.0.0
@@ -6010,7 +6056,7 @@ packages:
       pathe: 1.1.1
       perfect-debounce: 1.0.0
       pkg-types: 1.0.3
-      postcss: 8.4.31
+      postcss: 8.4.32
       rollup-plugin-visualizer: 5.9.2(rollup@4.5.0)
       std-env: 3.6.0
       strip-literal: 1.3.0
@@ -6019,7 +6065,7 @@ packages:
       vite: 4.5.0(@types/node@20.3.1)(sass@1.69.5)
       vite-node: 0.33.0(sass@1.69.5)
       vite-plugin-checker: 0.6.2(eslint@8.33.0)(vite@4.5.0)
-      vue: 3.3.11
+      vue: 3.3.13
       vue-bundle-renderer: 2.0.0
     transitivePeerDependencies:
       - '@types/node'
@@ -6443,11 +6489,11 @@ packages:
       '@parcel/watcher-win32-x64': 2.3.0
     dev: true
 
-  /@pinia/nuxt@0.4.11(vue@3.3.11):
+  /@pinia/nuxt@0.4.11(vue@3.3.13):
     resolution: {integrity: sha512-bhuNFngJpmBCdAqWguezNJ/oJFR7wvKieqiZrmmdmPR07XjsidAw8RLXHMZE9kUm32M9E6T057OBbG/22jERTg==}
     dependencies:
       '@nuxt/kit': 3.7.0
-      pinia: 2.1.7(vue@3.3.11)
+      pinia: 2.1.7(vue@3.3.13)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - rollup
@@ -6681,6 +6727,20 @@ packages:
       picomatch: 2.3.1
       rollup: 4.5.0
 
+  /@rollup/pluginutils@5.1.0:
+    resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+    dependencies:
+      '@types/estree': 1.0.1
+      estree-walker: 2.0.2
+      picomatch: 2.3.1
+    dev: true
+
   /@rollup/rollup-android-arm-eabi@4.5.0:
     resolution: {integrity: sha512-OINaBGY+Wc++U0rdr7BLuFClxcoWaVW3vQYqmQq6B3bqQ/2olkaoz+K8+af/Mmka/C2yN5j+L9scBkv4BtKsDA==}
     cpu: [arm]
@@ -8226,7 +8286,7 @@ packages:
       - '@tiptap/pm'
     dev: false
 
-  /@tiptap/vue-3@2.0.4(@tiptap/core@2.1.13)(@tiptap/pm@2.1.13)(vue@3.3.11):
+  /@tiptap/vue-3@2.0.4(@tiptap/core@2.1.13)(@tiptap/pm@2.1.13)(vue@3.3.13):
     resolution: {integrity: sha512-XfoFl1RKCElYIoloGoqMC2iG4RalEtaGvwSAmqqNGdITCdwnuDhLlCvGAjnVbIR4d3Y0NRPyXZzGWfWSi4bbHg==}
     peerDependencies:
       '@tiptap/core': ^2.0.0
@@ -8237,7 +8297,7 @@ packages:
       '@tiptap/extension-bubble-menu': 2.1.12(@tiptap/core@2.1.13)(@tiptap/pm@2.1.13)
       '@tiptap/extension-floating-menu': 2.1.12(@tiptap/core@2.1.13)(@tiptap/pm@2.1.13)
       '@tiptap/pm': 2.1.13
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
   /@tootallnate/once@1.1.2:
@@ -8301,7 +8361,7 @@ packages:
   /@types/babel__core@7.20.1:
     resolution: {integrity: sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==}
     dependencies:
-      '@babel/parser': 7.23.4
+      '@babel/parser': 7.23.5
       '@babel/types': 7.23.4
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
@@ -8317,7 +8377,7 @@ packages:
   /@types/babel__template@7.4.1:
     resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
-      '@babel/parser': 7.23.4
+      '@babel/parser': 7.23.5
       '@babel/types': 7.23.4
     dev: true
 
@@ -8704,7 +8764,7 @@ packages:
   /@types/splitpanes@2.2.6:
     resolution: {integrity: sha512-3dV5sO1Ht74iER4jJU03mreL3f+Q2h47ZqXS6Sfbqc6hkCvsDrX1GA0NbYWRdNvZemPyTDzUoApWKeoGbALwkQ==}
     dependencies:
-      vue: 3.3.11
+      vue: 3.3.13
     transitivePeerDependencies:
       - typescript
     dev: true
@@ -8763,7 +8823,7 @@ packages:
   /@types/vue-barcode-reader@0.0.3:
     resolution: {integrity: sha512-klrzMKXdc1eHFnMQXl5QwTGuKki09hh+hxV0AlNjg72VpMRifEbW+roGbDK0LHCK+LTcz13Ebx2/bMKgQr0Ovw==}
     dependencies:
-      vue: 3.3.11
+      vue: 3.3.13
     transitivePeerDependencies:
       - typescript
     dev: true
@@ -8807,7 +8867,7 @@ packages:
       '@eslint-community/regexpp': 4.8.0
       '@typescript-eslint/parser': 5.62.0(eslint@8.33.0)
       '@typescript-eslint/scope-manager': 5.62.0
-      '@typescript-eslint/type-utils': 5.62.0(eslint@8.33.0)
+      '@typescript-eslint/type-utils': 5.62.0(eslint@8.33.0)(typescript@5.3.2)
       '@typescript-eslint/utils': 5.62.0(eslint@8.33.0)(typescript@5.3.2)
       debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.33.0
@@ -8878,8 +8938,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/eslint-plugin@6.13.2(@typescript-eslint/parser@6.13.2)(eslint@8.54.0)(typescript@5.3.2):
-    resolution: {integrity: sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ==}
+  /@typescript-eslint/eslint-plugin@6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.54.0)(typescript@5.3.2):
+    resolution: {integrity: sha512-1ZJBykBCXaSHG94vMMKmiHoL0MhNHKSVlcHVYZNw+BKxufhqQVTOawNpwwI1P5nIFZ/4jLVop0mcY6mJJDFNaw==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha
@@ -8890,11 +8950,11 @@ packages:
         optional: true
     dependencies:
       '@eslint-community/regexpp': 4.8.0
-      '@typescript-eslint/parser': 6.13.2(eslint@8.54.0)(typescript@5.3.2)
-      '@typescript-eslint/scope-manager': 6.13.2
-      '@typescript-eslint/type-utils': 6.13.2(eslint@8.54.0)(typescript@5.3.2)
-      '@typescript-eslint/utils': 6.13.2(eslint@8.54.0)(typescript@5.3.2)
-      '@typescript-eslint/visitor-keys': 6.13.2
+      '@typescript-eslint/parser': 6.14.0(eslint@8.54.0)(typescript@5.3.2)
+      '@typescript-eslint/scope-manager': 6.14.0
+      '@typescript-eslint/type-utils': 6.14.0(eslint@8.54.0)(typescript@5.3.2)
+      '@typescript-eslint/utils': 6.14.0(eslint@8.54.0)(typescript@5.3.2)
+      '@typescript-eslint/visitor-keys': 6.14.0
       debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.54.0
       graphemer: 1.4.0
@@ -8967,8 +9027,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@6.13.2(eslint@8.54.0)(typescript@5.3.2):
-    resolution: {integrity: sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==}
+  /@typescript-eslint/parser@6.14.0(eslint@8.54.0)(typescript@5.3.2):
+    resolution: {integrity: sha512-QjToC14CKacd4Pa7JK4GeB/vHmWFJckec49FR4hmIRf97+KXole0T97xxu9IFiPxVQ1DBWrQ5wreLwAGwWAVQA==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0
@@ -8977,10 +9037,10 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 6.13.2
-      '@typescript-eslint/types': 6.13.2
-      '@typescript-eslint/typescript-estree': 6.13.2(typescript@5.3.2)
-      '@typescript-eslint/visitor-keys': 6.13.2
+      '@typescript-eslint/scope-manager': 6.14.0
+      '@typescript-eslint/types': 6.14.0
+      '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.3.2)
+      '@typescript-eslint/visitor-keys': 6.14.0
       debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.54.0
       typescript: 5.3.2
@@ -9012,31 +9072,12 @@ packages:
       '@typescript-eslint/visitor-keys': 6.11.0
     dev: true
 
-  /@typescript-eslint/scope-manager@6.13.2:
-    resolution: {integrity: sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==}
+  /@typescript-eslint/scope-manager@6.14.0:
+    resolution: {integrity: sha512-VT7CFWHbZipPncAZtuALr9y3EuzY1b1t1AEkIq2bTXUPKw+pHoXflGNG5L+Gv6nKul1cz1VH8fz16IThIU0tdg==}
     engines: {node: ^16.0.0 || >=18.0.0}
     dependencies:
-      '@typescript-eslint/types': 6.13.2
-      '@typescript-eslint/visitor-keys': 6.13.2
-    dev: true
-
-  /@typescript-eslint/type-utils@5.62.0(eslint@8.33.0):
-    resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '*'
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.2)
-      '@typescript-eslint/utils': 5.62.0(eslint@8.33.0)(typescript@5.3.2)
-      debug: 4.3.4(supports-color@5.5.0)
-      eslint: 8.33.0
-      tsutils: 3.21.0(typescript@5.3.2)
-    transitivePeerDependencies:
-      - supports-color
+      '@typescript-eslint/types': 6.14.0
+      '@typescript-eslint/visitor-keys': 6.14.0
     dev: true
 
   /@typescript-eslint/type-utils@5.62.0(eslint@8.33.0)(typescript@5.3.2):
@@ -9118,8 +9159,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/type-utils@6.13.2(eslint@8.54.0)(typescript@5.3.2):
-    resolution: {integrity: sha512-Qr6ssS1GFongzH2qfnWKkAQmMUyZSyOr0W54nZNU1MDfo+U4Mv3XveeLZzadc/yq8iYhQZHYT+eoXJqnACM1tw==}
+  /@typescript-eslint/type-utils@6.14.0(eslint@8.54.0)(typescript@5.3.2):
+    resolution: {integrity: sha512-x6OC9Q7HfYKqjnuNu5a7kffIYs3No30isapRBJl1iCHLitD8O0lFbRcVGiOcuyN837fqXzPZ1NS10maQzZMKqw==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0
@@ -9128,8 +9169,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 6.13.2(typescript@5.3.2)
-      '@typescript-eslint/utils': 6.13.2(eslint@8.54.0)(typescript@5.3.2)
+      '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.3.2)
+      '@typescript-eslint/utils': 6.14.0(eslint@8.54.0)(typescript@5.3.2)
       debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.54.0
       ts-api-utils: 1.0.2(typescript@5.3.2)
@@ -9153,8 +9194,8 @@ packages:
     engines: {node: ^16.0.0 || >=18.0.0}
     dev: true
 
-  /@typescript-eslint/types@6.13.2:
-    resolution: {integrity: sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==}
+  /@typescript-eslint/types@6.14.0:
+    resolution: {integrity: sha512-uty9H2K4Xs8E47z3SnXEPRNDfsis8JO27amp2GNCnzGETEW3yTqEIVg5+AI7U276oGF/tw6ZA+UesxeQ104ceA==}
     engines: {node: ^16.0.0 || >=18.0.0}
     dev: true
 
@@ -9220,8 +9261,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/typescript-estree@6.13.2(typescript@5.3.2):
-    resolution: {integrity: sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==}
+  /@typescript-eslint/typescript-estree@6.14.0(typescript@5.3.2):
+    resolution: {integrity: sha512-yPkaLwK0yH2mZKFE/bXkPAkkFgOv15GJAUzgUVonAbv0Hr4PK/N2yaA/4XQbTZQdygiDkpt5DkxPELqHguNvyw==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       typescript: '*'
@@ -9229,8 +9270,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 6.13.2
-      '@typescript-eslint/visitor-keys': 6.13.2
+      '@typescript-eslint/types': 6.14.0
+      '@typescript-eslint/visitor-keys': 6.14.0
       debug: 4.3.4(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
@@ -9319,8 +9360,8 @@ packages:
       - typescript
     dev: true
 
-  /@typescript-eslint/utils@6.13.2(eslint@8.54.0)(typescript@5.3.2):
-    resolution: {integrity: sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ==}
+  /@typescript-eslint/utils@6.14.0(eslint@8.54.0)(typescript@5.3.2):
+    resolution: {integrity: sha512-XwRTnbvRr7Ey9a1NT6jqdKX8y/atWG+8fAIu3z73HSP8h06i3r/ClMhmaF/RGWGW1tHJEwij1uEg2GbEmPYvYg==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0
@@ -9328,9 +9369,9 @@ packages:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.54.0)
       '@types/json-schema': 7.0.12
       '@types/semver': 7.5.0
-      '@typescript-eslint/scope-manager': 6.13.2
-      '@typescript-eslint/types': 6.13.2
-      '@typescript-eslint/typescript-estree': 6.13.2(typescript@5.3.2)
+      '@typescript-eslint/scope-manager': 6.14.0
+      '@typescript-eslint/types': 6.14.0
+      '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.3.2)
       eslint: 8.54.0
       semver: 7.5.4
     transitivePeerDependencies:
@@ -9362,11 +9403,11 @@ packages:
       eslint-visitor-keys: 3.4.3
     dev: true
 
-  /@typescript-eslint/visitor-keys@6.13.2:
-    resolution: {integrity: sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==}
+  /@typescript-eslint/visitor-keys@6.14.0:
+    resolution: {integrity: sha512-fB5cw6GRhJUz03MrROVuj5Zm/Q+XWlVdIsFj+Zb1Hvqouc8t+XP2H5y53QYU/MGtd2dPg6/vJJlhoX3xc2ehfw==}
     engines: {node: ^16.0.0 || >=18.0.0}
     dependencies:
-      '@typescript-eslint/types': 6.13.2
+      '@typescript-eslint/types': 6.14.0
       eslint-visitor-keys: 3.4.3
     dev: true
 
@@ -9401,7 +9442,7 @@ packages:
       '@unhead/shared': 1.8.5
     dev: true
 
-  /@unhead/vue@1.8.5(vue@3.3.11):
+  /@unhead/vue@1.8.5(vue@3.3.13):
     resolution: {integrity: sha512-m8Q1U1JJvn5LKI5tGRh6f0Of0R64szZN7AXfRN8zTumf6HuOAdg6bHEX+lUX3wtRLUAPzrM9Oz4r0nTqIa9Oow==}
     peerDependencies:
       vue: latest
@@ -9410,7 +9451,7 @@ packages:
       '@unhead/shared': 1.8.5
       hookable: 5.5.3
       unhead: 1.8.5
-      vue: 3.3.11
+      vue: 3.3.13
     dev: true
 
   /@unocss/astro@0.51.13(vite@4.5.0):
@@ -9438,7 +9479,7 @@ packages:
       chokidar: 3.5.3
       colorette: 2.0.20
       consola: 3.2.3
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       magic-string: 0.30.5
       pathe: 1.1.1
       perfect-debounce: 1.0.0
@@ -9505,7 +9546,7 @@ packages:
       '@unocss/config': 0.51.13
       '@unocss/core': 0.51.13
       css-tree: 2.3.1
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       magic-string: 0.30.5
       postcss: 8.4.32
     dev: true
@@ -9620,7 +9661,7 @@ packages:
       '@unocss/scope': 0.51.13
       '@unocss/transformer-directives': 0.51.13
       chokidar: 3.5.3
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       magic-string: 0.30.5
       vite: 4.5.0(@types/node@20.3.1)(sass@1.69.5)
     transitivePeerDependencies:
@@ -9637,9 +9678,9 @@ packages:
       '@unocss/config': 0.51.13
       '@unocss/core': 0.51.13
       chokidar: 3.5.3
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       magic-string: 0.30.5
-      unplugin: 1.5.0
+      unplugin: 1.5.1
       webpack: 5.89.0(esbuild@0.19.7)
       webpack-sources: 3.2.3
     transitivePeerDependencies:
@@ -9667,7 +9708,7 @@ packages:
       - supports-color
     dev: true
 
-  /@vitejs/plugin-vue-jsx@3.1.0(vite@4.5.0)(vue@3.3.11):
+  /@vitejs/plugin-vue-jsx@3.1.0(vite@4.5.0)(vue@3.3.13):
     resolution: {integrity: sha512-w9M6F3LSEU5kszVb9An2/MmXNxocAnUb3WhRr8bHlimhDrXNt6n6D2nJQR3UXpGlZHh/EsgouOHCsM8V3Ln+WA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -9678,12 +9719,12 @@ packages:
       '@babel/plugin-transform-typescript': 7.23.4(@babel/core@7.23.3)
       '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.23.3)
       vite: 4.5.0(@types/node@20.3.1)(sass@1.69.5)
-      vue: 3.3.11
+      vue: 3.3.13
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@vitejs/plugin-vue@4.5.0(vite@4.5.0)(vue@3.3.11):
+  /@vitejs/plugin-vue@4.5.0(vite@4.5.0)(vue@3.3.13):
     resolution: {integrity: sha512-a2WSpP8X8HTEww/U00bU4mX1QpLINNuz/2KMNpLsdu3BzOpak3AGI1CJYBTXcc4SPhaD0eNRUp7IyQK405L5dQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -9691,7 +9732,7 @@ packages:
       vue: latest
     dependencies:
       vite: 4.5.0(@types/node@20.3.1)(sass@1.69.5)
-      vue: 3.3.11
+      vue: 3.3.13
     dev: true
 
   /@vitest/expect@0.30.1:
@@ -9739,33 +9780,33 @@ packages:
       pretty-format: 27.5.1
     dev: true
 
-  /@vue-flow/additional-components@1.3.3(@vue-flow/core@1.26.0)(vue@3.3.11):
+  /@vue-flow/additional-components@1.3.3(@vue-flow/core@1.26.0)(vue@3.3.13):
     resolution: {integrity: sha512-AZhz0diM7VIN7MGKODiuqiu+xiujFQSs2UdiThgNI5vGSwwizd0g9dGzB+LK0Dt4FCRJ1g64xzxqbrAFFfzuFw==}
     peerDependencies:
       '@vue-flow/core': ^1.0.0
       vue: latest
     dependencies:
-      '@vue-flow/core': 1.26.0(vue@3.3.11)
+      '@vue-flow/core': 1.26.0(vue@3.3.13)
       d3-selection: 3.0.0
       d3-zoom: 3.0.0
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
-  /@vue-flow/core@1.26.0(vue@3.3.11):
+  /@vue-flow/core@1.26.0(vue@3.3.13):
     resolution: {integrity: sha512-/sHe8Cx+KapjP1PdYsJwMgtCXN1kD2/+8We5/VAoQlfiKj3h+WgRJ5BGnluMwSpoaFOTRPhBuynF4r3N4uXJDA==}
     peerDependencies:
       vue: latest
     dependencies:
-      '@vueuse/core': 10.6.1(vue@3.3.11)
+      '@vueuse/core': 10.6.1(vue@3.3.13)
       d3-drag: 3.0.0
       d3-selection: 3.0.0
       d3-zoom: 3.0.0
-      vue: 3.3.11
+      vue: 3.3.13
     transitivePeerDependencies:
       - '@vue/composition-api'
     dev: false
 
-  /@vue-macros/common@1.8.0(vue@3.3.11):
+  /@vue-macros/common@1.8.0(vue@3.3.13):
     resolution: {integrity: sha512-auDJJzE0z3uRe3867e0DsqcseKImktNf5ojCZgUKqiVxb2yTlwlgOVAYCgoep9oITqxkXQymSvFeKhedi8PhaA==}
     engines: {node: '>=16.14.0'}
     peerDependencies:
@@ -9776,11 +9817,11 @@ packages:
     dependencies:
       '@babel/types': 7.23.4
       '@rollup/pluginutils': 5.0.5(rollup@4.5.0)
-      '@vue/compiler-sfc': 3.3.11
+      '@vue/compiler-sfc': 3.3.13
       ast-kit: 0.11.2
       local-pkg: 0.4.3
       magic-string-ast: 0.3.0
-      vue: 3.3.11
+      vue: 3.3.13
     transitivePeerDependencies:
       - rollup
     dev: true
@@ -9808,95 +9849,95 @@ packages:
       - supports-color
     dev: true
 
-  /@vue/compiler-core@3.3.11:
-    resolution: {integrity: sha512-h97/TGWBilnLuRaj58sxNrsUU66fwdRKLOLQ9N/5iNDfp+DZhYH9Obhe0bXxhedl8fjAgpRANpiZfbgWyruQ0w==}
+  /@vue/compiler-core@3.3.13:
+    resolution: {integrity: sha512-bwi9HShGu7uaZLOErZgsH2+ojsEdsjerbf2cMXPwmvcgZfVPZ2BVZzCVnwZBxTAYd6Mzbmf6izcUNDkWnBBQ6A==}
     dependencies:
       '@babel/parser': 7.23.5
-      '@vue/shared': 3.3.11
+      '@vue/shared': 3.3.13
       estree-walker: 2.0.2
       source-map-js: 1.0.2
 
-  /@vue/compiler-dom@3.3.11:
-    resolution: {integrity: sha512-zoAiUIqSKqAJ81WhfPXYmFGwDRuO+loqLxvXmfUdR5fOitPoUiIeFI9cTTyv9MU5O1+ZZglJVTusWzy+wfk5hw==}
+  /@vue/compiler-dom@3.3.13:
+    resolution: {integrity: sha512-EYRDpbLadGtNL0Gph+HoKiYqXLqZ0xSSpR5Dvnu/Ep7ggaCbjRDIus1MMxTS2Qm0koXED4xSlvTZaTnI8cYAsw==}
     dependencies:
-      '@vue/compiler-core': 3.3.11
-      '@vue/shared': 3.3.11
+      '@vue/compiler-core': 3.3.13
+      '@vue/shared': 3.3.13
 
-  /@vue/compiler-sfc@3.3.11:
-    resolution: {integrity: sha512-U4iqPlHO0KQeK1mrsxCN0vZzw43/lL8POxgpzcJweopmqtoYy9nljJzWDIQS3EfjiYhfdtdk9Gtgz7MRXnz3GA==}
+  /@vue/compiler-sfc@3.3.13:
+    resolution: {integrity: sha512-DQVmHEy/EKIgggvnGRLx21hSqnr1smUS9Aq8tfxiiot8UR0/pXKHN9k78/qQ7etyQTFj5em5nruODON7dBeumw==}
     dependencies:
       '@babel/parser': 7.23.5
-      '@vue/compiler-core': 3.3.11
-      '@vue/compiler-dom': 3.3.11
-      '@vue/compiler-ssr': 3.3.11
-      '@vue/reactivity-transform': 3.3.11
-      '@vue/shared': 3.3.11
+      '@vue/compiler-core': 3.3.13
+      '@vue/compiler-dom': 3.3.13
+      '@vue/compiler-ssr': 3.3.13
+      '@vue/reactivity-transform': 3.3.13
+      '@vue/shared': 3.3.13
       estree-walker: 2.0.2
       magic-string: 0.30.5
       postcss: 8.4.32
       source-map-js: 1.0.2
 
-  /@vue/compiler-ssr@3.3.11:
-    resolution: {integrity: sha512-Zd66ZwMvndxRTgVPdo+muV4Rv9n9DwQ4SSgWWKWkPFebHQfVYRrVjeygmmDmPewsHyznCNvJ2P2d6iOOhdv8Qg==}
+  /@vue/compiler-ssr@3.3.13:
+    resolution: {integrity: sha512-d/P3bCeUGmkJNS1QUZSAvoCIW4fkOKK3l2deE7zrp0ypJEy+En2AcypIkqvcFQOcw3F0zt2VfMvNsA9JmExTaw==}
     dependencies:
-      '@vue/compiler-dom': 3.3.11
-      '@vue/shared': 3.3.11
+      '@vue/compiler-dom': 3.3.13
+      '@vue/shared': 3.3.13
 
   /@vue/devtools-api@6.5.0:
     resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==}
 
-  /@vue/reactivity-transform@3.3.11:
-    resolution: {integrity: sha512-fPGjH0wqJo68A0wQ1k158utDq/cRyZNlFoxGwNScE28aUFOKFEnCBsvyD8jHn+0kd0UKVpuGuaZEQ6r9FJRqCg==}
+  /@vue/reactivity-transform@3.3.13:
+    resolution: {integrity: sha512-oWnydGH0bBauhXvh5KXUy61xr9gKaMbtsMHk40IK9M4gMuKPJ342tKFarY0eQ6jef8906m35q37wwA8DMZOm5Q==}
     dependencies:
       '@babel/parser': 7.23.5
-      '@vue/compiler-core': 3.3.11
-      '@vue/shared': 3.3.11
+      '@vue/compiler-core': 3.3.13
+      '@vue/shared': 3.3.13
       estree-walker: 2.0.2
       magic-string: 0.30.5
 
-  /@vue/reactivity@3.3.11:
-    resolution: {integrity: sha512-D5tcw091f0nuu+hXq5XANofD0OXnBmaRqMYl5B3fCR+mX+cXJIGNw/VNawBqkjLNWETrFW0i+xH9NvDbTPVh7g==}
+  /@vue/reactivity@3.3.13:
+    resolution: {integrity: sha512-fjzCxceMahHhi4AxUBzQqqVhuA21RJ0COaWTbIBl1PruGW1CeY97louZzLi4smpYx+CHfFPPU/CS8NybbGvPKQ==}
     dependencies:
-      '@vue/shared': 3.3.11
+      '@vue/shared': 3.3.13
 
-  /@vue/runtime-core@3.3.11:
-    resolution: {integrity: sha512-g9ztHGwEbS5RyWaOpXuyIVFTschclnwhqEbdy5AwGhYOgc7m/q3NFwr50MirZwTTzX55JY8pSkeib9BX04NIpw==}
+  /@vue/runtime-core@3.3.13:
+    resolution: {integrity: sha512-1TzA5TvGuh2zUwMJgdfvrBABWZ7y8kBwBhm7BXk8rvdx2SsgcGfz2ruv2GzuGZNvL1aKnK8CQMV/jFOrxNQUMA==}
     dependencies:
-      '@vue/reactivity': 3.3.11
-      '@vue/shared': 3.3.11
+      '@vue/reactivity': 3.3.13
+      '@vue/shared': 3.3.13
 
-  /@vue/runtime-dom@3.3.11:
-    resolution: {integrity: sha512-OlhtV1PVpbgk+I2zl+Y5rQtDNcCDs12rsRg71XwaA2/Rbllw6mBLMi57VOn8G0AjOJ4Mdb4k56V37+g8ukShpQ==}
+  /@vue/runtime-dom@3.3.13:
+    resolution: {integrity: sha512-JJkpE8R/hJKXqVTgUoODwS5wqKtOsmJPEqmp90PDVGygtJ4C0PtOkcEYXwhiVEmef6xeXcIlrT3Yo5aQ4qkHhQ==}
     dependencies:
-      '@vue/runtime-core': 3.3.11
-      '@vue/shared': 3.3.11
-      csstype: 3.1.2
+      '@vue/runtime-core': 3.3.13
+      '@vue/shared': 3.3.13
+      csstype: 3.1.3
 
-  /@vue/server-renderer@3.3.11(vue@3.3.11):
-    resolution: {integrity: sha512-AIWk0VwwxCAm4wqtJyxBylRTXSy1wCLOKbWxHaHiu14wjsNYtiRCSgVuqEPVuDpErOlRdNnuRgipQfXRLjLN5A==}
+  /@vue/server-renderer@3.3.13(vue@3.3.13):
+    resolution: {integrity: sha512-vSnN+nuf6iSqTL3Qgx/9A+BT+0Zf/VJOgF5uMZrKjYPs38GMYyAU1coDyBNHauehXDaP+zl73VhwWv0vBRBHcg==}
     peerDependencies:
       vue: latest
     dependencies:
-      '@vue/compiler-ssr': 3.3.11
-      '@vue/shared': 3.3.11
-      vue: 3.3.11
+      '@vue/compiler-ssr': 3.3.13
+      '@vue/shared': 3.3.13
+      vue: 3.3.13
 
-  /@vue/shared@3.3.11:
-    resolution: {integrity: sha512-u2G8ZQ9IhMWTMXaWqZycnK4UthG1fA238CD+DP4Dm4WJi5hdUKKLg0RMRaRpDPNMdkTwIDkp7WtD0Rd9BH9fLw==}
+  /@vue/shared@3.3.13:
+    resolution: {integrity: sha512-/zYUwiHD8j7gKx2argXEMCUXVST6q/21DFU0sTfNX0URJroCe3b1UF6vLJ3lQDfLNIiiRl2ONp7Nh5UVWS6QnA==}
 
   /@vue/shared@3.3.8:
     resolution: {integrity: sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==}
     dev: true
 
-  /@vue/test-utils@2.0.2(vue@3.3.11):
+  /@vue/test-utils@2.0.2(vue@3.3.13):
     resolution: {integrity: sha512-E2P4oXSaWDqTZNbmKZFVLrNN/siVN78YkEqs7pHryWerrlZR9bBFLWdJwRoguX45Ru6HxIflzKl4vQvwRMwm5g==}
     peerDependencies:
       vue: latest
     dependencies:
-      vue: 3.3.11
+      vue: 3.3.13
     dev: true
 
-  /@vuelidate/core@2.0.3(vue@3.3.11):
+  /@vuelidate/core@2.0.3(vue@3.3.13):
     resolution: {integrity: sha512-AN6l7KF7+mEfyWG0doT96z+47ljwPpZfi9/JrNMkOGLFv27XVZvKzRLXlmDPQjPl/wOB1GNnHuc54jlCLRNqGA==}
     peerDependencies:
       '@vue/composition-api': ^1.0.0-rc.1
@@ -9905,11 +9946,11 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      vue: 3.3.11
-      vue-demi: 0.13.11(vue@3.3.11)
+      vue: 3.3.13
+      vue-demi: 0.13.11(vue@3.3.13)
     dev: false
 
-  /@vuelidate/validators@2.0.4(vue@3.3.11):
+  /@vuelidate/validators@2.0.4(vue@3.3.13):
     resolution: {integrity: sha512-odTxtUZ2JpwwiQ10t0QWYJkkYrfd0SyFYhdHH44QQ1jDatlZgTh/KRzrWVmn/ib9Gq7H4hFD4e8ahoo5YlUlDw==}
     peerDependencies:
       '@vue/composition-api': ^1.0.0-rc.1
@@ -9918,34 +9959,34 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      vue: 3.3.11
-      vue-demi: 0.13.11(vue@3.3.11)
+      vue: 3.3.13
+      vue-demi: 0.13.11(vue@3.3.13)
     dev: false
 
-  /@vueuse/core@10.2.1(vue@3.3.11):
+  /@vueuse/core@10.2.1(vue@3.3.13):
     resolution: {integrity: sha512-c441bfMbkAwTNwVRHQ0zdYZNETK//P84rC01aP2Uy/aRFCiie9NE/k9KdIXbno0eDYP5NPUuWv0aA/I4Unr/7w==}
     dependencies:
       '@types/web-bluetooth': 0.0.17
       '@vueuse/metadata': 10.2.1
-      '@vueuse/shared': 10.2.1(vue@3.3.11)
-      vue-demi: 0.14.5(vue@3.3.11)
+      '@vueuse/shared': 10.2.1(vue@3.3.13)
+      vue-demi: 0.14.5(vue@3.3.13)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  /@vueuse/core@10.6.1(vue@3.3.11):
+  /@vueuse/core@10.6.1(vue@3.3.13):
     resolution: {integrity: sha512-Pc26IJbqgC9VG1u6VY/xrXXfxD33hnvxBnKrLlA2LJlyHII+BSrRoTPJgGYq7qZOu61itITFUnm6QbacwZ4H8Q==}
     dependencies:
       '@types/web-bluetooth': 0.0.20
       '@vueuse/metadata': 10.6.1
-      '@vueuse/shared': 10.6.1(vue@3.3.11)
-      vue-demi: 0.14.6(vue@3.3.11)
+      '@vueuse/shared': 10.6.1(vue@3.3.13)
+      vue-demi: 0.14.6(vue@3.3.13)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
     dev: false
 
-  /@vueuse/core@7.7.1(vue@3.3.11):
+  /@vueuse/core@7.7.1(vue@3.3.13):
     resolution: {integrity: sha512-PRRgbATMpoeUmkCEBtUeJgOwtew8s+4UsEd+Pm7MhkjL2ihCNrSqxNVtM6NFE4uP2sWnkGcZpCjPuNSxowJ1Ow==}
     peerDependencies:
       '@vue/composition-api': ^1.1.0
@@ -9956,12 +9997,12 @@ packages:
       vue:
         optional: true
     dependencies:
-      '@vueuse/shared': 7.7.1(vue@3.3.11)
-      vue: 3.3.11
-      vue-demi: 0.14.6(vue@3.3.11)
+      '@vueuse/shared': 7.7.1(vue@3.3.13)
+      vue: 3.3.13
+      vue-demi: 0.14.6(vue@3.3.13)
     dev: false
 
-  /@vueuse/integrations@10.2.1(fuse.js@6.6.2)(jwt-decode@3.1.2)(qrcode@1.5.3)(sortablejs@1.15.1)(vue@3.3.11):
+  /@vueuse/integrations@10.2.1(fuse.js@6.6.2)(jwt-decode@3.1.2)(qrcode@1.5.3)(sortablejs@1.15.1)(vue@3.3.13):
     resolution: {integrity: sha512-FDP5lni+z9FjHE9H3xuvwSjoRV9U8jmDvJpmHPCBjUgPGYRynwb60eHWXCFJXLUtb4gSIHy0e+iaEbrKdalCkQ==}
     peerDependencies:
       async-validator: '*'
@@ -10002,13 +10043,13 @@ packages:
       universal-cookie:
         optional: true
     dependencies:
-      '@vueuse/core': 10.2.1(vue@3.3.11)
-      '@vueuse/shared': 10.2.1(vue@3.3.11)
+      '@vueuse/core': 10.2.1(vue@3.3.13)
+      '@vueuse/shared': 10.2.1(vue@3.3.13)
       fuse.js: 6.6.2
       jwt-decode: 3.1.2
       qrcode: 1.5.3
       sortablejs: 1.15.1
-      vue-demi: 0.14.5(vue@3.3.11)
+      vue-demi: 0.14.5(vue@3.3.13)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -10021,17 +10062,17 @@ packages:
     resolution: {integrity: sha512-qhdwPI65Bgcj23e5lpGfQsxcy0bMjCAsUGoXkJ7DsoeDUdasbZ2DBa4dinFCOER3lF4gwUv+UD2AlA11zdzMFw==}
     dev: false
 
-  /@vueuse/nuxt@10.2.1(nuxt@3.8.2)(vue@3.3.11):
+  /@vueuse/nuxt@10.2.1(nuxt@3.8.2)(vue@3.3.13):
     resolution: {integrity: sha512-01iDXnjZFDaGZnEL0nvlmSTNV0EG6WY+VSFyWnBji9lbxdQwOn4DHvLou3ePe8ipaoQVtY58WcL0OHIFa4+fBA==}
     peerDependencies:
       nuxt: ^3.0.0
     dependencies:
       '@nuxt/kit': 3.7.0
-      '@vueuse/core': 10.2.1(vue@3.3.11)
+      '@vueuse/core': 10.2.1(vue@3.3.13)
       '@vueuse/metadata': 10.2.1
       local-pkg: 0.4.3
       nuxt: 3.8.2(eslint@8.33.0)(sass@1.69.5)(vite@4.5.0)
-      vue-demi: 0.14.5(vue@3.3.11)
+      vue-demi: 0.14.5(vue@3.3.13)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - rollup
@@ -10039,24 +10080,24 @@ packages:
       - vue
     dev: true
 
-  /@vueuse/shared@10.2.1(vue@3.3.11):
+  /@vueuse/shared@10.2.1(vue@3.3.13):
     resolution: {integrity: sha512-QWHq2bSuGptkcxx4f4M/fBYC3Y8d3M2UYyLsyzoPgEoVzJURQ0oJeWXu79OiLlBb8gTKkqe4mO85T/sf39mmiw==}
     dependencies:
-      vue-demi: 0.14.6(vue@3.3.11)
+      vue-demi: 0.14.6(vue@3.3.13)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  /@vueuse/shared@10.6.1(vue@3.3.11):
+  /@vueuse/shared@10.6.1(vue@3.3.13):
     resolution: {integrity: sha512-TECVDTIedFlL0NUfHWncf3zF9Gc4VfdxfQc8JFwoVZQmxpONhLxFrlm0eHQeidHj4rdTPL3KXJa0TZCk1wnc5Q==}
     dependencies:
-      vue-demi: 0.14.6(vue@3.3.11)
+      vue-demi: 0.14.6(vue@3.3.13)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
     dev: false
 
-  /@vueuse/shared@7.7.1(vue@3.3.11):
+  /@vueuse/shared@7.7.1(vue@3.3.13):
     resolution: {integrity: sha512-rN2qd22AUl7VdBxihagWyhUNHCyVk9IpvBTTfHoLH9G7rGE552X1f+zeCfehuno0zXif13jPw+icW/wn2a0rnQ==}
     peerDependencies:
       '@vue/composition-api': ^1.1.0
@@ -10067,8 +10108,8 @@ packages:
       vue:
         optional: true
     dependencies:
-      vue: 3.3.11
-      vue-demi: 0.14.6(vue@3.3.11)
+      vue: 3.3.13
+      vue-demi: 0.14.6(vue@3.3.13)
     dev: false
 
   /@webassemblyjs/ast@1.11.6:
@@ -10242,7 +10283,7 @@ packages:
       '@antfu/utils': 0.7.6
       '@windicss/config': 1.9.1
       debug: 4.3.4(supports-color@5.5.0)
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       magic-string: 0.30.5
       micromatch: 4.0.5
       windicss: 3.5.6
@@ -10568,14 +10609,14 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /ant-design-vue@3.2.20(vue@3.3.11):
+  /ant-design-vue@3.2.20(vue@3.3.13):
     resolution: {integrity: sha512-YWpMfGaGoRastIXEYfCoJiaRiDHk4chqtYhlKQM5GqPt6NfvrM1Vg2e60yHtjxlZjed91wCMm0rAmyUr7Hwzdg==}
     engines: {node: '>=12.22.0'}
     peerDependencies:
       vue: latest
     dependencies:
       '@ant-design/colors': 6.0.0
-      '@ant-design/icons-vue': 6.1.0(vue@3.3.11)
+      '@ant-design/icons-vue': 6.1.0(vue@3.3.13)
       '@babel/runtime': 7.22.11
       '@ctrl/tinycolor': 3.6.1
       '@simonwep/pickr': 1.8.2
@@ -10589,8 +10630,8 @@ packages:
       resize-observer-polyfill: 1.5.1
       scroll-into-view-if-needed: 2.2.31
       shallow-equal: 1.2.1
-      vue: 3.3.11
-      vue-types: 3.0.2(vue@3.3.11)
+      vue: 3.3.13
+      vue-types: 3.0.2(vue@3.3.13)
       warning: 4.0.3
     dev: false
 
@@ -10886,7 +10927,7 @@ packages:
     resolution: {integrity: sha512-Q0DjXK4ApbVoIf9GLyCo252tUH44iTnD/hiJ2TQaJeydYWSpKk0sI34+WMel8S9Wt5pbLgG02oJ+gkgX5DV3sQ==}
     engines: {node: '>=16.14.0'}
     dependencies:
-      '@babel/parser': 7.23.4
+      '@babel/parser': 7.23.5
       '@rollup/pluginutils': 5.0.5(rollup@4.5.0)
       pathe: 1.1.1
     transitivePeerDependencies:
@@ -10897,7 +10938,7 @@ packages:
     resolution: {integrity: sha512-kbL7ERlqjXubdDd+szuwdlQ1xUxEz9mCz1+m07ftNVStgwRb2RWw+U6oKo08PAvOishMxiqz1mlJyLl8yQx2Qg==}
     engines: {node: '>=16.14.0'}
     dependencies:
-      '@babel/parser': 7.23.4
+      '@babel/parser': 7.23.5
       '@rollup/pluginutils': 5.0.5(rollup@4.5.0)
       pathe: 1.1.1
     transitivePeerDependencies:
@@ -10908,7 +10949,7 @@ packages:
     resolution: {integrity: sha512-NsyHMxBh4dmdEHjBo1/TBZvCKxffmZxRYhmclfu0PP6Aftre47jOHYaYaNqJcV0bxihxFXhDkzLHUwHc0ocd0Q==}
     engines: {node: '>=16.14.0'}
     dependencies:
-      '@babel/parser': 7.23.4
+      '@babel/parser': 7.23.5
       ast-kit: 0.9.5
     transitivePeerDependencies:
       - rollup
@@ -10954,7 +10995,7 @@ packages:
     engines: {node: '>=8'}
     dev: false
 
-  /autoprefixer@10.4.16(postcss@8.4.31):
+  /autoprefixer@10.4.16(postcss@8.4.32):
     resolution: {integrity: sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==}
     engines: {node: ^10 || ^12 || >=14}
     hasBin: true
@@ -10966,7 +11007,7 @@ packages:
       fraction.js: 4.3.7
       normalize-range: 0.1.2
       picocolors: 1.0.0
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -11064,9 +11105,19 @@ packages:
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
+    dev: false
 
-  /axios@1.6.2(debug@4.3.4):
-    resolution: {integrity: sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==}
+  /axios@1.6.3:
+    resolution: {integrity: sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==}
+    dependencies:
+      follow-redirects: 1.15.2(debug@3.2.7)
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+
+  /axios@1.6.3(debug@4.3.4):
+    resolution: {integrity: sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==}
     dependencies:
       follow-redirects: 1.15.2(debug@4.3.4)
       form-data: 4.0.0
@@ -12605,13 +12656,13 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /css-declaration-sorter@6.4.1(postcss@8.4.31):
+  /css-declaration-sorter@6.4.1(postcss@8.4.32):
     resolution: {integrity: sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==}
     engines: {node: ^10 || ^12 || >=14}
     peerDependencies:
       postcss: ^8.0.9
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
     dev: true
 
   /css-select@5.1.0:
@@ -12661,62 +12712,62 @@ packages:
     dev: true
     optional: true
 
-  /cssnano-preset-default@6.0.1(postcss@8.4.31):
+  /cssnano-preset-default@6.0.1(postcss@8.4.32):
     resolution: {integrity: sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      css-declaration-sorter: 6.4.1(postcss@8.4.31)
-      cssnano-utils: 4.0.0(postcss@8.4.31)
-      postcss: 8.4.31
-      postcss-calc: 9.0.1(postcss@8.4.31)
-      postcss-colormin: 6.0.0(postcss@8.4.31)
-      postcss-convert-values: 6.0.0(postcss@8.4.31)
-      postcss-discard-comments: 6.0.0(postcss@8.4.31)
-      postcss-discard-duplicates: 6.0.0(postcss@8.4.31)
-      postcss-discard-empty: 6.0.0(postcss@8.4.31)
-      postcss-discard-overridden: 6.0.0(postcss@8.4.31)
-      postcss-merge-longhand: 6.0.0(postcss@8.4.31)
-      postcss-merge-rules: 6.0.1(postcss@8.4.31)
-      postcss-minify-font-values: 6.0.0(postcss@8.4.31)
-      postcss-minify-gradients: 6.0.0(postcss@8.4.31)
-      postcss-minify-params: 6.0.0(postcss@8.4.31)
-      postcss-minify-selectors: 6.0.0(postcss@8.4.31)
-      postcss-normalize-charset: 6.0.0(postcss@8.4.31)
-      postcss-normalize-display-values: 6.0.0(postcss@8.4.31)
-      postcss-normalize-positions: 6.0.0(postcss@8.4.31)
-      postcss-normalize-repeat-style: 6.0.0(postcss@8.4.31)
-      postcss-normalize-string: 6.0.0(postcss@8.4.31)
-      postcss-normalize-timing-functions: 6.0.0(postcss@8.4.31)
-      postcss-normalize-unicode: 6.0.0(postcss@8.4.31)
-      postcss-normalize-url: 6.0.0(postcss@8.4.31)
-      postcss-normalize-whitespace: 6.0.0(postcss@8.4.31)
-      postcss-ordered-values: 6.0.0(postcss@8.4.31)
-      postcss-reduce-initial: 6.0.0(postcss@8.4.31)
-      postcss-reduce-transforms: 6.0.0(postcss@8.4.31)
-      postcss-svgo: 6.0.0(postcss@8.4.31)
-      postcss-unique-selectors: 6.0.0(postcss@8.4.31)
-    dev: true
-
-  /cssnano-utils@4.0.0(postcss@8.4.31):
+      css-declaration-sorter: 6.4.1(postcss@8.4.32)
+      cssnano-utils: 4.0.0(postcss@8.4.32)
+      postcss: 8.4.32
+      postcss-calc: 9.0.1(postcss@8.4.32)
+      postcss-colormin: 6.0.0(postcss@8.4.32)
+      postcss-convert-values: 6.0.0(postcss@8.4.32)
+      postcss-discard-comments: 6.0.0(postcss@8.4.32)
+      postcss-discard-duplicates: 6.0.0(postcss@8.4.32)
+      postcss-discard-empty: 6.0.0(postcss@8.4.32)
+      postcss-discard-overridden: 6.0.0(postcss@8.4.32)
+      postcss-merge-longhand: 6.0.0(postcss@8.4.32)
+      postcss-merge-rules: 6.0.1(postcss@8.4.32)
+      postcss-minify-font-values: 6.0.0(postcss@8.4.32)
+      postcss-minify-gradients: 6.0.0(postcss@8.4.32)
+      postcss-minify-params: 6.0.0(postcss@8.4.32)
+      postcss-minify-selectors: 6.0.0(postcss@8.4.32)
+      postcss-normalize-charset: 6.0.0(postcss@8.4.32)
+      postcss-normalize-display-values: 6.0.0(postcss@8.4.32)
+      postcss-normalize-positions: 6.0.0(postcss@8.4.32)
+      postcss-normalize-repeat-style: 6.0.0(postcss@8.4.32)
+      postcss-normalize-string: 6.0.0(postcss@8.4.32)
+      postcss-normalize-timing-functions: 6.0.0(postcss@8.4.32)
+      postcss-normalize-unicode: 6.0.0(postcss@8.4.32)
+      postcss-normalize-url: 6.0.0(postcss@8.4.32)
+      postcss-normalize-whitespace: 6.0.0(postcss@8.4.32)
+      postcss-ordered-values: 6.0.0(postcss@8.4.32)
+      postcss-reduce-initial: 6.0.0(postcss@8.4.32)
+      postcss-reduce-transforms: 6.0.0(postcss@8.4.32)
+      postcss-svgo: 6.0.0(postcss@8.4.32)
+      postcss-unique-selectors: 6.0.0(postcss@8.4.32)
+    dev: true
+
+  /cssnano-utils@4.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
     dev: true
 
-  /cssnano@6.0.1(postcss@8.4.31):
+  /cssnano@6.0.1(postcss@8.4.32):
     resolution: {integrity: sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      cssnano-preset-default: 6.0.1(postcss@8.4.31)
+      cssnano-preset-default: 6.0.1(postcss@8.4.32)
       lilconfig: 2.1.0
-      postcss: 8.4.31
+      postcss: 8.4.32
     dev: true
 
   /csso@5.0.5:
@@ -12734,8 +12785,8 @@ packages:
       rrweb-cssom: 0.6.0
     dev: false
 
-  /csstype@3.1.2:
-    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
+  /csstype@3.1.3:
+    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
 
   /d3-array@3.2.4:
     resolution: {integrity: sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==}
@@ -13353,14 +13404,14 @@ packages:
     engines: {node: '>=10'}
     dev: false
 
-  /emoji-mart-vue-fast@15.0.0(vue@3.3.11):
+  /emoji-mart-vue-fast@15.0.0(vue@3.3.13):
     resolution: {integrity: sha512-3BzkDrs60JyT00dLHMAxWKbpFhbyaW9C+q1AjtqGovSxTu8TC2mYAGsvTmXNYKm39IRRAS56v92TihOcB98IsQ==}
     peerDependencies:
       vue: latest
     dependencies:
       '@babel/runtime': 7.22.11
       core-js: 3.32.1
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
   /emoji-regex@8.0.0:
@@ -13856,7 +13907,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.13.2)(eslint-import-resolver-node@0.3.9)(eslint@8.54.0):
+  /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.14.0)(eslint-import-resolver-node@0.3.9)(eslint@8.54.0):
     resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -13877,7 +13928,7 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 6.13.2(eslint@8.54.0)(typescript@5.3.2)
+      '@typescript-eslint/parser': 6.14.0(eslint@8.54.0)(typescript@5.3.2)
       debug: 3.2.7
       eslint: 8.54.0
       eslint-import-resolver-node: 0.3.9
@@ -13938,7 +13989,7 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/type-utils': 5.62.0(eslint@8.33.0)
+      '@typescript-eslint/type-utils': 5.62.0(eslint@8.33.0)(typescript@5.3.2)
       '@typescript-eslint/utils': 5.62.0(eslint@8.33.0)(typescript@5.3.2)
       deepmerge-ts: 5.1.0
       escape-string-regexp: 4.0.0
@@ -14100,8 +14151,43 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.13.2)(eslint@8.54.0):
-    resolution: {integrity: sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==}
+  /eslint-plugin-import@2.29.1(@typescript-eslint/parser@5.62.0)(eslint@8.33.0):
+    resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 5.62.0(eslint@8.33.0)
+      array-includes: 3.1.7
+      array.prototype.findlastindex: 1.2.3
+      array.prototype.flat: 1.3.2
+      array.prototype.flatmap: 1.3.2
+      debug: 3.2.7
+      doctrine: 2.1.0
+      eslint: 8.33.0
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.33.0)
+      hasown: 2.0.0
+      is-core-module: 2.13.1
+      is-glob: 4.0.3
+      minimatch: 3.1.2
+      object.fromentries: 2.0.7
+      object.groupby: 1.0.1
+      object.values: 1.1.7
+      semver: 6.3.1
+      tsconfig-paths: 3.15.0
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+    dev: true
+
+  /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.14.0)(eslint@8.54.0):
+    resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
     engines: {node: '>=4'}
     peerDependencies:
       '@typescript-eslint/parser': '*'
@@ -14110,7 +14196,7 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 6.13.2(eslint@8.54.0)(typescript@5.3.2)
+      '@typescript-eslint/parser': 6.14.0(eslint@8.54.0)(typescript@5.3.2)
       array-includes: 3.1.7
       array.prototype.findlastindex: 1.2.3
       array.prototype.flat: 1.3.2
@@ -14119,7 +14205,7 @@ packages:
       doctrine: 2.1.0
       eslint: 8.54.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.13.2)(eslint-import-resolver-node@0.3.9)(eslint@8.54.0)
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.14.0)(eslint-import-resolver-node@0.3.9)(eslint@8.54.0)
       hasown: 2.0.0
       is-core-module: 2.13.1
       is-glob: 4.0.3
@@ -14128,7 +14214,7 @@ packages:
       object.groupby: 1.0.1
       object.values: 1.1.7
       semver: 6.3.1
-      tsconfig-paths: 3.14.2
+      tsconfig-paths: 3.15.0
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
@@ -14178,7 +14264,7 @@ packages:
       eslint-plugin-es: 4.1.0(eslint@8.33.0)
       eslint-utils: 3.0.0(eslint@8.33.0)
       ignore: 5.3.0
-      is-core-module: 2.13.0
+      is-core-module: 2.13.1
       minimatch: 3.1.2
       resolve: 1.22.4
       semver: 7.5.4
@@ -14250,8 +14336,8 @@ packages:
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
     dependencies:
-      array-includes: 3.1.6
-      array.prototype.flatmap: 1.3.1
+      array-includes: 3.1.7
+      array.prototype.flatmap: 1.3.2
       array.prototype.tosorted: 1.1.1
       doctrine: 2.1.0
       es-iterator-helpers: 1.0.14
@@ -14260,9 +14346,9 @@ packages:
       jsx-ast-utils: 3.3.5
       minimatch: 3.1.2
       object.entries: 1.1.7
-      object.fromentries: 2.0.6
+      object.fromentries: 2.0.7
       object.hasown: 1.1.2
-      object.values: 1.1.6
+      object.values: 1.1.7
       prop-types: 15.8.1
       resolve: 2.0.0-next.4
       semver: 6.3.1
@@ -14884,6 +14970,7 @@ packages:
       glob-parent: 5.1.2
       merge2: 1.4.1
       micromatch: 4.0.5
+    dev: true
 
   /fast-glob@3.3.2:
     resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
@@ -15751,7 +15838,7 @@ packages:
     dependencies:
       array-union: 2.1.0
       dir-glob: 3.0.1
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       ignore: 5.3.0
       merge2: 1.4.1
       slash: 3.0.0
@@ -15762,7 +15849,7 @@ packages:
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
       dir-glob: 3.0.1
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       ignore: 5.3.0
       merge2: 1.4.1
       slash: 4.0.0
@@ -16797,7 +16884,7 @@ packages:
       eslint: '*'
       typescript: latest
     dependencies:
-      '@typescript-eslint/type-utils': 5.62.0(eslint@8.33.0)
+      '@typescript-eslint/type-utils': 5.62.0(eslint@8.33.0)(typescript@5.3.2)
       eslint: 8.33.0
     transitivePeerDependencies:
       - supports-color
@@ -17135,7 +17222,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       '@babel/core': 7.23.3
-      '@babel/parser': 7.23.4
+      '@babel/parser': 7.23.5
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
       semver: 6.3.1
@@ -17148,7 +17235,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       '@babel/core': 7.23.3
-      '@babel/parser': 7.23.4
+      '@babel/parser': 7.23.5
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
       semver: 7.5.4
@@ -17900,10 +17987,10 @@ packages:
     resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
     engines: {node: '>=4.0'}
     dependencies:
-      array-includes: 3.1.6
-      array.prototype.flat: 1.3.1
+      array-includes: 3.1.7
+      array.prototype.flat: 1.3.2
       object.assign: 4.1.4
-      object.values: 1.1.6
+      object.values: 1.1.7
     dev: true
 
   /jwa@1.4.1:
@@ -18338,7 +18425,7 @@ packages:
       mlly: 1.4.2
       node-forge: 1.3.1
       pathe: 1.1.1
-      std-env: 3.6.0
+      std-env: 3.7.0
       ufo: 1.3.2
       untun: 0.1.2
       uqr: 0.1.2
@@ -18673,7 +18760,7 @@ packages:
   /magicast@0.3.2:
     resolution: {integrity: sha512-Fjwkl6a0syt9TFN0JSYpOybxiMCkYNEeOTnOTNRbjphirLakznZXAqrXgj/7GG3D1dvETONNwrBfinvAbpunDg==}
     dependencies:
-      '@babel/parser': 7.23.4
+      '@babel/parser': 7.23.5
       '@babel/types': 7.23.4
       source-map-js: 1.0.2
     dev: true
@@ -19426,12 +19513,6 @@ packages:
     hasBin: true
     dev: true
 
-  /nanoid@3.3.6:
-    resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-    dev: true
-
   /nanoid@3.3.7:
     resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -19690,6 +19771,10 @@ packages:
   /node-fetch-native@1.4.1:
     resolution: {integrity: sha512-NsXBU0UgBxo2rQLOeWNZqS3fvflWePMECr8CoSWoSTqCqGbVVsvl9vZu1HfQicYN0g5piV9Gh8RTEvo/uP752w==}
 
+  /node-fetch-native@1.6.1:
+    resolution: {integrity: sha512-bW9T/uJDPAJB2YNYEpWzE54U5O3MQidXsOyTfnbKYtTtFexRvGzb1waphBN4ZwP6EcIvYYEOwW0b72BpAqydTw==}
+    dev: true
+
   /node-fetch@2.6.7:
     resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
     engines: {node: 4.x || >=6.0.0}
@@ -19882,7 +19967,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       hosted-git-info: 4.1.0
-      is-core-module: 2.13.0
+      is-core-module: 2.13.1
       semver: 7.5.4
       validate-npm-package-license: 3.0.4
     dev: true
@@ -19892,7 +19977,7 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       hosted-git-info: 6.1.1
-      is-core-module: 2.13.0
+      is-core-module: 2.13.1
       semver: 7.5.4
       validate-npm-package-license: 3.0.4
     dev: true
@@ -19902,7 +19987,7 @@ packages:
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
       hosted-git-info: 7.0.1
-      is-core-module: 2.13.0
+      is-core-module: 2.13.1
       semver: 7.5.4
       validate-npm-package-license: 3.0.4
     dev: true
@@ -20153,10 +20238,10 @@ packages:
       '@nuxt/schema': 3.8.2
       '@nuxt/telemetry': 2.5.2
       '@nuxt/ui-templates': 1.3.1
-      '@nuxt/vite-builder': 3.8.2(eslint@8.33.0)(sass@1.69.5)(vue@3.3.11)
+      '@nuxt/vite-builder': 3.8.2(eslint@8.33.0)(sass@1.69.5)(vue@3.3.13)
       '@unhead/dom': 1.8.5
       '@unhead/ssr': 1.8.5
-      '@unhead/vue': 1.8.5(vue@3.3.11)
+      '@unhead/vue': 1.8.5(vue@3.3.13)
       '@vue/shared': 3.3.8
       acorn: 8.11.2
       c12: 1.5.1
@@ -20196,12 +20281,12 @@ packages:
       unenv: 1.7.4
       unimport: 3.5.0(rollup@4.5.0)
       unplugin: 1.5.1
-      unplugin-vue-router: 0.7.0(vue-router@4.2.5)(vue@3.3.11)
+      unplugin-vue-router: 0.7.0(vue-router@4.2.5)(vue@3.3.13)
       untyped: 1.4.0
-      vue: 3.3.11
+      vue: 3.3.13
       vue-bundle-renderer: 2.0.0
       vue-devtools-stub: 0.1.0
-      vue-router: 4.2.5(vue@3.3.11)
+      vue-router: 4.2.5(vue@3.3.13)
     transitivePeerDependencies:
       - '@azure/app-configuration'
       - '@azure/cosmos'
@@ -20261,7 +20346,7 @@ packages:
       '@yarnpkg/lockfile': 1.1.0
       '@yarnpkg/parsers': 3.0.0-rc.46
       '@zkochan/js-yaml': 0.0.6
-      axios: 1.6.2
+      axios: 1.6.3
       chalk: 4.1.2
       cli-cursor: 3.1.0
       cli-spinners: 2.6.1
@@ -20368,15 +20453,6 @@ packages:
       es-abstract: 1.22.1
     dev: true
 
-  /object.fromentries@2.0.6:
-    resolution: {integrity: sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.0
-      es-abstract: 1.22.1
-    dev: true
-
   /object.fromentries@2.0.7:
     resolution: {integrity: sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==}
     engines: {node: '>= 0.4'}
@@ -20518,7 +20594,7 @@ packages:
     hasBin: true
     dependencies:
       ansi-colors: 4.1.3
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       js-yaml: 4.1.0
       supports-color: 9.4.0
       undici: 5.27.2
@@ -21107,7 +21183,7 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /pinia@2.1.7(vue@3.3.11):
+  /pinia@2.1.7(vue@3.3.13):
     resolution: {integrity: sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==}
     peerDependencies:
       '@vue/composition-api': ^1.4.0
@@ -21120,8 +21196,8 @@ packages:
         optional: true
     dependencies:
       '@vue/devtools-api': 6.5.0
-      vue: 3.3.11
-      vue-demi: 0.14.6(vue@3.3.11)
+      vue: 3.3.13
+      vue-demi: 0.14.6(vue@3.3.13)
     dev: false
 
   /pinkie-promise@1.0.0:
@@ -21191,18 +21267,18 @@ packages:
     resolution: {integrity: sha512-HRCx4+KJE30JhX84wBN4+vja9bNfysxg1y28l0DuJmkoaICiv2ZSilKddbS48pq50P8d2erAhqDLbp47yv3MbQ==}
     dev: false
 
-  /postcss-calc@9.0.1(postcss@8.4.31):
+  /postcss-calc@9.0.1(postcss@8.4.32):
     resolution: {integrity: sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.2
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-selector-parser: 6.0.13
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-colormin@6.0.0(postcss@8.4.31):
+  /postcss-colormin@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
@@ -21211,55 +21287,55 @@ packages:
       browserslist: 4.21.10
       caniuse-api: 3.0.0
       colord: 2.9.3
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-convert-values@6.0.0(postcss@8.4.31):
+  /postcss-convert-values@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       browserslist: 4.21.10
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-discard-comments@6.0.0(postcss@8.4.31):
+  /postcss-discard-comments@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
     dev: true
 
-  /postcss-discard-duplicates@6.0.0(postcss@8.4.31):
+  /postcss-discard-duplicates@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
     dev: true
 
-  /postcss-discard-empty@6.0.0(postcss@8.4.31):
+  /postcss-discard-empty@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
     dev: true
 
-  /postcss-discard-overridden@6.0.0(postcss@8.4.31):
+  /postcss-discard-overridden@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
     dev: true
 
   /postcss-import-resolver@2.0.0:
@@ -21267,18 +21343,18 @@ packages:
     dependencies:
       enhanced-resolve: 4.5.0
 
-  /postcss-merge-longhand@6.0.0(postcss@8.4.31):
+  /postcss-merge-longhand@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
-      stylehacks: 6.0.0(postcss@8.4.31)
+      stylehacks: 6.0.0(postcss@8.4.32)
     dev: true
 
-  /postcss-merge-rules@6.0.1(postcss@8.4.31):
+  /postcss-merge-rules@6.0.1(postcss@8.4.32):
     resolution: {integrity: sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
@@ -21286,157 +21362,157 @@ packages:
     dependencies:
       browserslist: 4.21.10
       caniuse-api: 3.0.0
-      cssnano-utils: 4.0.0(postcss@8.4.31)
-      postcss: 8.4.31
+      cssnano-utils: 4.0.0(postcss@8.4.32)
+      postcss: 8.4.32
       postcss-selector-parser: 6.0.13
     dev: true
 
-  /postcss-minify-font-values@6.0.0(postcss@8.4.31):
+  /postcss-minify-font-values@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-minify-gradients@6.0.0(postcss@8.4.31):
+  /postcss-minify-gradients@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       colord: 2.9.3
-      cssnano-utils: 4.0.0(postcss@8.4.31)
-      postcss: 8.4.31
+      cssnano-utils: 4.0.0(postcss@8.4.32)
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-minify-params@6.0.0(postcss@8.4.31):
+  /postcss-minify-params@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       browserslist: 4.21.10
-      cssnano-utils: 4.0.0(postcss@8.4.31)
-      postcss: 8.4.31
+      cssnano-utils: 4.0.0(postcss@8.4.32)
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-minify-selectors@6.0.0(postcss@8.4.31):
+  /postcss-minify-selectors@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-selector-parser: 6.0.13
     dev: true
 
-  /postcss-normalize-charset@6.0.0(postcss@8.4.31):
+  /postcss-normalize-charset@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
     dev: true
 
-  /postcss-normalize-display-values@6.0.0(postcss@8.4.31):
+  /postcss-normalize-display-values@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-positions@6.0.0(postcss@8.4.31):
+  /postcss-normalize-positions@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-repeat-style@6.0.0(postcss@8.4.31):
+  /postcss-normalize-repeat-style@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-string@6.0.0(postcss@8.4.31):
+  /postcss-normalize-string@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-timing-functions@6.0.0(postcss@8.4.31):
+  /postcss-normalize-timing-functions@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-unicode@6.0.0(postcss@8.4.31):
+  /postcss-normalize-unicode@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       browserslist: 4.21.10
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-url@6.0.0(postcss@8.4.31):
+  /postcss-normalize-url@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-normalize-whitespace@6.0.0(postcss@8.4.31):
+  /postcss-normalize-whitespace@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-ordered-values@6.0.0(postcss@8.4.31):
+  /postcss-ordered-values@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      cssnano-utils: 4.0.0(postcss@8.4.31)
-      postcss: 8.4.31
+      cssnano-utils: 4.0.0(postcss@8.4.32)
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-reduce-initial@6.0.0(postcss@8.4.31):
+  /postcss-reduce-initial@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
@@ -21444,16 +21520,16 @@ packages:
     dependencies:
       browserslist: 4.21.10
       caniuse-api: 3.0.0
-      postcss: 8.4.31
+      postcss: 8.4.32
     dev: true
 
-  /postcss-reduce-transforms@6.0.0(postcss@8.4.31):
+  /postcss-reduce-transforms@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -21465,24 +21541,24 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /postcss-svgo@6.0.0(postcss@8.4.31):
+  /postcss-svgo@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==}
     engines: {node: ^14 || ^16 || >= 18}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-value-parser: 4.2.0
       svgo: 3.0.4
     dev: true
 
-  /postcss-unique-selectors@6.0.0(postcss@8.4.31):
+  /postcss-unique-selectors@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-selector-parser: 6.0.13
     dev: true
 
@@ -21490,15 +21566,6 @@ packages:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
     dev: true
 
-  /postcss@8.4.31:
-    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.6
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-    dev: true
-
   /postcss@8.4.32:
     resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==}
     engines: {node: ^10 || ^12 || >=14}
@@ -22355,7 +22422,7 @@ packages:
     resolution: {integrity: sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==}
     hasBin: true
     dependencies:
-      is-core-module: 2.13.0
+      is-core-module: 2.13.1
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
     dev: true
@@ -22656,6 +22723,10 @@ packages:
   /scule@1.1.0:
     resolution: {integrity: sha512-vRUjqhyM/YWYzT+jsMk6tnl3NkY4A4soJ8uyh3O6Um+JXEQL9ozUCe7pqrxn3CSKokw0hw3nFStfskzpgYwR0g==}
 
+  /scule@1.1.1:
+    resolution: {integrity: sha512-sHtm/SsIK9BUBI3EFT/Gnp9VoKfY6QLvlkvAE6YK7454IF8FSgJEAnJpVdSC7K5/pjI5NfxhzBLW2JAfYA/shQ==}
+    dev: true
+
   /sdp@2.12.0:
     resolution: {integrity: sha512-jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw==}
     dev: false
@@ -23358,6 +23429,10 @@ packages:
   /std-env@3.6.0:
     resolution: {integrity: sha512-aFZ19IgVmhdB2uX599ve2kE6BIE3YMnQ6Gp6BURhW/oIzpXGKr878TQfAQZn1+i0Flcc/UKUy1gOlcfaUBCryg==}
 
+  /std-env@3.7.0:
+    resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==}
+    dev: true
+
   /step@0.0.6:
     resolution: {integrity: sha512-qSSeQinUJk2w38vUFobjFoE307GqsozMC8VisOCkJLpklvKPT0ptPHwWOrENoag8rgLudvTkfP3bancwP93/Jw==}
     dev: false
@@ -23591,14 +23666,14 @@ packages:
     resolution: {integrity: sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==}
     dev: false
 
-  /stylehacks@6.0.0(postcss@8.4.31):
+  /stylehacks@6.0.0(postcss@8.4.32):
     resolution: {integrity: sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       browserslist: 4.21.10
-      postcss: 8.4.31
+      postcss: 8.4.32
       postcss-selector-parser: 6.0.13
     dev: true
 
@@ -24195,6 +24270,40 @@ packages:
       yargs-parser: 21.1.1
     dev: true
 
+  /ts-jest@29.1.1(@babel/core@7.23.3)(jest@29.5.0)(typescript@5.3.2):
+    resolution: {integrity: sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
+    peerDependencies:
+      '@babel/core': '>=7.0.0-beta.0 <8'
+      '@jest/types': ^29.0.0
+      babel-jest: ^29.0.0
+      esbuild: '*'
+      jest: ^29.0.0
+      typescript: latest
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      '@jest/types':
+        optional: true
+      babel-jest:
+        optional: true
+      esbuild:
+        optional: true
+    dependencies:
+      '@babel/core': 7.23.3
+      bs-logger: 0.2.6
+      fast-json-stable-stringify: 2.1.0
+      jest: 29.5.0(@types/node@20.3.3)(ts-node@10.9.2)
+      jest-util: 29.6.3
+      json5: 2.2.3
+      lodash.memoize: 4.1.2
+      make-error: 1.3.6
+      semver: 7.5.4
+      typescript: 5.3.2
+      yargs-parser: 21.1.1
+    dev: true
+
   /ts-loader@9.4.4(typescript@5.3.2)(webpack@5.89.0):
     resolution: {integrity: sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==}
     engines: {node: '>=12.0.0'}
@@ -24299,6 +24408,15 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
+  /tsconfig-paths@3.15.0:
+    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
+    dependencies:
+      '@types/json5': 0.0.29
+      json5: 1.0.2
+      minimist: 1.2.8
+      strip-bom: 3.0.0
+    dev: true
+
   /tsconfig-paths@4.2.0:
     resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
     engines: {node: '>=6'}
@@ -24581,7 +24699,7 @@ packages:
       acorn: 8.11.2
       estree-walker: 3.0.3
       magic-string: 0.30.5
-      unplugin: 1.5.0
+      unplugin: 1.5.1
 
   /undefsafe@2.0.5:
     resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==}
@@ -24646,6 +24764,26 @@ packages:
     transitivePeerDependencies:
       - rollup
 
+  /unimport@3.7.0:
+    resolution: {integrity: sha512-vesCVjU3CYk41UZNY10kwii7l77vcP4IxPbBMgpve+vean7g7zJWrcCqSoG7u0eB9LZ5bM5BP+3vr3W2uYk0Yg==}
+    dependencies:
+      '@rollup/pluginutils': 5.1.0
+      acorn: 8.11.2
+      escape-string-regexp: 5.0.0
+      estree-walker: 3.0.3
+      fast-glob: 3.3.2
+      local-pkg: 0.5.0
+      magic-string: 0.30.5
+      mlly: 1.4.2
+      pathe: 1.1.1
+      pkg-types: 1.0.3
+      scule: 1.1.1
+      strip-literal: 1.3.0
+      unplugin: 1.5.1
+    transitivePeerDependencies:
+      - rollup
+    dev: true
+
   /unique-filename@1.1.1:
     resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==}
     requiresBuild: true
@@ -24756,7 +24894,7 @@ packages:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
 
-  /unplugin-icons@0.14.15(@vue/compiler-sfc@3.3.11):
+  /unplugin-icons@0.14.15(@vue/compiler-sfc@3.3.13):
     resolution: {integrity: sha512-J6YBA+fUzVM2IZPXCK3Pnk36jYVwQ6lkjRgOnZaXNIxpMDsmwDqrE1AGJ0zUbfuEoOa90OBGc0OPfN1r+qlSIQ==}
     peerDependencies:
       '@svgr/core': '>=5.5.0'
@@ -24776,7 +24914,7 @@ packages:
       '@antfu/install-pkg': 0.1.1
       '@antfu/utils': 0.7.6
       '@iconify/utils': 2.1.9
-      '@vue/compiler-sfc': 3.3.11
+      '@vue/compiler-sfc': 3.3.13
       debug: 4.3.4(supports-color@5.5.0)
       kolorist: 1.8.0
       local-pkg: 0.4.3
@@ -24785,7 +24923,7 @@ packages:
       - supports-color
     dev: true
 
-  /unplugin-vue-components@0.22.12(vue@3.3.11):
+  /unplugin-vue-components@0.22.12(vue@3.3.13):
     resolution: {integrity: sha512-FxyzsuBvMCYPIk+8cgscGBQ345tvwVu+qY5IhE++eorkyvA4Z1TiD/HCiim+Kbqozl10i4K+z+NCa2WO2jexRA==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -24805,13 +24943,13 @@ packages:
       minimatch: 5.1.6
       resolve: 1.22.4
       unplugin: 1.4.0
-      vue: 3.3.11
+      vue: 3.3.13
     transitivePeerDependencies:
       - rollup
       - supports-color
     dev: true
 
-  /unplugin-vue-router@0.7.0(vue-router@4.2.5)(vue@3.3.11):
+  /unplugin-vue-router@0.7.0(vue-router@4.2.5)(vue@3.3.13):
     resolution: {integrity: sha512-ddRreGq0t5vlSB7OMy4e4cfU1w2AwBQCwmvW3oP/0IHQiokzbx4hd3TpwBu3eIAFVuhX2cwNQwp1U32UybTVCw==}
     peerDependencies:
       vue-router: ^4.1.0
@@ -24821,17 +24959,17 @@ packages:
     dependencies:
       '@babel/types': 7.23.4
       '@rollup/pluginutils': 5.0.5(rollup@4.5.0)
-      '@vue-macros/common': 1.8.0(vue@3.3.11)
+      '@vue-macros/common': 1.8.0(vue@3.3.13)
       ast-walker-scope: 0.5.0
       chokidar: 3.5.3
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       json5: 2.2.3
       local-pkg: 0.4.3
       mlly: 1.4.2
       pathe: 1.1.1
       scule: 1.1.0
       unplugin: 1.5.1
-      vue-router: 4.2.5(vue@3.3.11)
+      vue-router: 4.2.5(vue@3.3.13)
       yaml: 2.3.4
     transitivePeerDependencies:
       - rollup
@@ -24854,6 +24992,7 @@ packages:
       chokidar: 3.5.3
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.5.0
+    dev: true
 
   /unplugin@1.5.1:
     resolution: {integrity: sha512-0QkvG13z6RD+1L1FoibQqnvTwVBXvS4XSPwAyinVgoOCl2jAgwzdUKmEj05o4Lt8xwQI85Hb6mSyYkcAGwZPew==}
@@ -24912,7 +25051,7 @@ packages:
       listhen: 1.5.5
       lru-cache: 10.0.3
       mri: 1.2.0
-      node-fetch-native: 1.4.1
+      node-fetch-native: 1.6.1
       ofetch: 1.3.3
       ufo: 1.3.2
     transitivePeerDependencies:
@@ -25223,7 +25362,7 @@ packages:
       chokidar: 3.5.3
       commander: 8.3.0
       eslint: 8.33.0
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       fs-extra: 11.1.1
       lodash.debounce: 4.0.8
       lodash.pick: 4.4.0
@@ -25297,7 +25436,7 @@ packages:
       '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.3)
       '@babel/plugin-transform-typescript': 7.22.15(@babel/core@7.23.3)
       '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.23.3)
-      '@vue/compiler-dom': 3.3.11
+      '@vue/compiler-dom': 3.3.13
       kolorist: 1.8.0
       magic-string: 0.30.5
       vite: 4.5.0(@types/node@20.3.1)(sass@1.69.5)
@@ -25349,7 +25488,7 @@ packages:
     dependencies:
       '@types/node': 20.3.1
       esbuild: 0.18.20
-      postcss: 8.4.31
+      postcss: 8.4.32
       rollup: 3.29.4
       sass: 1.69.5
     optionalDependencies:
@@ -25386,7 +25525,7 @@ packages:
     dependencies:
       '@types/node': 20.3.1
       esbuild: 0.18.20
-      postcss: 8.4.31
+      postcss: 8.4.32
       rollup: 3.29.4
       sass: 1.69.5
     optionalDependencies:
@@ -25532,17 +25671,17 @@ packages:
       ufo: 1.3.2
     dev: true
 
-  /vue-chartjs@5.2.0(chart.js@4.4.1)(vue@3.3.11):
+  /vue-chartjs@5.2.0(chart.js@4.4.1)(vue@3.3.13):
     resolution: {integrity: sha512-d3zpKmGZr2OWHQ1xmxBcAn5ShTG917+/UCLaSpaCDDqT0U7DBsvFzTs69ZnHCgKoXT55GZDW8YEj9Av+dlONLA==}
     peerDependencies:
       chart.js: ^4.1.1
       vue: latest
     dependencies:
       chart.js: 4.4.1
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
-  /vue-demi@0.13.11(vue@3.3.11):
+  /vue-demi@0.13.11(vue@3.3.13):
     resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
     engines: {node: '>=12'}
     hasBin: true
@@ -25554,10 +25693,10 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
-  /vue-demi@0.14.5(vue@3.3.11):
+  /vue-demi@0.14.5(vue@3.3.13):
     resolution: {integrity: sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==}
     engines: {node: '>=12'}
     hasBin: true
@@ -25569,9 +25708,9 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      vue: 3.3.11
+      vue: 3.3.13
 
-  /vue-demi@0.14.6(vue@3.3.11):
+  /vue-demi@0.14.6(vue@3.3.13):
     resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==}
     engines: {node: '>=12'}
     hasBin: true
@@ -25583,19 +25722,19 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      vue: 3.3.11
+      vue: 3.3.13
 
   /vue-devtools-stub@0.1.0:
     resolution: {integrity: sha512-RutnB7X8c5hjq39NceArgXg28WZtZpGc3+J16ljMiYnFhKvd8hITxSWQSQ5bvldxMDU6gG5mkxl1MTQLXckVSQ==}
     dev: true
 
-  /vue-dompurify-html@3.0.0(vue@3.3.11):
+  /vue-dompurify-html@3.0.0(vue@3.3.13):
     resolution: {integrity: sha512-S6PMeJU7S3w0TnxMWWd4iydc7oPdOER1GmW9rsgiRwHvcw+nUi2v6BgERcFBULlM+x6PXsfu5P/Rm4reVvWH5A==}
     peerDependencies:
       vue: latest
     dependencies:
       dompurify: 2.4.7
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
   /vue-eslint-parser@9.3.1(eslint@8.33.0):
@@ -25622,7 +25761,7 @@ packages:
       github-buttons: 2.27.0
     dev: false
 
-  /vue-i18n@9.2.2(vue@3.3.11):
+  /vue-i18n@9.2.2(vue@3.3.13):
     resolution: {integrity: sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==}
     engines: {node: '>= 14'}
     peerDependencies:
@@ -25632,7 +25771,7 @@ packages:
       '@intlify/shared': 9.2.2
       '@intlify/vue-devtools': 9.2.2
       '@vue/devtools-api': 6.5.0
-      vue: 3.3.11
+      vue: 3.3.13
 
   /vue-qrcode-reader@3.1.8:
     resolution: {integrity: sha512-WUsq3YamW8FFprcZPoyvEgXCDhvopvI0v2sGuRKbID16gdg3CIq1xJeYw5AsM8HnzVS5uEiqrEv+TDzsZt/JCg==}
@@ -25640,32 +25779,32 @@ packages:
       barcode-detector: 1.0.4
       callforth: 0.3.1
       core-js: 3.32.1
-      vue: 3.3.11
+      vue: 3.3.13
       webrtc-adapter: 7.7.0
     transitivePeerDependencies:
       - typescript
     dev: false
 
-  /vue-router@4.2.5(vue@3.3.11):
+  /vue-router@4.2.5(vue@3.3.13):
     resolution: {integrity: sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==}
     peerDependencies:
       vue: latest
     dependencies:
       '@vue/devtools-api': 6.5.0
-      vue: 3.3.11
+      vue: 3.3.13
     dev: true
 
-  /vue-types@3.0.2(vue@3.3.11):
+  /vue-types@3.0.2(vue@3.3.13):
     resolution: {integrity: sha512-IwUC0Aq2zwaXqy74h4WCvFCUtoV0iSWr0snWnE9TnU18S66GAQyqQbRf2qfJtUuiFsBf6qp0MEwdonlwznlcrw==}
     engines: {node: '>=10.15.0'}
     peerDependencies:
       vue: latest
     dependencies:
       is-plain-object: 3.0.1
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
-  /vue3-calendar-heatmap@2.0.5(tippy.js@6.3.7)(vue@3.3.11):
+  /vue3-calendar-heatmap@2.0.5(tippy.js@6.3.7)(vue@3.3.13):
     resolution: {integrity: sha512-qvveNQlTS5Aw7AvRLs0zOyu3uP5iGJlXJAnkrkG2ElDdyQ8H1TJhQ8rL702CROjAg16ezIveUY10nCO7lqZ25w==}
     engines: {node: '>=16'}
     peerDependencies:
@@ -25673,7 +25812,7 @@ packages:
       vue: latest
     dependencies:
       tippy.js: 6.3.7
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
   /vue3-contextmenu@0.2.12:
@@ -25681,7 +25820,7 @@ packages:
     dependencies:
       core-js: 3.32.1
       mitt: 2.1.0
-      vue: 3.3.11
+      vue: 3.3.13
     transitivePeerDependencies:
       - typescript
     dev: false
@@ -25702,37 +25841,37 @@ packages:
       mitt: 3.0.1
     dev: false
 
-  /vue3-text-clamp@0.1.2(resize-detector@0.3.0)(vue@3.3.11):
+  /vue3-text-clamp@0.1.2(resize-detector@0.3.0)(vue@3.3.13):
     resolution: {integrity: sha512-896tGhkwaDObKL4gUv9KhR6GQQYzIzut77P2jmfUoTaJ5lJP6kLMfCUEKwGQWbDgXXkqDcoE/QV/UtP4Jn7r3Q==}
     peerDependencies:
       resize-detector: ^0.3.0
       vue: latest
     dependencies:
       resize-detector: 0.3.0
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
-  /vue@3.3.11:
-    resolution: {integrity: sha512-d4oBctG92CRO1cQfVBZp6WJAs0n8AK4Xf5fNjQCBeKCvMI1efGQ5E3Alt1slFJS9fZuPcFoiAiqFvQlv1X7t/w==}
+  /vue@3.3.13:
+    resolution: {integrity: sha512-LDnUpQvDgsfc0u/YgtAgTMXJlJQqjkxW1PVcOnJA5cshPleULDjHi7U45pl2VJYazSSvLH8UKcid/kzH8I0a0Q==}
     peerDependencies:
       typescript: latest
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@vue/compiler-dom': 3.3.11
-      '@vue/compiler-sfc': 3.3.11
-      '@vue/runtime-dom': 3.3.11
-      '@vue/server-renderer': 3.3.11(vue@3.3.11)
-      '@vue/shared': 3.3.11
+      '@vue/compiler-dom': 3.3.13
+      '@vue/compiler-sfc': 3.3.13
+      '@vue/runtime-dom': 3.3.13
+      '@vue/server-renderer': 3.3.13(vue@3.3.13)
+      '@vue/shared': 3.3.13
 
-  /vuedraggable@4.1.0(vue@3.3.11):
+  /vuedraggable@4.1.0(vue@3.3.13):
     resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}
     peerDependencies:
       vue: latest
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.3.11
+      vue: 3.3.13
     dev: false
 
   /w3c-keyname@2.2.8:
@@ -25851,6 +25990,7 @@ packages:
 
   /webpack-virtual-modules@0.5.0:
     resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
+    dev: true
 
   /webpack-virtual-modules@0.6.0:
     resolution: {integrity: sha512-KnaMTE6EItz/f2q4Gwg5/rmeKVi79OR58NoYnwDJqCk9ywMtTGbBnBcfoBtN4QbYu0lWXvyMoH2Owxuhe4qI6Q==}
@@ -26093,7 +26233,7 @@ packages:
       cac: 6.7.14
       connect: 3.7.0
       declass: 0.0.1
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       fs-extra: 10.1.0
       sirv: 1.0.19
     transitivePeerDependencies:
diff --git a/scripts/pkg-executable/package.json b/scripts/pkg-executable/package.json
index 6b7d031d1a..ff72e28f42 100644
--- a/scripts/pkg-executable/package.json
+++ b/scripts/pkg-executable/package.json
@@ -28,7 +28,7 @@
   "license": "ISC",
   "dependencies": {
     "express": "^4.17.3",
-    "nocodb": "0.202.9",
+    "nocodb": "0.202.10",
     "@nestjs/common": "^10.2.10",
     "@nestjs/core": "^10.2.10"
   }
diff --git a/tests/playwright/pages/Base.ts b/tests/playwright/pages/Base.ts
index ae8db5bf72..a93a00cfa8 100644
--- a/tests/playwright/pages/Base.ts
+++ b/tests/playwright/pages/Base.ts
@@ -1,4 +1,4 @@
-import { Locator, Page } from '@playwright/test';
+import { expect, Locator, Page } from '@playwright/test';
 import { readFileSync } from 'fs';
 
 type ResponseSelector = (json: any) => boolean;
@@ -16,6 +16,10 @@ export default abstract class BasePage {
     await this.rootPage.locator('.ant-message .ant-message-notice-content', { hasText: message }).last().isVisible();
   }
 
+  async verifyErrorMessage({ message }: { message: RegExp }) {
+    await expect(this.get().locator('.ant-form-item-explain-error', { hasText: message })).toBeVisible();
+  }
+
   async waitForResponse({
     // Playwright action that triggers the request i.e locatorSomething.click()
     uiAction,
@@ -24,18 +28,20 @@ export default abstract class BasePage {
     // A function that takes the response body and returns true if the response is the one we are looking for
     responseJsonMatcher,
     timeout,
+    responseStatusCodeToMatch = 200,
   }: {
     uiAction: () => Promise<any>;
     requestUrlPathToMatch: string;
     httpMethodsToMatch?: string[];
     responseJsonMatcher?: ResponseSelector;
     timeout?: number;
+    responseStatusCodeToMatch?: number;
   }) {
     const [res] = await Promise.all([
       this.rootPage.waitForResponse(
         res =>
           res.url().includes(requestUrlPathToMatch) &&
-          res.status() === 200 &&
+          res.status() === responseStatusCodeToMatch &&
           httpMethodsToMatch.includes(res.request().method()),
         timeout ? { timeout } : undefined
       ),
diff --git a/tests/playwright/pages/Dashboard/Grid/Column/UserOptionColumn.ts b/tests/playwright/pages/Dashboard/Grid/Column/UserOptionColumn.ts
new file mode 100644
index 0000000000..52feb78846
--- /dev/null
+++ b/tests/playwright/pages/Dashboard/Grid/Column/UserOptionColumn.ts
@@ -0,0 +1,117 @@
+import { ColumnPageObject } from '.';
+import BasePage from '../../../Base';
+import { expect } from '@playwright/test';
+
+export class UserOptionColumnPageObject extends BasePage {
+  readonly column: ColumnPageObject;
+
+  constructor(column: ColumnPageObject) {
+    super(column.rootPage);
+    this.column = column;
+  }
+
+  get() {
+    return this.column.get();
+  }
+
+  async allowMultipleUser({
+    columnTitle,
+    allowMultiple = false,
+  }: {
+    columnTitle: string;
+    allowMultiple?: boolean;
+  }): Promise<void> {
+    await this.column.openEdit({ title: columnTitle });
+    const checkbox = this.get().getByTestId('user-column-allow-multiple');
+    const isChecked = await checkbox.isChecked();
+
+    if ((isChecked && !allowMultiple) || (!isChecked && allowMultiple)) {
+      await checkbox.click();
+    }
+    await this.column.save({ isUpdated: true });
+  }
+
+  async selectDefaultValueOption({
+    columnTitle,
+    option,
+    multiSelect,
+  }: {
+    columnTitle: string;
+    option: string | string[];
+    multiSelect?: boolean;
+  }): Promise<void> {
+    // Verify allow multiple checkbox before selecting default value
+    await this.allowMultipleUser({ columnTitle, allowMultiple: multiSelect });
+
+    await this.column.openEdit({ title: columnTitle });
+
+    // Clear previous default value
+    await this.clearDefaultValue();
+
+    const selector = this.column.get().locator('.nc-user-select >> .ant-select-selector');
+    await selector.click();
+
+    if (multiSelect) {
+      const optionsToSelect = Array.isArray(option) ? option : [option];
+
+      for (const op of optionsToSelect) {
+        await this.selectOption({ option: op });
+      }
+    } else if (!Array.isArray(option)) {
+      await this.selectOption({ option });
+    }
+
+    // Press `Escape` to close the dropdown
+    await this.rootPage.keyboard.press('Escape');
+    await this.rootPage.locator('.nc-dropdown-user-select-cell').waitFor({ state: 'hidden' });
+
+    await this.column.save({ isUpdated: true });
+  }
+
+  async selectOption({ option }: { option: string }) {
+    await this.get().locator('.ant-select-selection-search-input[aria-expanded="true"]').waitFor();
+    await this.get().locator('.ant-select-selection-search-input[aria-expanded="true"]').fill(option);
+
+    // Select user option
+    await this.rootPage.locator('.rc-virtual-list-holder-inner > div').locator(`text="${option}"`).click();
+  }
+
+  async clearDefaultValue(): Promise<void> {
+    await this.column.get().locator('.nc-cell-user + svg.nc-icon').click();
+  }
+
+  async verifyDefaultValueOptionCount({
+    columnTitle,
+    totalCount,
+  }: {
+    columnTitle: string;
+    totalCount: number;
+  }): Promise<void> {
+    await this.column.openEdit({ title: columnTitle });
+
+    await this.column.get().locator('.nc-cell-user > .nc-user-select').click();
+
+    expect(await this.rootPage.getByTestId(`select-option-${columnTitle}-undefined`).count()).toEqual(totalCount);
+    await this.column.get().locator('.nc-cell-user').click();
+
+    // Press `Cancel` to close edit modal
+    await this.column.get().locator('button:has-text("Cancel")').click();
+    await this.get().waitFor({ state: 'hidden' });
+  }
+
+  async verifySelectedOptions({ options, columnHeader }: { columnHeader: string; options: string[] }) {
+    await this.column.openEdit({ title: columnHeader });
+
+    const defaultValueSelector = this.get().locator('.nc-user-select >> .ant-select-selector');
+
+    let counter = 0;
+    for (const option of options) {
+      await expect(defaultValueSelector.locator(`.nc-selected-option`).nth(counter)).toHaveText(option);
+      counter++;
+    }
+
+    // Press `Cancel` to close edit modal
+    await this.column.get().locator('button:has-text("Cancel")').click();
+    await this.get().waitFor({ state: 'hidden' });
+  }
+}
diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
index 21eb680434..bfb4679103 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -4,17 +4,20 @@ import BasePage from '../../../Base';
 import { SelectOptionColumnPageObject } from './SelectOptionColumn';
 import { AttachmentColumnPageObject } from './Attachment';
 import { getTextExcludeIconText } from '../../../../tests/utils/general';
+import { UserOptionColumnPageObject } from './UserOptionColumn';
 
 export class ColumnPageObject extends BasePage {
   readonly grid: GridPage;
   readonly selectOption: SelectOptionColumnPageObject;
   readonly attachmentColumnPageObject: AttachmentColumnPageObject;
+  readonly userOption: UserOptionColumnPageObject;
 
   constructor(grid: GridPage) {
     super(grid.rootPage);
     this.grid = grid;
     this.selectOption = new SelectOptionColumnPageObject(this);
     this.attachmentColumnPageObject = new AttachmentColumnPageObject(this);
+    this.userOption = new UserOptionColumnPageObject(this);
   }
 
   get() {
@@ -185,6 +188,8 @@ export class ColumnPageObject extends BasePage {
           .nth(0)
           .click();
         break;
+      case 'User':
+        break;
       default:
         break;
     }
@@ -370,6 +375,15 @@ export class ColumnPageObject extends BasePage {
     await this.rootPage.waitForTimeout(200);
   }
 
+  async checkMessageAndClose({ errorMessage }: { errorMessage?: RegExp } = {}) {
+    await this.verifyErrorMessage({
+      message: errorMessage,
+    });
+    await this.get().locator('button:has-text("Cancel")').click();
+    await this.get().waitFor({ state: 'hidden' });
+    await this.rootPage.waitForTimeout(200);
+  }
+
   async verify({ title, isVisible = true }: { title: string; isVisible?: boolean }) {
     if (!isVisible) {
       return await expect(this.getColumnHeader(title)).not.toBeVisible();
diff --git a/tests/playwright/pages/Dashboard/Grid/index.ts b/tests/playwright/pages/Dashboard/Grid/index.ts
index 6debe77668..019b0d7f87 100644
--- a/tests/playwright/pages/Dashboard/Grid/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/index.ts
@@ -123,6 +123,9 @@ export class GridPage extends BasePage {
 
     await this.get().locator('.nc-grid-add-new-cell').click();
 
+    // wait for insert row response
+    await this.rootPage.waitForTimeout(400);
+
     const rowCount = index + 1;
     await expect(this.get().locator('.nc-grid-row')).toHaveCount(rowCount);
 
@@ -135,9 +138,13 @@ export class GridPage extends BasePage {
       await this.waitForResponse({
         uiAction: clickOnColumnHeaderToSave,
         requestUrlPathToMatch: 'api/v1/db/data/noco',
-        httpMethodsToMatch: ['POST'],
+        httpMethodsToMatch: [
+          // if the row does not contain the required cell, editing the row cell will emit a PATCH request; otherwise, it will emit a POST request.
+          'PATCH',
+          'POST',
+        ],
         // numerical types are returned in number format from the server
-        responseJsonMatcher: resJson => String(resJson?.[columnHeader]) === String(rowValue),
+        responseJsonMatcher: resJson => String(resJson?.[columnHeader]) === String(value),
       });
     } else {
       await clickOnColumnHeaderToSave();
@@ -460,4 +467,9 @@ export class GridPage extends BasePage {
     // kludge: wait for paste to complete
     await this.rootPage.waitForTimeout(1000);
   }
+
+  async clearWithMouse({ index, columnHeader }: CellProps) {
+    await this.cell.get({ index, columnHeader }).click({ button: 'right' });
+    await this.get().page().getByTestId('context-menu-item-clear').click();
+  }
 }
diff --git a/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts b/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts
index 9750f6b363..1e0ae1f59b 100644
--- a/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts
+++ b/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts
@@ -24,7 +24,7 @@ export class AccessSettingsPage extends BasePage {
       if (userEmail === email) {
         const roleDropdown = user.locator('.nc-roles-selector');
 
-        const selectedRole = await user.locator('.nc-roles-selector .badge-text').innerText();
+        const selectedRole = await user.locator('.nc-roles-selector').innerText();
 
         await roleDropdown.click();
         const menu = this.rootPage.locator('.nc-role-select-dropdown:visible');
diff --git a/tests/playwright/pages/Dashboard/common/Cell/SelectOptionCell.ts b/tests/playwright/pages/Dashboard/common/Cell/SelectOptionCell.ts
index 8ce4a2f27e..d8f6a2e6c7 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/SelectOptionCell.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/SelectOptionCell.ts
@@ -19,11 +19,13 @@ export class SelectOptionCellPageObject extends BasePage {
     columnHeader,
     option,
     multiSelect,
+    ignoreDblClick,
   }: {
     index: number;
     columnHeader: string;
     option: string;
     multiSelect?: boolean;
+    ignoreDblClick?: boolean;
   }) {
     const selectCell = this.get({ index, columnHeader });
 
@@ -32,14 +34,20 @@ export class SelectOptionCellPageObject extends BasePage {
       !(await selectCell.getAttribute('class')).includes('active') &&
       (await selectCell.locator('.nc-selected-option').count()) === 0
     ) {
-      await selectCell.click();
+      if (!ignoreDblClick) await selectCell.click();
     }
 
     await selectCell.click();
 
-    if (index === -1)
-      await this.rootPage.getByTestId(`select-option-${columnHeader}-undefined`).getByText(option).click();
-    else await this.rootPage.getByTestId(`select-option-${columnHeader}-${index}`).getByText(option).click();
+    if (index === -1) {
+      const selectOption = this.rootPage.getByTestId(`select-option-${columnHeader}-undefined`).getByText(option);
+      await selectOption.waitFor({ state: 'visible' });
+      await selectOption.click();
+    } else {
+      const selectOption = this.rootPage.getByTestId(`select-option-${columnHeader}-${index}`).getByText(option);
+      await selectOption.waitFor({ state: 'visible' });
+      await selectOption.click();
+    }
 
     if (multiSelect) await this.get({ index, columnHeader }).click();
 
diff --git a/tests/playwright/pages/Dashboard/common/Cell/UserOptionCell.ts b/tests/playwright/pages/Dashboard/common/Cell/UserOptionCell.ts
new file mode 100644
index 0000000000..8b6398f5c6
--- /dev/null
+++ b/tests/playwright/pages/Dashboard/common/Cell/UserOptionCell.ts
@@ -0,0 +1,160 @@
+import { expect } from '@playwright/test';
+import { CellPageObject } from '.';
+import BasePage from '../../../Base';
+
+export class UserOptionCellPageObject extends BasePage {
+  readonly cell: CellPageObject;
+
+  constructor(cell: CellPageObject) {
+    super(cell.rootPage);
+    this.cell = cell;
+  }
+
+  get({ index, columnHeader }: { index: number; columnHeader: string }) {
+    return this.cell.get({ index, columnHeader });
+  }
+
+  async select({
+    index,
+    columnHeader,
+    option,
+    multiSelect,
+  }: {
+    index: number;
+    columnHeader: string;
+    option: string;
+    multiSelect?: boolean;
+  }) {
+    const selectCell = this.get({ index, columnHeader });
+
+    // check if cell active
+    if (
+      !(await selectCell.getAttribute('class')).includes('active') &&
+      (await selectCell.locator('.nc-selected-option').count()) === 0
+    ) {
+      await selectCell.click();
+    }
+
+    await selectCell.click();
+
+    if (index === -1) {
+      const selectOption = this.rootPage.getByTestId(`select-option-${columnHeader}-undefined`).getByText(option);
+      await selectOption.waitFor({ state: 'visible' });
+      await selectOption.click();
+    } else {
+      const selectOption = this.rootPage.getByTestId(`select-option-${columnHeader}-${index}`).getByText(option);
+      await selectOption.waitFor({ state: 'visible' });
+      await selectOption.click();
+    }
+
+    if (multiSelect) await this.get({ index, columnHeader }).click();
+
+    await this.rootPage
+      .getByTestId(`select-option-${columnHeader}-${index}`)
+      .getByText(option)
+      .waitFor({ state: 'hidden' });
+  }
+
+  async clear({ index, columnHeader, multiSelect }: { index: number; columnHeader: string; multiSelect?: boolean }) {
+    if (multiSelect) {
+      await this.cell.get({ index, columnHeader }).click();
+      await this.cell.get({ index, columnHeader }).click();
+
+      const optionCount = await this.cell.get({ index, columnHeader }).locator('.ant-tag').count();
+
+      for (let i = 0; i < optionCount; i++) {
+        await this.cell.get({ index, columnHeader }).locator('.ant-tag > .ant-tag-close-icon').first().click();
+        // wait till number of options is less than before
+        await this.cell
+          .get({ index, columnHeader })
+          .locator('.ant-tag')
+          .nth(optionCount - i - 1)
+          .waitFor({ state: 'hidden' });
+      }
+      return;
+    }
+
+    await this.get({ index, columnHeader }).click();
+    await this.rootPage.locator('.ant-tag > .ant-tag-close-icon').click();
+
+    // Press `Escape` to close the dropdown
+    await this.rootPage.keyboard.press('Escape');
+    await this.rootPage.locator('.nc-dropdown-user-select-cell').waitFor({ state: 'hidden' });
+  }
+
+  async verify({
+    index = 0,
+    columnHeader,
+    option,
+    multiSelect,
+  }: {
+    index?: number;
+    columnHeader: string;
+    option: string;
+    multiSelect?: boolean;
+  }) {
+    if (multiSelect) {
+      return await expect(this.cell.get({ index, columnHeader })).toContainText(option, { useInnerText: true });
+    }
+
+    const locator = this.cell.get({ index, columnHeader }).locator('.ant-tag');
+    await locator.waitFor({ state: 'visible' });
+    const text = await locator.allInnerTexts();
+    return expect(text).toContain(option);
+  }
+
+  async verifyNoOptionsSelected({ index, columnHeader }: { index: number; columnHeader: string }) {
+    return await expect(
+      this.cell.get({ index, columnHeader }).locator('.ant-select-selection-overflow-item >> .ant-tag')
+    ).toBeHidden();
+  }
+
+  async verifyOptions({
+    index = 0,
+    columnHeader,
+    options,
+  }: {
+    index?: number;
+    columnHeader: string;
+    options: string[];
+  }) {
+    const selectCell = this.get({ index, columnHeader });
+
+    // check if cell active
+    // drag based non-primary cell will have 'active' attribute
+    // primary cell with blue border will have 'active-cell' attribute
+    if (!(await selectCell.getAttribute('class')).includes('active-cell')) {
+      await selectCell.click();
+    }
+
+    await this.get({ index, columnHeader }).click();
+    await this.rootPage.waitForTimeout(500);
+
+    let counter = 0;
+    for (const option of options) {
+      await expect(this.rootPage.locator(`div.ant-select-item-option`).nth(counter)).toHaveText(option);
+      counter++;
+    }
+    await this.rootPage.keyboard.press('Escape');
+    await this.rootPage.locator(`.nc-dropdown-user-select-cell`).nth(index).waitFor({ state: 'hidden' });
+  }
+
+  async verifySelectedOptions({
+    index,
+    options,
+    columnHeader,
+  }: {
+    columnHeader: string;
+    options: string[];
+    index: number;
+  }) {
+    const selectCell = this.get({ index, columnHeader });
+    await selectCell.click();
+
+    let counter = 0;
+    for (const option of options) {
+      await expect(selectCell.locator(`.nc-selected-option`).nth(counter)).toHaveText(option);
+      counter++;
+    }
+  }
+}
diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 1e35e1622a..c1fdff7c1a 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -13,6 +13,7 @@ import { getTextExcludeIconText } from '../../../../tests/utils/general';
 import { YearCellPageObject } from './YearCell';
 import { TimeCellPageObject } from './TimeCell';
 import { GroupPageObject } from '../../Grid/Group';
+import { UserOptionCellPageObject } from './UserOptionCell';
 
 export interface CellProps {
   indexMap?: Array<number>;
@@ -31,6 +32,7 @@ export class CellPageObject extends BasePage {
   readonly geoData: GeoDataCellPageObject;
   readonly date: DateCellPageObject;
   readonly dateTime: DateTimeCellPageObject;
+  readonly userOption: UserOptionCellPageObject;
 
   constructor(parent: GridPage | SharedFormPage | GroupPageObject) {
     super(parent.rootPage);
@@ -44,6 +46,7 @@ export class CellPageObject extends BasePage {
     this.geoData = new GeoDataCellPageObject(this);
     this.date = new DateCellPageObject(this);
     this.dateTime = new DateTimeCellPageObject(this);
+    this.userOption = new UserOptionCellPageObject(this);
   }
 
   get({ indexMap, index, columnHeader }: CellProps): Locator {
diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts b/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
index fd34caef00..547098c028 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
@@ -331,6 +331,28 @@ export class ToolbarFilterPage extends BasePage {
               .click();
           }
           break;
+        case UITypes.User:
+          if (!['is blank', 'is not blank'].includes(operation)) {
+            await this.get()
+              .locator('.nc-filter-value-select')
+              .click({
+                position: {
+                  x: 1,
+                  y: 1,
+                },
+              });
+
+            const v = value.split(',');
+            for (let i = 0; i < v.length; i++) {
+              await this.rootPage
+                .locator(`.nc-dropdown-user-select-cell`)
+                .getByTestId('select-option-User-filter')
+                .getByText(v[i])
+                .click();
+            }
+          }
+          break;
+
         default:
           fillFilter = () => this.rootPage.locator('.nc-filter-value-select > input').last().fill(value);
           await this.waitForResponse({
diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/Groupby.ts b/tests/playwright/pages/Dashboard/common/Toolbar/Groupby.ts
index b96a1db64d..10d48b34be 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/Groupby.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/Groupby.ts
@@ -118,11 +118,15 @@ export class ToolbarGroupByPage extends BasePage {
         .nth(ascending ? 0 : 1)
         .click();
 
-    await this.waitForResponse({
-      uiAction: selectSortDirection,
-      httpMethodsToMatch: ['GET'],
-      requestUrlPathToMatch: locallySaved ? `/api/v1/db/public/` : `/api/v1/db/data/noco/`,
-    });
+    const selectedSortDirection = await this.rootPage.locator('.nc-sort-dir-select').last().textContent();
+
+    if ((ascending && selectedSortDirection != 'A → Z') || (!ascending && selectedSortDirection != 'Z → A')) {
+      await this.waitForResponse({
+        uiAction: selectSortDirection,
+        httpMethodsToMatch: ['GET'],
+        requestUrlPathToMatch: locallySaved ? `/api/v1/db/public/` : `/api/v1/db/data/noco/`,
+      });
+    }
 
     await this.toolbar.parent.dashboard.waitForLoaderToDisappear();
 
diff --git a/tests/playwright/pages/Dashboard/common/Topbar/Share.ts b/tests/playwright/pages/Dashboard/common/Topbar/Share.ts
index e63d4f26ea..bfcfdbfe53 100644
--- a/tests/playwright/pages/Dashboard/common/Topbar/Share.ts
+++ b/tests/playwright/pages/Dashboard/common/Topbar/Share.ts
@@ -1,6 +1,6 @@
 import BasePage from '../../../Base';
 import { TopbarPage } from '../Topbar';
-import { Locator } from '@playwright/test';
+import { expect, Locator } from '@playwright/test';
 
 export class TopbarSharePage extends BasePage {
   readonly topbar: TopbarPage;
@@ -25,6 +25,7 @@ export class TopbarSharePage extends BasePage {
   }
 
   async clickShareViewPublicAccess() {
+    await expect(this.get().locator(`[data-testid="share-view-toggle"]`)).toHaveCount(1);
     await this.get().locator(`[data-testid="share-view-toggle"]`).click();
   }
 
diff --git a/tests/playwright/pages/WorkspacePage/CollaborationPage.ts b/tests/playwright/pages/WorkspacePage/CollaborationPage.ts
index 62a8c5a49a..49b90c03de 100644
--- a/tests/playwright/pages/WorkspacePage/CollaborationPage.ts
+++ b/tests/playwright/pages/WorkspacePage/CollaborationPage.ts
@@ -19,7 +19,7 @@ export class CollaborationPage extends BasePage {
     this.workspace = workspace;
     this.button_addUser = this.get().locator('button.ant-btn.ant-btn-primary');
     this.input_email = this.get().locator('input[id="email"]');
-    this.selector_role = this.get().locator('[data-testid="invite"] >> [data-testid="roles"]');
+    this.selector_role = this.get().locator('.ant-select-selector');
     this.list_collaborators = this.get().locator('.nc-collaborators-list-table');
   }
 
@@ -39,9 +39,9 @@ export class CollaborationPage extends BasePage {
     await this.rootPage.keyboard.press('Enter');
 
     // role
-    await this.selector_role.click();
+    await this.selector_role.first().click();
     const menu = this.rootPage.locator('.nc-role-select-dropdown:visible');
-    await menu.locator(`.nc-role-select-workspace-level-${role.toLowerCase()}:visible`).click();
+    await menu.locator(`.nc-role-select-workspace-level-${role.toLowerCase()}:visible`).first().click();
 
     // submit
 
diff --git a/tests/playwright/tests/db/columns/columnFormula.spec.ts b/tests/playwright/tests/db/columns/columnFormula.spec.ts
index 6e3105b39a..b9ca6de3ce 100644
--- a/tests/playwright/tests/db/columns/columnFormula.spec.ts
+++ b/tests/playwright/tests/db/columns/columnFormula.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
 import { DashboardPage } from '../../../pages/Dashboard';
 import setup, { NcContext, unsetup } from '../../../setup';
-import { enableQuickRun, isPg, isSqlite } from '../../../setup/db';
+import { enableQuickRun, isMysql, isPg, isSqlite } from '../../../setup/db';
 
 // Add formula to be verified here & store expected results for 5 rows
 // Column data from City table (Sakila DB)
@@ -19,6 +19,7 @@ const formulaDataByDbType = (context: NcContext, index: number) => {
       {
         formula: '1 + 1',
         result: ['2', '2', '2', '2', '2'],
+        unSupDbType: [],
       },
       {
         formula: 'ADD({CityId}, {CountryId}) + AVG({CityId}, {CountryId}) + LEN({City})',
@@ -92,6 +93,7 @@ const formulaDataByDbType = (context: NcContext, index: number) => {
       {
         formula: 'VALUE("12ab-c345")',
         result: ['-12345', '-12345', '-12345', '-12345', '-12345'],
+        unSupDbType: ['sqlite3'],
       },
       {
         formula: 'TRUE()',
@@ -101,19 +103,6 @@ const formulaDataByDbType = (context: NcContext, index: number) => {
         formula: 'FALSE()',
         result: ['0', '0', '0', '0', '0'],
       },
-      {
-        formula: 'REGEX_MATCH({City}, "a[a-z]a")',
-        result: ['0', '0', '0', '0', '1'],
-      },
-      {
-        formula: 'REGEX_EXTRACT({City}, "a[a-z]a")',
-        result: ['', '', '', '', 'ana'],
-      },
-      {
-        formula: 'REGEX_REPLACE({City}, "a[a-z]a","...")',
-        result: ['A Corua (La Corua)', 'Abha', 'Abu Dhabi', 'Acua', 'Ad...'],
-      },
-
       {
         formula: '"City Name: " & {City}',
         result: [
@@ -127,22 +116,40 @@ const formulaDataByDbType = (context: NcContext, index: number) => {
 
       {
         formula: 'ROUNDDOWN({CityId} + 2.49, 1)',
-        result: ['3', '4', '5', '6', '7'],
+        result: ['3.4', '4.4', '5.4', '6.4', '7.4'],
+        unSupDbType: ['sqlite3'],
       },
       {
         formula: 'ROUNDUP({CityId} + 2.49, 1)',
-        result: ['4', '5', '6', '7', '8'],
+        result: ['3.5', '4.5', '5.5', '6.5', '7.5'],
+        unSupDbType: ['sqlite3'],
       },
       {
         formula: 'RECORD_ID()',
         result: ['1', '2', '3', '4', '5'],
       },
+      {
+        formula: 'REGEX_MATCH({City}, "a[a-z]a")',
+        result: ['0', '0', '0', '0', '1'],
+        unSupDbType: ['sqlite3'],
+      },
+      {
+        formula: 'REGEX_EXTRACT({City}, "a[a-z]a")',
+        result: ['', '', '', '', 'ana'],
+        unSupDbType: ['sqlite3'],
+      },
+      {
+        formula: 'REGEX_REPLACE({City}, "a[a-z]a","...")',
+        result: ['A Corua (La Corua)', 'Abha', 'Abu Dhabi', 'Acua', 'Ad...'],
+        unSupDbType: ['sqlite3'],
+      },
     ];
   else
     return [
       {
         formula: `DATETIME_DIFF("2023/10/14", "2023/01/12", "y")`,
         result: ['0', '0', '0', '0', '0'],
+        unSupDbType: [],
       },
       {
         formula: `DATETIME_DIFF("2023-01-12", "2021-08-29", "y")`,
@@ -183,6 +190,7 @@ const formulaDataByDbType = (context: NcContext, index: number) => {
         result: isPg(context)
           ? ['13.04566088154786', '24.74547123273205', '57.61253379902822', '126.94617671688704', '283.9609869087087']
           : ['13.04566088154786', '25.137588417628013', '58.23402483297667', '127.73041108667896', '284.8714548168068'],
+        unSupDbType: ['sqlite3'],
       },
       {
         formula: `NOW()`,
@@ -245,26 +253,30 @@ test.describe('Virtual Columns', () => {
   async function formulaTestSpec(index: number) {
     // close 'Team & Auth' tab
     const formulaData = formulaDataByDbType(context, index);
+    const dbType = context.base.sources[0].type;
     await dashboard.closeTab({ title: 'Team & Auth' });
 
     await dashboard.treeView.openTable({ title: 'City' });
-    // Create formula column
+    // Create dummy formula column which will then be updated for every testcase
     await dashboard.grid.column.create({
       title: 'NC_MATH_0',
       type: 'Formula',
-      formula: formulaData[1].formula,
+      formula: '1 + 1',
     });
 
     // verify different formula's
-    for (let i = 1; i < formulaData.length; i++) {
-      // Sqlite does not support log function
-      if (isSqlite(context) && formulaData[i].formula.includes('LOG(')) continue;
-
+    for (let i = 0; i < formulaData.length; i++) {
       await dashboard.grid.column.openEdit({
         title: 'NC_MATH_0',
         type: 'Formula',
         formula: formulaData[i].formula,
       });
+      console.log(`running test function: ${formulaData[i].formula}`);
+      if (formulaData[i].unSupDbType?.includes(dbType)) {
+        // assert for message not supported or greyed out save button.
+        await dashboard.grid.column.checkMessageAndClose({ errorMessage: new RegExp('Function .* is not available') });
+        continue;
+      }
       await dashboard.grid.column.save({ isUpdated: true });
       if (formulaData[i].formula !== `NOW()`) {
         await formulaResultVerify({
diff --git a/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts b/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
index f7b8b04201..74df46ddcc 100644
--- a/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
+++ b/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
@@ -39,7 +39,12 @@ test.describe('Single select', () => {
 
     await grid.column.selectOption.addOption({ index: 2, option: 'Option 3', columnTitle: 'SingleSelect' });
 
-    await grid.cell.selectOption.select({ index: 0, columnHeader: 'SingleSelect', option: 'Option 3' });
+    await grid.cell.selectOption.select({
+      index: 0,
+      columnHeader: 'SingleSelect',
+      option: 'Option 3',
+      ignoreDblClick: true,
+    });
     await grid.cell.selectOption.verify({ index: 0, columnHeader: 'SingleSelect', option: 'Option 3' });
 
     await grid.column.selectOption.editOption({ index: 2, columnTitle: 'SingleSelect', newOption: 'New Option 3' });
diff --git a/tests/playwright/tests/db/columns/columnUserSelect.spec.ts b/tests/playwright/tests/db/columns/columnUserSelect.spec.ts
new file mode 100644
index 0000000000..6a0cc5ba84
--- /dev/null
+++ b/tests/playwright/tests/db/columns/columnUserSelect.spec.ts
@@ -0,0 +1,747 @@
+import { test } from '@playwright/test';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup, { unsetup } from '../../../setup';
+import { TopbarPage } from '../../../pages/Dashboard/common/Topbar';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { WorkspacePage } from '../../../pages/WorkspacePage';
+import { CollaborationPage } from '../../../pages/WorkspacePage/CollaborationPage';
+import { Api } from 'nocodb-sdk';
+import { isEE } from '../../../setup/db';
+import { getDefaultPwd } from '../../utils/general';
+
+const users: string[] = isEE()
+  ? ['useree@nocodb.com', 'useree-0@nocodb.com', 'useree-1@nocodb.com', 'useree-2@nocodb.com', 'useree-3@nocodb.com']
+  : ['user@nocodb.com', 'user-0@nocodb.com', 'user-1@nocodb.com', 'user-2@nocodb.com', 'user-3@nocodb.com'];
+
+const roleDb = [
+  { email: 'useree@nocodb.com', role: 'editor' },
+  { email: 'useree-0@nocodb.com', role: 'editor' },
+  { email: 'useree-1@nocodb.com', role: 'editor' },
+  { email: 'useree-2@nocodb.com', role: 'editor' },
+  { email: 'useree-3@nocodb.com', role: 'editor' },
+];
+
+async function beforeEachInit({ page }: { page: any }) {
+  let workspacePage: WorkspacePage;
+  let collaborationPage: CollaborationPage;
+  let api: Api<any>;
+
+  const context: any = await setup({ page, isEmptyProject: true });
+  const dashboard: DashboardPage = new DashboardPage(page, context.base);
+
+  if (isEE()) {
+    workspacePage = new WorkspacePage(page);
+    collaborationPage = workspacePage.collaboration;
+
+    api = new Api({
+      baseURL: `http://localhost:8080/`,
+      headers: {
+        'xc-auth': context.token,
+      },
+    });
+
+    for (let i = 0; i < roleDb.length; i++) {
+      try {
+        await api.auth.signup({
+          email: roleDb[i].email,
+          password: getDefaultPwd(),
+        });
+      } catch (e) {
+        // ignore error even if user already exists
+      }
+    }
+
+    await dashboard.leftSidebar.clickTeamAndSettings();
+
+    for (const user of roleDb) {
+      await collaborationPage.addUsers(user.email, user.role);
+    }
+  }
+
+  return { dashboard, context };
+}
+
+test.describe('User single select', () => {
+  let dashboard: DashboardPage, grid: GridPage, topbar: TopbarPage;
+  let context: any;
+
+  test.beforeEach(async ({ page }) => {
+    const initRsp = await beforeEachInit({ page: page });
+    context = initRsp.context;
+    dashboard = initRsp.dashboard;
+    grid = dashboard.grid;
+    topbar = dashboard.grid.topbar;
+
+    await dashboard.treeView.createTable({ title: 'Sheet1', baseTitle: context.base.title });
+
+    await grid.column.create({ title: 'User', type: 'User' });
+
+    await grid.addNewRow({ index: 0, value: 'Row 0' });
+  });
+
+  test.afterEach(async () => {
+    await unsetup(context);
+  });
+
+  test('Verify the default option count, select default value and verify', async () => {
+    if (!isEE()) {
+      await grid.column.userOption.verifyDefaultValueOptionCount({ columnTitle: 'User', totalCount: 5 });
+    }
+
+    await grid.column.userOption.selectDefaultValueOption({
+      columnTitle: 'User',
+      option: users[0],
+      multiSelect: false,
+    });
+
+    // Verify default value is set
+    await grid.column.userOption.verifySelectedOptions({
+      columnHeader: 'User',
+      options: [users[0]],
+    });
+
+    // Add new row and verify default value is added in new cell
+    await grid.addNewRow({ index: 1, value: 'Row 1' });
+    await grid.cell.userOption.verify({
+      index: 1,
+      columnHeader: 'User',
+      option: users[0],
+      multiSelect: false,
+    });
+  });
+
+  test('Rename column title and delete the column', async () => {
+    // Rename column title, reload page and verify
+    await grid.column.openEdit({ title: 'User' });
+    await grid.column.fillTitle({ title: 'UserField' });
+    await grid.column.save({
+      isUpdated: true,
+    });
+
+    // reload page
+    await dashboard.rootPage.reload();
+
+    await grid.column.verify({ title: 'UserField', isVisible: true });
+
+    // delete column and verify
+    await grid.column.delete({ title: 'UserField' });
+    await grid.column.verify({ title: 'UserField', isVisible: false });
+  });
+
+  test('Field operations - duplicate column, convert to SingleLineText', async () => {
+    for (let i = 0; i <= 4; i++) {
+      await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: false });
+      await grid.addNewRow({ index: i + 1, value: `Row ${i + 1}` });
+    }
+
+    await grid.column.duplicateColumn({
+      title: 'User',
+      expectedTitle: 'User copy',
+    });
+
+    // Verify duplicate column content
+    for (let i = 0; i <= 4; i++) {
+      await grid.cell.userOption.verify({ index: i, columnHeader: 'User copy', option: users[i], multiSelect: false });
+    }
+
+    // Convert User field column to SingleLineText
+    await grid.column.openEdit({ title: 'User copy' });
+    await grid.column.selectType({ type: 'SingleLineText' });
+    await grid.column.save({ isUpdated: true });
+
+    // Verify converted column content
+    for (let i = 0; i <= 4; i++) {
+      await grid.cell.verify({ index: i, columnHeader: 'User copy', value: users[i] });
+    }
+  });
+
+  test('Cell Operation - edit, copy-paste and delete', async () => {
+    // set default user
+    await grid.column.userOption.selectDefaultValueOption({
+      columnTitle: 'User',
+      option: users[0],
+      multiSelect: false,
+    });
+
+    // Edit, refresh and verify
+    for (let i = 0; i <= 4; i++) {
+      await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: false });
+      await grid.addNewRow({ index: i + 1, value: `Row ${i + 1}` });
+    }
+
+    // refresh page
+    await topbar.clickRefresh();
+
+    for (let i = 0; i <= 4; i++) {
+      await grid.cell.userOption.verify({
+        index: i,
+        columnHeader: 'User',
+        option: users[i],
+        multiSelect: false,
+      });
+    }
+
+    // Delete/clear cell, refresh and verify
+    // #1 Using `Delete` keyboard button
+    await grid.cell.click({ index: 0, columnHeader: 'User' });
+    // trigger delete button key
+    await dashboard.rootPage.keyboard.press('Delete');
+
+    // refresh
+    await topbar.clickRefresh();
+
+    await grid.cell.userOption.verifyNoOptionsSelected({ index: 0, columnHeader: 'user' });
+
+    // #2 Using mouse click
+    await grid.cell.userOption.clear({ index: 1, columnHeader: 'User', multiSelect: false });
+
+    // refresh
+    await topbar.clickRefresh();
+
+    await grid.cell.userOption.verifyNoOptionsSelected({ index: 1, columnHeader: 'user' });
+
+    // #3 Using `Cell Context Menu` right click `Clear` option
+    await grid.clearWithMouse({ index: 2, columnHeader: 'User' });
+
+    // refresh
+    await topbar.clickRefresh();
+
+    await grid.cell.userOption.verifyNoOptionsSelected({ index: 2, columnHeader: 'user' });
+
+    // Copy-paste
+    // #1 Using keyboard
+    await grid.cell.click({ index: 3, columnHeader: 'User' });
+    await dashboard.rootPage.keyboard.press('Shift+ArrowDown');
+
+    await dashboard.rootPage.keyboard.press((await grid.isMacOs()) ? 'Meta+c' : 'Control+c');
+    await grid.cell.click({ index: 0, columnHeader: 'User' });
+    await dashboard.rootPage.keyboard.press((await grid.isMacOs()) ? 'Meta+v' : 'Control+v');
+
+    // refresh
+    await topbar.clickRefresh();
+
+    let counter = 3;
+    for (let i = 0; i <= 1; i++) {
+      await grid.cell.userOption.verify({
+        index: i,
+        columnHeader: 'User',
+        option: users[counter],
+        multiSelect: false,
+      });
+      counter++;
+    }
+
+    // #2 Using cell context menu copy paste option
+    await grid.copyWithMouse({ index: 4, columnHeader: 'User' });
+    await grid.pasteWithMouse({ index: 0, columnHeader: 'User' });
+
+    // refresh
+    await topbar.clickRefresh();
+
+    await grid.cell.userOption.verify({
+      index: 0,
+      columnHeader: 'User',
+      option: users[4],
+      multiSelect: false,
+    });
+  });
+});
+
+test.describe('User single select - filter, sort & GroupBy', () => {
+  // Row values
+  // only user@nocodb.com (row 0)
+  // only user-0@nocodb.com (row 1)
+  // only user-1@nocodb.com (row 2)
+  // only user-2@nocodb.com (row 3)
+  // only user-3@nocodb.com (row 4)
+
+  // Example filters:
+  //
+  // where tags contains all of [user@nocodb.com]
+  //   result: rows 0
+  // where tags contains any of [user@nocodb.com, user-0@nocodb.com]
+  //   result: rows 0,1
+  // where tags does not contain any of [user@nocodb.com, user-0@nocodb.com]
+  //   result: rows 2,3,4
+  // where tags does not contain all of [user-0@nocodb.com]
+  //   result: rows 0,2,3,4
+  // where tags is not blank
+  //   result: rows 0,1,2,3,4
+  // where tags is blank
+  //   result: null
+
+  let dashboard: DashboardPage, grid: GridPage, toolbar: ToolbarPage;
+  let context: any;
+
+  test.beforeEach(async ({ page }) => {
+    const initRsp = await beforeEachInit({ page: page });
+    context = initRsp.context;
+    dashboard = initRsp.dashboard;
+    grid = dashboard.grid;
+    toolbar = dashboard.grid.toolbar;
+
+    await dashboard.treeView.createTable({ title: 'sheet1', baseTitle: context.base.title });
+
+    await grid.column.create({ title: 'User', type: 'User' });
+
+    for (let i = 0; i <= 4; i++) {
+      await grid.addNewRow({ index: i, value: `${i}` });
+      await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: false });
+    }
+  });
+
+  test.afterEach(async () => {
+    await unsetup(context);
+  });
+
+  // define validateRowArray function
+  async function validateRowArray(value: string[]) {
+    const length = value.length;
+    for (let i = 0; i < length; i++) {
+      await dashboard.grid.cell.verify({
+        index: i,
+        columnHeader: 'Title',
+        value: value[i],
+      });
+    }
+  }
+
+  async function verifyFilter(param: { opType: string; value?: string; result: string[] }) {
+    await toolbar.clickFilter();
+    await toolbar.filter.add({
+      title: 'User',
+      operation: param.opType,
+      value: param.value,
+      locallySaved: false,
+      dataType: 'User',
+    });
+    await toolbar.clickFilter();
+
+    // verify filtered rows
+    await validateRowArray(param.result);
+    // Reset filter
+    await toolbar.filter.reset();
+  }
+
+  test('User sort & validate, filter & validate', async () => {
+    const ascendingOrderRowTitle = ['1', '2', '3', '4', '0'];
+    const descendingOrderRowTitle = ['0', '4', '3', '2', '1'];
+
+    // Sort ascending and validate
+    await toolbar.sort.add({
+      title: 'User',
+      ascending: true,
+      locallySaved: false,
+    });
+    await validateRowArray(ascendingOrderRowTitle);
+    await toolbar.sort.reset();
+
+    // sort descending and validate
+    await toolbar.sort.add({
+      title: 'User',
+      ascending: false,
+      locallySaved: false,
+    });
+    await validateRowArray(descendingOrderRowTitle);
+    await toolbar.sort.reset();
+
+    // filter
+    await verifyFilter({ opType: 'contains all of', value: users[0], result: ['0'] });
+    await verifyFilter({
+      opType: 'contains any of',
+      value: `${users[0]},${users[1]}`,
+      result: ['0', '1'],
+    });
+    await verifyFilter({
+      opType: 'does not contain any of',
+      value: `${users[0]},${users[1]}`,
+      result: ['2', '3', '4'],
+    });
+    await verifyFilter({ opType: 'does not contain all of', value: users[1], result: ['0', '2', '3', '4'] });
+    await verifyFilter({ opType: 'is not blank', result: ['0', '1', '2', '3', '4'] });
+    await verifyFilter({ opType: 'is blank', result: [] });
+
+    //GroupBy
+    // ascending order
+    await toolbar.groupBy.add({ title: 'User', ascending: true, locallySaved: false });
+
+    for (let i = 0; i <= 4; i++) {
+      await dashboard.grid.groupPage.openGroup({ indexMap: [i] });
+
+      await dashboard.grid.groupPage.validateFirstRow({
+        indexMap: [i],
+        rowIndex: 0,
+        columnHeader: 'Title',
+        value: ascendingOrderRowTitle[i],
+      });
+    }
+
+    // descending order
+    await toolbar.groupBy.update({ title: 'User', ascending: false, index: 0 });
+
+    for (let i = 0; i <= 4; i++) {
+      await dashboard.grid.groupPage.openGroup({ indexMap: [i] });
+      await dashboard.grid.groupPage.validateFirstRow({
+        indexMap: [i],
+        rowIndex: 0,
+        columnHeader: 'Title',
+        value: descendingOrderRowTitle[i],
+      });
+    }
+    await toolbar.groupBy.remove({ index: 0 });
+  });
+});
+
+test.describe('User multiple select', () => {
+  let dashboard: DashboardPage, grid: GridPage, topbar: TopbarPage;
+  let context: any;
+
+  test.beforeEach(async ({ page }) => {
+    const initRsp = await beforeEachInit({ page: page });
+    context = initRsp.context;
+    dashboard = initRsp.dashboard;
+    grid = dashboard.grid;
+    topbar = dashboard.grid.topbar;
+
+    await dashboard.treeView.createTable({ title: 'Sheet1', baseTitle: context.base.title });
+
+    await grid.column.create({ title: 'User', type: 'User' });
+    await grid.column.userOption.allowMultipleUser({ columnTitle: 'User', allowMultiple: true });
+  });
+
+  test.afterEach(async () => {
+    await unsetup(context);
+  });
+
+  test('Verify the default option count, select default value and verify', async () => {
+    await grid.addNewRow({ index: 0, value: 'Row 0' });
+
+    if (!isEE()) {
+      await grid.column.userOption.verifyDefaultValueOptionCount({ columnTitle: 'User', totalCount: 5 });
+    }
+
+    await grid.column.userOption.selectDefaultValueOption({
+      columnTitle: 'User',
+      option: [users[0], users[1]],
+      multiSelect: true,
+    });
+
+    // Verify default value is set
+    await grid.column.userOption.verifySelectedOptions({
+      columnHeader: 'User',
+      options: [users[0], users[1]],
+    });
+
+    // Add new row and verify default value is added in new cell
+    await grid.addNewRow({ index: 1, value: 'Row 1' });
+    await grid.cell.userOption.verify({
+      index: 1,
+      columnHeader: 'User',
+      option: users[0],
+      multiSelect: true,
+    });
+    await grid.cell.userOption.verify({
+      index: 1,
+      columnHeader: 'User',
+      option: users[1],
+      multiSelect: true,
+    });
+  });
+
+  test('Field operations - duplicate column, convert to SingleLineText', async () => {
+    let counter = 1;
+    for (let i = 0; i <= 4; i++) {
+      await grid.addNewRow({ index: i, value: `Row ${i}` });
+
+      await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: true });
+      await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[counter], multiSelect: true });
+
+      if (counter === 4) counter = 0;
+      else counter++;
+    }
+
+    await grid.column.duplicateColumn({
+      title: 'User',
+      expectedTitle: 'User copy',
+    });
+
+    // Verify duplicate column content
+    counter = 1;
+    for (let i = 0; i <= 4; i++) {
+      await grid.cell.userOption.verifySelectedOptions({
+        index: i,
+        columnHeader: 'User copy',
+        options: [users[i], users[counter]],
+      });
+
+      if (counter === 4) counter = 0;
+      else counter++;
+    }
+
+    // Convert User field column to SingleLineText
+    await grid.column.openEdit({ title: 'User copy' });
+    await grid.column.selectType({ type: 'SingleLineText' });
+    await grid.column.save({ isUpdated: true });
+
+    // Verify converted column content
+    counter = 1;
+    for (let i = 0; i <= 4; i++) {
+      await grid.cell.verify({ index: i, columnHeader: 'User copy', value: `${users[i]},${users[counter]}` });
+
+      if (counter === 4) counter = 0;
+      else counter++;
+    }
+  });
+
+  test('Cell Operation - edit, copy-paste and delete', async () => {
+    // Edit, refresh and verify
+    let counter = 1;
+    for (let i = 0; i <= 4; i++) {
+      await grid.addNewRow({ index: i, value: `Row ${i}` });
+
+      await grid.cell.userOption.select({
+        index: i,
+        columnHeader: 'User',
+        option: users[i],
+        multiSelect: true,
+      });
+
+      await grid.cell.userOption.select({
+        index: i,
+        columnHeader: 'User',
+        option: users[counter],
+        multiSelect: true,
+      });
+      if (counter === 4) counter = 0;
+      else counter++;
+    }
+
+    // reload page
+    await dashboard.rootPage.reload();
+
+    counter = 1;
+    for (let i = 0; i <= 4; i++) {
+      await grid.cell.userOption.verifySelectedOptions({
+        index: i,
+        columnHeader: 'User',
+        options: [users[i], users[counter]],
+      });
+      if (counter === 4) counter = 0;
+      else counter++;
+    }
+
+    // Delete/clear cell, refresh and verify
+    // #1 Using `Delete` keyboard button
+    await grid.cell.click({ index: 0, columnHeader: 'User' });
+    // trigger delete button key
+    await dashboard.rootPage.keyboard.press('Delete');
+
+    // refresh
+    await topbar.clickRefresh();
+
+    await grid.cell.userOption.verifyNoOptionsSelected({ index: 0, columnHeader: 'user' });
+
+    // #2 Using mouse click
+    await grid.cell.userOption.clear({ index: 1, columnHeader: 'User', multiSelect: true });
+
+    // refresh
+    await topbar.clickRefresh();
+
+    await grid.cell.userOption.verifyNoOptionsSelected({ index: 1, columnHeader: 'user' });
+
+    // #3 Using `Cell Context Menu` right click `Clear` option
+    await grid.clearWithMouse({ index: 2, columnHeader: 'User' });
+
+    // refresh
+    await topbar.clickRefresh();
+
+    await grid.cell.userOption.verifyNoOptionsSelected({ index: 2, columnHeader: 'user' });
+
+    // Copy-paste
+    // #1 Using keyboard
+    await grid.cell.click({ index: 3, columnHeader: 'User' });
+
+    await dashboard.rootPage.keyboard.press((await grid.isMacOs()) ? 'Meta+c' : 'Control+c');
+    await grid.cell.click({ index: 0, columnHeader: 'User' });
+    await dashboard.rootPage.keyboard.press((await grid.isMacOs()) ? 'Meta+v' : 'Control+v');
+
+    // refresh
+    await topbar.clickRefresh();
+
+    await grid.cell.userOption.verifySelectedOptions({
+      index: 0,
+      columnHeader: 'User',
+      options: [users[3], users[4]],
+    });
+
+    // #2 Using cell context menu copy paste option
+    await grid.copyWithMouse({ index: 4, columnHeader: 'User' });
+    await grid.pasteWithMouse({ index: 1, columnHeader: 'User' });
+
+    // refresh
+    await topbar.clickRefresh();
+
+    await grid.cell.userOption.verifySelectedOptions({
+      index: 1,
+      columnHeader: 'User',
+      options: [users[4], users[0]],
+    });
+  });
+});
+
+test.describe('User multiple select - filter, sort & GroupBy', () => {
+  // Row values
+  // only user@nocodb.com (row 0)
+  // user-0@nocodb.com and user-1@nocodb.com (row 1)
+  // user-1@nocodb.com and user-2@nocodb.com (row 2)
+  // user-2@nocodb.com and user-3@nocodb.com (row 3)
+  // user-3@nocodb.com and user@nocodb.com (row 4)
+
+  // Example filters:
+  //
+  // where tags contains all of [user-0@nocodb.com, user-1@nocodb.com]
+  //   result: rows 1
+  // where tags contains any of [user@nocodb.com, user-0@nocodb.com]
+  //   result: rows 0,1,4
+  // where tags does not contain any of [user@nocodb.com, user-0@nocodb.com]
+  //   result: rows 2,3
+  // where tags does not contain all of [user-0@nocodb.com]
+  //   result: rows 0,2,3,4
+  // where tags is not blank
+  //   result: rows 0,1,2,3,4
+  // where tags is blank
+  //   result: null
+
+  let dashboard: DashboardPage, grid: GridPage, toolbar: ToolbarPage;
+  let context: any;
+
+  test.beforeEach(async ({ page }) => {
+    const initRsp = await beforeEachInit({ page: page });
+    context = initRsp.context;
+    dashboard = initRsp.dashboard;
+    grid = dashboard.grid;
+    toolbar = dashboard.grid.toolbar;
+
+    await dashboard.treeView.createTable({ title: 'sheet1', baseTitle: context.base.title });
+
+    await grid.column.create({ title: 'User', type: 'User' });
+    await grid.column.userOption.allowMultipleUser({ columnTitle: 'User', allowMultiple: true });
+
+    let counter = 2;
+    for (let i = 0; i <= 4; i++) {
+      await grid.addNewRow({ index: i, value: `${i}` });
+      await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: true });
+      if (i !== 0) {
+        await grid.cell.userOption.select({
+          index: i,
+          columnHeader: 'User',
+          option: users[counter],
+          multiSelect: true,
+        });
+        if (counter === 4) counter = 0;
+        else counter++;
+      }
+    }
+  });
+
+  test.afterEach(async () => {
+    await unsetup(context);
+  });
+
+  // define validateRowArray function
+  async function validateRowArray(value: string[]) {
+    const length = value.length;
+    for (let i = 0; i < length; i++) {
+      await dashboard.grid.cell.verify({
+        index: i,
+        columnHeader: 'Title',
+        value: value[i],
+      });
+    }
+  }
+
+  async function verifyFilter(param: { opType: string; value?: string; result: string[] }) {
+    await toolbar.clickFilter();
+    await toolbar.filter.add({
+      title: 'User',
+      operation: param.opType,
+      value: param.value,
+      locallySaved: false,
+      dataType: 'User',
+    });
+    await toolbar.clickFilter();
+
+    // verify filtered rows
+    await validateRowArray(param.result);
+    // Reset filter
+    await toolbar.filter.reset();
+  }
+
+  test('User sort & validate, filter & validate', async () => {
+    const ascendingOrderRowTitle = ['1', '2', '3', '4', '0'];
+    const descendingOrderRowTitle = ['0', '4', '3', '2', '1'];
+
+    // Sort ascending and validate
+    await toolbar.sort.add({
+      title: 'User',
+      ascending: true,
+      locallySaved: false,
+    });
+    await validateRowArray(ascendingOrderRowTitle);
+    await toolbar.sort.reset();
+
+    // sort descending and validate
+    await toolbar.sort.add({
+      title: 'User',
+      ascending: false,
+      locallySaved: false,
+    });
+    await validateRowArray(descendingOrderRowTitle);
+    await toolbar.sort.reset();
+
+    // filter
+    await verifyFilter({ opType: 'contains all of', value: `${(users[1], users[2])}`, result: ['1'] });
+    await verifyFilter({
+      opType: 'contains any of',
+      value: `${users[0]},${users[1]}`,
+      result: ['0', '1', '4'],
+    });
+    await verifyFilter({
+      opType: 'does not contain any of',
+      value: `${users[0]},${users[1]}`,
+      result: ['2', '3'],
+    });
+    await verifyFilter({ opType: 'does not contain all of', value: users[1], result: ['0', '2', '3', '4'] });
+    await verifyFilter({ opType: 'is not blank', result: ['0', '1', '2', '3', '4'] });
+    await verifyFilter({ opType: 'is blank', result: [] });
+
+    //GroupBy
+    // ascending order
+    await toolbar.groupBy.add({ title: 'User', ascending: true, locallySaved: false });
+
+    for (let i = 0; i <= 4; i++) {
+      await dashboard.grid.groupPage.openGroup({ indexMap: [i] });
+      await dashboard.grid.groupPage.validateFirstRow({
+        indexMap: [i],
+        rowIndex: 0,
+        columnHeader: 'Title',
+        value: ascendingOrderRowTitle[i],
+      });
+    }
+
+    // descending order
+    await toolbar.groupBy.update({ title: 'User', ascending: false, index: 0 });
+
+    for (let i = 0; i <= 4; i++) {
+      await dashboard.grid.groupPage.openGroup({ indexMap: [i] });
+      await dashboard.grid.groupPage.validateFirstRow({
+        indexMap: [i],
+        rowIndex: 0,
+        columnHeader: 'Title',
+        value: descendingOrderRowTitle[i],
+      });
+    }
+    await toolbar.groupBy.remove({ index: 0 });
+  });
+});
diff --git a/tests/playwright/tests/db/features/timezone.spec.ts b/tests/playwright/tests/db/features/timezone.spec.ts
index 9cfb97ba2a..9364eb8b1d 100644
--- a/tests/playwright/tests/db/features/timezone.spec.ts
+++ b/tests/playwright/tests/db/features/timezone.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
 import { DashboardPage } from '../../../pages/Dashboard';
 import setup, { NcContext, unsetup } from '../../../setup';
-import { Api, ProjectListType, UITypes } from 'nocodb-sdk';
+import { Api, PaginatedType, ProjectListType, UITypes } from 'nocodb-sdk';
 import { enableQuickRun, isEE, isMysql, isPg, isSqlite } from '../../../setup/db';
 import { getKnexConfig } from '../../utils/config';
 import { getBrowserTimezoneOffset } from '../../utils/general';
@@ -778,7 +778,11 @@ test.describe.serial('Timezone- ExtDB : DateTime column, Browser Timezone same a
     // Hence, we skip seconds from API response
     //
 
-    const records = await api.dbTableRow.list('noco', context.base.id, 'MyTable', { limit: 10 });
+    const records = (await api.dbTableRow.list('noco', context.base.id, 'MyTable', { limit: 10 })) as {
+      list: Record<string, any>[];
+      pageInfo: PaginatedType;
+    };
+    records.list = records.list.filter(record => record.DatetimeWithoutTz && record.DatetimeWithTz);
     let dateTimeWithoutTz = records.list.map(record => record.DatetimeWithoutTz);
     let dateTimeWithTz = records.list.map(record => record.DatetimeWithTz);
 
@@ -1082,7 +1086,11 @@ test.describe.serial('Timezone- ExtDB (MySQL Only) : DB Timezone configured as H
     // Hence, we skip seconds from API response
     //
 
-    const records = await api.dbTableRow.list('sakila', context.base.id, 'MyTable', { limit: 10 });
+    const records = (await api.dbTableRow.list('sakila', context.base.id, 'MyTable', { limit: 10 })) as {
+      list: Record<string, any>[];
+      pageInfo: PaginatedType;
+    };
+    records.list = records.list.filter(record => record.DatetimeWithoutTz && record.DatetimeWithTz);
     let dateTimeWithoutTz = records.list.map(record => record.DatetimeWithoutTz);
     let dateTimeWithTz = records.list.map(record => record.DatetimeWithTz);
 
diff --git a/tests/playwright/tests/db/features/undo-redo.spec.ts b/tests/playwright/tests/db/features/undo-redo.spec.ts
index d8438dedac..3a03beea38 100644
--- a/tests/playwright/tests/db/features/undo-redo.spec.ts
+++ b/tests/playwright/tests/db/features/undo-redo.spec.ts
@@ -134,13 +134,13 @@ test.describe('Undo Redo', () => {
     await dashboard.treeView.openTable({ title: 'numberBased' });
 
     // Row.Create
-    await grid.addNewRow({ index: 10, value: '333', columnHeader: 'Number', networkValidation: true });
-    await grid.addNewRow({ index: 11, value: '444', columnHeader: 'Number', networkValidation: true });
+    await grid.addNewRow({ index: 10, value: '333', columnHeader: 'Number' });
+    await grid.addNewRow({ index: 11, value: '444', columnHeader: 'Number' });
     await verifyRecords([333, 444]);
 
     // Row.Update
-    await grid.editRow({ index: 10, value: '555', columnHeader: 'Number', networkValidation: true });
-    await grid.editRow({ index: 11, value: '666', columnHeader: 'Number', networkValidation: true });
+    await grid.editRow({ index: 10, value: '555', columnHeader: 'Number' });
+    await grid.editRow({ index: 11, value: '666', columnHeader: 'Number' });
     await verifyRecords([555, 666]);
 
     // Row.Delete
@@ -162,8 +162,11 @@ test.describe('Undo Redo', () => {
 
     // Undo : Row.Create
     await undo({ page, dashboard });
+    await verifyRecords([333, NaN]);
+    await undo({ page, dashboard });
     await verifyRecords([333]);
     await undo({ page, dashboard });
+    await undo({ page, dashboard });
     await verifyRecords([]);
   });
 
diff --git a/tests/playwright/tests/db/features/webhook.spec.ts b/tests/playwright/tests/db/features/webhook.spec.ts
index b0af354a0a..57d19b2ec6 100644
--- a/tests/playwright/tests/db/features/webhook.spec.ts
+++ b/tests/playwright/tests/db/features/webhook.spec.ts
@@ -9,6 +9,12 @@ import { enableQuickRun, isEE, isMysql, isSqlite } from '../../../setup/db';
 
 const hookPath = 'http://localhost:9090/hook';
 
+/**
+ * @note AddNewRow function makes two requests:
+ *  1. Creates a blank row with default values (POST) if current cell is not required cell.
+ *  2. Fills cell values (PATCH) if current cell is not required cell else (POST).
+ */
+
 // clear server data
 async function clearServerData({ request }) {
   // clear stored data in server
@@ -39,7 +45,7 @@ async function getWebhookResponses({ request, count = 1 }) {
   return await response.json();
 }
 
-async function verifyHookTrigger(count: number, value: string, request, expectedData?: any) {
+async function verifyHookTrigger(count: number, value: string | null, request, expectedData?: any) {
   // Retry since there can be lag between the time the hook is triggered and the time the server receives the request
   let response: { json: () => any };
 
@@ -160,14 +166,15 @@ test.describe.serial('Webhook', () => {
       columnHeader: 'Title',
       value: 'Poole',
     });
-    await verifyHookTrigger(1, 'Poole', request, buildExpectedResponseData('records.after.insert', 'Poole'));
+
+    await verifyHookTrigger(1, null, request, buildExpectedResponseData('records.after.insert', null));
 
     // trigger edit row & delete row
     // verify that the hook is not triggered (count doesn't change in this case)
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
-    await verifyHookTrigger(1, 'Poole', request);
+    await verifyHookTrigger(1, null, request);
     await dashboard.grid.deleteRow(0);
-    await verifyHookTrigger(1, 'Poole', request);
+    await verifyHookTrigger(1, null, request);
 
     ///////////////////////////////////////////////////////////////////////////
 
@@ -192,16 +199,17 @@ test.describe.serial('Webhook', () => {
       columnHeader: 'Title',
       value: 'Poole',
     });
-    await verifyHookTrigger(1, 'Poole', request, buildExpectedResponseData('records.after.insert', 'Poole'));
+
+    await verifyHookTrigger(2, 'Poole', request, buildExpectedResponseData('records.after.update', 'Poole'));
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
     await verifyHookTrigger(
-      2,
+      3,
       'Delaware',
       request,
       buildExpectedResponseData('records.after.update', 'Delaware', 'Poole')
     );
     await dashboard.grid.deleteRow(0);
-    await verifyHookTrigger(2, 'Delaware', request);
+    await verifyHookTrigger(3, 'Delaware', request);
 
     ///////////////////////////////////////////////////////////////////////////
 
@@ -224,16 +232,17 @@ test.describe.serial('Webhook', () => {
       columnHeader: 'Title',
       value: 'Poole',
     });
-    await verifyHookTrigger(1, 'Poole', request, buildExpectedResponseData('records.after.insert', 'Poole'));
+
+    await verifyHookTrigger(2, 'Poole', request, buildExpectedResponseData('records.after.update', 'Poole'));
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
     await verifyHookTrigger(
-      2,
+      3,
       'Delaware',
       request,
       buildExpectedResponseData('records.after.update', 'Delaware', 'Poole')
     );
     await dashboard.grid.deleteRow(0);
-    await verifyHookTrigger(3, 'Delaware', request, buildExpectedResponseData('records.after.delete', 'Delaware'));
+    await verifyHookTrigger(4, 'Delaware', request, buildExpectedResponseData('records.after.delete', 'Delaware'));
 
     ///////////////////////////////////////////////////////////////////////////
 
@@ -379,7 +388,7 @@ test.describe.serial('Webhook', () => {
       columnHeader: 'Title',
       value: 'Delaware',
     });
-    await verifyHookTrigger(1, 'Poole', request, buildExpectedResponseData('records.after.insert', 'Poole'));
+    await verifyHookTrigger(1, 'Poole', request, buildExpectedResponseData('records.after.update', 'Poole'));
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
     await dashboard.grid.editRow({ index: 1, value: 'Poole' });
     await verifyHookTrigger(
@@ -421,18 +430,18 @@ test.describe.serial('Webhook', () => {
       columnHeader: 'Title',
       value: 'Delaware',
     });
-    await verifyHookTrigger(2, 'Delaware', request, buildExpectedResponseData('records.after.insert', 'Delaware'));
+    await verifyHookTrigger(4, 'Delaware', request, buildExpectedResponseData('records.after.insert', 'Delaware'));
     await dashboard.grid.editRow({ index: 0, value: 'Delaware' });
     await dashboard.grid.editRow({ index: 1, value: 'Poole' });
     await verifyHookTrigger(
-      4,
+      6,
       'Poole',
       request,
       buildExpectedResponseData('records.after.update', 'Poole', 'Delaware')
     );
     await dashboard.grid.deleteRow(1);
     await dashboard.grid.deleteRow(0);
-    await verifyHookTrigger(6, 'Delaware', request, buildExpectedResponseData('records.after.delete', 'Delaware'));
+    await verifyHookTrigger(8, 'Delaware', request, buildExpectedResponseData('records.after.delete', 'Delaware'));
   });
 
   test('Bulk operations', async ({ request, page }) => {
diff --git a/tests/playwright/tests/db/views/viewForm.spec.ts b/tests/playwright/tests/db/views/viewForm.spec.ts
index 53e23559c5..747613db70 100644
--- a/tests/playwright/tests/db/views/viewForm.spec.ts
+++ b/tests/playwright/tests/db/views/viewForm.spec.ts
@@ -486,6 +486,7 @@ test.describe('Form view', () => {
       columnHeader: 'MultiSelect',
       option: 'jan',
       multiSelect: true,
+      ignoreDblClick: true,
     };
     await sharedForm.cell.selectOption.select({ ...multiSelectParams, option: 'jan' });
     await sharedForm.cell.selectOption.select({ ...multiSelectParams, option: 'feb' });