diff --git a/packages/nc-gui/components/smartsheet-column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet-column/EditOrAdd.vue
index 7fb911f3fe..f9cd0dfa46 100644
--- a/packages/nc-gui/components/smartsheet-column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet-column/EditOrAdd.vue
@@ -53,7 +53,9 @@ const reloadMetaAndData = async () => {
 }
 
 async function onSubmit() {
-  await addOrUpdate(reloadMetaAndData)
+  const saved = await addOrUpdate(reloadMetaAndData)
+
+  if (!saved) return
 
   // add delay to complete the minimize transition
   setTimeout(() => {
diff --git a/packages/nc-gui/components/smartsheet-column/FormulaOptions.vue b/packages/nc-gui/components/smartsheet-column/FormulaOptions.vue
index 0e06220b66..f0858875bd 100644
--- a/packages/nc-gui/components/smartsheet-column/FormulaOptions.vue
+++ b/packages/nc-gui/components/smartsheet-column/FormulaOptions.vue
@@ -50,6 +50,7 @@ const validators = {
     {
       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))
diff --git a/packages/nc-gui/components/smartsheet-column/SelectOptions.vue b/packages/nc-gui/components/smartsheet-column/SelectOptions.vue
index 15e54cc04a..40a52cc1f2 100644
--- a/packages/nc-gui/components/smartsheet-column/SelectOptions.vue
+++ b/packages/nc-gui/components/smartsheet-column/SelectOptions.vue
@@ -15,7 +15,7 @@ const props = defineProps<Props>()
 const emit = defineEmits(['update:value'])
 const vModel = useVModel(props, 'value', emit)
 
-const { setAdditionalValidations } = useColumnCreateStoreOrThrow()
+const { setAdditionalValidations, validateInfos } = useColumnCreateStoreOrThrow()
 
 let options = $ref<any[]>([])
 const colorMenus = $ref<any>({})
@@ -103,13 +103,20 @@ watch(inputs, () => {
             </template>
             <MdiArrowDownDropCircle :style="{ 'font-size': '1.5em', 'color': element.color }" class="mr-2" />
           </a-dropdown>
+
           <a-input ref="inputs" v-model:value="element.title" class="caption" />
           <MdiClose class="ml-2" :style="{ color: 'red' }" @click="removeOption(index)" />
         </div>
       </template>
       <template #footer>
+        <div v-if="validateInfos?.['colOptions.options']?.help?.[0]?.[0]" class="text-error text-[10px] my-2">
+          {{ validateInfos['colOptions.options'].help[0][0] }}
+        </div>
         <a-button type="dashed" class="w-full caption mt-2" @click="addNewOption()">
-          <div class="flex items-center"><MdiPlusIcon /><span class="flex-auto">Add option</span></div>
+          <div class="flex items-center">
+            <MdiPlusIcon />
+            <span class="flex-auto">Add option</span>
+          </div>
         </a-button>
       </template>
     </Draggable>
diff --git a/packages/nc-gui/components/smartsheet-header/Menu.vue b/packages/nc-gui/components/smartsheet-header/Menu.vue
index f0e3778ad7..5522edf2a0 100644
--- a/packages/nc-gui/components/smartsheet-header/Menu.vue
+++ b/packages/nc-gui/components/smartsheet-header/Menu.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
 import { Modal, message } from 'ant-design-vue'
+import type { LinkToAnotherRecordType } from 'nocodb-sdk'
+import { UITypes } from 'nocodb-sdk'
 import { ColumnInj, IsLockedInj, MetaInj, extractSdkResponseErrorMsg, inject, useI18n, useMetas, useNuxtApp } from '#imports'
 
 const { virtual = false } = defineProps<{ virtual?: boolean }>()
@@ -29,6 +31,12 @@ const deleteColumn = () =>
         await $api.dbTableColumn.delete(column?.value?.id as string)
 
         await getMeta(meta?.value?.id as string, true)
+
+        /** force-reload related table meta if deleted column is a LTAR and not linked to same table */
+        if (column?.value?.uidt === UITypes.LinkToAnotherRecord && column.value?.colOptions) {
+          await getMeta((column.value?.colOptions as LinkToAnotherRecordType).fk_related_model_id!, true)
+        }
+
         $e('a:column:delete')
       } catch (e: any) {
         message.error(await extractSdkResponseErrorMsg(e))
diff --git a/packages/nc-gui/components/smartsheet-toolbar/SortListMenu.vue b/packages/nc-gui/components/smartsheet-toolbar/SortListMenu.vue
index 704f21c48a..efb4d3eb49 100644
--- a/packages/nc-gui/components/smartsheet-toolbar/SortListMenu.vue
+++ b/packages/nc-gui/components/smartsheet-toolbar/SortListMenu.vue
@@ -41,7 +41,7 @@ watch(
 </script>
 
 <template>
-  <a-dropdown offset-y class="" :trigger="['click']">
+  <a-dropdown offset-y class="" :trigger="['click']" overlay-class-name="sort-menu-overlay">
     <div :class="{ 'nc-badge nc-active-btn': sorts?.length }">
       <a-button v-t="['c:sort']" class="nc-sort-menu-btn nc-toolbar-btn" :disabled="isLocked"
         ><div class="flex items-center gap-1">
@@ -73,6 +73,7 @@ watch(
               :label="$t('labels.operation')"
               @click.stop
               @select="saveOrUpdate(sort, i)"
+              dropdown-class-name="sort-dir-dropdown"
             >
               <a-select-option
                 v-for="(option, j) in getSortDirectionOptions(columnByID[sort.fk_column_id]?.uidt)"
diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue
index f746c15655..90ee5826da 100644
--- a/packages/nc-gui/components/smartsheet/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/Cell.vue
@@ -15,6 +15,7 @@ import {
   toRef,
   useColumn,
   useDebounceFn,
+  useSmartsheetRowStoreOrThrow,
   useVModel,
 } from '#imports'
 import { NavigateDir } from '~/lib'
@@ -57,10 +58,10 @@ const isPublic = inject(IsPublicInj, ref(false))
 
 const isLocked = inject(IsLockedInj, ref(false))
 
-let changed = $ref(false)
+const { currentRow } = useSmartsheetRowStoreOrThrow()
 
 const syncValue = useDebounceFn(function () {
-  changed = false
+  currentRow.value.rowMeta.changed = false
   emit('save')
 }, 1000)
 
@@ -89,13 +90,13 @@ const vModel = computed({
   get: () => props.modelValue,
   set: (val) => {
     if (val !== props.modelValue) {
-      changed = true
+      currentRow.value.rowMeta.changed = true
       emit('update:modelValue', val)
       if (isAutoSaved) {
         syncValue()
       } else if (!isManualSaved) {
         emit('save')
-        changed = true
+        currentRow.value.rowMeta.changed = true
       }
     }
   },
@@ -129,9 +130,9 @@ const {
 const syncAndNavigate = (dir: NavigateDir) => {
   if (isJSON.value) return
 
-  if (changed) {
+  if (currentRow.value.rowMeta.changed) {
     emit('save')
-    changed = false
+    currentRow.value.rowMeta.changed = false
   }
   emit('navigate', dir)
 }
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 7d2eee0c0d..8beddeef37 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -91,7 +91,7 @@ const {
   deleteRow,
   deleteSelectedRows,
   selectedAllRecords,
-  removeLastEmptyRow,
+  removeRowIfNew,
 } = useViewData(meta, view as any, xWhere)
 
 const { loadGridViewColumns, updateWidth, resizingColWidth, resizingCol } = useGridViewColumnWidth(view as any)
@@ -113,15 +113,18 @@ reloadViewDataHook?.on(async () => {
   await loadData()
 })
 
-const expandForm = (row: Row, state?: Record<string, any>) => {
+const skipRowRemovalOnCancel = ref(false)
+
+const expandForm = (row: Row, state?: Record<string, any>, fromToolbar = false) => {
   expandedFormRow.value = row
   expandedFormRowState.value = state
   expandedFormDlg.value = true
+  skipRowRemovalOnCancel.value = !fromToolbar
 }
 
 openNewRecordFormHook?.on(async () => {
   const newRow = await addEmptyRow()
-  expandForm(newRow)
+  expandForm(newRow, undefined, true)
 })
 
 const selectCell = (row: number, col: number) => {
@@ -324,6 +327,34 @@ const showContextMenu = (e: MouseEvent, target?: { row: number; col: number }) =
     contextMenuTarget.value = target
   }
 }
+
+const rowRefs = $ref<any[]>()
+
+/** save/update records before unmounting the component */
+onBeforeUnmount(async () => {
+  let index = -1
+  for (const currentRow of data.value) {
+    index++
+    /** if new record save row and save the LTAR cells */
+    if (currentRow.rowMeta.new) {
+      const syncLTARRefs = rowRefs[index]!.syncLTARRefs
+      const savedRow = await updateOrSaveRow(currentRow, '')
+      await syncLTARRefs(savedRow)
+      currentRow.rowMeta.changed = false
+      continue
+    }
+    /** if existing row check updated cell and invoke update method */
+    if (currentRow.rowMeta.changed) {
+      currentRow.rowMeta.changed = false
+      for (const field of meta?.value.columns ?? []) {
+        if (isVirtualCol(field)) continue
+        if (currentRow.row[field.title!] !== currentRow.oldRow[field.title!]) {
+          await updateOrSaveRow(currentRow, field.title!)
+        }
+      }
+    }
+  }
+})
 </script>
 
 <template>
@@ -399,7 +430,7 @@ const showContextMenu = (e: MouseEvent, target?: { row: number; col: number }) =
             </tr>
           </thead>
           <tbody>
-            <SmartsheetRow v-for="(row, rowIndex) of data" :key="rowIndex" :row="row">
+            <SmartsheetRow v-for="(row, rowIndex) of data" ref="rowRefs" :key="rowIndex" :row="row">
               <template #default="{ state }">
                 <tr class="nc-grid-row">
                   <td key="row-index" class="caption nc-grid-cell pl-5 pr-1">
@@ -489,10 +520,6 @@ const showContextMenu = (e: MouseEvent, target?: { row: number; col: number }) =
               </template>
             </SmartsheetRow>
 
-            <!--
-      TODO: add relationType !== 'bt' ?
-      v1: <tr v-if="!isView && !isLocked && !isPublicView && isEditable && relationType !== 'bt'">
-    -->
             <tr v-if="!isView && !isLocked && isUIAllowed('xcDatatableEditable') && !isSqlView">
               <td
                 v-t="['c:row:add:grid-bottom']"
@@ -552,7 +579,11 @@ const showContextMenu = (e: MouseEvent, target?: { row: number; col: number }) =
       :row="expandedFormRow"
       :state="expandedFormRowState"
       :meta="meta"
-      @cancel="removeLastEmptyRow"
+      @update:model-value="
+        () => {
+          if (!skipRowRemovalOnCancel) removeRowIfNew(expandedFormRow)
+        }
+      "
     />
   </div>
 </template>
diff --git a/packages/nc-gui/components/smartsheet/Row.vue b/packages/nc-gui/components/smartsheet/Row.vue
index efeea50ef1..acfbbea0c8 100644
--- a/packages/nc-gui/components/smartsheet/Row.vue
+++ b/packages/nc-gui/components/smartsheet/Row.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { Row } from '~/composables'
-import { useProvideSmartsheetRowStore, useSmartsheetStoreOrThrow } from '#imports'
+import { ReloadRowDataHookInj, useProvideSmartsheetRowStore, useSmartsheetStoreOrThrow } from '#imports'
 
 interface Props {
   row: Row
@@ -21,6 +21,22 @@ watch(isNew, async (nextVal, prevVal) => {
     currentRow.value.oldRow = { ...currentRow.value.row, ...state.value }
   }
 })
+
+const reloadViewDataTrigger = inject(ReloadViewDataHookInj)!
+
+// override reload trigger and use it to reload row
+const reloadHook = createEventHook()
+
+reloadHook.on(() => {
+  if (isNew.value) return
+  reloadViewDataTrigger?.trigger()
+})
+
+provide(ReloadRowDataHookInj, reloadHook)
+
+defineExpose({
+  syncLTARRefs,
+})
 </script>
 
 <template>
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
index b215fd4a47..2f8e0c7cf6 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
@@ -1,20 +1,29 @@
 <script lang="ts" setup>
-import { useExpandedFormStoreOrThrow, useSmartsheetRowStoreOrThrow, useSmartsheetStoreOrThrow, useUIPermission } from '#imports'
+import {
+  ReloadRowDataHookInj,
+  useExpandedFormStoreOrThrow,
+  useSmartsheetRowStoreOrThrow,
+  useSmartsheetStoreOrThrow,
+  useUIPermission,
+} from '#imports'
 
 const emit = defineEmits(['cancel'])
 
 const { meta, isSqlView } = useSmartsheetStoreOrThrow()
 
-const { commentsDrawer, primaryValue, save: _save } = useExpandedFormStoreOrThrow()
+const { commentsDrawer, primaryValue, save: _save, loadRow } = useExpandedFormStoreOrThrow()
 
 const { isNew, syncLTARRefs } = useSmartsheetRowStoreOrThrow()
 
 const { isUIAllowed } = useUIPermission()
 
+const reloadTrigger = inject(ReloadRowDataHookInj, createEventHook())
+
 const save = async () => {
   if (isNew.value) {
     const data = await _save()
     await syncLTARRefs(data)
+    reloadTrigger?.trigger()
   } else {
     await _save()
   }
@@ -46,7 +55,7 @@ const iconColor = '#1890ff'
       <template #title>
         <div class="text-center w-full">{{ $t('general.reload') }}</div>
       </template>
-      <mdi-reload class="cursor-pointer select-none text-gray-500" />
+      <mdi-reload class="cursor-pointer select-none text-gray-500" @click="loadRow" />
     </a-tooltip>
     <a-tooltip v-if="!isSqlView" placement="bottom">
       <!--      Toggle comments draw -->
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index be6aba144d..0f4e69fc0b 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { ColumnType, TableType, ViewType } from 'nocodb-sdk'
+import type { TableType, ViewType } from 'nocodb-sdk'
 import { isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import Cell from '../Cell.vue'
@@ -10,14 +10,11 @@ import {
   FieldsInj,
   IsFormInj,
   MetaInj,
-  NOCO,
+  ReloadRowDataHookInj,
   computedInject,
-  extractPkFromRow,
   provide,
   ref,
   toRef,
-  useNuxtApp,
-  useProject,
   useProvideExpandedFormStore,
   useProvideSmartsheetStore,
   useVModel,
@@ -53,25 +50,10 @@ const fields = computedInject(FieldsInj, (_fields) => {
 
 provide(MetaInj, meta)
 
-const { commentsDrawer, changedColumns, state: rowState, isNew } = useProvideExpandedFormStore(meta, row)
-
-const { $api } = useNuxtApp()
+const { commentsDrawer, changedColumns, state: rowState, isNew, loadRow } = useProvideExpandedFormStore(meta, row)
 
 if (props.loadRow) {
-  const { project } = useProject()
-
-  const { sharedView } = useSharedView() as Record<string, any>
-
-  row.value.row = await $api.dbTableRow.read(
-    NOCO,
-    (project?.value?.id || sharedView.value.view.project_id) as string,
-    meta.value.title,
-    extractPkFromRow(row.value.row, meta.value.columns as ColumnType[]),
-  )
-
-  row.value.oldRow = { ...row.value.row }
-
-  row.value.rowMeta = {}
+  await loadRow()
 }
 
 useProvideSmartsheetStore(ref({}) as Ref<ViewType>, meta)
@@ -98,6 +80,19 @@ const onClose = () => {
   if (row.value?.rowMeta?.new) emits('cancel')
   isExpanded.value = false
 }
+
+const reloadParentRowHook = inject(ReloadRowDataHookInj, createEventHook())
+
+// override reload trigger and use it to reload grid and the form itself
+const reloadHook = createEventHook()
+
+reloadHook.on(() => {
+  reloadParentRowHook?.trigger()
+  if (isNew.value) return
+  loadRow()
+})
+
+provide(ReloadRowDataHookInj, reloadHook)
 </script>
 
 <script lang="ts">
diff --git a/packages/nc-gui/components/tabs/Smartsheet.vue b/packages/nc-gui/components/tabs/Smartsheet.vue
index 06b8314a9d..715d64474d 100644
--- a/packages/nc-gui/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui/components/tabs/Smartsheet.vue
@@ -21,6 +21,10 @@ import {
 
 import type { TabItem } from '~/composables'
 
+const { activeTab } = defineProps<{
+  activeTab: TabItem
+}>()
+
 const { metas } = useMetas()
 
 const activeView = ref()
@@ -29,11 +33,8 @@ const el = ref<typeof SmartsheetGrid>()
 
 const fields = ref<ColumnType[]>([])
 
-const tabMeta = inject(
-  TabMetaInj,
-  computed(() => ({} as TabItem)),
-)
-const meta = computed<TableType>(() => metas.value?.[tabMeta?.value?.id as string])
+provide(TabMetaInj, ref(activeTab))
+const meta = computed<TableType>(() => metas.value?.[activeTab?.id as string])
 
 const reloadEventHook = createEventHook<void>()
 const openNewRecordFormHook = createEventHook<void>()
diff --git a/packages/nc-gui/components/virtual-cell/BelongsTo.vue b/packages/nc-gui/components/virtual-cell/BelongsTo.vue
index 2358ca6d79..58fc4d9f71 100644
--- a/packages/nc-gui/components/virtual-cell/BelongsTo.vue
+++ b/packages/nc-gui/components/virtual-cell/BelongsTo.vue
@@ -6,7 +6,7 @@ import {
   CellValueInj,
   ColumnInj,
   ReadonlyInj,
-  ReloadViewDataHookInj,
+  ReloadRowDataHookInj,
   RowInj,
   defineAsyncComponent,
   inject,
@@ -24,7 +24,7 @@ const ListItems = defineAsyncComponent(() => import('./components/ListItems.vue'
 
 const column = inject(ColumnInj)!
 
-const reloadTrigger = inject(ReloadViewDataHookInj)!
+const reloadRowTrigger = inject(ReloadRowDataHookInj, createEventHook())
 
 const cellValue = inject(CellValueInj, ref<any>(null))
 
@@ -48,7 +48,7 @@ const { loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvid
   column as Ref<Required<ColumnType>>,
   row,
   isNew,
-  reloadTrigger.trigger,
+  reloadRowTrigger.trigger,
 )
 
 await loadRelatedTableMeta()
diff --git a/packages/nc-gui/components/virtual-cell/HasMany.vue b/packages/nc-gui/components/virtual-cell/HasMany.vue
index 1bad20b077..505cc065d2 100644
--- a/packages/nc-gui/components/virtual-cell/HasMany.vue
+++ b/packages/nc-gui/components/virtual-cell/HasMany.vue
@@ -7,7 +7,7 @@ import {
   IsFormInj,
   IsLockedInj,
   ReadonlyInj,
-  ReloadViewDataHookInj,
+  ReloadRowDataHookInj,
   RowInj,
   computed,
   defineAsyncComponent,
@@ -30,7 +30,7 @@ const cellValue = inject(CellValueInj)!
 
 const row = inject(RowInj)!
 
-const reloadTrigger = inject(ReloadViewDataHookInj)!
+const reloadRowTrigger = inject(ReloadRowDataHookInj, createEventHook())
 
 const isForm = inject(IsFormInj)
 
@@ -50,7 +50,7 @@ const { loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvid
   column as Ref<Required<ColumnType>>,
   row,
   isNew,
-  reloadTrigger.trigger,
+  reloadRowTrigger.trigger,
 )
 await loadRelatedTableMeta()
 
@@ -112,6 +112,7 @@ const unlinkRef = async (rec: Record<string, any>) => {
 
     <ListChildItems
       v-model="childListDlg"
+      :cell-value="localCellValue"
       @attach-record="
         () => {
           childListDlg = false
diff --git a/packages/nc-gui/components/virtual-cell/ManyToMany.vue b/packages/nc-gui/components/virtual-cell/ManyToMany.vue
index 47febc5caa..b5d81ed648 100644
--- a/packages/nc-gui/components/virtual-cell/ManyToMany.vue
+++ b/packages/nc-gui/components/virtual-cell/ManyToMany.vue
@@ -7,7 +7,7 @@ import {
   IsFormInj,
   IsLockedInj,
   ReadonlyInj,
-  ReloadViewDataHookInj,
+  ReloadRowDataHookInj,
   RowInj,
   computed,
   inject,
@@ -29,7 +29,7 @@ const row = inject(RowInj)!
 
 const cellValue = inject(CellValueInj)!
 
-const reloadTrigger = inject(ReloadViewDataHookInj)!
+const reloadRowTrigger = inject(ReloadRowDataHookInj, createEventHook())
 
 const isForm = inject(IsFormInj)
 
@@ -48,7 +48,7 @@ const { loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvid
   column as Ref<Required<ColumnType>>,
   row,
   isNew,
-  reloadTrigger.trigger,
+  reloadRowTrigger.trigger,
 )
 
 await loadRelatedTableMeta()
@@ -112,6 +112,7 @@ const unlinkRef = async (rec: Record<string, any>) => {
 
     <ListChildItems
       v-model="childListDlg"
+      :cell-value="localCellValue"
       @attach-record="
         () => {
           childListDlg = false
diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
index 8339270602..3ab8524bf8 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
@@ -13,7 +13,7 @@ import {
 } from '#imports'
 import { IsPublicInj } from '~/context'
 
-const props = defineProps<{ modelValue?: boolean }>()
+const props = defineProps<{ modelValue?: boolean; cellValue: any }>()
 
 const emit = defineEmits(['update:modelValue', 'attachRecord'])
 
@@ -77,6 +77,13 @@ const container = computed(() =>
 
 const expandedFormDlg = ref(false)
 const expandedFormRow = ref()
+
+watch(
+  () => props.cellValue,
+  () => {
+    if (!isNew.value) loadChildrenList()
+  },
+)
 </script>
 
 <template>
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index e6fdb82f5c..42fcfd72c7 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -64,6 +64,7 @@ const expandedFormDlg = ref(false)
 
 /** populate initial state for a new row which is parent/child of current record */
 const newRowState = computed(() => {
+  if (isNew.value) return {}
   const colOpt = (column?.value as ColumnType)?.colOptions as LinkToAnotherRecordType
   const colInRelatedTable: ColumnType | undefined = relatedTableMeta?.value?.columns?.find((col) => {
     if (col.uidt !== UITypes.LinkToAnotherRecord) return false
@@ -94,6 +95,12 @@ const newRowState = computed(() => {
     }
   }
 })
+
+// if it's an existing record close the list
+// after new record creation since it's already linking while creating
+watch(expandedFormDlg, (nexVal) => {
+  if (!nexVal && !isNew.value) vModel.value = false
+})
 </script>
 
 <template>
@@ -109,9 +116,9 @@ const newRowState = computed(() => {
         <div class="flex-1" />
         <MdiReload class="cursor-pointer text-gray-500 nc-reload" @click="loadChildrenExcludedList" />
         <!--        Add new record -->
-        <a-button v-if="!isPublic" type="primary" size="small" @click="expandedFormDlg = true">{{
-          $t('activity.addNewRecord')
-        }}</a-button>
+        <a-button v-if="!isPublic" type="primary" size="small" @click="expandedFormDlg = true">
+          {{ $t('activity.addNewRecord') }}
+        </a-button>
       </div>
       <template v-if="childrenExcludedList?.pageInfo?.totalRows">
         <div class="flex-1 overflow-auto min-h-0 scrollbar-thin-dull px-12">
@@ -121,10 +128,10 @@ const newRowState = computed(() => {
             class="!my-4 cursor-pointer hover:(!bg-gray-200/50 shadow-md) group"
             @click="linkRow(refRow)"
           >
-            {{ refRow[relatedTablePrimaryValueProp]
-            }}<span class="hidden group-hover:(inline) text-gray-400 text-[11px] ml-1"
-              >({{ $t('labels.primaryKey') }} : {{ getRelatedTableRowId(refRow) }})</span
-            >
+            {{ refRow[relatedTablePrimaryValueProp] }}
+            <span class="hidden group-hover:(inline) text-gray-400 text-[11px] ml-1">
+              ({{ $t('labels.primaryKey') }} : {{ getRelatedTableRowId(refRow) }})
+            </span>
           </a-card>
         </div>
         <div class="flex justify-center mt-6">
diff --git a/packages/nc-gui/composables/useColumnCreateStore.ts b/packages/nc-gui/composables/useColumnCreateStore.ts
index 1e9b17b897..419e339ec4 100644
--- a/packages/nc-gui/composables/useColumnCreateStore.ts
+++ b/packages/nc-gui/composables/useColumnCreateStore.ts
@@ -206,6 +206,7 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
           $e('a:column:add', { datatype: formState.value.uidt })
         }
         onSuccess?.()
+        return true
       } catch (e: any) {
         message.error(await extractSdkResponseErrorMsg(e))
       }
diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts
index c8c8b29102..b6664cf0a3 100644
--- a/packages/nc-gui/composables/useExpandedFormStore.ts
+++ b/packages/nc-gui/composables/useExpandedFormStore.ts
@@ -29,6 +29,8 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
   const changedColumns = ref(new Set<string>())
   const { project } = useProject()
   const rowStore = useProvideSmartsheetRowStore(meta, row)
+  const { sharedView } = useSharedView() as Record<string, any>
+
   // todo
   // const activeView = inject(ActiveViewInj)
 
@@ -174,6 +176,20 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
     return data
   }
 
+  const loadRow = async () => {
+    const record = await $api.dbTableRow.read(
+      NOCO,
+      (project?.value?.id || sharedView.value.view.project_id) as string,
+      meta.value.title,
+      extractPkFromRow(row.value.row, meta.value.columns as ColumnType[]),
+    )
+    Object.assign(row.value, {
+      row: record,
+      oldRow: { ...record },
+      rowMeta: {},
+    })
+  }
+
   return {
     ...rowStore,
     commentsOnly,
@@ -189,6 +205,7 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
     primaryValue,
     save,
     changedColumns,
+    loadRow,
   }
 }, 'expanded-form-store')
 
diff --git a/packages/nc-gui/composables/useLTARStore.ts b/packages/nc-gui/composables/useLTARStore.ts
index fb88755b67..f4daf4d3fb 100644
--- a/packages/nc-gui/composables/useLTARStore.ts
+++ b/packages/nc-gui/composables/useLTARStore.ts
@@ -193,7 +193,22 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
         onOk: async () => {
           const id = getRelatedTableRowId(row)
           try {
-            $api.dbTableRow.delete(NOCO, projectId, relatedTableMeta.value.id as string, id as string)
+            const res: { message?: string[] } = await $api.dbTableRow.delete(
+              NOCO,
+              projectId,
+              relatedTableMeta.value.id as string,
+              id as string,
+            )
+
+            if (res.message) {
+              message.info(
+                `Row delete failed: ${`Unable to delete row with ID ${id} because of the following:
+              \n${res.message.join('\n')}.\n
+              Clear the data first & try again`})}`,
+              )
+              return false
+            }
+
             reloadData?.()
 
             /** reload child list if not a new row */
diff --git a/packages/nc-gui/composables/useSmartsheetRowStore.ts b/packages/nc-gui/composables/useSmartsheetRowStore.ts
index e4f0ea02f0..c337d2e2d6 100644
--- a/packages/nc-gui/composables/useSmartsheetRowStore.ts
+++ b/packages/nc-gui/composables/useSmartsheetRowStore.ts
@@ -29,6 +29,8 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
 
   const { metas } = useMetas()
 
+  const currentRow = ref(row)
+
   // state
   const state = ref<Record<string, Record<string, any> | Record<string, any>[] | null>>({})
 
@@ -109,6 +111,20 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
     }
   }
 
+  const loadRow = async () => {
+    const record = await $api.dbTableRow.read(
+      NOCO,
+      project?.value?.id as string,
+      meta.value.title,
+      extractPkFromRow(ref(row).value?.row, meta.value.columns as ColumnType[]),
+    )
+    Object.assign(ref(row).value, {
+      row: record,
+      oldRow: { ...record },
+      rowMeta: {},
+    })
+  }
+
   return {
     row,
     state,
@@ -117,6 +133,8 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
     addLTARRef,
     removeLTARRef,
     syncLTARRefs,
+    loadRow,
+    currentRow,
   }
 }, 'smartsheet-row-store')
 
diff --git a/packages/nc-gui/composables/useTable.ts b/packages/nc-gui/composables/useTable.ts
index 9666ff4c38..3246ae75d9 100644
--- a/packages/nc-gui/composables/useTable.ts
+++ b/packages/nc-gui/composables/useTable.ts
@@ -68,7 +68,7 @@ export function useTable(onTableCreate?: (tableMeta: TableType) => void) {
       cancelText: t('general.no'),
       async onOk() {
         try {
-          const meta = (await getMeta(table.id as string)) as TableType
+          const meta = (await getMeta(table.id as string, true)) as TableType
           const relationColumns = meta?.columns?.filter((c) => c.uidt === UITypes.LinkToAnotherRecord)
 
           if (relationColumns?.length) {
diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index 05b86d81e8..1e0c7941e4 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -28,6 +28,7 @@ export interface Row {
     new?: boolean
     selected?: boolean
     commentCount?: number
+    changed?: boolean
   }
 }
 
@@ -78,7 +79,7 @@ export function useViewData(
   })
 
   const queryParams = computed(() => ({
-    offset: (paginationData.value?.page ?? 0) - 1,
+    offset: ((paginationData.value?.page ?? 0) - 1) * (paginationData.value?.pageSize ?? 25),
     limit: paginationData.value?.pageSize ?? 25,
     where: where?.value ?? '',
   }))
@@ -165,6 +166,7 @@ export function useViewData(
     if ((!project?.value?.id || !meta?.value?.id || !viewMeta?.value?.id) && !isPublic.value) return
     const response = !isPublic.value
       ? await api.dbViewRow.list('noco', project.value.id!, meta!.value.id!, viewMeta!.value.id, {
+          ...queryParams.value,
           ...params,
           ...(isUIAllowed('sortSync') ? {} : { sortArrJson: JSON.stringify(sorts.value) }),
           ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }),
@@ -249,11 +251,11 @@ export function useViewData(
     }
   }
 
-  async function updateOrSaveRow(row: Row, property: string) {
+  async function updateOrSaveRow(row: Row, property?: string) {
     if (row.rowMeta.new) {
-      await insertRow(row.row, formattedData.value.indexOf(row))
+      return await insertRow(row.row, formattedData.value.indexOf(row))
     } else {
-      await updateRowProperty(row, property)
+      await updateRowProperty(row, property!)
     }
   }
 
@@ -278,11 +280,9 @@ export function useViewData(
 
     if (res.message) {
       message.info(
-        `Row delete failed: ${h('div', {
-          innerHTML: `<div style="padding:10px 4px">Unable to delete row with ID ${id} because of the following:
-              <br><br>${res.message.join('<br>')}<br><br>
-              Clear the data first & try again</div>`,
-        })}`,
+        `Row delete failed: ${`Unable to delete row with ID ${id} because of the following:
+              \n${res.message.join('\n')}.\n
+              Clear the data first & try again`})}`,
       )
       return false
     }
@@ -382,6 +382,14 @@ export function useViewData(
     }
   }
 
+  const removeRowIfNew = (row: Row) => {
+    const index = formattedData.value.indexOf(row)
+
+    if (index > -1 && row.rowMeta.new) {
+      formattedData.value.splice(index, 1)
+    }
+  }
+
   return {
     error,
     isLoading,
@@ -408,5 +416,6 @@ export function useViewData(
     aggCommentCount,
     loadAggCommentsCount,
     removeLastEmptyRow,
+    removeRowIfNew,
   }
 }
diff --git a/packages/nc-gui/context/index.ts b/packages/nc-gui/context/index.ts
index a2463cfa08..3a08d13944 100644
--- a/packages/nc-gui/context/index.ts
+++ b/packages/nc-gui/context/index.ts
@@ -22,6 +22,7 @@ export const CellValueInj: InjectionKey<Ref<any>> = Symbol('cell-value-injection
 export const ActiveViewInj: InjectionKey<Ref<ViewType>> = Symbol('active-view-injection')
 export const ReadonlyInj: InjectionKey<boolean> = Symbol('readonly-injection')
 export const ReloadViewDataHookInj: InjectionKey<EventHook<void>> = Symbol('reload-view-data-injection')
+export const ReloadRowDataHookInj: InjectionKey<EventHook<void>> = Symbol('reload-row-data-injection')
 export const OpenNewRecordFormHookInj: InjectionKey<EventHook<void>> = Symbol('open-new-record-form-injection')
 export const FieldsInj: InjectionKey<Ref<any[]>> = Symbol('fields-injection')
 export const ViewListInj: InjectionKey<Ref<ViewType[]>> = Symbol('view-list-injection')
diff --git a/packages/nc-gui/pages/[projectType]/[projectId]/index/index/[type]/[title]/[[viewTitle]].vue b/packages/nc-gui/pages/[projectType]/[projectId]/index/index/[type]/[title]/[[viewTitle]].vue
index 8aac5c92b7..ee6297069c 100644
--- a/packages/nc-gui/pages/[projectType]/[projectId]/index/index/[type]/[title]/[[viewTitle]].vue
+++ b/packages/nc-gui/pages/[projectType]/[projectId]/index/index/[type]/[title]/[[viewTitle]].vue
@@ -1,8 +1,16 @@
 <script setup lang="ts">
+import type { TabItem } from '~/composables'
+import { TabMetaInj } from '#imports'
+
 const { getMeta } = useMetas()
 const route = useRoute()
 const loading = ref(true)
 
+const activeTab = inject(
+  TabMetaInj,
+  computed(() => ({} as TabItem)),
+)
+
 getMeta(route.params.title as string, true).finally(() => {
   loading.value = false
 })
@@ -12,7 +20,7 @@ getMeta(route.params.title as string, true).finally(() => {
   <div v-if="loading" class="flex items-center justify-center h-full w-full">
     <a-spin size="large" />
   </div>
-  <TabsSmartsheet v-else />
+  <TabsSmartsheet v-else :key="route.params.title" :active-tab="activeTab" />
 </template>
 
 <style scoped></style>
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 15647089b9..ee7f9ddf5a 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -2395,7 +2395,7 @@ export class Api<
      * @name Delete
      * @summary Table row delete
      * @request DELETE:/api/v1/db/data/{orgs}/{projectName}/{tableName}/{rowId}
-     * @response `200` `void` OK
+     * @response `200` `any` OK
      */
     delete: (
       orgs: string,
@@ -2404,9 +2404,10 @@ export class Api<
       rowId: string,
       params: RequestParams = {}
     ) =>
-      this.request<void, any>({
+      this.request<any, any>({
         path: `/api/v1/db/data/${orgs}/${projectName}/${tableName}/${rowId}`,
         method: 'DELETE',
+        format: 'json',
         ...params,
       }),
 
diff --git a/packages/nocodb/src/lib/models/FormViewColumn.ts b/packages/nocodb/src/lib/models/FormViewColumn.ts
index fb4028e027..a8feb61db1 100644
--- a/packages/nocodb/src/lib/models/FormViewColumn.ts
+++ b/packages/nocodb/src/lib/models/FormViewColumn.ts
@@ -76,11 +76,19 @@ export default class FormViewColumn implements FormColumnType {
 
     await NocoCache.set(`${CacheScope.FORM_VIEW_COLUMN}:${fk_column_id}`, id);
 
-    await NocoCache.appendToList(
-      CacheScope.FORM_VIEW_COLUMN,
-      [column.fk_view_id],
-      `${CacheScope.FORM_VIEW_COLUMN}:${id}`
-    );
+    // if cache is not present skip pushing it into the list to avoid unexpected behaviour
+    if (
+      (
+        await NocoCache.getList(CacheScope.FORM_VIEW_COLUMN, [
+          column.fk_view_id,
+        ])
+      )?.length
+    )
+      await NocoCache.appendToList(
+        CacheScope.FORM_VIEW_COLUMN,
+        [column.fk_view_id],
+        `${CacheScope.FORM_VIEW_COLUMN}:${id}`
+      );
     return this.get(id, ncMeta);
   }
 
diff --git a/packages/nocodb/src/lib/models/GalleryViewColumn.ts b/packages/nocodb/src/lib/models/GalleryViewColumn.ts
index 39e80dd45c..75ca96f4f1 100644
--- a/packages/nocodb/src/lib/models/GalleryViewColumn.ts
+++ b/packages/nocodb/src/lib/models/GalleryViewColumn.ts
@@ -72,11 +72,19 @@ export default class GalleryViewColumn {
       id
     );
 
-    await NocoCache.appendToList(
-      CacheScope.GALLERY_VIEW_COLUMN,
-      [column.fk_view_id],
-      `${CacheScope.GALLERY_VIEW_COLUMN}:${id}`
-    );
+    // if cache is not present skip pushing it into the list to avoid unexpected behaviour
+    if (
+      (
+        await NocoCache.getList(CacheScope.GALLERY_VIEW_COLUMN, [
+          column.fk_view_id,
+        ])
+      )?.length
+    )
+      await NocoCache.appendToList(
+        CacheScope.GALLERY_VIEW_COLUMN,
+        [column.fk_view_id],
+        `${CacheScope.GALLERY_VIEW_COLUMN}:${id}`
+      );
 
     return this.get(id, ncMeta);
   }
diff --git a/packages/nocodb/src/lib/models/GridViewColumn.ts b/packages/nocodb/src/lib/models/GridViewColumn.ts
index 8088c93037..f00bee3ea2 100644
--- a/packages/nocodb/src/lib/models/GridViewColumn.ts
+++ b/packages/nocodb/src/lib/models/GridViewColumn.ts
@@ -93,11 +93,19 @@ export default class GridViewColumn implements GridColumnType {
 
     await NocoCache.set(`${CacheScope.GRID_VIEW_COLUMN}:${fk_column_id}`, id);
 
-    await NocoCache.appendToList(
-      CacheScope.GRID_VIEW_COLUMN,
-      [column.fk_view_id],
-      `${CacheScope.GRID_VIEW_COLUMN}:${id}`
-    );
+    // if cache is not present skip pushing it into the list to avoid unexpected behaviour
+    if (
+      (
+        await NocoCache.getList(CacheScope.GRID_VIEW_COLUMN, [
+          column.fk_view_id,
+        ])
+      )?.length
+    )
+      await NocoCache.appendToList(
+        CacheScope.GRID_VIEW_COLUMN,
+        [column.fk_view_id],
+        `${CacheScope.GRID_VIEW_COLUMN}:${id}`
+      );
 
     return this.get(id, ncMeta);
   }
diff --git a/scripts/cypress/integration/common/3a_filter_sort_fields_operations.js b/scripts/cypress/integration/common/3a_filter_sort_fields_operations.js
index 718d1ce9cf..e869574ae2 100644
--- a/scripts/cypress/integration/common/3a_filter_sort_fields_operations.js
+++ b/scripts/cypress/integration/common/3a_filter_sort_fields_operations.js
@@ -1,4 +1,5 @@
 import { mainPage } from "../../support/page_objects/mainPage";
+import { loginPage} from "../../support/page_objects/navigation";
 import { isTestSuiteActive } from "../../support/page_objects/projectConstants";
 
 export const genTest = (apiType, dbType) => {
@@ -6,14 +7,7 @@ export const genTest = (apiType, dbType) => {
 
     describe(`${apiType.toUpperCase()} api - Filter, Fields, Sort`, () => {
         before(() => {
-            cy.fileHook();
-            mainPage.tabReset();
-
-            // // kludge: wait for page load to finish
-            // cy.wait(1000);
-            // // close team & auth tab
-            // cy.get('button.ant-tabs-tab-remove').should('exist').click();
-            // cy.wait(1000);
+            // loginPage.loginAndOpenProject(apiType, dbType);
 
             // open country table
             cy.openTableTab("Country", 25);
@@ -25,7 +19,6 @@ export const genTest = (apiType, dbType) => {
 
         describe(`Pagination`, () => {
             beforeEach(() => {
-                cy.fileHook();
             })
 
             // check pagination
@@ -95,6 +88,8 @@ export const genTest = (apiType, dbType) => {
 
                 // verify
                 cy.get(`:nth-child(10) > [data-title="Country"]`).should("not.exist");
+
+                mainPage.getPagination(1).click();
             });
 
             // create new row using right click menu option
diff --git a/scripts/cypress/integration/common/3f_link_to_another_record.js b/scripts/cypress/integration/common/3f_link_to_another_record.js
new file mode 100644
index 0000000000..0015743c1d
--- /dev/null
+++ b/scripts/cypress/integration/common/3f_link_to_another_record.js
@@ -0,0 +1,359 @@
+import { mainPage } from "../../support/page_objects/mainPage";
+import { loginPage } from "../../support/page_objects/navigation";
+import { isTestSuiteActive } from "../../support/page_objects/projectConstants";
+
+export const genTest = (apiType, dbType) => {
+  if (!isTestSuiteActive(apiType, dbType)) return;
+
+  describe(`${apiType.toUpperCase()} api - RollUp column`, () => {
+
+    function fetchParentFromLabel(label) {
+      cy.get("label").contains(label).parents(".ant-row").click();
+    }
+
+    // Insert new row
+    function addRow(index, cellValue) {
+      cy.get('.nc-grid-add-new-cell').should('exist').click();
+      mainPage.getCell('Title', index)
+        .dblclick().then(($el) => {
+        cy.wrap($el).find('input')
+          .clear()
+          .type(`${cellValue}{enter}`);
+      });
+      mainPage.getCell('Title', index)
+        .contains(cellValue).should('exist');
+    }
+
+    // Insert LTAR column
+    //
+    function addLtarColumn(columnName, foreignTable, relationType) {
+      // + icon
+      cy.get(".nc-grid  tr > th:last .nc-icon").click();
+
+      // Column name
+      cy.getActiveMenu().find('input.nc-column-name-input', { timeout: 3000 })
+        .should('exist')
+        .clear()
+        .type(columnName);
+
+      // Column type
+      cy.get(".nc-column-type-input").last()
+        .click()
+        .type("Link");
+      cy.getActiveSelection()
+        .find('.ant-select-item-option')
+        .contains("LinkToAnotherRecord").click();
+
+      // relation type (hm/ mm)
+      cy.get('.nc-ltar-relation-type')
+        .find('.ant-radio')
+        .eq(relationType==='hm'?0:1)
+        .click();
+
+      // Foreign table
+      fetchParentFromLabel("Child table");
+      cy.get(".nc-ltar-child-table")
+        .last()
+        .click()
+        .type(foreignTable);
+      cy.getActiveSelection()
+        .find('.ant-select-item-option')
+        .contains(foreignTable)
+        .click();
+
+      // Save
+      cy.get(".ant-btn-primary")
+        .contains("Save")
+        .should('exist')
+        .click();
+
+      // Toast
+      cy.toastWait(`Column created`);
+
+      // Verify
+      cy.get(`th[data-title="${columnName}"]`)
+        .should("exist");
+    };
+
+    // Content verification for LTAR cell
+    // Validates only 1st chip contents
+    //
+    function verifyLtarCell(columnName, index, cellValue) {
+      cy.get(`:nth-child(${index}) > [data-title="${columnName}"]`)
+        .find('.chip')
+        .eq(0)
+        .contains(cellValue)
+        .should("exist");
+    }
+
+    // Unlink LTAR cell
+    //
+    function ltarUnlink(columnName, index) {
+      // Click on cell to enable unlink icon
+      cy.get(`:nth-child(${index}) > [data-title="${columnName}"]`).last()
+        .click()
+
+      // Click on unlink icon
+      cy.get(`:nth-child(${index}) > [data-title="${columnName}"]`).last()
+        .find('.unlink-icon')
+        .should("exist")
+        .click();
+
+      // Glitch; hence wait
+      cy.wait(1000);
+    }
+
+    before(() => {
+      // required for standalone test
+      // loginPage.loginAndOpenProject(apiType, dbType);
+
+      cy.createTable("Sheet1");
+      cy.createTable("Sheet2");
+
+      cy.saveLocalStorage();
+    });
+
+    beforeEach(() => {
+      cy.restoreLocalStorage();
+    });
+
+    after(() => {
+      // Cleanup
+      //
+      cy.openTableTab("Sheet1", 0);
+      mainPage.deleteColumn("Link1-2hm");
+      mainPage.deleteColumn("Link1-2mm");
+      mainPage.deleteColumn("Sheet2");
+      cy.deleteTable("Sheet1");
+
+      cy.deleteTable("Sheet2");
+    });
+
+    ///////////////////////////////////////////////////
+    // Test case
+
+    it("Create Link columns", () => {
+      cy.openTableTab("Sheet1", 0);
+      addRow(1, "1a");
+      addRow(2, "1b");
+      addRow(3, "1c");
+      addLtarColumn("Link1-2hm", "Sheet2", "hm");
+      addLtarColumn("Link1-2mm", "Sheet2", "mm");
+      cy.closeTableTab("Sheet1");
+
+      cy.openTableTab("Sheet2", 0);
+      addLtarColumn("Link2-1hm", "Sheet1", "hm");
+      cy.closeTableTab("Sheet2");
+
+      // Sheet2 now has all 3 column categories : HM, BT, MM
+      //
+    });
+
+    // Expand form [Add new row]
+    //
+    it("Add HM, BT, MM Link, Expand form", () => {
+      cy.openTableTab("Sheet2", 0);
+
+      // Click on `Add new row` button
+      cy.get(".nc-add-new-row-btn:visible").should("exist");
+      cy.get(".nc-add-new-row-btn").click();
+
+      // Title
+      cy.get(".nc-expand-col-Title").find(".nc-cell > input")
+        .should("exist")
+        .first()
+        .clear()
+        .type("2a");
+
+      // trigger("mouseover") is required to show the + icon
+      // didn't seem to work. As a kludge, used click with {force:true}
+      // additional delay ensures card contents are available before clicking
+      //
+
+      // BT
+      cy.get(".nc-expand-col-Sheet1").find(".nc-action-icon")
+        .should("exist")
+        .click({ force: true });
+      cy.wait(1000);
+      cy.getActiveModal()
+        .find('.ant-card').should('exist')
+        .eq(0).click();
+
+      // MM
+      cy.get(".nc-expand-col-Sheet1.List").find(".ant-btn-primary").click();
+      cy.wait(1000);
+      cy.getActiveModal()
+        .find('.ant-card').should('exist')
+        .eq(0).click();
+
+      // HM
+      cy.get(".nc-expand-col-Link2-1hm")
+        .find(".ant-btn-primary")
+        .click();
+      cy.wait(1000);
+      cy.getActiveModal()
+        .find('.ant-card').should('exist')
+        .eq(0).click();
+
+      // Save row
+      cy.getActiveDrawer()
+        .find("button")
+        .contains("Save row")
+        .click({ force: true });
+
+      // Toast
+      cy.toastWait("updated successfully");
+
+      // Close modal
+      cy.get("body").type("{esc}");
+    })
+
+    // In cell insert
+    it("Add HM, BT, MM Link, In cell form", () => {
+
+      // Insert row with `Title` field, rest of links are empty
+      addRow(2, "2b");
+
+      // BT
+      mainPage.getCell("Sheet1", 2)
+        .find(".nc-action-icon")
+        .click({ force: true });
+      cy.getActiveModal()
+        .find('.ant-card')
+        .should('exist')
+        .eq(1)
+        .click();
+      cy.wait(1000);
+
+      // MM
+      mainPage.getCell("Sheet1 List", 2)
+        .find(".nc-action-icon")
+        .last()
+        .click({ force: true });
+      cy.getActiveModal()
+        .find('.ant-card')
+        .should('exist')
+        .eq(1)
+        .click();
+      cy.wait(1000);
+
+      // HM
+      mainPage.getCell("Link2-1hm", 2)
+        .find(".nc-action-icon")
+        .last()
+        .click({ force: true });
+      cy.getActiveModal()
+        .find('.ant-card')
+        .should('exist')
+        .eq(1)
+        .click();
+    });
+
+    // Existing row, expand record
+    it("Add HM, BT, MM Link, expand record", () => {
+      addRow(3, "2c");
+      cy.get(".nc-row-expand").eq(2).click({ force: true });
+
+      // BT
+      cy.wait(1000);
+      cy.get(".nc-expand-col-Sheet1")
+        .find(".nc-action-icon")
+        .should("exist")
+        .click({ force: true });
+      cy.wait(1000);
+      cy.getActiveModal()
+        .find('.ant-card').should('exist')
+        .eq(2).click();
+
+      // MM
+      cy.get(".nc-expand-col-Sheet1.List")
+        .find(".ant-btn-primary").click();
+      cy.wait(1000);
+      cy.getActiveModal()
+        .find('.ant-card').should('exist')
+        .eq(2).click();
+      cy.wait(1000);
+
+      // HM
+      cy.get(".nc-expand-col-Link2-1hm")
+        .find(".ant-btn-primary").click();
+      cy.wait(1000);
+      cy.getActiveModal()
+        .find('.ant-card').should('exist')
+        .eq(2).click();
+      cy.wait(1000);
+
+      cy.getActiveDrawer()
+        .find("button")
+        .contains("Save row")
+        .click({ force: true });
+
+      // cy.toastWait("updated successfully");
+      cy.toastWait("No columns to update");
+      cy.get("body").type("{esc}");
+
+      verifyLtarCell("Sheet1", 1, "1a");
+      verifyLtarCell("Sheet1", 2, "1b");
+      verifyLtarCell("Sheet1", 3, "1c");
+      verifyLtarCell("Sheet1 List", 1, "1a");
+      verifyLtarCell("Sheet1 List", 2, "1b");
+      verifyLtarCell("Sheet1 List", 3, "1c");
+      verifyLtarCell("Link2-1hm", 1, "1a");
+      verifyLtarCell("Link2-1hm", 2, "1b");
+      verifyLtarCell("Link2-1hm", 3, "1c");
+
+      cy.closeTableTab("Sheet2");
+    });
+
+    it("Verification", () => {
+      cy.openTableTab("Sheet1", 3);
+      verifyLtarCell("Link1-2hm", 1, "2a");
+      verifyLtarCell("Link1-2hm", 2, "2b");
+      verifyLtarCell("Link1-2hm", 3, "2c");
+      verifyLtarCell("Link1-2mm", 1, "2a");
+      verifyLtarCell("Link1-2mm", 2, "2b");
+      verifyLtarCell("Link1-2mm", 3, "2c");
+      verifyLtarCell("Sheet2", 1, "2a");
+      verifyLtarCell("Sheet2", 2, "2b");
+      verifyLtarCell("Sheet2", 3, "2c");
+      cy.closeTableTab("Sheet1");
+    })
+
+    it("Unlink", () => {
+      cy.openTableTab("Sheet1", 3);
+      ltarUnlink("Link1-2hm", 1);
+      ltarUnlink("Link1-2hm", 2);
+      ltarUnlink("Link1-2hm", 3);
+      ltarUnlink("Link1-2mm", 1);
+      ltarUnlink("Link1-2mm", 2);
+      ltarUnlink("Link1-2mm", 3);
+      ltarUnlink("Sheet2", 1);
+      ltarUnlink("Sheet2", 2);
+      ltarUnlink("Sheet2", 3);
+      cy.closeTableTab("Sheet1");
+    });
+  });
+};
+
+/**
+ * @copyright Copyright (c) 2021, Xgene Cloud Ltd
+ *
+ * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Raju Udava <sivadstala@gmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
diff --git a/scripts/cypress/integration/test/restTableOps.js b/scripts/cypress/integration/test/restTableOps.js
index ad44c17d4d..003685c448 100644
--- a/scripts/cypress/integration/test/restTableOps.js
+++ b/scripts/cypress/integration/test/restTableOps.js
@@ -12,6 +12,7 @@ let t3b = require("../common/3b_formula_column");
 let t3c = require("../common/3c_lookup_column");
 let t3d = require("../common/3d_rollup_column");
 let t3e = require("../common/3e_duration_column");
+let t3f = require("../common/3f_link_to_another_record");
 const {
     setCurrentMode,
 } = require("../../support/page_objects/projectConstants");
@@ -32,6 +33,7 @@ const nocoTestSuite = (apiType, dbType) => {
     t3c.genTest(apiType, dbType);
     t3d.genTest(apiType, dbType);
     // NcGUI v2 t3e.genTest(apiType, dbType);
+    t3f.genTest(apiType, dbType);
 };
 
 nocoTestSuite("rest", "mysql");
diff --git a/scripts/cypress/support/commands.js b/scripts/cypress/support/commands.js
index 8caa7ee8d8..84020b99a1 100644
--- a/scripts/cypress/support/commands.js
+++ b/scripts/cypress/support/commands.js
@@ -24,398 +24,401 @@
 // -- This will overwrite an existing command --
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
 
-import "cypress-file-upload";
-import { isXcdb, isPostgres } from "./page_objects/projectConstants";
+import 'cypress-file-upload';
+import { isXcdb, isPostgres } from './page_objects/projectConstants';
 
-require("@4tw/cypress-drag-drop");
+require('@4tw/cypress-drag-drop');
 
 // for waiting until page load
-Cypress.Commands.add("waitForSpinners", () => {
-    cy.visit("http://localhost:3000/signup", {
-        retryOnNetworkFailure: true,
-        timeout: 1200000,
-        headers: {
-            "Accept-Encoding": "gzip, deflate",
-        },
-    });
-    cy.get(".nc-form-signup").should("exist")
+Cypress.Commands.add('waitForSpinners', () => {
+  cy.visit('http://localhost:3000/signup', {
+    retryOnNetworkFailure: true,
+    timeout: 1200000,
+    headers: {
+      'Accept-Encoding': 'gzip, deflate',
+    },
+  });
+  cy.get('.nc-form-signup').should('exist');
 });
 
-Cypress.Commands.add("signinOrSignup", (_args) => {
-    const args = Object.assign(
-        { username: "user@nocodb.com", password: "Password123." },
-        _args
-    );
-
-    cy.wait(1000);
-
-    // signin/signup
-    cy.get("body").then(($body) => {
-        // cy.wait(1000)
-        cy.url().then((url) => {
-            if (!url.includes("/projects")) {
-                // handle initial load
-                if ($body.find(".welcome-page").length > 0) {
-                    cy.wait(8000);
-                    cy.get("body").trigger("mousemove");
-                    cy.snip("LetsBegin");
-                    cy.contains("Let's Begin").click();
-                    cy.get('input[type="text"]', { timeout: 12000 }).type(
-                        args.username
-                    );
-                    cy.get('input[type="password"]').type(args.password);
-                    cy.snip("SignUp");
-                    cy.get('button:contains("SIGN UP")').click();
-
-                    // handle signin
-                } else {
-                    cy.get('input[type="text"]', { timeout: 12000 }).type(
-                        args.username
-                    );
-                    cy.get('input[type="password"]').type(args.password);
-                    cy.snip("SignIn");
-                    cy.get('button:contains("SIGN IN")').click();
-                }
-            } else if (url.includes("/signin")) {
-                cy.get('input[type="text"]', { timeout: 12000 }).type(
-                    args.username
-                );
-                cy.get('input[type="password"]').type(args.password);
-                cy.snip("SignIn");
-                cy.get('button:contains("SIGN IN")').click();
-            }
-        });
+Cypress.Commands.add('signinOrSignup', (_args) => {
+  const args = Object.assign(
+    { username: 'user@nocodb.com', password: 'Password123.' },
+    _args
+  );
+
+  cy.wait(1000);
+
+  // signin/signup
+  cy.get('body').then(($body) => {
+    // cy.wait(1000)
+    cy.url().then((url) => {
+      if (!url.includes('/projects')) {
+        // handle initial load
+        if ($body.find('.welcome-page').length > 0) {
+          cy.wait(8000);
+          cy.get('body').trigger('mousemove');
+          cy.snip('LetsBegin');
+          cy.contains('Let\'s Begin').click();
+          cy.get('input[type="text"]', { timeout: 12000 }).type(
+            args.username
+          );
+          cy.get('input[type="password"]').type(args.password);
+          cy.snip('SignUp');
+          cy.get('button:contains("SIGN UP")').click();
+
+          // handle signin
+        } else {
+          cy.get('input[type="text"]', { timeout: 12000 }).type(
+            args.username
+          );
+          cy.get('input[type="password"]').type(args.password);
+          cy.snip('SignIn');
+          cy.get('button:contains("SIGN IN")').click();
+        }
+      } else if (url.includes('/signin')) {
+        cy.get('input[type="text"]', { timeout: 12000 }).type(
+          args.username
+        );
+        cy.get('input[type="password"]').type(args.password);
+        cy.snip('SignIn');
+        cy.get('button:contains("SIGN IN")').click();
+      }
     });
+  });
 
-    // indicates page-load complete
-    cy.get(".nc-noco-brand-icon", { timeout: 12000 }).should("exist");
+  // indicates page-load complete
+  cy.get('.nc-noco-brand-icon', { timeout: 12000 }).should('exist');
 });
 
 // for opening/creating a rest project
-Cypress.Commands.add("openOrCreateRestProject", (_args) => {
-    const args = Object.assign({ new: false }, _args);
-
-    // signin/signup
-    cy.signinOrSignup();
-    cy.get(".nc-new-project-menu").should("exist");
-    cy.snip("ProjectPage");
-    cy.get("body").then(($body) => {
-        const filter = args.meta
-            ? ".nc-meta-project-row"
-            : ":not(.nc-meta-project-row)";
-        // if project exist open
-        if (
-            $body.find(".nc-rest-project-row").filter(filter).length &&
-            !args.new
-        ) {
-            cy.get(".nc-rest-project-row").filter(filter).first().click();
-        } else {
-            cy.contains("New Project")
-                .trigger("onmouseover")
-                .trigger("mouseenter");
-            if (args.meta) {
-                cy.get(".nc-create-xc-db-project").click();
-                cy.url({ timeout: 6000 }).should("contain", "#/project/xcdb");
-                cy.get(".nc-metadb-project-name").type(
-                    "test_proj" + Date.now()
-                );
-                cy.contains("button", "Create", { timeout: 3000 }).click();
-            } else {
-                cy.get(".nc-create-external-db-project").click();
-                cy.url({ timeout: 6000 }).should("contain", "#/project");
-                cy.get(".database-field input").click().clear().type("sakila");
-                cy.contains("Test Database Connection").click();
-                cy.contains("Ok & Save Project", { timeout: 3000 }).click();
-            }
-        }
-    });
-    cy.url({ timeout: 20000 }).should("contain", "#/nc/");
+Cypress.Commands.add('openOrCreateRestProject', (_args) => {
+  const args = Object.assign({ new: false }, _args);
+
+  // signin/signup
+  cy.signinOrSignup();
+  cy.get('.nc-new-project-menu').should('exist');
+  cy.snip('ProjectPage');
+  cy.get('body').then(($body) => {
+    const filter = args.meta
+      ? '.nc-meta-project-row'
+      : ':not(.nc-meta-project-row)';
+    // if project exist open
+    if (
+      $body.find('.nc-rest-project-row').filter(filter).length &&
+      !args.new
+    ) {
+      cy.get('.nc-rest-project-row').filter(filter).first().click();
+    } else {
+      cy.contains('New Project')
+        .trigger('onmouseover')
+        .trigger('mouseenter');
+      if (args.meta) {
+        cy.get('.nc-create-xc-db-project').click();
+        cy.url({ timeout: 6000 }).should('contain', '#/project/xcdb');
+        cy.get('.nc-metadb-project-name').type(
+          'test_proj' + Date.now()
+        );
+        cy.contains('button', 'Create', { timeout: 3000 }).click();
+      } else {
+        cy.get('.nc-create-external-db-project').click();
+        cy.url({ timeout: 6000 }).should('contain', '#/project');
+        cy.get('.database-field input').click().clear().type('sakila');
+        cy.contains('Test Database Connection').click();
+        cy.contains('Ok & Save Project', { timeout: 3000 }).click();
+      }
+    }
+  });
+  cy.url({ timeout: 20000 }).should('contain', '#/nc/');
 });
 
-Cypress.Commands.add("refreshTableTab", () => {
-    cy.task("log", `[refreshTableTab]`);
+Cypress.Commands.add('refreshTableTab', () => {
+  cy.task('log', `[refreshTableTab]`);
 
-    cy.get(".nc-project-tree")
-        .find(".v-list-item__title:contains(Tables)", { timeout: 10000 })
-        .should("exist")
-        .first()
-        .rightclick({ force: true });
+  cy.get('.nc-project-tree')
+    .find('.v-list-item__title:contains(Tables)', { timeout: 10000 })
+    .should('exist')
+    .first()
+    .rightclick({ force: true });
 
-    cy.getActiveMenu()
-        .find('[role="menuitem"]')
-        .contains("Tables Refresh")
-        .should("exist")
-        .click({ force: true });
+  cy.getActiveMenu()
+    .find('[role="menuitem"]')
+    .contains('Tables Refresh')
+    .should('exist')
+    .click({ force: true });
 
-    cy.toastWait("Tables refreshed");
+  cy.toastWait('Tables refreshed');
 });
 
 // tn: table name
 // rc: row count. validate row count if rc!=0
-Cypress.Commands.add("openTableTab", (tn, rc) => {
-    cy.task("log", `[openTableTab] ${tn} ${rc}`);
+Cypress.Commands.add('openTableTab', (tn, rc) => {
+  cy.task('log', `[openTableTab] ${tn} ${rc}`);
+
+  cy.get(`.nc-project-tree-tbl-${tn}`)
+    .should('exist')
+    .first()
+    .click();
+
+  // kludge to make new tab active
+  // cy.get('.ant-tabs-tab-btn')
+  //   .contains(tn)
+  //   .should('exist')
+  //   .click();
+  cy.wait(3000);
+
+  cy.get('.xc-row-table.nc-grid').should('exist');
+
+  // wait for page rendering to complete
+  if (rc != 0) {
+    cy.get('.nc-grid-row').should('have.length', rc);
+  }
+});
 
-    cy.get(`.nc-project-tree-tbl-${tn}`)
-      .should("exist")
-      .first()
-      .click();
+Cypress.Commands.add('closeTableTab', (tn) => {
+  cy.task('log', `[closeTableTab] ${tn}`);
+  cy.get('.ant-tabs-tab-btn')
+    .contains(tn)
+    .should('exist')
+    .parent()
+    .parent()
+    .parent()
+    .find('button')
+    .click();
+
+  // subsequent tab open commands will fail if tab is not closed completely
+  cy.wait(1000);
+});
 
-    // kludge to make new tab active
-    // cy.get('.ant-tabs-tab-btn')
-    //   .contains(tn)
-    //   .should('exist')
-    //   .click();
-    cy.wait(3000);
+Cypress.Commands.add('openOrCreateGqlProject', (_args) => {
+  const args = Object.assign({ new: false, meta: false }, _args);
 
-    cy.get('.xc-row-table.nc-grid').should('exist');
+  cy.signinOrSignup();
 
-    // wait for page rendering to complete
-    if (rc != 0) {
-        cy.get(".nc-grid-row").should("have.length", rc);
+  cy.get('.nc-new-project-menu').should('exist');
+  cy.get('body').then(($body) => {
+    const filter = args.meta
+      ? '.nc-meta-project-row'
+      : ':not(.nc-meta-project-row)';
+    // if project exist open
+    if (
+      $body.find('.nc-graphql-project-row').filter(filter).length &&
+      !args.new
+    ) {
+      cy.get('.nc-graphql-project-row').filter(filter).first().click();
+    } else {
+      cy.contains('New Project')
+        .trigger('onmouseover')
+        .trigger('mouseenter');
+      if (args.meta) {
+        cy.get('.nc-create-xc-db-project').click();
+        cy.url({ timeout: 6000 }).should('contain', '#/project/xcdb');
+        cy.contains('GRAPHQL APIs').closest('label').click();
+        cy.get('.nc-metadb-project-name').type(
+          'test_proj' + Date.now()
+        );
+        cy.contains('button', 'Create', { timeout: 3000 }).click();
+      } else {
+        cy.get('.nc-create-external-db-project').click();
+        cy.url({ timeout: 6000 }).should('contain', '#/project');
+        cy.contains('GRAPHQL APIs').closest('label').click();
+        cy.get('.database-field input').click().clear().type('sakila');
+        cy.contains('Test Database Connection').click();
+        cy.contains('Ok & Save Project').should('exist').click();
+      }
     }
-});
-
-Cypress.Commands.add("closeTableTab", (tn) => {
-    cy.task("log", `[closeTableTab] ${tn}`);
-    cy.get('.ant-tabs-tab-btn')
-      .contains(tn)
-      .should('exist')
-      .parent()
-      .parent()
-      .parent()
-      .find('button')
-      .click();
-
-    // subsequent tab open commands will fail if tab is not closed completely
-    cy.wait(1000);
-});
-
-Cypress.Commands.add("openOrCreateGqlProject", (_args) => {
-    const args = Object.assign({ new: false, meta: false }, _args);
-
-    cy.signinOrSignup();
-
-    cy.get(".nc-new-project-menu").should("exist");
-    cy.get("body").then(($body) => {
-        const filter = args.meta
-            ? ".nc-meta-project-row"
-            : ":not(.nc-meta-project-row)";
-        // if project exist open
-        if (
-            $body.find(".nc-graphql-project-row").filter(filter).length &&
-            !args.new
-        ) {
-            cy.get(".nc-graphql-project-row").filter(filter).first().click();
-        } else {
-            cy.contains("New Project")
-                .trigger("onmouseover")
-                .trigger("mouseenter");
-            if (args.meta) {
-                cy.get(".nc-create-xc-db-project").click();
-                cy.url({ timeout: 6000 }).should("contain", "#/project/xcdb");
-                cy.contains("GRAPHQL APIs").closest("label").click();
-                cy.get(".nc-metadb-project-name").type(
-                    "test_proj" + Date.now()
-                );
-                cy.contains("button", "Create", { timeout: 3000 }).click();
-            } else {
-                cy.get(".nc-create-external-db-project").click();
-                cy.url({ timeout: 6000 }).should("contain", "#/project");
-                cy.contains("GRAPHQL APIs").closest("label").click();
-                cy.get(".database-field input").click().clear().type("sakila");
-                cy.contains("Test Database Connection").click();
-                cy.contains("Ok & Save Project").should('exist').click();
-            }
-        }
-    });
-    cy.url({ timeout: 20000 }).should("contain", "#/nc/");
+  });
+  cy.url({ timeout: 20000 }).should('contain', '#/nc/');
 });
 
 let LOCAL_STORAGE_MEMORY = {};
 let LOCAL_STORAGE_MEMORY_v2 = {};
 
-Cypress.Commands.add("saveLocalStorage", (name) => {
-    if(name) {
-        cy.task('log', `[saveLocalStorage] ${name}`);
-        LOCAL_STORAGE_MEMORY_v2[name] = {}
-        Object.keys(localStorage).forEach((key) => {
-            LOCAL_STORAGE_MEMORY_v2[name][key] = localStorage[key];
-        });
-        return;
-    }
-
-    LOCAL_STORAGE_MEMORY = {};
+Cypress.Commands.add('saveLocalStorage', (name) => {
+  if (name) {
+    cy.task('log', `[saveLocalStorage] ${name}`);
+    LOCAL_STORAGE_MEMORY_v2[name] = {};
     Object.keys(localStorage).forEach((key) => {
-        LOCAL_STORAGE_MEMORY[key] = localStorage[key];
+      LOCAL_STORAGE_MEMORY_v2[name][key] = localStorage[key];
     });
-    cy.printLocalStorage();
-
-});
+    return;
+  }
 
-Cypress.Commands.add("restoreLocalStorage", (name) => {
-    if(name) {
-        cy.task('log', `[restoreLocalStorage] ${name}`);
-        Object.keys(LOCAL_STORAGE_MEMORY_v2[name]).forEach((key) => {
-            localStorage.setItem(key, LOCAL_STORAGE_MEMORY_v2[name][key]);
-        });
-        return;
-    }
+  LOCAL_STORAGE_MEMORY = {};
+  Object.keys(localStorage).forEach((key) => {
+    LOCAL_STORAGE_MEMORY[key] = localStorage[key];
+  });
+  cy.printLocalStorage();
 
-    cy.deleteLocalStorage().then(() => {
-        Object.keys(LOCAL_STORAGE_MEMORY).forEach((key) => {
-            localStorage.setItem(key, LOCAL_STORAGE_MEMORY[key]);
-        });
+});
 
-        cy.printLocalStorage();
+Cypress.Commands.add('restoreLocalStorage', (name) => {
+  if (name) {
+    cy.task('log', `[restoreLocalStorage] ${name}`);
+    Object.keys(LOCAL_STORAGE_MEMORY_v2[name]).forEach((key) => {
+      localStorage.setItem(key, LOCAL_STORAGE_MEMORY_v2[name][key]);
     });
-});
+    return;
+  }
 
-Cypress.Commands.add("deleteLocalStorage", () => {
+  cy.deleteLocalStorage().then(() => {
     Object.keys(LOCAL_STORAGE_MEMORY).forEach((key) => {
-        localStorage.removeItem(key);
+      localStorage.setItem(key, LOCAL_STORAGE_MEMORY[key]);
     });
+
+    cy.printLocalStorage();
+  });
+});
+
+Cypress.Commands.add('deleteLocalStorage', () => {
+  Object.keys(LOCAL_STORAGE_MEMORY).forEach((key) => {
+    localStorage.removeItem(key);
+  });
 });
 
 Cypress.Commands.add('printLocalStorage', () => {
-    cy.task('log', `[printLocalStorage]`);
-    cy.task('log', JSON.stringify(localStorage, null, 2));
-    cy.task('log', JSON.stringify(LOCAL_STORAGE_MEMORY, null, 2));
-})
+  cy.task('log', `[printLocalStorage]`);
+  cy.task('log', JSON.stringify(localStorage, null, 2));
+  cy.task('log', JSON.stringify(LOCAL_STORAGE_MEMORY, null, 2));
+});
 
-Cypress.Commands.add("getActiveModal", () => {
-    return cy.get(".ant-modal-content:visible").last()
+Cypress.Commands.add('getActiveModal', () => {
+  return cy.get('.ant-modal-content:visible').last();
 });
 
-Cypress.Commands.add("getActiveMenu", () => {
-    return cy.get(".ant-dropdown-content:visible").last();
+Cypress.Commands.add('getActiveMenu', (overlayClassName) => {
+  if (overlayClassName) {
+    return cy.get(`${overlayClassName} .ant-dropdown-content:visible`);
+  }
+  return cy.get('.ant-dropdown-content:visible').last();
 });
 
-Cypress.Commands.add("getActivePopUp", () => {
-    return cy.get(".ant-menu-submenu-popup:visible").last();
-})
+Cypress.Commands.add('getActivePopUp', () => {
+  return cy.get('.ant-menu-submenu-popup:visible').last();
+});
 
-Cypress.Commands.add("getActiveSelection", () => {
-    return cy.get(".ant-select-dropdown:visible").last();
-})
+Cypress.Commands.add('getActiveSelection', () => {
+  return cy.get('.ant-select-dropdown:visible').last();
+});
 
-Cypress.Commands.add("getActiveDrawer", () => {
-    return cy.get(".ant-drawer-content:visible").last();
+Cypress.Commands.add('getActiveDrawer', () => {
+  return cy.get('.ant-drawer-content:visible').last();
 });
 
-Cypress.Commands.add("getActivePicker", () => {
-    return cy.get(".ant-picker-dropdown :visible").last();
+Cypress.Commands.add('getActivePicker', () => {
+  return cy.get('.ant-picker-dropdown :visible').last();
 });
 
-Cypress.Commands.add("createTable", (name) => {
-    cy.task("log", `[createTableTab] ${name}`);
-    cy.wait(1000);
-    cy.get('.nc-add-new-table').should('exist').click();
-    cy.wait(1000);
-    cy.getActiveModal().find(`input[type="text"]:visible`)
-      .click()
-      .clear()
-      .type(name)
-    // submit button
-    cy.getActiveModal().find("button.ant-btn-primary:visible").click();
-    cy.wait(1000)
-    cy.get('.xc-row-table.nc-grid').should('exist');
-    // cy.get('.ant-tabs-tab-active > .ant-tabs-tab-btn').contains(name).should("exist");
-    cy.url().should("contain", `table/${name}`);
-    cy.get(`.nc-project-tree-tbl-${name}`).should("exist");
-    cy.wait(1000)
+Cypress.Commands.add('createTable', (name) => {
+  cy.task('log', `[createTableTab] ${name}`);
+  cy.wait(1000);
+  cy.get('.nc-add-new-table').should('exist').click();
+  cy.wait(1000);
+  cy.getActiveModal().find(`input[type="text"]:visible`)
+    .click()
+    .clear()
+    .type(name);
+  // submit button
+  cy.getActiveModal().find('button.ant-btn-primary:visible').click();
+  cy.wait(1000);
+  cy.get('.xc-row-table.nc-grid').should('exist');
+  // cy.get('.ant-tabs-tab-active > .ant-tabs-tab-btn').contains(name).should("exist");
+  cy.url().should('contain', `table/${name}`);
+  cy.get(`.nc-project-tree-tbl-${name}`).should('exist');
+  cy.wait(1000);
 });
 
-Cypress.Commands.add("deleteTable", (name, dbType) => {
-    cy.get(`.nc-project-tree-tbl-${name}`).should("exist").rightclick();
-    cy.getActiveMenu().find('[role="menuitem"]').contains("Delete").click();
-    cy.getActiveModal().find("button").contains("Yes").click();
+Cypress.Commands.add('deleteTable', (name, dbType) => {
+  cy.get(`.nc-project-tree-tbl-${name}`).should('exist').rightclick();
+  cy.getActiveMenu().find('[role="menuitem"]').contains('Delete').click();
+  cy.getActiveModal().find('button').contains('Yes').click();
 
-    cy.toastWait(`Deleted table successfully`);
+  cy.toastWait(`Deleted table successfully`);
 });
 
-Cypress.Commands.add("renameTable", (oldName, newName) => {
+Cypress.Commands.add('renameTable', (oldName, newName) => {
 
-    // right click on project table name
-    cy.get(`.nc-project-tree-tbl-${oldName}`)
-        .should('exist')
-        .first()
-        .rightclick();
+  // right click on project table name
+  cy.get(`.nc-project-tree-tbl-${oldName}`)
+    .should('exist')
+    .first()
+    .rightclick();
 
-    // choose rename option from menu
-    cy.getActiveMenu()
-        .find('[role="menuitem"]')
-        .contains("Rename")
-        .click({ force: true });
+  // choose rename option from menu
+  cy.getActiveMenu()
+    .find('[role="menuitem"]')
+    .contains('Rename')
+    .click({ force: true });
 
-    // feed new name
-    cy.getActiveModal().find("input").clear().type(newName);
+  // feed new name
+  cy.getActiveModal().find('input').clear().type(newName);
 
-    // submit
-    cy.getActiveModal().find("button").contains("Submit").click();
+  // submit
+  cy.getActiveModal().find('button').contains('Submit').click();
 
-    cy.toastWait("Table renamed successfully");
+  cy.toastWait('Table renamed successfully');
 
 });
 
-Cypress.Commands.add("createColumn", (table, columnName) => {
-    cy.get(".nc-project-tree")
-        .find(".v-list-item__title:contains(Tables)")
-        .should('exist')
-        .first()
-        .click();
-    cy.get(".nc-project-tree")
-        .contains(table)
-        .should('exist')
-        .first()
-        .click({ force: true });
-    cy.get(`.project-tab:contains(${table}):visible`).should("exist");
-    cy.get(".v-window-item--active .nc-grid  tr > th:last button").click({
-        force: true,
-    });
-    cy.get(".nc-column-name-input input").clear().type(columnName);
-    cy.getActiveMenu("Menu_CreateColumn");
-    cy.get(".nc-col-create-or-edit-card").contains("Save").click();
-    cy.get("th:contains(new_column)").should("exist");
+Cypress.Commands.add('createColumn', (table, columnName) => {
+  cy.get('.nc-project-tree')
+    .find('.v-list-item__title:contains(Tables)')
+    .should('exist')
+    .first()
+    .click();
+  cy.get('.nc-project-tree')
+    .contains(table)
+    .should('exist')
+    .first()
+    .click({ force: true });
+  cy.get(`.project-tab:contains(${table}):visible`).should('exist');
+  cy.get('.v-window-item--active .nc-grid  tr > th:last button').click({
+    force: true,
+  });
+  cy.get('.nc-column-name-input input').clear().type(columnName);
+  cy.getActiveMenu('Menu_CreateColumn');
+  cy.get('.nc-col-create-or-edit-card').contains('Save').click();
+  cy.get('th:contains(new_column)').should('exist');
 });
 
-Cypress.Commands.add("toastWait", (msg) => {
-    // cy.get('.ant-message-notice-content:visible', { timout: 30000 }).should('exist')
-    cy.get('.ant-message-notice-content:visible', { timout: 30000 }).contains(msg).should('exist')
-    cy.get('.ant-message-notice-content:visible', { timout: 12000 }).should('not.exist')
+Cypress.Commands.add('toastWait', (msg) => {
+  // cy.get('.ant-message-notice-content:visible', { timout: 30000 }).should('exist')
+  cy.get('.ant-message-notice-content:visible', { timout: 30000 }).contains(msg).should('exist');
+  cy.get('.ant-message-notice-content:visible', { timout: 12000 }).should('not.exist');
 });
 
 // vn: view name
 // rc: expected row count. validate row count if rc!=0
-Cypress.Commands.add("openViewsTab", (vn, rc) => {
-    cy.task("log", `[openViewsTab] ${vn} ${rc}`);
-
-    cy.get(`.nc-project-tree-tbl-${vn}`, { timeout: 10000 }).should("exist")
-      .first()
-      .click({ force: true });
-
-    // kludge to make new tab active
-    cy.get('.ant-tabs-tab-btn')
-      .contains(vn)
-      .should('exist')
-      .click({ force: true });
-
-    // wait for page rendering to complete
-    if (rc != 0) {
-        cy.get('.xc-row-table.nc-grid').should('exist');
-        cy.get(".nc-grid-row").should("have.length", rc);
-    }
+Cypress.Commands.add('openViewsTab', (vn, rc) => {
+  cy.task('log', `[openViewsTab] ${vn} ${rc}`);
+
+  cy.get(`.nc-project-tree-tbl-${vn}`, { timeout: 10000 }).should('exist')
+    .first()
+    .click({ force: true });
+
+  // kludge to make new tab active
+  cy.get('.ant-tabs-tab-btn')
+    .contains(vn)
+    .should('exist')
+    .click({ force: true });
+
+  // wait for page rendering to complete
+  if (rc != 0) {
+    cy.get('.xc-row-table.nc-grid').should('exist');
+    cy.get('.nc-grid-row').should('have.length', rc);
+  }
 });
 
-Cypress.Commands.add("closeViewsTab", (vn) => {
-    cy.task("log", `[closeViewsTab] ${vn}`);
-    cy.get('.ant-tabs-tab-btn')
-      .contains(vn)
-      .should('exist')
-      .parent()
-      .parent()
-      .parent()
-      .find('button')
-      .click();
+Cypress.Commands.add('closeViewsTab', (vn) => {
+  cy.task('log', `[closeViewsTab] ${vn}`);
+  cy.get('.ant-tabs-tab-btn')
+    .contains(vn)
+    .should('exist')
+    .parent()
+    .parent()
+    .parent()
+    .find('button')
+    .click();
 });
 
 // Support for screen-shots
@@ -424,66 +427,66 @@ Cypress.Commands.add("closeViewsTab", (vn) => {
 let screenShotDb = [];
 
 // snip entire screen
-Cypress.Commands.add("snip", (filename) => {
-    if (
-        true === Cypress.env("screenshot") &&
-        false === screenShotDb.includes(filename)
-    ) {
-        let storeName = `${screenShotDb.length}_${filename}`;
-        screenShotDb.push(filename);
-        cy.wait(1000);
-        cy.screenshot(storeName, { overwrite: true });
-    }
+Cypress.Commands.add('snip', (filename) => {
+  if (
+    true === Cypress.env('screenshot') &&
+    false === screenShotDb.includes(filename)
+  ) {
+    let storeName = `${screenShotDb.length}_${filename}`;
+    screenShotDb.push(filename);
+    cy.wait(1000);
+    cy.screenshot(storeName, { overwrite: true });
+  }
 });
 
 // snip current modal
-Cypress.Commands.add("snipActiveModal", (filename) => {
-    if (
-        true === Cypress.env("screenshot") &&
-        false === screenShotDb.includes(filename)
-    ) {
-        let storeName = `${screenShotDb.length}_${filename}`;
-        screenShotDb.push(filename);
-        cy.wait(1000);
-        // cy.getActiveModal().screenshot(filename, {
-        //     padding: 0,
-        //     overwrite: true,
-        // });
-        cy.screenshot(storeName, { overwrite: true });
-    }
+Cypress.Commands.add('snipActiveModal', (filename) => {
+  if (
+    true === Cypress.env('screenshot') &&
+    false === screenShotDb.includes(filename)
+  ) {
+    let storeName = `${screenShotDb.length}_${filename}`;
+    screenShotDb.push(filename);
+    cy.wait(1000);
+    // cy.getActiveModal().screenshot(filename, {
+    //     padding: 0,
+    //     overwrite: true,
+    // });
+    cy.screenshot(storeName, { overwrite: true });
+  }
 });
 
 // snip current menu
-Cypress.Commands.add("snipActiveMenu", (filename) => {
-    if (
-        true === Cypress.env("screenshot") &&
-        false === screenShotDb.includes(filename)
-    ) {
-        let storeName = `${screenShotDb.length}_${filename}`;
-        screenShotDb.push(filename);
-        cy.wait(1000);
-        // cy.getActiveMenu().screenshot(filename, {
-        //     padding: 0,
-        //     overwrite: true,
-        // });
-        cy.screenshot(storeName, { overwrite: true });
-    }
+Cypress.Commands.add('snipActiveMenu', (filename) => {
+  if (
+    true === Cypress.env('screenshot') &&
+    false === screenShotDb.includes(filename)
+  ) {
+    let storeName = `${screenShotDb.length}_${filename}`;
+    screenShotDb.push(filename);
+    cy.wait(1000);
+    // cy.getActiveMenu().screenshot(filename, {
+    //     padding: 0,
+    //     overwrite: true,
+    // });
+    cy.screenshot(storeName, { overwrite: true });
+  }
 });
 
 // pre-test file hook
-Cypress.Commands.add("fileHook", () => {
-    window.localStorage.setItem('vueuse-color-scheme', 'light')
+Cypress.Commands.add('fileHook', () => {
+  window.localStorage.setItem('vueuse-color-scheme', 'light');
 });
 
-Cypress.Commands.add("signOut", () => {
-    // sign out
-    cy.visit(`/`);
-    cy.get('.nc-project-page-title', {timeout: 30000}).contains("My Projects").should("be.visible");
-    cy.get('.nc-menu-accounts', {timeout: 30000}).should('exist').click();
-    cy.getActiveMenu().find('.ant-dropdown-menu-item').eq(1).click();
+Cypress.Commands.add('signOut', () => {
+  // sign out
+  cy.visit(`/`);
+  cy.get('.nc-project-page-title', { timeout: 30000 }).contains('My Projects').should('be.visible');
+  cy.get('.nc-menu-accounts', { timeout: 30000 }).should('exist').click();
+  cy.getActiveMenu().find('.ant-dropdown-menu-item').eq(1).click();
 
-    cy.wait(5000);
-    cy.get('button:contains("SIGN")').should('exist')
+  cy.wait(5000);
+  cy.get('button:contains("SIGN")').should('exist');
 });
 
 
diff --git a/scripts/cypress/support/page_objects/mainPage.js b/scripts/cypress/support/page_objects/mainPage.js
index ba2348498c..e012d15e83 100644
--- a/scripts/cypress/support/page_objects/mainPage.js
+++ b/scripts/cypress/support/page_objects/mainPage.js
@@ -313,7 +313,7 @@ export class _mainPage {
     sortField = (field, criteria) => {
         cy.get(".nc-sort-menu-btn").click();
         cy.wait(500)
-        cy.getActiveMenu().contains("Add Sort Option").click();
+        cy.getActiveMenu('.sort-menu-overlay').contains("Add Sort Option").click();
         cy.wait(500)
         // cy.get(".nc-sort-field-select div").first().click().type(field);
         cy.get(".nc-sort-field-select div").first().click();
@@ -322,7 +322,7 @@ export class _mainPage {
         cy.wait(500)
         cy.get(".nc-sort-dir-select div").first().click();
         cy.wait(500)
-        cy.get('.ant-select-dropdown:visible').find(`.ant-select-item`).contains(criteria).should('exist').click();
+        cy.get('.sort-dir-dropdown.ant-select-dropdown:visible').find(`.ant-select-item`).contains(criteria).should('exist').click();
         cy.wait(500)
         cy.get(".nc-sort-menu-btn").click();
         cy.wait(500)
diff --git a/scripts/sdk/swagger.json b/scripts/sdk/swagger.json
index d484f4d2be..3c689efa22 100644
--- a/scripts/sdk/swagger.json
+++ b/scripts/sdk/swagger.json
@@ -3393,7 +3393,12 @@
         "operationId": "db-table-row-delete",
         "responses": {
           "200": {
-            "description": "OK"
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
           }
         },
         "tags": [