diff --git a/.github/workflows/search.yml b/.github/workflows/search.yml
index 9d5aa59959ae6..7baa26f498144 100644
--- a/.github/workflows/search.yml
+++ b/.github/workflows/search.yml
@@ -45,6 +45,7 @@ jobs:
           sparse-checkout: |
             apps/docs
             apps/www/.env.local.example
+            examples
             supabase
 
       - uses: pnpm/action-setup@v4
@@ -63,7 +64,9 @@ jobs:
       - name: Update embeddings
         working-directory: ./apps/docs
         if: ${{ !inputs.refresh }}
-        run: pnpm run embeddings
+        run: |
+          pnpm run codegen:examples
+          pnpm run embeddings
 
       - name: Refresh embeddings
         working-directory: ./apps/docs
diff --git a/apps/docs/content/guides/deployment/branching/configuration.mdx b/apps/docs/content/guides/deployment/branching/configuration.mdx
index 5355264fff2ac..2c2d00a94aec0 100644
--- a/apps/docs/content/guides/deployment/branching/configuration.mdx
+++ b/apps/docs/content/guides/deployment/branching/configuration.mdx
@@ -34,6 +34,19 @@ supabase --experimental branches create --persistent
 # Do you want to create a branch named develop? [Y/n]
 ```
 
+<Admonition type="tip">
+
+To retrieve the project ID for an existing branch, use the `branches list` command:
+
+```bash
+supabase --experimental branches list
+```
+
+This will display a table showing all your branches with their corresponding project ID.
+Use the value from the `BRANCH PROJECT ID` column as your `project_id` in the remote configuration.
+
+</Admonition>
+
 ### Configuration merging
 
 When merging a PR into a persistent branch, the Supabase integration:
@@ -186,6 +199,19 @@ max_rows = 500
 pool_size = 25
 ```
 
+<Admonition type="tip">
+
+To retrieve the project ID for an existing branch, use the `branches list` command:
+
+```bash
+supabase --experimental branches list
+```
+
+This will display a table showing all your branches with their corresponding project ID.
+Use the value from the `BRANCH PROJECT ID` column as your `project_id` in the remote configuration.
+
+</Admonition>
+
 ### Feature branch configuration
 
 For feature branches that need specific settings:
