diff --git a/apps/docs/spec/cli_v1_commands.yaml b/apps/docs/spec/cli_v1_commands.yaml
index 15be75a9ee1f5..f68d0515e6acc 100644
--- a/apps/docs/spec/cli_v1_commands.yaml
+++ b/apps/docs/spec/cli_v1_commands.yaml
@@ -1,7 +1,7 @@
 clispec: '001'
 info:
   id: cli
-  version: 2.30.4
+  version: 2.31.4
   title: Supabase CLI
   language: sh
   source: https://github.com/supabase/cli
diff --git a/apps/studio/components/interfaces/BranchManagement/EdgeFunctionsDiffPanel.tsx b/apps/studio/components/interfaces/BranchManagement/EdgeFunctionsDiffPanel.tsx
index 6bcd2ba8bbbac..ad99d760f6cce 100644
--- a/apps/studio/components/interfaces/BranchManagement/EdgeFunctionsDiffPanel.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/EdgeFunctionsDiffPanel.tsx
@@ -1,4 +1,4 @@
-import { Code, Wind } from 'lucide-react'
+import { Circle, Code, Minus, Plus, Wind } from 'lucide-react'
 import Link from 'next/link'
 import { useEffect, useMemo, useState } from 'react'
 
@@ -34,15 +34,31 @@ const fileKey = (fullPath: string) => basename(fullPath)
 const getStatusColor = (status: FileStatus): string => {
   switch (status) {
     case 'added':
-      return 'bg-brand'
+      return 'text-brand'
     case 'removed':
-      return 'bg-destructive'
+      return 'text-destructive'
     case 'modified':
-      return 'bg-warning'
+      return 'text-warning'
     case 'unchanged':
-      return 'bg-muted'
+      return 'text-muted'
     default:
-      return 'bg-muted'
+      return 'text-muted'
+  }
+}
+
+// Helper to get the status icon for file indicators
+const getStatusIcon = (status: FileStatus) => {
+  switch (status) {
+    case 'added':
+      return Plus
+    case 'removed':
+      return Minus
+    case 'modified':
+      return Circle
+    case 'unchanged':
+      return Circle
+    default:
+      return Circle
   }
 }
 
@@ -65,8 +81,12 @@ const FunctionDiff = ({
     }
   }, [allFileKeys, activeFileKey])
 
