diff --git a/apps/docs/features/ui/CodeBlock/CodeBlock.tsx b/apps/docs/features/ui/CodeBlock/CodeBlock.tsx
index c79c416b9a620..83c074ed5cff6 100644
--- a/apps/docs/features/ui/CodeBlock/CodeBlock.tsx
+++ b/apps/docs/features/ui/CodeBlock/CodeBlock.tsx
@@ -64,7 +64,7 @@ export async function CodeBlock({
         'group',
         'relative',
         'not-prose',
-        'w-full overflow-hidden',
+        'w-full overflow-x-auto',
         'border border-default rounded-lg',
         'bg-200',
         'text-sm',
diff --git a/apps/docs/styles/main.scss b/apps/docs/styles/main.scss
index a581a22e6cd24..02fc3958d6478 100644
--- a/apps/docs/styles/main.scss
+++ b/apps/docs/styles/main.scss
@@ -359,8 +359,11 @@ th code {
 }
 
 /* Word wrap styles for code blocks */
-.shiki[data-wrapped='true'] .code-content {
+.shiki[data-wrapped='true'] {
   overflow-x: hidden !important;
+}
+
+.shiki[data-wrapped='true'] .code-content {
   white-space: pre-wrap !important;
   word-break: break-word !important;
 }
diff --git a/apps/studio/components/grid/SupabaseGrid.utils.ts b/apps/studio/components/grid/SupabaseGrid.utils.ts
index b6401bbbb8b33..289acb8791069 100644
--- a/apps/studio/components/grid/SupabaseGrid.utils.ts
+++ b/apps/studio/components/grid/SupabaseGrid.utils.ts
@@ -5,16 +5,15 @@ import { CalculatedColumn, CellKeyboardEvent } from 'react-data-grid'
 
 import type { Filter, SavedState } from 'components/grid/types'
 import { Entity, isTableLike } from 'data/table-editor/table-editor-types'
+import { BASE_PATH } from 'lib/constants'
 import { useSearchParams } from 'next/navigation'
-import { parseAsBoolean, parseAsNativeArrayOf, parseAsString, useQueryStates } from 'nuqs'
+import { parseAsNativeArrayOf, parseAsString, useQueryStates } from 'nuqs'
 import { copyToClipboard } from 'ui'
 import { FilterOperatorOptions } from './components/header/filter/Filter.constants'
 import { STORAGE_KEY_PREFIX } from './constants'
 import type { Sort, SupaColumn, SupaTable } from './types'
 import { formatClipboardValue } from './utils/common'
 
-export const LOAD_TAB_FROM_CACHE_PARAM = 'loadFromCache'
-
 export function formatSortURLParams(tableName: string, sort?: string[]): Sort[] {
   if (Array.isArray(sort)) {
     return compact(
@@ -29,7 +28,7 @@ export function formatSortURLParams(tableName: string, sort?: string[]): Sort[]
   return []
 }
 
-export function sortsToUrlParams(sorts: Sort[]) {
+export function sortsToUrlParams(sorts: { column: string; ascending?: boolean }[]) {
   return sorts.map((sort) => `${sort.column}:${sort.ascending ? 'asc' : 'desc'}`)
 }
 
@@ -54,7 +53,9 @@ export function formatFilterURLParams(filter?: string[]): Filter[] {
   ) as Filter[]
 }
 
-export function filtersToUrlParams(filters: Filter[]) {
+export function filtersToUrlParams(
+  filters: { column: string | Array<string>; operator: string; value: string }[]
+) {
   return filters.map((filter) => {
     const selectedOperator = FilterOperatorOptions.find(
       (option) => option.value === filter.operator
@@ -134,50 +135,75 @@ export function getStorageKey(prefix: string, ref: string) {
 
 export function loadTableEditorStateFromLocalStorage(
   projectRef: string,
-  tableName: string,
-  schema?: string | null
+  tableId: number
 ): SavedState | undefined {
   const storageKey = getStorageKey(STORAGE_KEY_PREFIX, projectRef)
   // Prefer sessionStorage (scoped to current tab) over localStorage
   const jsonStr = sessionStorage.getItem(storageKey) ?? localStorage.getItem(storageKey)
   if (!jsonStr) return
   const json = JSON.parse(jsonStr)
-  const tableKey = !schema || schema == 'public' ? tableName : `${schema}.${tableName}`
-  return json[tableKey]
+  return json[tableId]
+}
+
+/**
+ * Builds a table editor URL with the given project reference, table ID. It will load the saved state from local storage
+ * and add the sort and filter parameters to the URL.
+ */
+export function buildTableEditorUrl({
+  projectRef = 'default',
+  tableId,
+  schema,
+}: {
+  projectRef?: string
+  tableId: number
+  schema?: string
+}) {
+  const url = new URL(`${BASE_PATH}/project/${projectRef}/editor/${tableId}`, location.origin)
+
+  // If the schema is provided, add it to the URL so that the left sidebar is opened to the correct schema
+  if (schema) {
+    url.searchParams.set('schema', schema)
+  }
+
+  const savedState = loadTableEditorStateFromLocalStorage(projectRef, tableId)
+  if (savedState?.sorts && savedState.sorts.length > 0) {
+    savedState.sorts?.forEach((sort) => url.searchParams.append('sort', sort))
+  }
+  if (savedState?.filters && savedState.filters.length > 0) {
+    savedState.filters?.forEach((filter) => url.searchParams.append('filter', filter))
+  }
+  return url.toString()
 }
 
 export function saveTableEditorStateToLocalStorage({
   projectRef,
-  tableName,
-  schema,
+  tableId,
   gridColumns,
   sorts,
   filters,
 }: {
   projectRef: string
-  tableName: string
-  schema?: string | null
+  tableId: number
   gridColumns?: CalculatedColumn<any, any>[]
   sorts?: string[]
   filters?: string[]
 }) {
   const storageKey = getStorageKey(STORAGE_KEY_PREFIX, projectRef)
   const savedStr = sessionStorage.getItem(storageKey) ?? localStorage.getItem(storageKey)
-  const tableKey = !schema || schema == 'public' ? tableName : `${schema}.${tableName}`
 
   const config = {
     ...(gridColumns !== undefined && { gridColumns }),
-    ...(sorts !== undefined && { sorts }),
-    ...(filters !== undefined && { filters }),
+    ...(sorts !== undefined && { sorts: sorts.filter((sort) => sort !== '') }),
+    ...(filters !== undefined && { filters: filters.filter((filter) => filter !== '') }),
   }
 
   let savedJson
   if (savedStr) {
     savedJson = JSON.parse(savedStr)
-    const previousConfig = savedJson[tableKey]
-    savedJson = { ...savedJson, [tableKey]: { ...previousConfig, ...config } }
+    const previousConfig = savedJson[tableId]
+    savedJson = { ...savedJson, [tableId]: { ...previousConfig, ...config } }
   } else {
-    savedJson = { [tableKey]: config }
+    savedJson = { [tableId]: config }
   }
   // Save to both localStorage and sessionStorage so it's consistent to current tab
   localStorage.setItem(storageKey, JSON.stringify(savedJson))
@@ -193,8 +219,7 @@ function getLatestParams() {
   const queryParams = new URLSearchParams(window.location.search)
   const sort = queryParams.getAll('sort')
   const filter = queryParams.getAll('filter')
-  const loadFromCache = !!queryParams.get(LOAD_TAB_FROM_CACHE_PARAM)
-  return { sort, filter, loadFromCache }
+  return { sort, filter }
 }
 
 export function useSyncTableEditorStateFromLocalStorageWithUrl({
@@ -209,7 +234,6 @@ export function useSyncTableEditorStateFromLocalStorageWithUrl({
     {
       sort: parseAsNativeArrayOf(parseAsString),
       filter: parseAsNativeArrayOf(parseAsString),
-      [LOAD_TAB_FROM_CACHE_PARAM]: parseAsBoolean.withDefault(false),
     },
     {
       history: 'replace',
@@ -220,8 +244,7 @@ export function useSyncTableEditorStateFromLocalStorageWithUrl({
   const urlParams = useMemo(() => {
     const sort = searchParams.getAll('sort')
     const filter = searchParams.getAll('filter')
-    const loadFromCache = !!searchParams.get(LOAD_TAB_FROM_CACHE_PARAM)
-    return { sort, filter, loadFromCache }
+    return { sort, filter }
   }, [searchParams])
 
   useEffect(() => {
@@ -232,25 +255,12 @@ export function useSyncTableEditorStateFromLocalStorageWithUrl({
     // `urlParams` from `useQueryStates` can be stale so always get the latest from the URL
     const latestUrlParams = getLatestParams()
 
-    if (latestUrlParams.loadFromCache) {
-      const savedState = loadTableEditorStateFromLocalStorage(projectRef, table.name, table.schema)
-      updateUrlParams(
-        {
-          sort: savedState?.sorts ?? [],
-          filter: savedState?.filters ?? [],
-          loadFromCache: false,
-        },
-        { clearOnDefault: true }
-      )
-    } else {
-      saveTableEditorStateToLocalStorage({
-        projectRef,
-        tableName: table.name,
-        schema: table.schema,
-        sorts: latestUrlParams.sort,
-        filters: latestUrlParams.filter,
-      })
-    }
+    saveTableEditorStateToLocalStorage({
+      projectRef,
+      tableId: table.id,
+      sorts: latestUrlParams.sort,
+      filters: latestUrlParams.filter,
+    })
   }, [urlParams, table, projectRef])
 }
 
diff --git a/apps/studio/components/interfaces/BranchManagement/BranchPanels.tsx b/apps/studio/components/interfaces/BranchManagement/BranchPanels.tsx
index f1a67a24999d1..c9f752df7aae7 100644
--- a/apps/studio/components/interfaces/BranchManagement/BranchPanels.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/BranchPanels.tsx
@@ -81,6 +81,10 @@ export const BranchRow = ({
   const page = router.pathname.split('/').pop()
 
   const daysFromNow = dayjs().diff(dayjs(branch.updated_at), 'day')
+  const willBeDeletedIn = branch.deletion_scheduled_at
+    ? dayjs(branch.deletion_scheduled_at).diff(dayjs(), 'minutes')
+    : null
+  const isDeletionPending = willBeDeletedIn !== null && willBeDeletedIn < 0
   const formattedTimeFromNow = dayjs(branch.updated_at).fromNow()
   const formattedUpdatedAt = dayjs(branch.updated_at).format('DD MMM YYYY, HH:mm:ss (ZZ)')
 
@@ -125,9 +129,19 @@ export const BranchRow = ({
         </Tooltip>
       </div>
       <div className="flex items-center gap-x-4">
-        <p className="text-xs text-foreground-lighter">
-          {daysFromNow > 1 ? `Updated on ${formattedUpdatedAt}` : `Updated ${formattedTimeFromNow}`}
-        </p>
+        {branch.deletion_scheduled_at ? (
+          <p className="text-xs text-foreground-lighter">
+            {isDeletionPending
+              ? 'Deletion pending...'
+              : `Will be deleted in ${willBeDeletedIn} minutes`}
+          </p>
+        ) : (
+          <p className="text-xs text-foreground-lighter">
+            {daysFromNow > 1
+              ? `Updated on ${formattedUpdatedAt}`
+              : `Updated ${formattedTimeFromNow}`}
+          </p>
+        )}
         <WorkflowLogs projectRef={branch.project_ref} status={branch.status} />
         {rowActions}
       </div>
diff --git a/apps/studio/components/interfaces/BranchManagement/Overview.tsx b/apps/studio/components/interfaces/BranchManagement/Overview.tsx
index aa498cb98aebf..20f9e947c25b3 100644
--- a/apps/studio/components/interfaces/BranchManagement/Overview.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/Overview.tsx
@@ -39,6 +39,7 @@ import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'
 import { BranchLoader, BranchManagementSection, BranchRow, BranchRowLoader } from './BranchPanels'
 import { EditBranchModal } from './EditBranchModal'
 import { PreviewBranchesEmptyState } from './EmptyStates'
+import { useBranchRestoreMutation } from 'data/branches/branch-restore-mutation'
 
 interface OverviewProps {
   isGithubConnected: boolean
@@ -63,8 +64,12 @@ export const Overview = ({
   onSelectDeleteBranch,
   generateCreatePullRequestURL,
 }: OverviewProps) => {
-  const [persistentBranches, ephemeralBranches] = partition(
+  const [scheduledForDeletionBranches, aliveBranches] = partition(
     previewBranches,
+    (branch) => branch.deletion_scheduled_at !== undefined
+  )
+  const [persistentBranches, ephemeralBranches] = partition(
+    aliveBranches,
     (branch) => branch.persistent
   )
   const { ref: projectRef } = useParams()
@@ -186,6 +191,35 @@ export const Overview = ({
             )
           })}
       </BranchManagementSection>
+      {/* Scheduled for deletion branches section */}
+      <BranchManagementSection header="Scheduled for deletion branches">
+        {isLoading && <BranchLoader />}
+        {isSuccess && scheduledForDeletionBranches.length === 0 && (
+          <div className="flex items-center flex-col justify-center w-full py-10">
+            <p>No scheduled for deletion branches</p>
+          </div>
+        )}
+        {isSuccess &&
+          scheduledForDeletionBranches.map((branch) => {
+            return (
+              <BranchRow
+                isGithubConnected={isGithubConnected}
+                key={branch.id}
+                repo={repo}
+                branch={branch}
+                rowActions={
+                  <PreviewBranchActions
+                    branch={branch}
+                    repo={repo}
+                    // If a scheduled for deletion branch is deleted, we force the deletion
+                    onSelectDeleteBranch={() => onSelectDeleteBranch(branch)}
+                    generateCreatePullRequestURL={generateCreatePullRequestURL}
+                  />
+                }
+              />
+            )
+          })}
+      </BranchManagementSection>
     </>
   )
 }
@@ -213,13 +247,14 @@ const PreviewBranchActions = ({
     PermissionAction.UPDATE,
     'preview_branches'
   )
+  // If user can update branches, they can restore branches
+  const canRestoreBranches = canUpdateBranches
 
   const { data } = useBranchQuery({ projectRef, branchRef })
   const isBranchActiveHealthy = data?.status === 'ACTIVE_HEALTHY'
   const isPersistentBranch = branch.persistent
 
-  const { hasAccess: hasAccessToPersistentBranching, isLoading: isLoadingEntitlement } =
-    useCheckEntitlements('branching_persistent')
+  const { hasAccess: hasAccessToPersistentBranching } = useCheckEntitlements('branching_persistent')
 
   const [showConfirmResetModal, setShowConfirmResetModal] = useState(false)
   const [showBranchModeSwitch, setShowBranchModeSwitch] = useState(false)
@@ -245,6 +280,16 @@ const PreviewBranchActions = ({
       }
     },
   })
+  const { mutate: restoreBranch } = useBranchRestoreMutation({
+    onSuccess() {
+      toast.success('Success! Please allow a few minutes for the branch to restore.')
+      setShowBranchModeSwitch(false)
+    },
+  })
+
+  const onRestoreBranch = () => {
+    restoreBranch({ branchRef, projectRef })
+  }
 
   const onConfirmReset = () => {
     resetBranch({ branchRef, projectRef })
@@ -275,64 +320,66 @@ const PreviewBranchActions = ({
           />
         </DropdownMenuTrigger>
         <DropdownMenuContent className="w-56" side="bottom" align="end">
-          <DropdownMenuItemTooltip
-            className="gap-x-2"
-            disabled={isResetting || !isBranchActiveHealthy}
-            onSelect={(e) => {
-              e.stopPropagation()
-              setShowConfirmResetModal(true)
-            }}
-            onClick={(e) => {
-              e.stopPropagation()
-              setShowConfirmResetModal(true)
-            }}
-            tooltip={{
-              content: {
-                side: 'left',
-                text: !isBranchActiveHealthy
-                  ? 'Branch is still initializing. Please wait for it to become healthy before resetting.'
-                  : undefined,
-              },
-            }}
-          >
-            <RefreshCw size={14} /> Reset branch
-          </DropdownMenuItemTooltip>
-
-          <DropdownMenuItemTooltip
-            className="gap-x-2"
-            disabled={
-              !isBranchActiveHealthy || (!branch.persistent && !hasAccessToPersistentBranching)
-            }
-            onSelect={(e) => {
-              e.stopPropagation()
-              setShowBranchModeSwitch(true)
-            }}
-            onClick={(e) => {
-              e.stopPropagation()
-              setShowBranchModeSwitch(true)
-            }}
-            tooltip={{
-              content: {
-                side: 'left',
-                text: !isBranchActiveHealthy
-                  ? 'Branch is still initializing. Please wait for it to become healthy before switching.'
-                  : !branch.persistent && !hasAccessToPersistentBranching
-                    ? 'Upgrade your plan to access persistent branches'
+          {!branch.deletion_scheduled_at && (
+            <DropdownMenuItemTooltip
+              className="gap-x-2"
+              disabled={isResetting || !isBranchActiveHealthy}
+              onSelect={(e) => {
+                e.stopPropagation()
+                setShowConfirmResetModal(true)
+              }}
+              onClick={(e) => {
+                e.stopPropagation()
+                setShowConfirmResetModal(true)
+              }}
+              tooltip={{
+                content: {
+                  side: 'left',
+                  text: !isBranchActiveHealthy
+                    ? 'Branch is still initializing. Please wait for it to become healthy before resetting.'
                     : undefined,
-              },
-            }}
-          >
-            {branch.persistent ? (
-              <>
-                <Clock size={14} /> Switch to preview
-              </>
-            ) : (
-              <>
-                <Infinity size={14} className="scale-110" /> Switch to persistent
-              </>
-            )}
-          </DropdownMenuItemTooltip>
-
+                },
+              }}
+            >
+              <RefreshCw size={14} /> Reset branch
+            </DropdownMenuItemTooltip>
+          )}
+          {!branch.deletion_scheduled_at && (
+            <DropdownMenuItemTooltip
+              className="gap-x-2"
+              disabled={
+                !isBranchActiveHealthy || (!branch.persistent && !hasAccessToPersistentBranching)
+              }
+              onSelect={(e) => {
+                e.stopPropagation()
+                setShowBranchModeSwitch(true)
+              }}
+              onClick={(e) => {
+                e.stopPropagation()
+                setShowBranchModeSwitch(true)
+              }}
+              tooltip={{
+                content: {
+                  side: 'left',
+                  text: !isBranchActiveHealthy
+                    ? 'Branch is still initializing. Please wait for it to become healthy before switching.'
+                    : !branch.persistent && !hasAccessToPersistentBranching
+                      ? 'Upgrade your plan to access persistent branches'
+                      : undefined,
+                },
+              }}
+            >
+              {branch.persistent ? (
+                <>
+                  <Clock size={14} /> Switch to preview
+                </>
+              ) : (
+                <>
+                  <Infinity size={14} className="scale-110" /> Switch to persistent
+                </>
+              )}
+            </DropdownMenuItemTooltip>
+          )}
           {/* Edit Branch (gitless) */}
           {gitlessBranching && (
             <DropdownMenuItemTooltip
@@ -391,6 +438,32 @@ const PreviewBranchActions = ({
               </a>
             </DropdownMenuItem>
           )}
+          {branch.deletion_scheduled_at && (
+            <DropdownMenuItemTooltip
+              className="gap-x-2"
+              disabled={!canRestoreBranches || branch.preview_project_status !== 'INACTIVE'}
+              onSelect={(e) => {
+                e.stopPropagation()
+                onRestoreBranch()
+              }}
+              onClick={(e) => {
+                e.stopPropagation()
+                onRestoreBranch()
+              }}
+              tooltip={{
+                content: {
+                  side: 'left',
+                  text: !canRestoreBranches
+                    ? 'You need additional permissions to restore branches'
+                    : branch.preview_project_status !== 'INACTIVE'
+                      ? 'Preview project is not fully paused or already coming up. Please wait for it to become fully paused before restoring.'
+                      : undefined,
+                },
+              }}
+            >
+              <Clock size={14} /> Restore branch
+            </DropdownMenuItemTooltip>
+          )}
         </DropdownMenuContent>
       </DropdownMenu>
 
diff --git a/apps/studio/components/interfaces/Database/Schemas/SchemaTableNode.tsx b/apps/studio/components/interfaces/Database/Schemas/SchemaTableNode.tsx
index cb80338d86edd..effd0546cdc23 100644
--- a/apps/studio/components/interfaces/Database/Schemas/SchemaTableNode.tsx
+++ b/apps/studio/components/interfaces/Database/Schemas/SchemaTableNode.tsx
@@ -1,4 +1,4 @@
-import { LOAD_TAB_FROM_CACHE_PARAM } from 'components/grid/SupabaseGrid.utils'
+import { buildTableEditorUrl } from 'components/grid/SupabaseGrid.utils'
 import { DiamondIcon, ExternalLink, Fingerprint, Hash, Key, Table2 } from 'lucide-react'
 import Link from 'next/link'
 import { Handle, NodeProps } from 'reactflow'
@@ -10,9 +10,10 @@ export const TABLE_NODE_WIDTH = 320
 export const TABLE_NODE_ROW_HEIGHT = 40
 
 export type TableNodeData = {
-  id?: number
+  id: number
+  schema: string
   name: string
-  ref: string
+  ref?: string
   isForeign: boolean
   columns: {
     id: string
@@ -66,10 +67,14 @@ export const TableNode = ({
               <Table2 strokeWidth={1} size={12} className="text-light" />
               {data.name}
             </div>
-            {data.id && !placeholder && (
+            {!placeholder && (
               <Button asChild type="text" className="px-0 w-[16px] h-[16px] rounded">
                 <Link
-                  href={`/project/${data.ref}/editor/${data.id}?${LOAD_TAB_FROM_CACHE_PARAM}=true`}
+                  href={buildTableEditorUrl({
+                    projectRef: data.ref,
+                    tableId: data.id,
+                    schema: data.schema,
+                  })}
                 >
                   <ExternalLink size={10} className="text-foreground-light" />
                 </Link>
diff --git a/apps/studio/components/interfaces/Database/Schemas/Schemas.utils.ts b/apps/studio/components/interfaces/Database/Schemas/Schemas.utils.ts
index 2a3aaaa2828d8..4251a30e28499 100644
--- a/apps/studio/components/interfaces/Database/Schemas/Schemas.utils.ts
+++ b/apps/studio/components/interfaces/Database/Schemas/Schemas.utils.ts
@@ -4,9 +4,9 @@ import { uniqBy } from 'lodash'
 import { Edge, Node, Position } from 'reactflow'
 import 'reactflow/dist/style.css'
 
+import { LOCAL_STORAGE_KEYS } from 'common'
 import { tryParseJson } from 'lib/helpers'
 import { TABLE_NODE_ROW_HEIGHT, TABLE_NODE_WIDTH, TableNodeData } from './SchemaTableNode'
-import { LOCAL_STORAGE_KEYS } from 'common'
 
 const NODE_SEP = 25
 const RANK_SEP = 50
@@ -37,16 +37,19 @@ export async function getGraphDataFromTables(
       }
     })
 
+    const data: TableNodeData = {
+      ref,
+      id: table.id,
+      name: table.name,
+      schema: table.schema,
+      isForeign: false,
+      columns,
+    }
+
     return {
+      data,
       id: `${table.id}`,
       type: 'table',
-      data: {
-        ref,
-        id: table.id,
-        name: table.name,
-        isForeign: false,
-        columns,
-      } as TableNodeData,
       position: { x: 0, y: 0 },
     }
   })
@@ -66,15 +69,19 @@ export async function getGraphDataFromTables(
 
     // Create additional [this->foreign] node that we can point to on the graph.
     if (rel.target_table_schema !== currentSchema) {
+      const data: TableNodeData = {
+        id: rel.id,
+        ref: ref!,
+        schema: rel.target_table_schema,
+        name: `${rel.target_table_schema}.${rel.target_table_name}.${rel.target_column_name}`,
+        isForeign: true,
+        columns: [],
+      }
+
       nodes.push({
+        data,
         id: rel.constraint_name,
         type: 'table',
-        data: {
-          ref,
-          name: `${rel.target_table_schema}.${rel.target_table_name}.${rel.target_column_name}`,
-          isForeign: true,
-          columns: [],
-        } as TableNodeData,
         position: { x: 0, y: 0 },
       })
 
diff --git a/apps/studio/components/interfaces/Database/Tables/TableList.tsx b/apps/studio/components/interfaces/Database/Tables/TableList.tsx
index 330a50fbdff64..fb76465159289 100644
--- a/apps/studio/components/interfaces/Database/Tables/TableList.tsx
+++ b/apps/studio/components/interfaces/Database/Tables/TableList.tsx
@@ -19,7 +19,7 @@ import { useRouter } from 'next/router'
 import { useState } from 'react'
 
 import { useParams } from 'common'
-import { LOAD_TAB_FROM_CACHE_PARAM } from 'components/grid/SupabaseGrid.utils'
+import { buildTableEditorUrl } from 'components/grid/SupabaseGrid.utils'
 import AlertError from 'components/ui/AlertError'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
 import { DropdownMenuItemTooltip } from 'components/ui/DropdownMenuItemTooltip'
@@ -470,7 +470,11 @@ export const TableList = ({
                                     className="flex items-center space-x-2"
                                     onClick={() =>
                                       router.push(
-                                        `/project/${project?.ref}/editor/${x.id}?${LOAD_TAB_FROM_CACHE_PARAM}=true`
+                                        buildTableEditorUrl({
+                                          projectRef: project?.ref,
+                                          tableId: x.id,
+                                          schema: x.schema,
+                                        })
                                       )
                                     }
                                     onMouseEnter={() =>
diff --git a/apps/studio/components/interfaces/Database/Tables/Tables.utils.ts b/apps/studio/components/interfaces/Database/Tables/Tables.utils.ts
index d9acbb4e0f6da..1d5d69e843b4e 100644
--- a/apps/studio/components/interfaces/Database/Tables/Tables.utils.ts
+++ b/apps/studio/components/interfaces/Database/Tables/Tables.utils.ts
@@ -2,7 +2,7 @@ import { PostgresMaterializedView, PostgresTable, PostgresView } from '@supabase
 import { PostgresForeignTable } from '@supabase/postgres-meta/dist/lib/types'
 import { ENTITY_TYPE } from 'data/entity-types/entity-type-constants'
 
-// [Joshen] We just need name, description, rows, size, and the number of columns
+// [Joshen] We just need name, schema, description, rows, size, and the number of columns
 // Just missing partitioned tables as missing pg-meta support
 export const formatAllEntities = ({
   tables = [],
@@ -30,6 +30,7 @@ export const formatAllEntities = ({
       id: x.id,
       name: x.name,
       comment: x.comment,
+      schema: x.schema,
       rows: undefined,
       size: undefined,
       columns: x.columns ?? [],
@@ -42,6 +43,7 @@ export const formatAllEntities = ({
       id: x.id,
       name: x.name,
       comment: x.comment,
+      schema: x.schema,
       rows: undefined,
       size: undefined,
       columns: x.columns ?? [],
@@ -54,6 +56,7 @@ export const formatAllEntities = ({
       id: x.id,
       name: x.name,
       comment: x.comment,
+      schema: x.schema,
       rows: undefined,
       size: undefined,
       columns: x.columns ?? [],
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/ForeignRowSelector/ForeignRowSelector.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/ForeignRowSelector/ForeignRowSelector.tsx
index 02ac21c5f5fbe..e2f2387a52c41 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/ForeignRowSelector/ForeignRowSelector.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/ForeignRowSelector/ForeignRowSelector.tsx
@@ -131,12 +131,7 @@ export const ForeignRowSelector = ({
     if (!project?.ref || !table?.name || !table?.schema) return
 
     try {
-      const persistenceTableName = table.name + FOREIGN_ROW_SELECTOR_TABLE_NAME_SUFFIX
-      const savedState = loadTableEditorStateFromLocalStorage(
-        project.ref,
-        persistenceTableName,
-        table.schema
-      )
+      const savedState = loadTableEditorStateFromLocalStorage(project.ref, table.id)
       const urlSorts = savedState?.sorts ?? []
       const parsedSorts = formatSortURLParams(table.name, urlSorts)
       if (parsedSorts.length > 0) {
@@ -147,24 +142,22 @@ export const ForeignRowSelector = ({
     } finally {
       setShouldSaveSorts(true)
     }
-  }, [project?.ref, table?.schema, table?.name])
+  }, [project?.ref, table?.schema, table?.name, table?.id])
 
   // Persist sorts to local storage
   useEffect(() => {
-    if (!project?.ref || !table?.name || !table?.schema || !shouldSaveSorts) return
+    if (!project?.ref || !table?.id || !shouldSaveSorts) return
     try {
       const urlSorts = sortsToUrlParams(sorts)
-      const persistenceTableName = table.name + FOREIGN_ROW_SELECTOR_TABLE_NAME_SUFFIX
       saveTableEditorStateToLocalStorage({
         projectRef: project.ref,
-        tableName: persistenceTableName,
-        schema: table.schema,
+        tableId: table.id,
         sorts: urlSorts,
       })
     } catch (e) {
       console.error(e)
     }
-  }, [shouldSaveSorts, sorts, project?.ref, table?.schema, table?.name])
+  }, [shouldSaveSorts, sorts, project?.ref, table?.id])
 
   return (
     <SidePanel
diff --git a/apps/studio/components/layouts/AppLayout/BranchDropdown.tsx b/apps/studio/components/layouts/AppLayout/BranchDropdown.tsx
index 88d26f753c04a..3529b54fd67ba 100644
--- a/apps/studio/components/layouts/AppLayout/BranchDropdown.tsx
+++ b/apps/studio/components/layouts/AppLayout/BranchDropdown.tsx
@@ -33,6 +33,7 @@ import {
 } from 'ui'
 import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
 import { sanitizeRoute } from './ProjectDropdown'
+import { partition } from 'lodash'
 
 const BranchLink = ({
   branch,
@@ -101,7 +102,7 @@ export const BranchDropdown = () => {
   const mainBranch = branches?.find((branch) => branch.is_default)
   const restOfBranches = branches
     ?.filter((branch) => !branch.is_default)
-    .sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime())
+    ?.sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime())
 
   const sortedBranches =
     branches && branches.length > 0
diff --git a/apps/studio/components/layouts/TableEditorLayout/EntityListItem.tsx b/apps/studio/components/layouts/TableEditorLayout/EntityListItem.tsx
index 90676a4c35d9f..a4237116cf247 100644
--- a/apps/studio/components/layouts/TableEditorLayout/EntityListItem.tsx
+++ b/apps/studio/components/layouts/TableEditorLayout/EntityListItem.tsx
@@ -5,7 +5,7 @@ import { toast } from 'sonner'
 
 import { useParams } from 'common'
 import { useTableFilter } from 'components/grid/hooks/useTableFilter'
-import { LOAD_TAB_FROM_CACHE_PARAM } from 'components/grid/SupabaseGrid.utils'
+import { buildTableEditorUrl } from 'components/grid/SupabaseGrid.utils'
 import { getEntityLintDetails } from 'components/interfaces/TableGridEditor/TableEntity.utils'
 import { EntityTypeIcon } from 'components/ui/EntityTypeIcon'
 import { InlineLink } from 'components/ui/InlineLink'
@@ -167,7 +167,7 @@ const EntityListItem = ({
       title={entity.name}
       style={style}
       id={String(entity.id)}
-      href={`/project/${projectRef}/editor/${entity.id}?schema=${entity.schema}&${LOAD_TAB_FROM_CACHE_PARAM}=true`}
+      href={buildTableEditorUrl({ projectRef, tableId: entity.id, schema: entity.schema })}
       role="button"
       aria-label={`View ${entity.name}`}
       className={cn(
diff --git a/apps/studio/components/layouts/Tabs/RecentItems.tsx b/apps/studio/components/layouts/Tabs/RecentItems.tsx
index 315d4196659f9..90fb50e4852a7 100644
--- a/apps/studio/components/layouts/Tabs/RecentItems.tsx
+++ b/apps/studio/components/layouts/Tabs/RecentItems.tsx
@@ -3,11 +3,11 @@ import { AnimatePresence, motion } from 'framer-motion'
 import Link from 'next/link'
 
 import { useParams } from 'common'
+import { buildTableEditorUrl } from 'components/grid/SupabaseGrid.utils'
 import { EntityTypeIcon } from 'components/ui/EntityTypeIcon'
 import { ENTITY_TYPE } from 'data/entity-types/entity-type-constants'
 import { editorEntityTypes, useTabsStateSnapshot } from 'state/tabs'
 import { useEditorType } from '../editors/EditorsLayout.hooks'
-import { LOAD_TAB_FROM_CACHE_PARAM } from 'components/grid/SupabaseGrid.utils'
 
 export function RecentItems() {
   const { ref } = useParams()
@@ -53,17 +53,21 @@ export function RecentItems() {
                   transition={{ delay: index * 0.012, duration: 0.15 }}
                 >
                   <Link
-                    href={`/project/${ref}/${
+                    href={
                       item.type === 'sql'
-                        ? `sql/${item.metadata?.sqlId}`
+                        ? `/project/${ref}/sql/${item.metadata?.sqlId}`
                         : item.type === 'r' ||
                             item.type === 'v' ||
                             item.type === 'm' ||
                             item.type === 'f' ||
                             item.type === 'p'
-                          ? `editor/${item.metadata?.tableId}?schema=${item.metadata?.schema}&${LOAD_TAB_FROM_CACHE_PARAM}=true`
-                          : `explorer/${item.type}/${item.metadata?.schema}/${item.metadata?.name}`
-                    }`}
+                          ? buildTableEditorUrl({
+                              projectRef: ref,
+                              tableId: item.metadata?.tableId!,
+                              schema: item.metadata?.schema,
+                            })
+                          : `/project/${ref}/explorer/${item.type}/${item.metadata?.schema}/${item.metadata?.name}`
+                    }
                     className="flex items-center gap-4 rounded-lg bg-surface-100 py-2 transition-colors hover:bg-surface-200"
                   >
                     <div className="flex h-6 w-6 items-center justify-center rounded bg-surface-100 border">
diff --git a/apps/studio/components/ui/ErrorBoundary/ClientSideExceptionHandler.tsx b/apps/studio/components/ui/ErrorBoundary/ClientSideExceptionHandler.tsx
index ebfaeaa55f9a5..5779cbf34db7f 100644
--- a/apps/studio/components/ui/ErrorBoundary/ClientSideExceptionHandler.tsx
+++ b/apps/studio/components/ui/ErrorBoundary/ClientSideExceptionHandler.tsx
@@ -48,8 +48,8 @@ export const ClientSideExceptionHandler = ({
         </p>
         <p className="text-foreground-light text-sm">{message}</p>
       </div>
-      <Admonition type="warning" showIcon={false} title="We recommend trying the following:">
-        <ul className="list-disc pl-2 list-inside text-sm space-y-1 [&_b]:font-medium [&_b]:text-foreground">
+      <Admonition type="note" showIcon={false} title="We recommend trying the following:">
+        <ul className="list-disc mt-1.5 pl-2 list-inside text-sm space-y-1">
           <li>
             <span
               className={cn(InlineLinkClassName, 'cursor-pointer')}
@@ -77,9 +77,7 @@ export const ClientSideExceptionHandler = ({
             </span>{' '}
             to clean potentially outdated data
           </li>
-          <li>
-            Disable browser extensions that might modify page content (e.g., Google Translate)
-          </li>
+          <li>Disable browser extensions that might modify page content (e.g. Google Translate)</li>
           <li>If the problem persists, please contact support for assistance</li>
         </ul>
       </Admonition>
diff --git a/apps/studio/data/branches/branch-restore-mutation.ts b/apps/studio/data/branches/branch-restore-mutation.ts
new file mode 100644
index 0000000000000..0ac798a371e17
--- /dev/null
+++ b/apps/studio/data/branches/branch-restore-mutation.ts
@@ -0,0 +1,50 @@
+import { type UseMutationOptions, useMutation, useQueryClient } from '@tanstack/react-query'
+import { handleError, post } from 'data/fetchers'
+import { toast } from 'sonner'
+import type { ResponseError } from 'types'
+import { branchKeys } from './keys'
+
+export type BranchRestoreVariables = {
+  branchRef: string
+  projectRef: string
+}
+
+export async function restoreBranch({ branchRef }: BranchRestoreVariables) {
+  const { data, error } = await post('/v1/branches/{branch_id_or_ref}/restore', {
+    params: {
+      path: { branch_id_or_ref: branchRef },
+    },
+  })
+
+  if (error) handleError(error)
+  return data
+}
+
+type BranchRestoreData = Awaited<ReturnType<typeof restoreBranch>>
+
+export const useBranchRestoreMutation = ({
+  onSuccess,
+  onError,
+  ...options
+}: Omit<
+  UseMutationOptions<BranchRestoreData, ResponseError, BranchRestoreVariables>,
+  'mutationFn'
+> = {}) => {
+  const queryClient = useQueryClient()
+  return useMutation<BranchRestoreData, ResponseError, BranchRestoreVariables>({
+    mutationFn: (vars) => restoreBranch(vars),
+    async onSuccess(data, variables, context) {
+      const { projectRef } = variables
+      await queryClient.invalidateQueries({ queryKey: branchKeys.list(projectRef) })
+      await onSuccess?.(data, variables, context)
+    },
+    async onError(data, variables, context) {
+      if (onError === undefined) {
+        toast.error(`Failed to restore branch: ${data.message}`)
+      } else {
+        onError(data, variables, context)
+      }
+    },
+    ...options,
+  })
+}
diff --git a/apps/studio/data/prefetchers/project.$ref.editor.$id.tsx b/apps/studio/data/prefetchers/project.$ref.editor.$id.tsx
index 3468fb8a62a93..36e8cb25162b3 100644
--- a/apps/studio/data/prefetchers/project.$ref.editor.$id.tsx
+++ b/apps/studio/data/prefetchers/project.$ref.editor.$id.tsx
@@ -45,7 +45,7 @@ export function prefetchEditorTablePage({
       const supaTable = parseSupaTable(entity)
 
       const { sorts: localSorts = [], filters: localFilters = [] } =
-        loadTableEditorStateFromLocalStorage(projectRef, entity.name, entity.schema) ?? {}
+        loadTableEditorStateFromLocalStorage(projectRef, entity.id) ?? {}
 
       prefetchTableRows(queryClient, {
         projectRef,
diff --git a/apps/studio/pages/project/[ref]/branches/index.tsx b/apps/studio/pages/project/[ref]/branches/index.tsx
index 024c45cede2cb..5e11086f673af 100644
--- a/apps/studio/pages/project/[ref]/branches/index.tsx
+++ b/apps/studio/pages/project/[ref]/branches/index.tsx
@@ -95,8 +95,12 @@ const BranchesPage: NextPageWithLayout = () => {
   }
 
   const onConfirmDeleteBranch = () => {
-    if (selectedBranchToDelete == undefined) return console.error('No branch selected')
-    const { project_ref: branchRef, parent_project_ref: projectRef } = selectedBranchToDelete
+    if (selectedBranchToDelete === undefined) return console.error('No branch selected')
+    const {
+      project_ref: branchRef,
+      parent_project_ref: projectRef,
+      persistent,
+    } = selectedBranchToDelete
     deleteBranch(
       { branchRef, projectRef },
       {
@@ -108,7 +112,7 @@ const BranchesPage: NextPageWithLayout = () => {
           sendEvent({
             action: 'branch_delete_button_clicked',
             properties: {
-              branchType: selectedBranchToDelete.persistent ? 'persistent' : 'preview',
+              branchType: persistent ? 'persistent' : 'preview',
               origin: 'branches_page',
             },
             groups: {
@@ -175,7 +179,9 @@ const BranchesPage: NextPageWithLayout = () => {
         confirmLabel="Delete branch"
         confirmPlaceholder="Type in name of branch"
         confirmString={selectedBranchToDelete?.name ?? ''}
-        alert={{ title: 'You cannot recover this branch once deleted' }}
+        alert={{
+          title: 'You cannot recover this branch once deleted',
+        }}
         text={
           <>
             This will delete your database preview branch{' '}
diff --git a/apps/studio/pages/project/[ref]/editor/index.tsx b/apps/studio/pages/project/[ref]/editor/index.tsx
index 325696c08580d..d3484ceae44b7 100644
--- a/apps/studio/pages/project/[ref]/editor/index.tsx
+++ b/apps/studio/pages/project/[ref]/editor/index.tsx
@@ -2,7 +2,7 @@ import { useRouter } from 'next/router'
 import { useEffect } from 'react'
 
 import { useParams } from 'common'
-import { LOAD_TAB_FROM_CACHE_PARAM } from 'components/grid/SupabaseGrid.utils'
+import { buildTableEditorUrl } from 'components/grid/SupabaseGrid.utils'
 import { SidePanelEditor } from 'components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor'
 import { DefaultLayout } from 'components/layouts/DefaultLayout'
 import { EditorBaseLayout } from 'components/layouts/editors/EditorBaseLayout'
@@ -28,26 +28,35 @@ const TableEditorPage: NextPageWithLayout = () => {
   }
 
   useEffect(() => {
-    if (isHistoryLoaded) {
-      const lastOpenedTable = history.editor
-      const lastTabId = tabStore.openTabs.find((id) =>
-        editorEntityTypes.table.includes(tabStore.tabsMap[id]?.type)
+    if (isHistoryLoaded && projectRef && router) {
+      const lastOpenedTableId = Number(history.editor)
+      const lastTabId = Number(
+        tabStore.openTabs.find((id) => editorEntityTypes.table.includes(tabStore.tabsMap[id]?.type))
       )
 
       // Handle redirect to last opened table tab, or last table tab
-      if (lastOpenedTable !== undefined) {
+      if (Number.isInteger(lastOpenedTableId)) {
+        const lastOpenedTableData = tabStore.tabsMap[lastOpenedTableId]
         router.push(
-          `/project/${projectRef}/editor/${history.editor}?${LOAD_TAB_FROM_CACHE_PARAM}=true`
+          buildTableEditorUrl({
+            projectRef,
+            tableId: lastOpenedTableId,
+            schema: lastOpenedTableData?.metadata?.schema,
+          })
+        )
+      } else if (Number.isInteger(lastTabId)) {
+        const lastOpenedTableData = tabStore.tabsMap[lastTabId]
+        router.push(
+          buildTableEditorUrl({
+            projectRef,
+            tableId: lastTabId,
+            schema: lastOpenedTableData?.metadata?.schema,
+          })
         )
-      } else if (lastTabId) {
-        const lastTab = tabStore.tabsMap[lastTabId]
-        if (lastTab)
-          router.push(
-            `/project/${projectRef}/editor/${lastTab.metadata?.tableId}?${LOAD_TAB_FROM_CACHE_PARAM}=true`
-          )
       }
     }
-  }, [isHistoryLoaded])
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isHistoryLoaded, projectRef, router])
 
   return (
     <>
diff --git a/apps/studio/state/sql-editor-v2.ts b/apps/studio/state/sql-editor-v2.ts
index 28e74016f3906..be0fe276f7907 100644
--- a/apps/studio/state/sql-editor-v2.ts
+++ b/apps/studio/state/sql-editor-v2.ts
@@ -1,7 +1,7 @@
 import { debounce, memoize } from 'lodash'
 import { useMemo } from 'react'
 import { toast } from 'sonner'
-import { proxy, snapshot, subscribe, useSnapshot } from 'valtio'
+import { proxy, ref, snapshot, subscribe, useSnapshot } from 'valtio'
 import { devtools, proxyMap } from 'valtio/utils'
 
 import { DiffType } from 'components/interfaces/SQLEditor/SQLEditor.types'
@@ -237,13 +237,18 @@ export const sqlEditorState = proxy({
 
   addResult: (id: string, results: any[], autoLimit?: number) => {
     if (sqlEditorState.results[id]) {
-      sqlEditorState.results[id].unshift({ rows: results, autoLimit })
+      // Use ref() to prevent Valtio from creating proxies for each row object.
+      // This is critical for large result sets - without ref(), Valtio wraps every
+      // row and nested property in a Proxy, causing massive memory overhead.
+      // Alright to use ref() in this case as the data is meant to be read-only and we
+      // don't need to track changes to the underlying data
+      sqlEditorState.results[id] = [{ rows: ref(results), autoLimit }]
     }
   },
 
   addResultError: (id: string, error: any, autoLimit?: number) => {
     if (sqlEditorState.results[id]) {
-      sqlEditorState.results[id].unshift({ rows: [], error, autoLimit })
+      sqlEditorState.results[id] = [{ rows: ref([]), error, autoLimit }]
     }
   },
 
diff --git a/apps/studio/state/table-editor-table.tsx b/apps/studio/state/table-editor-table.tsx
index 160544614e465..384681fcd2e1f 100644
--- a/apps/studio/state/table-editor-table.tsx
+++ b/apps/studio/state/table-editor-table.tsx
@@ -34,7 +34,7 @@ export const createTableEditorTableState = ({
 }) => {
   const table = parseSupaTable(originalTable)
 
-  const savedState = loadTableEditorStateFromLocalStorage(projectRef, table.name, table.schema)
+  const savedState = loadTableEditorStateFromLocalStorage(projectRef, table.id)
   const gridColumns = getInitialGridColumns(
     getGridColumns(table, {
       tableId: table.id,
@@ -205,8 +205,7 @@ export const TableEditorTableStateContextProvider = ({
         saveTableEditorStateToLocalStorageDebounced({
           gridColumns: state.gridColumns,
           projectRef,
-          tableName: state.table.name,
-          schema: state.table.schema,
+          tableId: state.table.id,
         })
       })
     }
diff --git a/apps/studio/state/tabs.tsx b/apps/studio/state/tabs.tsx
index 3064047b4d722..6a136cfbe697b 100644
--- a/apps/studio/state/tabs.tsx
+++ b/apps/studio/state/tabs.tsx
@@ -1,9 +1,9 @@
-import { LOAD_TAB_FROM_CACHE_PARAM } from 'components/grid/SupabaseGrid.utils'
+import { buildTableEditorUrl } from 'components/grid/SupabaseGrid.utils'
 import { ENTITY_TYPE } from 'data/entity-types/entity-type-constants'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { partition } from 'lodash'
 import { NextRouter } from 'next/router'
-import { createContext, PropsWithChildren, ReactNode, useContext, useEffect, useState } from 'react'
+import { createContext, PropsWithChildren, useContext, useEffect, useState } from 'react'
 import { proxy, subscribe, useSnapshot } from 'valtio'
 
 export const editorEntityTypes = {
@@ -30,7 +30,6 @@ export interface Tab {
   id: string
   type: TabType
   label?: string
-  icon?: ReactNode
   metadata?: {
     schema?: string
     name?: string
@@ -76,7 +75,7 @@ function getSavedRecentItems(ref: string): RecentItem[] {
 const DEFAULT_TABS_STATE = {
   activeTab: null as string | null,
   openTabs: [] as string[],
-  tabsMap: {} as { [key: string]: Tab },
+  tabsMap: {} as Record<string, Tab>,
   previewTabId: undefined as string | undefined,
   recentItems: [],
 }
@@ -290,7 +289,11 @@ function createTabsState(projectRef: string) {
         case 'f':
         case 'p':
           router.push(
-            `/project/${router.query.ref}/editor/${tab.metadata?.tableId}?schema=${tab.metadata?.schema}&${LOAD_TAB_FROM_CACHE_PARAM}=true`
+            buildTableEditorUrl({
+              projectRef: router.query.ref as string,
+              tableId: tab.metadata?.tableId!,
+              schema: tab.metadata?.schema,
+            })
           )
           break
       }