@@ -200,6 +226,19 @@ client_id = "env(GOOGLE_CLIENT_ID)"
 secret = "env(GOOGLE_CLIENT_SECRET)"
 ```
 
+<Admonition type="tip">
+
+To retrieve the project ID for an existing branch, use the `branches list` command:
+
+```bash
+supabase --experimental branches list
+```
+
+This will display a table showing all your branches with their corresponding project ID.
+Use the value from the `BRANCH PROJECT ID` column as your `project_id` in the remote configuration.
+
+</Admonition>
+
 ## Next steps
 
 - Explore [branching integrations](/docs/guides/deployment/branching/integrations)
diff --git a/apps/docs/features/docs/GuidesMdx.template.tsx b/apps/docs/features/docs/GuidesMdx.template.tsx
index e7067e6815f6b..76fbe6d397cc5 100644
--- a/apps/docs/features/docs/GuidesMdx.template.tsx
+++ b/apps/docs/features/docs/GuidesMdx.template.tsx
@@ -90,7 +90,9 @@ const GuideTemplate = ({ meta, content, children, editLink, mdxOptions }: GuideT
             )}
             <hr className="not-prose border-t-0 border-b my-8" />
 
-            {content && <MDXRemoteBase source={content} options={mdxOptions} />}
+            {content && (
+              <MDXRemoteBase source={content} options={mdxOptions} customPreprocess={(x) => x} />
+            )}
             {children}
 
             <footer className="mt-16 not-prose">
diff --git a/apps/docs/features/docs/GuidesMdx.utils.tsx b/apps/docs/features/docs/GuidesMdx.utils.tsx
index 86088c497f3e0..50b5dede231a2 100644
--- a/apps/docs/features/docs/GuidesMdx.utils.tsx
+++ b/apps/docs/features/docs/GuidesMdx.utils.tsx
@@ -73,7 +73,7 @@ const getGuidesMarkdownInternal = async (slug: string[]) => {
       editLink,
     }
   } catch (error: unknown) {
-    if (error instanceof FileNotFoundError) {
+    if (error instanceof Error && error.cause instanceof FileNotFoundError) {
       // Not using console.error because this includes pages that are genuine
       // 404s and clutters up the logs
       console.log('Could not read Markdown at path: %s', fullPath)
diff --git a/packages/common/posthog-client.ts b/packages/common/posthog-client.ts
index 5e3fc98c46be9..b27e104efa316 100644
--- a/packages/common/posthog-client.ts
+++ b/packages/common/posthog-client.ts
@@ -1,6 +1,10 @@
 import posthog from 'posthog-js'
 import { PostHogConfig } from 'posthog-js'
 
+// Limit the max number of queued events
+// (e.g. if a user navigates around a lot before accepting consent)
+const MAX_PENDING_EVENTS = 20
+
 interface PostHogClientConfig {
   apiKey?: string
   apiHost?: string
@@ -10,7 +14,9 @@ class PostHogClient {
   private initialized = false
   private pendingGroups: Record<string, string> = {}
   private pendingIdentification: { userId: string; properties?: Record<string, any> } | null = null
+  private pendingEvents: Array<{ event: string; properties: Record<string, any> }> = []
   private config: PostHogClientConfig
+  private readonly maxPendingEvents = MAX_PENDING_EVENTS
 
   constructor(config: PostHogClientConfig = {}) {
     this.config = {
@@ -34,6 +40,10 @@ class PostHogClient {
       capture_pageview: false, // We'll manually track pageviews
       capture_pageleave: false, // We'll manually track page leaves
       loaded: (posthog) => {
+        // Apply pending properties that were set before PostHog
+        // initialized due to poor connection or user not accepting
+        // consent right away
+
         // Apply any pending groups
         Object.entries(this.pendingGroups).forEach(([type, id]) => {
           posthog.group(type, id)
@@ -42,9 +52,26 @@ class PostHogClient {
 
         // Apply any pending identification
         if (this.pendingIdentification) {
-          posthog.identify(this.pendingIdentification.userId, this.pendingIdentification.properties)
+          try {
+            posthog.identify(
+              this.pendingIdentification.userId,
+              this.pendingIdentification.properties
+            )
+          } catch (error) {
+            console.error('PostHog identify failed:', error)
+          }
           this.pendingIdentification = null
         }
+
+        // Flush any pending events
+        this.pendingEvents.forEach(({ event, properties }) => {
+          try {
+            posthog.capture(event, properties, { transport: 'sendBeacon' })
+          } catch (error) {
+            console.error('PostHog capture failed:', error)
+          }
+        })
+        this.pendingEvents = []
       },
     }
 
@@ -53,21 +80,51 @@ class PostHogClient {
   }
 
   capturePageView(properties: Record<string, any>, hasConsent: boolean = true) {
-    if (!hasConsent || !this.initialized) return
+    if (!hasConsent) return
 
-    // Store groups from properties if present (for later group() calls)
-    if (properties.$groups) {
-      Object.entries(properties.$groups).forEach(([type, id]) => {
-        if (id) posthog.group(type, id as string)
-      })
+    if (!this.initialized) {
+      // Queue the event for when PostHog initializes (up to cap)
+      // (e.g. poor connection or user not accepting consent right away)
+      if (this.pendingEvents.length >= this.maxPendingEvents) {
+        this.pendingEvents.shift() // Remove oldest event
+      }
+      this.pendingEvents.push({ event: '$pageview', properties })
+      return
     }
 
-    posthog.capture('$pageview', properties)
+    try {
+      // Store groups from properties if present (for later group() calls)
+      if (properties.$groups) {
+        Object.entries(properties.$groups).forEach(([type, id]) => {
+          if (id) posthog.group(type, id as string)
+        })
+      }
+
+      posthog.capture('$pageview', properties, { transport: 'sendBeacon' })
+    } catch (error) {
+      console.error('PostHog pageview capture failed:', error)
+    }
   }
 
   capturePageLeave(properties: Record<string, any>, hasConsent: boolean = true) {
-    if (!hasConsent || !this.initialized) return
-    posthog.capture('$pageleave', properties)
+    if (!hasConsent) return
+
+    if (!this.initialized) {
+      // Queue the event for when PostHog initializes (up to cap)
+      // (e.g. poor connection or user not accepting consent right away)
+      if (this.pendingEvents.length >= this.maxPendingEvents) {
+        this.pendingEvents.shift() // Remove oldest event
+      }
+      this.pendingEvents.push({ event: '$pageleave', properties })
+      return
+    }
+
+    try {
+      // Use sendBeacon for page leave to survive tab close
+      posthog.capture('$pageleave', properties, { transport: 'sendBeacon' })
+    } catch (error) {
+      console.error('PostHog pageleave capture failed:', error)
+    }
   }
 
   identify(userId: string, properties?: Record<string, any>, hasConsent: boolean = true) {
@@ -79,7 +136,11 @@ class PostHogClient {
       return
     }
 
-    posthog.identify(userId, properties)
+    try {
+      posthog.identify(userId, properties)
+    } catch (error) {
+      console.error('PostHog identify failed:', error)
+    }
   }
 }
 
diff --git a/packages/common/telemetry-utils.ts b/packages/common/telemetry-utils.ts
index 00e25e69671a1..a37b7c2a7a59a 100644
--- a/packages/common/telemetry-utils.ts
+++ b/packages/common/telemetry-utils.ts
@@ -1,10 +1,36 @@
 import { isBrowser } from './helpers'
 
+// Parse session_id from PostHog cookie since SDK doesn't expose session ID
+// (needed to correlate client and server events)
+function getPostHogSessionId(): string | null {
+  if (!isBrowser) return null
+
+  try {
+    // Parse PostHog cookie to extract session ID
+    const phCookies = document.cookie.split(';').find((cookie) => cookie.trim().startsWith('ph_'))
+
+    if (phCookies) {
+      const cookieValue = decodeURIComponent(phCookies.split('=')[1])
+      const phData = JSON.parse(cookieValue)
+      if (phData.$sesid && Array.isArray(phData.$sesid) && phData.$sesid[1]) {
+        return phData.$sesid[1]
+      }
+    }
+  } catch (error) {
+    console.warn('Could not extract PostHog session ID:', error)
+  }
+
+  return null
+}
+
 export function getSharedTelemetryData(pathname?: string) {
+  const sessionId = getPostHogSessionId()
+
   return {
     page_url: isBrowser ? window.location.href : '',
     page_title: isBrowser ? document?.title : '',
     pathname: pathname ? pathname : isBrowser ? window.location.pathname : '',
+    session_id: sessionId,
     ph: {
       referrer: isBrowser ? document?.referrer : '',
       language: navigator.language ?? 'en-US',
diff --git a/packages/common/telemetry.tsx b/packages/common/telemetry.tsx
index bc89809486501..3eaf60dd39445 100644
--- a/packages/common/telemetry.tsx
+++ b/packages/common/telemetry.tsx
@@ -54,6 +54,12 @@ export function handlePageTelemetry(
   // Send to PostHog client-side (only in browser)
   if (typeof window !== 'undefined') {
     const pageData = getSharedTelemetryData(pathname)
+
+    // Align frontend and backend session IDs for correlation
+    if (pageData.session_id) {
+      document.cookie = `session_id=${pageData.session_id}; path=/; SameSite=Lax`
+    }
+
     posthogClient.capturePageView({
       $current_url: pageData.page_url,
       $pathname: pageData.pathname,
@@ -63,6 +69,7 @@ export function handlePageTelemetry(
         ...(ref ? { project: ref } : {}),
       },
       page_title: pageData.page_title,
+      ...(pageData.session_id && { $session_id: pageData.session_id }),
       ...pageData.ph,
       ...Object.fromEntries(
         Object.entries(featureFlags || {}).map(([k, v]) => [`$feature/${k}`, v])
@@ -72,12 +79,14 @@ export function handlePageTelemetry(
 
   // Send to backend
   // TODO: Remove this once migration to client-side page telemetry is complete
-  return post(
-    `${ensurePlatformSuffix(API_URL)}/telemetry/page`,
+  const sharedData = getSharedTelemetryData(pathname)
+  const { session_id, ...backendData } = sharedData // Remove session_id from backend payload (it's already in the cookie)
+
+  const payload =
     telemetryDataOverride !== undefined
       ? { feature_flags: featureFlags, ...telemetryDataOverride }
       : {
-          ...getSharedTelemetryData(pathname),
+          ...backendData,
           ...(slug || ref
             ? {
                 groups: {
@@ -87,9 +96,10 @@ export function handlePageTelemetry(
               }
             : {}),
           feature_flags: featureFlags,
-        },
-    { headers: { Version: '2' } }
-  )
+        }
+  return post(`${ensurePlatformSuffix(API_URL)}/telemetry/page`, payload, {
+    headers: { Version: '2' },
+  })
 }
 
 export function handlePageLeaveTelemetry(
@@ -108,6 +118,7 @@ export function handlePageLeaveTelemetry(
       $current_url: pageData.page_url,
       $pathname: pageData.pathname,
       page_title: pageData.page_title,
+      ...(pageData.session_id && { $session_id: pageData.session_id }),
     })
   }