-  const currentFile = currentBody.find((f) => fileKey(f.name) === activeFileKey)
-  const mainFile = mainBody.find((f) => fileKey(f.name) === activeFileKey)
+  const currentFile = currentBody.find(
+    (f: EdgeFunctionBodyData[number]) => fileKey(f.name) === activeFileKey
+  )
+  const mainFile = mainBody.find(
+    (f: EdgeFunctionBodyData[number]) => fileKey(f.name) === activeFileKey
+  )
 
   const language = useMemo(() => {
     if (!activeFileKey) return 'plaintext'
@@ -96,28 +116,31 @@ const FunctionDiff = ({
         <div className="flex h-full min-h-0">
           <div className="w-48 border-r bg-surface-200 flex flex-col overflow-y-auto">
             <ul className="divide-y divide-border">
-              {fileInfos.map((fileInfo) => (
-                <li key={fileInfo.key} className="flex">
-                  <button
-                    type="button"
-                    onClick={() => setActiveFileKey(fileInfo.key)}
-                    className={cn(
-                      'flex-1 text-left text-xs px-4 py-2 flex items-center gap-2',
-                      activeFileKey === fileInfo.key
-                        ? 'bg-surface-300 text-foreground'
-                        : 'text-foreground-light hover:bg-surface-300'
-                    )}
-                  >
-                    <div
+              {fileInfos.map((fileInfo) => {
+                const Icon = getStatusIcon(fileInfo.status)
+
+                return (
+                  <li key={fileInfo.key} className="flex">
+                    <button
+                      type="button"
+                      onClick={() => setActiveFileKey(fileInfo.key)}
                       className={cn(
-                        'w-1 h-1 rounded-full flex-shrink-0',
-                        getStatusColor(fileInfo.status)
+                        'flex-1 text-left text-xs px-4 py-2 flex items-center gap-2',
+                        activeFileKey === fileInfo.key
+                          ? 'bg-surface-300 text-foreground'
+                          : 'text-foreground-light hover:bg-surface-300'
                       )}
-                    />
-                    <span className="truncate">{fileInfo.key}</span>
-                  </button>
-                </li>
-              ))}
+                    >
+                      <Icon
+                        className={cn('flex-shrink-0', getStatusColor(fileInfo.status))}
+                        size={12}
+                        strokeWidth={1}
+                      />
+                      <span className="truncate">{fileInfo.key}</span>
+                    </button>
+                  </li>
+                )
+              })}
             </ul>
           </div>
           <div className="flex-1 min-h-0">
diff --git a/apps/studio/components/interfaces/Database/Backups/PITR/TimezoneSelection.tsx b/apps/studio/components/interfaces/Database/Backups/PITR/TimezoneSelection.tsx
index d527da4b6d495..18c443b0ef84f 100644
--- a/apps/studio/components/interfaces/Database/Backups/PITR/TimezoneSelection.tsx
+++ b/apps/studio/components/interfaces/Database/Backups/PITR/TimezoneSelection.tsx
@@ -48,7 +48,7 @@ export const TimezoneSelection = ({
               : 'Select timezone...'}
           </Button>
         </PopoverTrigger_Shadcn_>
-        <PopoverContent_Shadcn_ className="w-[350px] p-0">
+        <PopoverContent_Shadcn_ portal className="w-[350px] p-0">
           <Command_Shadcn_>
             <CommandInput_Shadcn_ placeholder="Search timezone..." className="h-9" />
             <CommandList_Shadcn_>
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationRow.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationRow.tsx
index 442540ebe0946..edfab6d923992 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationRow.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationRow.tsx
@@ -4,9 +4,12 @@ import { ReplicationPipelinesData } from 'data/replication/pipelines-query'
 import { ResponseError } from 'types'
 import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'
 import RowMenu from './RowMenu'
-import PipelineStatus, { PipelineStatusRequestStatus } from './PipelineStatus'
+import PipelineStatus, { PipelineStatusRequestStatus, PipelineStatusName } from './PipelineStatus'
 import { useParams } from 'common'
-import { useReplicationPipelineStatusQuery } from 'data/replication/pipeline-status-query'
+import {
+  ReplicationPipelineStatusData,
+  useReplicationPipelineStatusQuery,
+} from 'data/replication/pipeline-status-query'
 import { useState } from 'react'
 import { toast } from 'sonner'
 import { useStartPipelineMutation } from 'data/replication/start-pipeline-mutation'
@@ -65,10 +68,22 @@ const DestinationRow = ({
   const { mutateAsync: startPipeline } = useStartPipelineMutation()
   const { mutateAsync: stopPipeline } = useStopPipelineMutation()
   const pipelineStatus = pipelineStatusData?.status
+  const getStatusName = (
+    status: ReplicationPipelineStatusData['status'] | undefined
+  ): string | undefined => {
+    if (status && typeof status === 'object' && 'name' in status) {
+      return status.name
+    }
+
+    return undefined
+  }
+
+  const statusName = getStatusName(pipelineStatus)
   if (
     (requestStatus === PipelineStatusRequestStatus.EnableRequested &&
-      pipelineStatus === 'Started') ||
-    (requestStatus === PipelineStatusRequestStatus.DisableRequested && pipelineStatus === 'Stopped')
+      (statusName === PipelineStatusName.STARTED || statusName === PipelineStatusName.FAILED)) ||
+    (requestStatus === PipelineStatusRequestStatus.DisableRequested &&
+      (statusName === PipelineStatusName.STOPPED || statusName === PipelineStatusName.FAILED))
   ) {
     setRequestStatus(PipelineStatusRequestStatus.None)
   }
@@ -190,7 +205,7 @@ const DestinationRow = ({
           sourceId,
           destinationId: destinationId,
           pipelineId: pipeline?.id,
-          enabled: pipelineStatusData?.status === 'Started',
+          enabled: statusName === PipelineStatusName.STARTED,
         }}
       />
     </>
diff --git a/apps/studio/components/interfaces/Database/Replication/PipelineStatus.tsx b/apps/studio/components/interfaces/Database/Replication/PipelineStatus.tsx
index 6e8be284823f0..6fb360e6d972e 100644
--- a/apps/studio/components/interfaces/Database/Replication/PipelineStatus.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/PipelineStatus.tsx
@@ -2,8 +2,21 @@ import AlertError from 'components/ui/AlertError'
 import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'
 import { cn } from 'ui'
 import { ResponseError } from 'types'
-import { Loader2 } from 'lucide-react'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from 'ui'
+import { Loader2, ChevronDown, ChevronRight, Copy, AlertTriangle } from 'lucide-react'
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+  Button,
+  Collapsible_Shadcn_ as Collapsible,
+  CollapsibleContent_Shadcn_ as CollapsibleContent,
+  CollapsibleTrigger_Shadcn_ as CollapsibleTrigger,
+} from 'ui'
+import { useState, useEffect, useRef } from 'react'
+import { copyToClipboard } from 'ui'
+import { toast } from 'sonner'
+import { ReplicationPipelineStatusData } from 'data/replication/pipeline-status-query'
 
 export enum PipelineStatusRequestStatus {
   None = 'None',
@@ -11,8 +24,19 @@ export enum PipelineStatusRequestStatus {
   DisableRequested = 'DisableRequested',
 }
 
+export enum PipelineStatusName {
+  FAILED = 'failed',
+  STARTING = 'starting',
+  STARTED = 'started',
+  STOPPED = 'stopped',
+  UNKNOWN = 'unknown',
+}
+
+// Type alias for better readability
+type FailedStatus = Extract<ReplicationPipelineStatusData['status'], { name: 'failed' }>
+
 interface PipelineStatusProps {
-  pipelineStatus: string | undefined
+  pipelineStatus: ReplicationPipelineStatusData['status'] | undefined
   error: ResponseError | null
   isLoading: boolean
   isError: boolean
@@ -28,6 +52,175 @@ const PipelineStatus = ({
   isSuccess,
   requestStatus,
 }: PipelineStatusProps) => {
+  const [isErrorDetailsOpen, setIsErrorDetailsOpen] = useState(false)
+  const errorDetailsRef = useRef<HTMLDivElement>(null)
+
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (errorDetailsRef.current && !errorDetailsRef.current.contains(event.target as Node)) {
+        setIsErrorDetailsOpen(false)
+      }
+    }
+
+    if (isErrorDetailsOpen) {
+      document.addEventListener('mousedown', handleClickOutside)
+    }
+
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside)
+    }
+  }, [isErrorDetailsOpen])
+
+  const handleCopyToClipboard = async (text: string) => {
+    try {
+      await copyToClipboard(text)
+      toast.success('Error details copied to clipboard')
+    } catch (error) {
+      toast.error('Failed to copy error details')
+    }
+  }
+
+  const isFailedStatus = (
+    status: ReplicationPipelineStatusData['status'] | undefined
+  ): status is FailedStatus => {
+    return (
+      status !== null &&
+      status !== undefined &&
+      typeof status === 'object' &&
+      status.name === PipelineStatusName.FAILED
+    )
+  }
+
+  const isLogLoadingState = (failedStatus: FailedStatus): boolean => {
+    // Right now we hardcode the error message which is returned when k8s is not able to find logs, which seems
+    // to be a transient error. In case we find a way to properly handle this in the backend, this hack will not
+    // be needed anymore.
+    return (
+      failedStatus.message?.startsWith('unable to retrieve container logs for containerd://') ===
+      true
+    )
+  }
+
+  const renderFailedStatus = (failedStatus: FailedStatus) => {
+    const hasDetails =
+      failedStatus.message || failedStatus.reason || failedStatus.exit_code !== undefined
+    const isLoadingLogs = isLogLoadingState(failedStatus)
+
+    return (
+      <div className="flex items-center gap-2">
+        <TooltipProvider>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <div className="flex items-center gap-2 text-sm text-destructive">
+                {isLoadingLogs ? (
+                  <Loader2 className="w-3 h-3 animate-spin" />
+                ) : (
+                  <AlertTriangle className="w-3 h-3" />
+                )}
+                <span>Failed</span>
+              </div>
+            </TooltipTrigger>
+            <TooltipContent>
+              <p>
+                {isLoadingLogs
+                  ? 'Pipeline failed - logs are being retrieved from container'
+                  : 'Pipeline has failed - expand for error details'}
+              </p>
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+        {hasDetails && (
+          <Collapsible open={isErrorDetailsOpen} onOpenChange={setIsErrorDetailsOpen}>
+            <CollapsibleTrigger asChild>
+              <Button type="text" size="tiny" className="h-auto py-0 px-1 text-xs">
+                {isErrorDetailsOpen ? <ChevronDown size={12} /> : <ChevronRight size={12} />}
+              </Button>
+            </CollapsibleTrigger>
+            <CollapsibleContent className="absolute z-10 mt-1 left-0 min-w-[400px] max-w-[600px]">
+              <div
+                ref={errorDetailsRef}
+                className="rounded-lg border border-border bg-surface-100 p-3 shadow-md"
+              >
+                {isLoadingLogs ? (
+                  <div className="flex items-center gap-3">
+                    <Loader2 className="w-4 h-4 animate-spin text-warning-600" />
+                    <div>
+                      <div className="text-sm font-medium text-foreground mb-1">
+                        Pipeline Failed - Loading logs...
+                      </div>
+                      <div className="text-xs text-foreground-light">
+                        Error logs are being retrieved from the container. This may take a few
+                        moments.
+                      </div>
+                    </div>
+                  </div>
+                ) : (
+                  <>
+                    <div className="flex items-center justify-between mb-2">
+                      <span className="text-sm font-medium text-foreground">
+                        Pipeline Error Details
+                      </span>
+                      {(failedStatus.message || failedStatus.reason) && (
+                        <Button
+                          type="text"
+                          size="tiny"
+                          onClick={async () => {
+                            await handleCopyToClipboard(
+                              [
+                                failedStatus.exit_code !== undefined
+                                  ? `Exit Code: ${failedStatus.exit_code}`
+                                  : null,
+                                failedStatus.reason ? `Reason: ${failedStatus.reason}` : null,
+                                failedStatus.message ? `Message: ${failedStatus.message}` : null,
+                              ]
+                                .filter(Boolean)
+                                .join('\n')
+                            )
+                          }}
+                        >
+                          <Copy className="w-3 h-3" />
+                        </Button>
+                      )}
+                    </div>
+                    <div className="space-y-2">
+                      {failedStatus.exit_code !== undefined && (
+                        <div>
+                          <span className="text-xs font-medium text-foreground-light">
+                            Exit Code:
+                          </span>
+                          <div className="font-mono text-sm text-foreground mt-1">
+                            {failedStatus.exit_code}
+                          </div>
+                        </div>
+                      )}
+                      {failedStatus.reason && (
+                        <div>
+                          <span className="text-xs font-medium text-foreground-light">Reason:</span>
+                          <pre className="font-mono text-sm text-foreground whitespace-pre-wrap break-words mt-1 max-h-32 overflow-y-auto">
+                            {failedStatus.reason}
+                          </pre>
+                        </div>
+                      )}
+                      {failedStatus.message && (
+                        <div>
+                          <span className="text-xs font-medium text-foreground-light">
+                            Message:
+                          </span>
+                          <pre className="font-mono text-sm text-foreground whitespace-pre-wrap break-words mt-1 max-h-32 overflow-y-auto">
+                            {failedStatus.message}
+                          </pre>
+                        </div>
+                      )}
+                    </div>
+                  </>
+                )}
+              </div>
+            </CollapsibleContent>
+          </Collapsible>
+        )}
+      </div>
+    )
+  }
   // Map backend statuses to UX-friendly display
   const getStatusConfig = () => {
     if (requestStatus === PipelineStatusRequestStatus.EnableRequested) {
@@ -48,42 +241,59 @@ const PipelineStatus = ({
       }
     }
 
-    switch (pipelineStatus) {
-      case 'Starting':
-        return {
-          label: 'Starting',
-          dot: <Loader2 className="animate-spin w-3 h-3 text-warning-600" />,
-          color: 'text-warning-600',
-          tooltip: 'Pipeline is initializing and will be ready soon',
-        }
-      case 'Started':
-        return {
-          label: 'Running',
-          dot: <div className="w-2 h-2 bg-brand-600 rounded-full" />,
-          color: 'text-brand-600',
-          tooltip: 'Pipeline is active and processing data',
-        }
-      case 'Stopped':
-        return {
-          label: 'Stopped',
-          dot: <div className="w-2 h-2 bg-foreground-lighter rounded-full" />,
-          color: 'text-foreground-light',
-          tooltip: 'Pipeline is not running - enable to start processing',
-        }
-      case 'Unknown':
-        return {
-          label: 'Unknown',
-          dot: <div className="w-2 h-2 bg-warning-600 rounded-full" />,
-          color: 'text-warning-600',
-          tooltip: 'Pipeline status could not be determined',
-        }
-      default:
-        return {
-          label: 'Unknown',
-          dot: <div className="w-2 h-2 bg-destructive-600 rounded-full" />,
-          color: 'text-destructive-600',
-          tooltip: 'Pipeline status is unclear - check logs for details',
-        }
+    // Handle Failed status object
+    if (isFailedStatus(pipelineStatus)) {
+      return {
+        isFailedStatus: true,
+      }
+    }
+
+    if (pipelineStatus && typeof pipelineStatus === 'object' && 'name' in pipelineStatus) {
+      switch (pipelineStatus.name) {
+        case PipelineStatusName.STARTING:
+          return {
+            label: 'Starting',
+            dot: <Loader2 className="animate-spin w-3 h-3 text-warning-600" />,
+            color: 'text-warning-600',
+            tooltip: 'Pipeline is initializing and will be ready soon',
+          }
+        case PipelineStatusName.STARTED:
+          return {
+            label: 'Running',
+            dot: <div className="w-2 h-2 bg-brand-600 rounded-full" />,
+            color: 'text-brand-600',
+            tooltip: 'Pipeline is active and processing data',
+          }
+        case PipelineStatusName.STOPPED:
+          return {
+            label: 'Stopped',
+            dot: <div className="w-2 h-2 bg-foreground-lighter rounded-full" />,
+            color: 'text-foreground-light',
+            tooltip: 'Pipeline is not running - enable to start processing',
+          }
+        case PipelineStatusName.UNKNOWN:
+          return {
+            label: 'Unknown',
+            dot: <div className="w-2 h-2 bg-warning-600 rounded-full" />,
+            color: 'text-warning-600',
+            tooltip: 'Pipeline status could not be determined',
+          }
+        default:
+          return {
+            label: 'Unknown',
+            dot: <div className="w-2 h-2 bg-destructive-600 rounded-full" />,
+            color: 'text-destructive-600',
+            tooltip: 'Pipeline status is unclear - check logs for details',
+          }
+      }
+    }
+
+    // Fallback for undefined or invalid status
+    return {
+      label: 'Unknown',
+      dot: <div className="w-2 h-2 bg-destructive-600 rounded-full" />,
+      color: 'text-destructive-600',
+      tooltip: 'Pipeline status is unclear - check logs for details',
     }
   }
 
@@ -94,19 +304,25 @@ const PipelineStatus = ({
       {isLoading && <ShimmeringLoader></ShimmeringLoader>}
       {isError && <AlertError error={error} subject="Failed to retrieve pipeline status" />}
       {isSuccess && (
-        <TooltipProvider>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <div className={cn('flex items-center gap-2 text-sm', statusConfig.color)}>
-                {statusConfig.dot}
-                <span>{statusConfig.label}</span>
-              </div>
-            </TooltipTrigger>
-            <TooltipContent>
-              <p>{statusConfig.tooltip}</p>
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
+        <>
+          {statusConfig.isFailedStatus ? (
+            <div className="relative">{renderFailedStatus(pipelineStatus as FailedStatus)}</div>
+          ) : (
+            <TooltipProvider>
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <div className={cn('flex items-center gap-2 text-sm', statusConfig.color)}>
+                    {statusConfig.dot}
+                    <span>{statusConfig.label}</span>
+                  </div>
+                </TooltipTrigger>
+                <TooltipContent>
+                  <p>{statusConfig.tooltip}</p>
+                </TooltipContent>
+              </Tooltip>
+            </TooltipProvider>
+          )}
+        </>
       )}
     </>
   )
diff --git a/apps/studio/components/interfaces/Database/Replication/RowMenu.tsx b/apps/studio/components/interfaces/Database/Replication/RowMenu.tsx
index 2852aea357703..f09cc703093c2 100644
--- a/apps/studio/components/interfaces/Database/Replication/RowMenu.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/RowMenu.tsx
@@ -10,9 +10,10 @@ import {
   DropdownMenuTrigger,
 } from 'ui'
 import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'
+import { PipelineStatusName } from './PipelineStatus'
 
 interface RowMenuProps {
-  pipelineStatus: string | undefined
+  pipelineStatus: any
   error: ResponseError | null
   isLoading: boolean
   isError: boolean
@@ -32,7 +33,16 @@ const RowMenu = ({
   onEditClick,
   onDeleteClick,
 }: RowMenuProps) => {
-  const pipelineEnabled = pipelineStatus === 'Stopped' ? false : true
+  const getStatusName = (status: any) => {
+    if (status && typeof status === 'object' && 'name' in status) {
+      return status.name
+    }
+    return status
+  }
+
+  const statusName = getStatusName(pipelineStatus)
+  const pipelineEnabled = statusName !== PipelineStatusName.STOPPED
+
   return (
     <div className="flex justify-end items-center space-x-2">
       {isLoading && <ShimmeringLoader></ShimmeringLoader>}
diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/CreateIcebergWrapperSheet.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/CreateIcebergWrapperSheet.tsx
index a57546e61f2ec..8ff308fd8789b 100644
--- a/apps/studio/components/interfaces/Integrations/Wrappers/CreateIcebergWrapperSheet.tsx
+++ b/apps/studio/components/interfaces/Integrations/Wrappers/CreateIcebergWrapperSheet.tsx
@@ -8,6 +8,7 @@ import { FormSection, FormSectionContent, FormSectionLabel } from 'components/ui
 import SchemaSelector from 'components/ui/SchemaSelector'
 import { useSchemasQuery } from 'data/database/schemas-query'
 import { useFDWCreateMutation } from 'data/fdw/fdw-create-mutation'
+import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import {
   Button,
   Form,
@@ -24,6 +25,7 @@ import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
 import { CreateWrapperSheetProps } from './CreateWrapperSheet'
 import InputField from './InputField'
 import { makeValidateRequired } from './Wrappers.utils'
+import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
 
 const FORM_ID = 'create-wrapper-form'
 
@@ -63,6 +65,8 @@ export const CreateIcebergWrapperSheet = ({
   onClose,
 }: CreateWrapperSheetProps) => {
   const { project } = useProjectContext()
+  const org = useSelectedOrganization()
+  const { mutate: sendEvent } = useSendEventMutation()
 
   const [createSchemaSheetOpen, setCreateSchemaSheetOpen] = useState(false)
   const [selectedTarget, setSelectedTarget] = useState<Target>('S3Tables')
@@ -131,6 +135,17 @@ export const CreateIcebergWrapperSheet = ({
       sourceSchema: values.source_schema,
       targetSchema: values.target_schema,
     })
+
+    sendEvent({
+      action: 'foreign_data_wrapper_created',
+      properties: {
+        wrapperType: wrapperMeta.label,
+      },
+      groups: {
+        project: project?.ref ?? 'Unknown',
+        organization: org?.slug ?? 'Unknown',
+      },
+    })
   }
 
   return (
diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx
index 881db37bb74ae..d737aa6733bd4 100644
--- a/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx
+++ b/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx
@@ -11,6 +11,7 @@ import SchemaSelector from 'components/ui/SchemaSelector'
 import { useDatabaseExtensionsQuery } from 'data/database-extensions/database-extensions-query'
 import { invalidateSchemasQuery, useSchemasQuery } from 'data/database/schemas-query'
 import { useFDWCreateMutation } from 'data/fdw/fdw-create-mutation'
+import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import {
   Button,
   Form,
@@ -29,6 +30,7 @@ import InputField from './InputField'
 import { WrapperMeta } from './Wrappers.types'
 import { makeValidateRequired } from './Wrappers.utils'
 import WrapperTableEditor from './WrapperTableEditor'
+import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
 
 export interface CreateWrapperSheetProps {
   isClosing: boolean
@@ -47,6 +49,8 @@ export const CreateWrapperSheet = ({
 }: CreateWrapperSheetProps) => {
   const queryClient = useQueryClient()
   const { project } = useProjectContext()
+  const org = useSelectedOrganization()
+  const { mutate: sendEvent } = useSendEventMutation()
 
   const [newTables, setNewTables] = useState<any[]>([])
   const [isEditingTable, setIsEditingTable] = useState(false)
@@ -135,6 +139,17 @@ export const CreateWrapperSheet = ({
       sourceSchema: values.source_schema,
       targetSchema: values.target_schema,
     })
+
+    sendEvent({
+      action: 'foreign_data_wrapper_created',
+      properties: {
+        wrapperType: wrapperMeta.label,
+      },
+      groups: {
+        project: project?.ref ?? 'Unknown',
+        organization: org?.slug ?? 'Unknown',
+      },
+    })
   }
 
   return (
diff --git a/apps/studio/components/interfaces/Organization/SecuritySettings/SecuritySettings.tsx b/apps/studio/components/interfaces/Organization/SecuritySettings/SecuritySettings.tsx
index 906fb82dc4e29..076e8ded568ca 100644
--- a/apps/studio/components/interfaces/Organization/SecuritySettings/SecuritySettings.tsx
+++ b/apps/studio/components/interfaces/Organization/SecuritySettings/SecuritySettings.tsx
@@ -15,6 +15,7 @@ import { GenericSkeletonLoader } from 'components/ui/ShimmeringLoader'
 import { useOrganizationMembersQuery } from 'data/organizations/organization-members-query'
 import { useOrganizationMfaToggleMutation } from 'data/organizations/organization-mfa-mutation'
 import { useOrganizationMfaQuery } from 'data/organizations/organization-mfa-query'
+import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useCheckPermissions } from 'hooks/misc/useCheckPermissions'
 import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
 import { useProfile } from 'lib/profile'
@@ -48,6 +49,7 @@ const SecuritySettings = () => {
   const { data: members } = useOrganizationMembersQuery({ slug })
   const canReadMfaConfig = useCheckPermissions(PermissionAction.READ, 'organizations')
   const canUpdateMfaConfig = useCheckPermissions(PermissionAction.UPDATE, 'organizations')
+  const { mutate: sendEvent } = useSendEventMutation()
 
   const isPaidPlan = selectedOrganization?.plan.id !== 'free'
 
@@ -66,6 +68,15 @@ const SecuritySettings = () => {
     },
     onSuccess: (data) => {
       toast.success('Successfully updated organization MFA settings')
+      sendEvent({
+        action: 'organization_mfa_enforcement_updated',
+        properties: {
+          mfaEnforced: data.enforced,
+        },
+        groups: {
+          organization: slug ?? 'Unknown',
+        },
+      })
     },
   })
 
diff --git a/apps/studio/components/interfaces/Reports/SharedAPIReport.constants.ts b/apps/studio/components/interfaces/Reports/SharedAPIReport.constants.ts
new file mode 100644
index 0000000000000..1c7f679f2821d
--- /dev/null
+++ b/apps/studio/components/interfaces/Reports/SharedAPIReport.constants.ts
@@ -0,0 +1,278 @@
+import { get } from 'data/fetchers'
+import { generateRegexpWhere } from './Reports.constants'
+import { ReportFilterItem } from './Reports.types'
+import { useQueries } from '@tanstack/react-query'
+import * as Sentry from '@sentry/nextjs'
+
+export const SHARED_API_REPORT_SQL = {
+  totalRequests: {
+    queryType: 'logs',
+    sql: (filters: ReportFilterItem[], src = 'edge_logs') => `
+        --reports-api-total-requests
+        select
+          cast(timestamp_trunc(t.timestamp, hour) as datetime) as timestamp,
+          count(t.id) as count
+        FROM ${src} t
+          cross join unnest(metadata) as m
+          cross join unnest(m.response) as response
+          cross join unnest(m.request) as request
+          cross join unnest(request.headers) as headers
+          ${generateRegexpWhere(filters)}
+        GROUP BY
+          timestamp
+        ORDER BY
+          timestamp ASC`,
+  },
+  topRoutes: {
+    queryType: 'logs',
+    sql: (filters: ReportFilterItem[], src = 'edge_logs') => `
+        -- reports-api-top-routes
+        select
+          request.path as path,
+          request.method as method,
+          request.search as search,
+          response.status_code as status_code,
+          count(t.id) as count
+        from ${src} t
+          cross join unnest(metadata) as m
+          cross join unnest(m.response) as response
+          cross join unnest(m.request) as request
+          cross join unnest(request.headers) as headers
+          ${generateRegexpWhere(filters)}
+        group by
+          request.path, request.method, request.search, response.status_code
+        order by
+          count desc
+        limit 10
+        `,
+  },
+  errorCounts: {
+    queryType: 'logs',
+    sql: (filters: ReportFilterItem[], src = 'edge_logs') => `
+        -- reports-api-error-counts
+        select
+          cast(timestamp_trunc(t.timestamp, hour) as datetime) as timestamp,
+          count(t.id) as count
+        FROM ${src} t
+          cross join unnest(metadata) as m
+          cross join unnest(m.response) as response
+          cross join unnest(m.request) as request
+          cross join unnest(request.headers) as headers
+        WHERE
+          response.status_code >= 400
+        ${generateRegexpWhere(filters, false)}
+        GROUP BY
+          timestamp
+        ORDER BY
+          timestamp ASC
+        `,
+  },
+  topErrorRoutes: {
+    queryType: 'logs',
+    sql: (filters: ReportFilterItem[], src = 'edge_logs') => `
+        -- reports-api-top-error-routes
+        select
+          request.path as path,
+          request.method as method,
+          request.search as search,
+          response.status_code as status_code,
+          count(t.id) as count
+        from ${src} t
+          cross join unnest(metadata) as m
+          cross join unnest(m.response) as response
+          cross join unnest(m.request) as request
+          cross join unnest(request.headers) as headers
+        where
+          response.status_code >= 400
+        ${generateRegexpWhere(filters, false)}
+        group by
+          request.path, request.method, request.search, response.status_code
+        order by
+          count desc
+        limit 10
+        `,
+  },
+  responseSpeed: {
+    queryType: 'logs',
+    sql: (filters: ReportFilterItem[], src = 'edge_logs') => `
+        -- reports-api-response-speed
+        select
+          cast(timestamp_trunc(t.timestamp, hour) as datetime) as timestamp,
+          avg(response.origin_time) as avg
+        FROM
+          ${src} t
+          cross join unnest(metadata) as m
+          cross join unnest(m.response) as response
+          cross join unnest(m.request) as request
+          cross join unnest(request.headers) as headers
+          ${generateRegexpWhere(filters)}
+        GROUP BY
+          timestamp
+        ORDER BY
+          timestamp ASC
+      `,
+  },
+  topSlowRoutes: {
+    queryType: 'logs',
+    sql: (filters: ReportFilterItem[], src = 'edge_logs') => `
+        -- reports-api-top-slow-routes
+        select
+          request.path as path,
+          request.method as method,
+          request.search as search,
+          response.status_code as status_code,
+          count(t.id) as count,
+          avg(response.origin_time) as avg
+        from ${src} t
+          cross join unnest(metadata) as m
+          cross join unnest(m.response) as response
+          cross join unnest(m.request) as request
+          cross join unnest(request.headers) as headers
+        ${generateRegexpWhere(filters)}
+        group by
+          request.path, request.method, request.search, response.status_code
+        order by
+          avg desc
+        limit 10
+        `,
+  },
+  networkTraffic: {
+    queryType: 'logs',
+    sql: (filters: ReportFilterItem[], src = 'edge_logs') => `
+        -- reports-api-network-traffic
+        select
+          cast(timestamp_trunc(t.timestamp, hour) as datetime) as timestamp,
+          coalesce(
+            safe_divide(
+              sum(
+                cast(coalesce(headers.content_length, "0") as int64)
+              ),
+              1000000
+            ),
+            0
+          ) as ingress_mb,
+          coalesce(
+            safe_divide(
+              sum(
+                cast(coalesce(resp_headers.content_length, "0") as int64)
+              ),
+              1000000
+            ),
+            0
+          ) as egress_mb,
+        FROM
+          ${src} t
+          cross join unnest(metadata) as m
+          cross join unnest(m.response) as response
+          cross join unnest(m.request) as request
+          cross join unnest(request.headers) as headers
+          cross join unnest(response.headers) as resp_headers
+          ${generateRegexpWhere(filters)}
+        GROUP BY
+          timestamp
+        ORDER BY
+          timestamp ASC
+        `,
+  },
+}
+
+export type SharedAPIReportKey = keyof typeof SHARED_API_REPORT_SQL
+
+const fetchLogs = async ({
+  projectRef,
+  sql,
+  start,
+  end,
+}: {
+  projectRef: string
+  sql: string
+  start: string
+  end: string
+}) => {
+  const { data, error } = await get(`/platform/projects/{ref}/analytics/endpoints/logs.all`, {
+    params: {
+      path: { ref: projectRef },
+      query: {
+        sql,
+        iso_timestamp_start: start,
+        iso_timestamp_end: end,
+      },
+    },
+  })
+
+  if (error || data?.error) {
+    Sentry.captureException({
+      message: 'Shared API Report Error',
+      data: {
+        error,
+        data,
+      },
+    })
+    throw error || data?.error
+  }
+
+  return data
+}
+
+type SharedAPIReportParams = {
+  src: string
+  filters: ReportFilterItem[]
+  start: string
+  end: string
+  projectRef: string
+  enabled?: boolean
+}
+export const useSharedAPIReport = ({
+  src = 'edge_logs',
+  filters,
+  start,
+  end,
+  projectRef,
+  enabled = true,
+}: SharedAPIReportParams) => {
+  const queries = useQueries({
+    queries: Object.entries(SHARED_API_REPORT_SQL).map(([key, value]) => ({
+      queryKey: ['shared-api-report', key, src, filters, start, end, projectRef],
+      enabled,
+      queryFn: () =>
+        fetchLogs({
+          projectRef,
+          sql: value.sql(filters, src),
+          start,
+          end,
+        }),
+    })),
+  })
+
+  const keys = Object.keys(SHARED_API_REPORT_SQL) as Array<keyof typeof SHARED_API_REPORT_SQL>
+
+  const data = keys.reduce(
+    (acc, key, i) => {
+      acc[key] = queries[i].data?.result || []
+      return acc
+    },
+    {} as { [K in keyof typeof SHARED_API_REPORT_SQL]: unknown[] }
+  )
+
+  const error = keys.reduce(
+    (acc, key, i) => {
+      acc[key] = queries[i].error as string
+      return acc
+    },
+    {} as { [K in keyof typeof SHARED_API_REPORT_SQL]: string }
+  )
+
+  const isLoading = keys.reduce(
+    (acc, key, i) => {
+      acc[key] = queries[i].isLoading
+      return acc
+    },
+    {} as { [K in keyof typeof SHARED_API_REPORT_SQL]: boolean }
+  )
+
+  return {
+    data,
+    error,
+    isLoading,
+  }
+}
diff --git a/apps/studio/components/interfaces/Reports/SharedAPIReport.tsx b/apps/studio/components/interfaces/Reports/SharedAPIReport.tsx
new file mode 100644
index 0000000000000..8b19f008069ac
--- /dev/null
+++ b/apps/studio/components/interfaces/Reports/SharedAPIReport.tsx
@@ -0,0 +1,91 @@
+import ReportWidget from './ReportWidget'
+import {
+  ErrorCountsChartRenderer,
+  NetworkTrafficRenderer,
+  ResponseSpeedChartRenderer,
+  TopApiRoutesRenderer,
+  TotalRequestsChartRenderer,
+} from './renderers/ApiRenderers'
+import { SharedAPIReportKey, useSharedAPIReport } from './SharedAPIReport.constants'
+import { useParams } from 'common'
+
+export function SharedAPIReport({
+  filterBy,
+  start,
+  end,
+  hiddenReports = [],
+}: {
+  filterBy: 'auth' | 'realtime' | 'storage' | 'graphql' | 'functions'
+  start: string
+  end: string
+  hiddenReports?: SharedAPIReportKey[]
+}) {
+  const { ref } = useParams() as { ref: string }
+
+  const { data, error, isLoading } = useSharedAPIReport({
+    src: filterBy === 'functions' ? 'function_edge_logs' : 'edge_logs',
+    filters: [
+      {
+        key: 'request.path',
+        value: `/${filterBy}`,
+        compare: 'matches',
+      },
+    ],
+    start,
+    end,
+    projectRef: ref,
+    enabled: !!ref && !!filterBy,
+  })
+
+  return (
+    <div className="grid grid-cols-1 gap-4">
+      {!hiddenReports.includes('totalRequests') && (
+        <ReportWidget
+          isLoading={isLoading.totalRequests}
+          title="Total Requests"
+          data={data.totalRequests || []}
+          error={error.totalRequests}
+          renderer={TotalRequestsChartRenderer}
+          append={TopApiRoutesRenderer}
+          appendProps={{ data: data.topRoutes }}
+        />
+      )}
+      {!hiddenReports.includes('errorCounts') && (
+        <ReportWidget
+          isLoading={isLoading.errorCounts}
+          title="Response Errors"
+          tooltip="Error responses with 4XX or 5XX status codes"
+          data={data.errorCounts || []}
+          error={error.errorCounts}
+          renderer={ErrorCountsChartRenderer}
+          appendProps={{
+            data: data.topErrorRoutes || [],
+          }}
+          append={TopApiRoutesRenderer}
+        />
+      )}
+      {!hiddenReports.includes('responseSpeed') && (
+        <ReportWidget
+          isLoading={isLoading.responseSpeed}
+          title="Response Speed"
+          tooltip="Average response speed of a request (in ms)"
+          data={data.responseSpeed || []}
+          error={error.responseSpeed}
+          renderer={ResponseSpeedChartRenderer}
+          appendProps={{ data: data.topSlowRoutes || [] }}
+          append={TopApiRoutesRenderer}
+        />
+      )}
+      {!hiddenReports.includes('networkTraffic') && (
+        <ReportWidget
+          isLoading={isLoading.networkTraffic}
+          error={error.networkTraffic}
+          title="Network Traffic"
+          tooltip="Ingress and egress of requests and responses respectively"
+          data={data.networkTraffic || []}
+          renderer={NetworkTrafficRenderer}
+        />
+      )}
+    </div>
+  )
+}
diff --git a/apps/studio/components/layouts/AuthenticationLayout.tsx b/apps/studio/components/layouts/AuthenticationLayout.tsx
index 60ad6705137dd..8f1f32dd306dc 100644
--- a/apps/studio/components/layouts/AuthenticationLayout.tsx
+++ b/apps/studio/components/layouts/AuthenticationLayout.tsx
@@ -6,7 +6,7 @@ import { AppBannerContextProvider } from 'components/interfaces/App/AppBannerWra
 export const AuthenticationLayout = ({ children }: PropsWithChildren<{}>) => {
   return (
     <AppBannerContextProvider>
-      <div className="flex flex-col h-screen w-screen">
+      <div className="flex flex-col min-h-screen w-screen">
         <AppBannerWrapper />
         <div className="flex flex-1 w-full overflow-y-hidden">
           <div className="flex-grow h-full overflow-y-auto">{children}</div>
diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LayoutHeader.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LayoutHeader.tsx
index a0a3304b43a3a..97f5bddd388e2 100644
--- a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LayoutHeader.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LayoutHeader.tsx
@@ -136,7 +136,7 @@ const LayoutHeader = ({
                   {selectedProject && (
                     <>
                       <LayoutHeaderDivider />
-                      <BranchDropdown />
+                      {IS_PLATFORM && <BranchDropdown />}
                     </>
                   )}
                 </motion.div>
diff --git a/apps/studio/components/layouts/SignInLayout/ForgotPasswordLayout.tsx b/apps/studio/components/layouts/SignInLayout/ForgotPasswordLayout.tsx
index 2973ef53b7933..8723843fd13a8 100644
--- a/apps/studio/components/layouts/SignInLayout/ForgotPasswordLayout.tsx
+++ b/apps/studio/components/layouts/SignInLayout/ForgotPasswordLayout.tsx
@@ -21,7 +21,7 @@ const ForgotPasswordLayout = ({
   const { resolvedTheme } = useTheme()
 
   return (
-    <div className="flex-1 bg-studio flex flex-col gap-8 lg:gap-16 xl:gap-32">
+    <div className="min-h-screen flex-1 bg-studio flex flex-col gap-8 lg:gap-16 xl:gap-32">
       <div className="sticky top-0 mx-auto w-full max-w-7xl px-8 pt-6 sm:px-6 lg:px-8">
         <nav className="relative flex items-center justify-between sm:h-10">
           <div className="flex flex-shrink-0 flex-grow items-center lg:flex-grow-0">
diff --git a/apps/studio/components/layouts/SignInLayout/SignInLayout.tsx b/apps/studio/components/layouts/SignInLayout/SignInLayout.tsx
index 075623b470f62..f58f952f15d2e 100644
--- a/apps/studio/components/layouts/SignInLayout/SignInLayout.tsx
+++ b/apps/studio/components/layouts/SignInLayout/SignInLayout.tsx
@@ -82,7 +82,7 @@ const SignInLayout = ({
 
   return (
     <>
-      <div className="relative flex flex-col bg-alternative h-screen">
+      <div className="relative flex flex-col bg-alternative min-h-screen">
         <div
           className={`absolute top-0 w-full px-8 mx-auto sm:px-6 lg:px-8 ${
             ongoingIncident ? 'mt-14' : 'mt-6'
diff --git a/apps/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx b/apps/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx
index b869761e6d9ac..18aaf4c8c5e00 100644
--- a/apps/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx
+++ b/apps/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx
@@ -13,6 +13,7 @@ import { useFlag } from 'hooks/ui/useFlag'
 import { Input } from 'ui'
 import { getLastUsedAPIKeys, useLastUsedAPIKeysLogQuery } from './DisplayApiSettings.utils'
 import { ToggleLegacyApiKeysPanel } from './ToggleLegacyApiKeys'
+import Link from 'next/link'
 
 export const DisplayApiSettings = ({
   showTitle = true,
@@ -172,12 +173,12 @@ export const DisplayApiSettings = ({
                       {showLegacyText && (
                         <span>
                           Prefer using{' '}
-                          <a
+                          <Link
                             href={`/project/${projectRef}/settings/api-keys/new`}
                             className="text-link underline"
                           >
                             Secret API keys
-                          </a>{' '}
+                          </Link>{' '}
                           instead.
                         </span>
                       )}
@@ -189,12 +190,12 @@ export const DisplayApiSettings = ({
                       {showLegacyText && (
                         <span>
                           Prefer using{' '}
-                          <a
+                          <Link
                             href={`/project/${projectRef}/settings/api-keys/new`}
                             className="text-link underline"
                           >
                             Publishable API keys
-                          </a>{' '}
+                          </Link>{' '}
                           instead.
                         </span>
                       )}
diff --git a/apps/studio/data/api-keys/api-keys-query.ts b/apps/studio/data/api-keys/api-keys-query.ts
index de87ed9c42b11..a78f3c031d1fc 100644
--- a/apps/studio/data/api-keys/api-keys-query.ts
+++ b/apps/studio/data/api-keys/api-keys-query.ts
@@ -2,6 +2,7 @@ import { useQuery, UseQueryOptions } from '@tanstack/react-query'
 import { get, handleError } from 'data/fetchers'
 import { ResponseError } from 'types'
 
+import { IS_PLATFORM } from 'lib/constants'
 import { apiKeysKeys } from './keys'
 
 type LegacyKeys = {
@@ -74,7 +75,7 @@ export const useAPIKeysQuery = <TData = APIKeysData>(
     apiKeysKeys.list(projectRef),
     ({ signal }) => getAPIKeys({ projectRef, reveal }, signal),
     {
-      enabled: enabled && !!projectRef,
+      enabled: IS_PLATFORM && enabled && !!projectRef,
       ...options,
     }
   )
diff --git a/apps/studio/data/api-keys/legacy-api-keys-status-query.ts b/apps/studio/data/api-keys/legacy-api-keys-status-query.ts
index 964f2f49d5400..d768d3713e728 100644
--- a/apps/studio/data/api-keys/legacy-api-keys-status-query.ts
+++ b/apps/studio/data/api-keys/legacy-api-keys-status-query.ts
@@ -1,5 +1,6 @@
 import { useQuery, UseQueryOptions } from '@tanstack/react-query'
 import { get, handleError } from 'data/fetchers'
+import { IS_PLATFORM } from 'lib/constants'
 import { ResponseError } from 'types'
 import { apiKeysKeys } from './keys'
 
@@ -29,13 +30,13 @@ type LegacyAPIKeysStatusData = Awaited<ReturnType<typeof getLegacyAPIKeysStatus>
 
 export const useLegacyAPIKeysStatusQuery = <TData = LegacyAPIKeysStatusData>(
   { projectRef }: LegacyAPIKeysStatusVariables,
-  { ...options }: UseQueryOptions<LegacyAPIKeysStatusData, ResponseError, TData> = {}
+  { enabled, ...options }: UseQueryOptions<LegacyAPIKeysStatusData, ResponseError, TData> = {}
 ) =>
   useQuery<LegacyAPIKeysStatusData, ResponseError, TData>(
     apiKeysKeys.status(projectRef),
     ({ signal }) => getLegacyAPIKeysStatus({ projectRef }, signal),
     {
-      enabled: !!projectRef,
+      enabled: IS_PLATFORM && enabled && !!projectRef,
       ...options,
     }
   )
diff --git a/apps/studio/data/branches/branch-diff-query.ts b/apps/studio/data/branches/branch-diff-query.ts
index eba205e1908c6..bcff017beccdd 100644
--- a/apps/studio/data/branches/branch-diff-query.ts
+++ b/apps/studio/data/branches/branch-diff-query.ts
@@ -1,6 +1,7 @@
 import { useQuery, UseQueryOptions } from '@tanstack/react-query'
 
 import { get, handleError } from 'data/fetchers'
+import { IS_PLATFORM } from 'lib/constants'
 import type { ResponseError } from 'types'
 import { branchKeys } from './keys'
 
@@ -50,7 +51,7 @@ export const useBranchDiffQuery = (
     branchKeys.diff(projectRef, branchId),
     () => getBranchDiff({ branchId, includedSchemas }),
     {
-      enabled: enabled && typeof branchId !== 'undefined' && branchId !== '',
+      enabled: IS_PLATFORM && enabled && typeof branchId !== 'undefined' && branchId !== '',
       ...options,
     }
   )
diff --git a/apps/studio/data/branches/branch-query.ts b/apps/studio/data/branches/branch-query.ts
index c4a6b6ddfbdf8..a7a5c99a66d64 100644
--- a/apps/studio/data/branches/branch-query.ts
+++ b/apps/studio/data/branches/branch-query.ts
@@ -1,6 +1,7 @@
 import { useQuery, UseQueryOptions } from '@tanstack/react-query'
 
 import { get, handleError } from 'data/fetchers'
+import { IS_PLATFORM } from 'lib/constants'
 import type { ResponseError } from 'types'
 import { branchKeys } from './keys'
 
@@ -32,7 +33,7 @@ export const useBranchQuery = <TData = BranchData>(
     branchKeys.detail(projectRef, id),
     ({ signal }) => getBranch({ id }, signal),
     {
-      enabled: enabled && typeof id !== 'undefined',
+      enabled: IS_PLATFORM && enabled && typeof id !== 'undefined',
       ...options,
     }
   )
diff --git a/apps/studio/data/branches/branches-query.ts b/apps/studio/data/branches/branches-query.ts
index d83de6a6f4a91..c6c82abd22fbc 100644
--- a/apps/studio/data/branches/branches-query.ts
+++ b/apps/studio/data/branches/branches-query.ts
@@ -1,6 +1,8 @@
 import { useQuery, UseQueryOptions } from '@tanstack/react-query'
+
 import type { components } from 'data/api'
 import { get, handleError } from 'data/fetchers'
+import { IS_PLATFORM } from 'lib/constants'
 import type { ResponseError } from 'types'
 import { branchKeys } from './keys'
 
@@ -39,5 +41,5 @@ export const useBranchesQuery = <TData = BranchesData>(
   useQuery<BranchesData, BranchesError, TData>(
     branchKeys.list(projectRef),
     ({ signal }) => getBranches({ projectRef }, signal),
-    { enabled: enabled && typeof projectRef !== 'undefined', ...options }
+    { enabled: IS_PLATFORM && enabled && typeof projectRef !== 'undefined', ...options }
   )
diff --git a/apps/studio/lib/ai/model.ts b/apps/studio/lib/ai/model.ts
index ede4906ba93f0..e093e4702e9d0 100644
--- a/apps/studio/lib/ai/model.ts
+++ b/apps/studio/lib/ai/model.ts
@@ -14,8 +14,10 @@ export const regionMap = {
   eu: 'eu',
 }
 
-const SONNET_MODEL = 'anthropic.claude-3-7-sonnet-20250219-v1:0'
-const HAIKU_MODEL = 'anthropic.claude-3-haiku-20240307-v1:0'
+// Default behaviour here is to be throttled (e.g if this env var is not available, IS_THROTTLED should be true, unless specified 'false')
+const IS_THROTTLED = process.env.IS_THROTTLED !== 'false'
+const PRO_MODEL = process.env.AI_PRO_MODEL ?? 'anthropic.claude-3-7-sonnet-20250219-v1:0'
+const NORMAL_MODEL = process.env.AI_NORMAL_MODEL ?? 'anthropic.claude-3-5-haiku-20241022-v1:0'
 const OPENAI_MODEL = 'gpt-4.1-2025-04-14'
 
 export type ModelSuccess = {
@@ -47,7 +49,7 @@ export async function getModel(routingKey?: string, isLimited?: boolean): Promis
     // Select the Bedrock region based on the routing key
     const bedrockRegion: BedrockRegion = routingKey ? await selectBedrockRegion(routingKey) : 'us1'
     const bedrock = bedrockForRegion(bedrockRegion)
-    const model = HAIKU_MODEL
+    const model = IS_THROTTLED || isLimited ? NORMAL_MODEL : PRO_MODEL
     const modelName = `${regionMap[bedrockRegion]}.${model}`
 
     return {
diff --git a/apps/studio/lib/auth.tsx b/apps/studio/lib/auth.tsx
index e2ef0cdca9fcd..18ef96866c105 100644
--- a/apps/studio/lib/auth.tsx
+++ b/apps/studio/lib/auth.tsx
@@ -1,27 +1,41 @@
 import { useQueryClient } from '@tanstack/react-query'
-import { AuthProvider as AuthProviderInternal, clearLocalStorage, gotrueClient } from 'common'
+import {
+  AuthProvider as AuthProviderInternal,
+  clearLocalStorage,
+  gotrueClient,
+  useAuthError,
+} from 'common'
 import { PropsWithChildren, useCallback, useEffect } from 'react'
 import { toast } from 'sonner'
 
 import { GOTRUE_ERRORS, IS_PLATFORM } from './constants'
 
-export const AuthProvider = ({ children }: PropsWithChildren<{}>) => {
-  // Check for unverified GitHub users after a GitHub sign in
-  useEffect(() => {
-    async function handleEmailVerificationError() {
-      const { error } = await gotrueClient.initialize()
+const AuthErrorToaster = ({ children }: PropsWithChildren) => {
+  const error = useAuthError()
 
-      if (error?.message === GOTRUE_ERRORS.UNVERIFIED_GITHUB_USER) {
+  useEffect(() => {
+    if (error !== null) {
+      // Check for unverified GitHub users after a GitHub sign in
+      if (error.message === GOTRUE_ERRORS.UNVERIFIED_GITHUB_USER) {
         toast.error(
           'Please verify your email on GitHub first, then reach out to us at support@supabase.io to log into the dashboard'
         )
+        return
       }
+
+      toast.error(error.message)
     }
+  }, [error])
 
-    handleEmailVerificationError()
-  }, [])
+  return children
+}
 
-  return <AuthProviderInternal alwaysLoggedIn={!IS_PLATFORM}>{children}</AuthProviderInternal>
+export const AuthProvider = ({ children }: PropsWithChildren) => {
+  return (
+    <AuthProviderInternal alwaysLoggedIn={!IS_PLATFORM}>
+      <AuthErrorToaster>{children}</AuthErrorToaster>
+    </AuthProviderInternal>
+  )
 }
 
 export { useAuth, useIsLoggedIn, useSession, useUser } from 'common'
diff --git a/apps/studio/pages/api/cli-release-version.ts b/apps/studio/pages/api/cli-release-version.ts
index 7c6ce96b38a6e..4719fcfd946d5 100644
--- a/apps/studio/pages/api/cli-release-version.ts
+++ b/apps/studio/pages/api/cli-release-version.ts
@@ -8,7 +8,7 @@ type GitHubRepositoryRelease = {
   published_at: string
 }
 
-const current = `v${process.env.CURRENT_CLI_VERSION}`
+const current = process.env.CURRENT_CLI_VERSION ? `v${process.env.CURRENT_CLI_VERSION}` : undefined
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   try {
diff --git a/apps/studio/pages/project/[ref]/merge.tsx b/apps/studio/pages/project/[ref]/merge.tsx
index 4ebd96a1fc4ce..2f8d10228cf9b 100644
--- a/apps/studio/pages/project/[ref]/merge.tsx
+++ b/apps/studio/pages/project/[ref]/merge.tsx
@@ -520,7 +520,8 @@ const MergePage: NextPageWithLayout = () => {
                     >
                       <Link href={`/project/${parentProjectRef}/branches`}>Create new branch</Link>
                     </Button>
-                  ) : hasCurrentWorkflowCompleted ? (
+                  ) : hasCurrentWorkflowCompleted &&
+                    currentWorkflowRun?.id === parentBranchWorkflow?.id ? (
                     <Button
                       type="default"
                       onClick={handleCloseBranch}
diff --git a/apps/studio/pages/project/[ref]/realtime/settings.tsx b/apps/studio/pages/project/[ref]/realtime/settings.tsx
index bddfd65f9c223..0dae595dd4f00 100644
--- a/apps/studio/pages/project/[ref]/realtime/settings.tsx
+++ b/apps/studio/pages/project/[ref]/realtime/settings.tsx
@@ -22,7 +22,9 @@ RealtimePoliciesPage.getLayout = (page) => (
         title="Realtime Settings"
         subtitle="Configure your project's Realtime settings"
         // [Joshen] Scaffolding for now - once docs for this is ready
-        primaryActions={<DocsButton href="https://supabase.com/docs" />}
+        primaryActions={
+          <DocsButton href="https://supabase.com/docs/guides/realtime/authorization" />
+        }
       >
         {page}
       </PageLayout>
diff --git a/apps/studio/pages/project/[ref]/reports/auth.tsx b/apps/studio/pages/project/[ref]/reports/auth.tsx
index 30391fa409de8..791aeb1db2d9f 100644
--- a/apps/studio/pages/project/[ref]/reports/auth.tsx
+++ b/apps/studio/pages/project/[ref]/reports/auth.tsx
@@ -19,6 +19,7 @@ import { REPORT_DATERANGE_HELPER_LABELS } from 'components/interfaces/Reports/Re
 import UpgradePrompt from 'components/interfaces/Settings/Logs/UpgradePrompt'
 import { DatePickerValue } from 'components/interfaces/Settings/Logs/Logs.DatePickers'
 import type { NextPageWithLayout } from 'types'
+import { SharedAPIReport } from 'components/interfaces/Reports/SharedAPIReport'
 
 const AuthReport: NextPageWithLayout = () => {
   return (
@@ -133,6 +134,13 @@ const AuthUsage = () => {
               orgPlanId={orgPlan?.id}
             />
           ))}
+        <div className="relative pt-8 mt-8 border-t">
+          <SharedAPIReport
+            filterBy="auth"
+            start={selectedDateRange?.period_start?.date}
+            end={selectedDateRange?.period_end?.date}
+          />
+        </div>
       </ReportStickyNav>
     </>
   )
diff --git a/apps/studio/pages/project/[ref]/reports/edge-functions.tsx b/apps/studio/pages/project/[ref]/reports/edge-functions.tsx
index aca909da52831..8260039be9012 100644
--- a/apps/studio/pages/project/[ref]/reports/edge-functions.tsx
+++ b/apps/studio/pages/project/[ref]/reports/edge-functions.tsx
@@ -20,6 +20,7 @@ import { Label } from '@ui/components/shadcn/ui/label'
 
 import { getEdgeFunctionReportAttributes } from 'data/reports/edgefn-charts'
 import { useEdgeFunctionsQuery } from 'data/edge-functions/edge-functions-query'
+
 import { useReportDateRange } from 'hooks/misc/useReportDateRange'
 import { REPORT_DATERANGE_HELPER_LABELS } from 'components/interfaces/Reports/Reports.constants'
 import UpgradePrompt from 'components/interfaces/Settings/Logs/UpgradePrompt'
diff --git a/apps/studio/pages/project/[ref]/reports/realtime.tsx b/apps/studio/pages/project/[ref]/reports/realtime.tsx
index 8e3608d854f80..365850a75ee4f 100644
--- a/apps/studio/pages/project/[ref]/reports/realtime.tsx
+++ b/apps/studio/pages/project/[ref]/reports/realtime.tsx
@@ -33,6 +33,7 @@ import UpgradePrompt from 'components/interfaces/Settings/Logs/UpgradePrompt'
 
 import type { NextPageWithLayout } from 'types'
 import type { MultiAttribute } from 'components/ui/Charts/ComposedChart.utils'
+import { SharedAPIReport } from 'components/interfaces/Reports/SharedAPIReport'
 
 const RealtimeReport: NextPageWithLayout = () => {
   return (
@@ -204,46 +205,14 @@ const RealtimeUsage = () => {
               defaultChartStyle={chart.defaultChartStyle as 'line' | 'bar' | 'stackedAreaLine'}
             />
           ))}
-        <ReportStickyNav
-          className="mt-0 border-t"
-          content={
-            <ReportFilterBar
-              onRemoveFilters={removeFilters}
-              hideDatepicker={true}
-              datepickerFrom={selectedDateRange.period_start.date}
-              datepickerTo={selectedDateRange.period_end.date}
-              onAddFilter={addFilter}
-              isLoading={isLoading}
-              filters={filters}
-              selectedProduct="realtime"
-              datepickerHelpers={datePickerHelpers}
-              className="w-full"
-              showDatabaseSelector={false}
-            />
-          }
-        >
-          <ReportWidget
-            isLoading={isLoading}
-            params={params.totalRequests}
-            title="Total Requests"
-            data={data.totalRequests || []}
-            error={error.totalRequest}
-            renderer={TotalRequestsChartRenderer}
-            append={TopApiRoutesRenderer}
-            appendProps={{ data: data.topRoutes || [], params: params.topRoutes }}
-          />
-          <ReportWidget
-            isLoading={isLoading}
-            params={params.responseSpeed}
-            title="Response Speed"
-            tooltip="Average response speed (in miliseconds) of a request"
-            data={data.responseSpeed || []}
-            error={error.responseSpeed}
-            renderer={ResponseSpeedChartRenderer}
-            appendProps={{ data: data.topSlowRoutes || [], params: params.topSlowRoutes }}
-            append={TopApiRoutesRenderer}
+        <div className="relative pt-8 mt-8 border-t">
+          <SharedAPIReport
+            filterBy="realtime"
+            start={selectedDateRange?.period_start?.date}
+            end={selectedDateRange?.period_end?.date}
+            hiddenReports={['networkTraffic']}
           />
-        </ReportStickyNav>
+        </div>
       </ReportStickyNav>
     </>
   )
diff --git a/apps/studio/pages/sign-in-mfa.tsx b/apps/studio/pages/sign-in-mfa.tsx
index bc256f894287b..2eaa06b5dcbd4 100644
--- a/apps/studio/pages/sign-in-mfa.tsx
+++ b/apps/studio/pages/sign-in-mfa.tsx
@@ -1,3 +1,4 @@
+import * as Sentry from '@sentry/nextjs'
 import { useQueryClient } from '@tanstack/react-query'
 import { useRouter } from 'next/router'
 import { useEffect, useState } from 'react'
@@ -65,8 +66,8 @@ const SignInMfaPage: NextPageWithLayout = () => {
             await queryClient.resetQueries()
             router.push(getReturnToPath())
             return
-          }
-          if (data.currentLevel !== data.nextLevel) {
+          } else {
+            // Show the MFA form
             setLoading(false)
             return
           }
@@ -77,7 +78,13 @@ const SignInMfaPage: NextPageWithLayout = () => {
           return
         }
       })
-      .catch(() => {}) // catch all errors thrown by auth methods
+      .catch((error) => {
+        Sentry.captureException(error)
+        console.error('Auth initialization error:', error)
+        toast.error('Failed to initialize authentication. Please try again.')
+        setLoading(false)
+        router.push({ pathname: '/sign-in', query: router.query })
+      })
   }, [])
 
   if (loading) {
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index b2f4013b0f802..0601ca8a867f9 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -79,7 +79,7 @@ services:
 
   auth:
     container_name: supabase-auth
-    image: supabase/gotrue:v2.176.1
+    image: supabase/gotrue:v2.177.0
     restart: unless-stopped
     healthcheck:
       test:
@@ -231,7 +231,7 @@ services:
   # To use S3 backed storage: docker compose -f docker-compose.yml -f docker-compose.s3.yml up
   storage:
     container_name: supabase-storage
-    image: supabase/storage-api:v1.24.7
+    image: supabase/storage-api:v1.25.7
     restart: unless-stopped
     volumes:
       - ./volumes/storage:/var/lib/storage:z
@@ -296,7 +296,7 @@ services:
 
   meta:
     container_name: supabase-meta
-    image: supabase/postgres-meta:v0.89.3
+    image: supabase/postgres-meta:v0.91.0
     restart: unless-stopped
     depends_on:
       db:
@@ -475,7 +475,7 @@ services:
   # Update the DATABASE_URL if you are using an external Postgres database
   supavisor:
     container_name: supabase-pooler
-    image: supabase/supavisor:2.5.6
+    image: supabase/supavisor:2.5.7
     restart: unless-stopped
     ports:
       - ${POSTGRES_PORT}:5432
diff --git a/packages/api-types/types/api.d.ts b/packages/api-types/types/api.d.ts
index 76b8ed8d8537b..0f93564023b48 100644
--- a/packages/api-types/types/api.d.ts
+++ b/packages/api-types/types/api.d.ts
@@ -514,6 +514,26 @@ export interface paths {
     patch?: never
     trace?: never
   }
+  '/v1/projects/{ref}/branches/{name}': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * Get a database branch
+     * @description Fetches the specified database branch by its name.
+     */
+    get: operations['v1-get-a-branch']
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
   '/v1/projects/{ref}/claim-token': {
     parameters: {
       query?: never
@@ -3220,6 +3240,10 @@ export interface components {
       max_client_conn?: number
       /** @enum {string} */
       pool_mode?: 'transaction' | 'session' | 'statement'
+      query_wait_timeout?: number
+      reserve_pool_size?: number
+      server_idle_timeout?: number
+      server_lifetime?: number
     }
     V1PostgrestConfigResponse: {
       db_extra_search_path: string
@@ -4633,6 +4657,42 @@ export interface operations {
       }
     }
   }
+  'v1-get-a-branch': {
+    parameters: {
+      query?: never
+      header?: never
+      path: {
+        name: string
+        /** @description Project ref */
+        ref: string
+      }
+      cookie?: never
+    }
+    requestBody?: never
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['BranchResponse']
+        }
+      }
+      403: {
+        headers: {
+          [name: string]: unknown
+        }
+        content?: never
+      }
+      /** @description Failed to fetch database branch */
+      500: {
+        headers: {
+          [name: string]: unknown
+        }
+        content?: never
+      }
+    }
+  }
   'v1-get-project-claim-token': {
     parameters: {
       query?: never
diff --git a/packages/api-types/types/platform.d.ts b/packages/api-types/types/platform.d.ts
index be06c9dfb0ddb..090d53fbbd8e1 100644
--- a/packages/api-types/types/platform.d.ts
+++ b/packages/api-types/types/platform.d.ts
@@ -4896,7 +4896,7 @@ export interface components {
       id: string
       public: boolean
       /** @enum {string} */
-      type?: 'STANDARD' | 'ICEBERG'
+      type?: 'STANDARD' | 'ANALYTICS'
     }
     CreateStorageCredentialBody: {
       description: string
@@ -6550,7 +6550,7 @@ export interface components {
       db_port: number
       db_user: string
       default_pool_size?: number
-      ignore_startup_parameters: string
+      ignore_startup_parameters?: string
       inserted_at: string
       max_client_conn?: number
       pgbouncer_enabled: boolean
@@ -6558,6 +6558,10 @@ export interface components {
       pgbouncer_status: 'COMING_UP' | 'COMING_DOWN' | 'RELOADING' | 'ENABLED' | 'DISABLED'
       /** @enum {string} */
       pool_mode: 'transaction' | 'session' | 'statement'
+      query_wait_timeout?: number
+      reserve_pool_size?: number
+      server_idle_timeout?: number
+      server_lifetime?: number
       ssl_enforced: boolean
     }
     PgbouncerStatusResponse: {
@@ -7281,6 +7285,14 @@ export interface components {
         }[]
       }
     }
+    RemoveProjectResponse: {
+      id: number
+      name: string
+      ref: string
+      vercel?: {
+        resourceUninstallFailure: boolean
+      }
+    }
     ReplicationDestinationResponse: {
       /** @description Destination config */
       config: {
@@ -7385,11 +7397,38 @@ export interface components {
         tenant_id: string
       }[]
     }
-    ReplicationPipelinesStatusResponse: {
+    ReplicationPipelineStatusResponse: {
       /** @description Pipeline id */
       pipeline_id: number
       /** @description Pipeline status */
-      status: string
+      status:
+        | {
+            /** @enum {string} */
+            name: 'stopped'
+          }
+        | {
+            /** @enum {string} */
+            name: 'starting'
+          }
+        | {
+            /** @enum {string} */
+            name: 'started'
+          }
+        | {
+            /** @enum {string} */
+            name: 'stopping'
+          }
+        | {
+            /** @enum {string} */
+            name: 'unknown'
+          }
+        | {
+            exit_code?: number | null
+            message?: string | null
+            /** @enum {string} */
+            name: 'failed'
+            reason?: string | null
+          }
     }
     ReplicationPublicationsResponse: {
       /** @description List of publications */
@@ -7631,7 +7670,7 @@ export interface components {
       owner: string
       public: boolean
       /** @enum {string} */
-      type?: 'STANDARD' | 'ICEBERG'
+      type?: 'STANDARD' | 'ANALYTICS'
       updated_at: string
     }
     StorageConfigResponse: {
@@ -7660,7 +7699,7 @@ export interface components {
         owner: string
         public: boolean
         /** @enum {string} */
-        type?: 'STANDARD' | 'ICEBERG'
+        type?: 'STANDARD' | 'ANALYTICS'
         updated_at: string
       }
       created_at: string
@@ -8329,7 +8368,11 @@ export interface components {
     }
     UpdatePgbouncerConfigBody: {
       default_pool_size?: number
-      ignore_startup_parameters: string
+      /**
+       * @deprecated
+       * @default options,extra_float_digits
+       */
+      ignore_startup_parameters?: string
       max_client_conn?: number
       /** @deprecated */
       pgbouncer_enabled?: boolean
@@ -8338,6 +8381,10 @@ export interface components {
        * @enum {string}
        */
       pool_mode?: 'transaction' | 'session' | 'statement'
+      query_wait_timeout?: number
+      reserve_pool_size?: number
+      server_idle_timeout?: number
+      server_lifetime?: number
     }
     UpdatePolicyBody: {
       check?: string
@@ -8359,6 +8406,8 @@ export interface components {
        * @enum {string}
        */
       pool_mode?: 'transaction' | 'session' | 'statement'
+      server_idle_timeout?: number
+      server_lifetime?: number
     }
     UpdatePostgresConfigBody: {
       effective_cache_size?: string
@@ -14647,6 +14696,12 @@ export interface operations {
           'application/json': components['schemas']['ProjectDetailResponse']
         }
       }
+      403: {
+        headers: {
+          [name: string]: unknown
+        }
+        content?: never
+      }
     }
   }
   ProjectsRefController_deleteProject: {
@@ -14666,7 +14721,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['ProjectRefResponse']
+          'application/json': components['schemas']['RemoveProjectResponse']
         }
       }
       403: {
@@ -18498,7 +18553,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['ReplicationPipelinesStatusResponse']
+          'application/json': components['schemas']['ReplicationPipelineStatusResponse']
         }
       }
       403: {
diff --git a/packages/common/auth.tsx b/packages/common/auth.tsx
index 2c35f5c52adb2..661c67daac193 100644
--- a/packages/common/auth.tsx
+++ b/packages/common/auth.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import type { Session } from '@supabase/supabase-js'
+import type { AuthError, Session } from '@supabase/supabase-js'
 import {
   createContext,
   PropsWithChildren,
@@ -10,8 +10,8 @@ import {
   useMemo,
   useState,
 } from 'react'
-import { gotrueClient, type User } from './gotrue'
 import { clearLocalStorage } from './constants/local-storage'
+import { gotrueClient, type User } from './gotrue'
 
 export type { User }
 
@@ -43,10 +43,12 @@ const DEFAULT_SESSION: any = {
 type AuthState =
   | {
       session: Session | null
+      error: AuthError | null
       isLoading: false
     }
   | {
       session: null
+      error: AuthError | null
       isLoading: true
     }
 
@@ -54,6 +56,7 @@ export type AuthContext = { refreshSession: () => Promise<Session | null> } & Au
 
 export const AuthContext = createContext<AuthContext>({
   session: null,
+  error: null,
   isLoading: true,
   refreshSession: () => Promise.resolve(null),
 })
@@ -66,14 +69,32 @@ export const AuthProvider = ({
   alwaysLoggedIn,
   children,
 }: PropsWithChildren<AuthProviderProps>) => {
-  const [state, setState] = useState<AuthState>({ session: null, isLoading: true })
+  const [state, setState] = useState<AuthState>({ session: null, error: null, isLoading: true })
+
+  useEffect(() => {
+    let mounted = true
+    gotrueClient.initialize().then(({ error }) => {
+      if (mounted && error !== null) {
+        setState((prev) => ({ ...prev, error }))
+      }
+    })
+
+    return () => {
+      mounted = false
+    }
+  }, [])
 
   // Keep the session in sync
   useEffect(() => {
     const {
       data: { subscription },
     } = gotrueClient.onAuthStateChange((_event, session) => {
-      setState({ session, isLoading: false })
+      setState((prev) => ({
+        session,
+        // If there is a session, we clear the error
+        error: session !== null ? null : prev.error,
+        isLoading: false,
+      }))
     })
 
     return subscription.unsubscribe
@@ -91,7 +112,7 @@ export const AuthProvider = ({
 
   const value = useMemo(() => {
     if (alwaysLoggedIn) {
-      return { session: DEFAULT_SESSION, isLoading: false, refreshSession } as const
+      return { session: DEFAULT_SESSION, error: null, isLoading: false, refreshSession } as const
     } else {
       return { ...state, refreshSession } as const
     }
@@ -116,6 +137,8 @@ export const useIsLoggedIn = () => {
   return user !== null
 }
 
+export const useAuthError = () => useAuth().error
+
 export const useIsMFAEnabled = () => {
   const user = useUser()
 
diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.ts
index 763078527799f..2886475adef45 100644
--- a/packages/common/telemetry-constants.ts
+++ b/packages/common/telemetry-constants.ts
@@ -666,7 +666,7 @@ export interface CustomReportAddSQLBlockClicked {
  * @source studio
  * @page /dashboard/project/{ref}/reports/{id}
  */
-export interface CustomReportAssistantSQLBlockAdded {
+export interface CustomReportAssistantSQLBlockAddedEvent {
   action: 'custom_report_assistant_sql_block_added'
   groups: {
     project: string
@@ -1325,6 +1325,44 @@ export interface SupabaseUiCommandCopyButtonClickedEvent {
   }
 }
 
+/**
+ * Triggered when the organization MFA enforcement setting is updated.
+ *
+ * @group Events
+ * @source studio
+ * @page /dashboard/org/{slug}/security
+ */
+export interface OrganizationMfaEnforcementUpdated {
+  action: 'organization_mfa_enforcement_updated'
+  properties: {
+    mfaEnforced: boolean
+  }
+  groups: {
+    organization: string
+  }
+}
+
+/**
+ * Triggered when a new foreign data wrapper is created in a project.
+ *
+ * @group Events
+ * @source studio
+ * @page /dashboard/project/{ref}/database/integrations
+ */
+export interface ForeignDataWrapperCreatedEvent {
+  action: 'foreign_data_wrapper_created'
+  properties: {
+    /**
+     * The type of the foreign data wrapper, e.g. postgres_fdw, mysql_fdw, etc.
+     */
+    wrapperType: string
+  }
+  groups: {
+    project: string
+    organization: string
+  }
+}
+
 /**
  * @hidden
  */
@@ -1375,7 +1413,7 @@ export type TelemetryEvent =
   | HomepageCustomerStoryCardClickedEvent
   | HomepageProjectTemplateCardClickedEvent
   | CustomReportAddSQLBlockClicked
-  | CustomReportAssistantSQLBlockAdded
+  | CustomReportAssistantSQLBlockAddedEvent
   | OpenSourceRepoCardClickedEvent
   | StartProjectButtonClickedEvent
   | SeeDocumentationButtonClickedEvent
@@ -1403,3 +1441,5 @@ export type TelemetryEvent =
   | SupabaseUiCommandCopyButtonClickedEvent
   | SupportTicketSubmittedEvent
   | AiAssistantInSupportFormClickedEvent
+  | OrganizationMfaEnforcementUpdated
+  | ForeignDataWrapperCreatedEvent
diff --git a/turbo.json b/turbo.json
index b1484553135b0..fe75e665de77c 100644
--- a/turbo.json
+++ b/turbo.json
@@ -96,7 +96,10 @@
         "FORCE_ASSET_CDN",
         "ASSET_CDN_S3_ENDPOINT",
         "SITE_NAME",
-        "VERCEL_URL"
+        "VERCEL_URL",
+        "IS_THROTTLED",
+        "AI_PRO_MODEL",
+        "AI_NORMAL_MODEL"
       ],
       "passThroughEnv": ["CURRENT_CLI_VERSION"],
       "outputs": [".next/**", "!.next/cache/**"]