diff --git a/.github/workflows/container-images-cd.yml b/.github/workflows/container-images-cd.yml
index 9f9c05dfcbbda..ad78157702546 100644
--- a/.github/workflows/container-images-cd.yml
+++ b/.github/workflows/container-images-cd.yml
@@ -98,10 +98,10 @@ jobs:
             - name: Check for changes in plugins directory
               id: check_changes_plugins
               run: |
-                  echo "changed=$(git diff --name-only HEAD^ HEAD | grep '^plugin-server/' || true)" >> $GITHUB_OUTPUT
+                  echo "changed=$((git diff --name-only HEAD^ HEAD | grep -q '^plugin-server/' && echo true) || echo false)" >> $GITHUB_OUTPUT
 
             - name: Trigger Ingestion Cloud deployment
-              if: steps.check_changes_plugins.outputs.changed != ''
+              if: steps.check_changes_plugins.outputs.changed == 'true'
               uses: mvasigh/dispatch-action@main
               with:
                   token: ${{ steps.deployer.outputs.token }}
@@ -116,10 +116,10 @@ jobs:
             - name: Check for changes that affect batch exports temporal worker
               id: check_changes_batch_exports_temporal_worker
               run: |
-                  echo "changed=$(git diff --name-only HEAD^ HEAD | grep -E '^posthog/temporal/common|^posthog/temporal/batch_exports|^posthog/batch_exports/|^posthog/management/commands/start_temporal_worker.py$' || true)" >> $GITHUB_OUTPUT
+                  echo "changed=$((git diff --name-only HEAD^ HEAD | grep -qE '^posthog/temporal/common|^posthog/temporal/batch_exports|^posthog/batch_exports/|^posthog/management/commands/start_temporal_worker.py$' && echo true) || echo false)" >> $GITHUB_OUTPUT
 
             - name: Trigger Batch Exports Temporal Worker Cloud deployment
-              if: steps.check_changes_batch_exports_temporal_worker.outputs.changed != ''
+              if: steps.check_changes_batch_exports_temporal_worker.outputs.changed == 'true'
               uses: mvasigh/dispatch-action@main
               with:
                   token: ${{ steps.deployer.outputs.token }}
@@ -135,10 +135,10 @@ jobs:
             - name: Check for changes that affect data warehouse temporal worker
               id: check_changes_data_warehouse_temporal_worker
               run: |
-                  echo "changed=$(git diff --name-only HEAD^ HEAD | grep -E '^posthog/temporal/common|^posthog/temporal/data_imports|^posthog/warehouse/|^posthog/management/commands/start_temporal_worker.py$' || true)" >> $GITHUB_OUTPUT
+                  echo "changed=$((git diff --name-only HEAD^ HEAD | grep -qE '^posthog/temporal/common|^posthog/temporal/data_imports|^posthog/warehouse/|^posthog/management/commands/start_temporal_worker.py$' && echo true) || echo false)" >> $GITHUB_OUTPUT
 
             - name: Trigger Data Warehouse Temporal Worker Cloud deployment
-              if: steps.check_changes_data_warehouse_temporal_worker.outputs.changed != ''
+              if: steps.check_changes_data_warehouse_temporal_worker.outputs.changed == 'true'
               uses: mvasigh/dispatch-action@main
               with:
                   token: ${{ steps.deployer.outputs.token }}
diff --git a/cypress/e2e/systemStatus.cy.ts b/cypress/e2e/systemStatus.cy.ts
index 61a0d17acada8..e3e49b6768dc0 100644
--- a/cypress/e2e/systemStatus.cy.ts
+++ b/cypress/e2e/systemStatus.cy.ts
@@ -2,7 +2,7 @@ import { urls } from 'scenes/urls'
 
 describe('System Status', () => {
     it('System Status loaded', () => {
-        cy.location('pathname').should('eq', urls.savedInsights())
+        cy.location('pathname').should('eq', '/project/1/insights')
         cy.wait(500)
         cy.get('[data-attr=menu-item-me]').click()
         cy.get('[data-attr=system-status-badge]').click()
diff --git a/frontend/__snapshots__/scenes-app-apps--installed--dark.png b/frontend/__snapshots__/scenes-app-apps--installed--dark.png
index 46d9b6ac0f584..951b1068bb7fc 100644
Binary files a/frontend/__snapshots__/scenes-app-apps--installed--dark.png and b/frontend/__snapshots__/scenes-app-apps--installed--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-apps--installed--light.png b/frontend/__snapshots__/scenes-app-apps--installed--light.png
index b9be95598c8c5..c2f105784ea76 100644
Binary files a/frontend/__snapshots__/scenes-app-apps--installed--light.png and b/frontend/__snapshots__/scenes-app-apps--installed--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--user-paths-edit--dark--webkit.png b/frontend/__snapshots__/scenes-app-insights--user-paths-edit--dark--webkit.png
index f998c5f040fd0..fecccc919915f 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--user-paths-edit--dark--webkit.png and b/frontend/__snapshots__/scenes-app-insights--user-paths-edit--dark--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--user-paths-edit--dark.png b/frontend/__snapshots__/scenes-app-insights--user-paths-edit--dark.png
index 2a87f72cafd98..c6b98a58f4942 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--user-paths-edit--dark.png and b/frontend/__snapshots__/scenes-app-insights--user-paths-edit--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--user-paths-edit--light--webkit.png b/frontend/__snapshots__/scenes-app-insights--user-paths-edit--light--webkit.png
index e676a048434c7..ce3d83527b233 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--user-paths-edit--light--webkit.png and b/frontend/__snapshots__/scenes-app-insights--user-paths-edit--light--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--user-paths-edit--light.png b/frontend/__snapshots__/scenes-app-insights--user-paths-edit--light.png
index 66f315769be98..28cf1dd94717a 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--user-paths-edit--light.png and b/frontend/__snapshots__/scenes-app-insights--user-paths-edit--light.png differ
diff --git a/frontend/__snapshots__/scenes-app-sidepanels--side-panel-settings--dark.png b/frontend/__snapshots__/scenes-app-sidepanels--side-panel-settings--dark.png
index 423710832ea6b..1dada10c77fdf 100644
Binary files a/frontend/__snapshots__/scenes-app-sidepanels--side-panel-settings--dark.png and b/frontend/__snapshots__/scenes-app-sidepanels--side-panel-settings--dark.png differ
diff --git a/frontend/__snapshots__/scenes-app-sidepanels--side-panel-settings--light.png b/frontend/__snapshots__/scenes-app-sidepanels--side-panel-settings--light.png
index 8278339368b0d..88700b33dffe0 100644
Binary files a/frontend/__snapshots__/scenes-app-sidepanels--side-panel-settings--light.png and b/frontend/__snapshots__/scenes-app-sidepanels--side-panel-settings--light.png differ
diff --git a/frontend/src/layout/navigation-3000/navigationLogic.tsx b/frontend/src/layout/navigation-3000/navigationLogic.tsx
index 262c2dbde3724..6d3c0410daca8 100644
--- a/frontend/src/layout/navigation-3000/navigationLogic.tsx
+++ b/frontend/src/layout/navigation-3000/navigationLogic.tsx
@@ -15,13 +15,14 @@ import {
     IconTestTube,
     IconToggle,
 } from '@posthog/icons'
-import { lemonToast } from '@posthog/lemon-ui'
+import { lemonToast, Spinner } from '@posthog/lemon-ui'
 import { captureException } from '@sentry/react'
 import { actions, connect, events, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { IconPlusMini } from 'lib/lemon-ui/icons'
+import { LemonMenuOverlay } from 'lib/lemon-ui/LemonMenu/LemonMenu'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { isNotNil } from 'lib/utils'
 import React from 'react'
@@ -29,6 +30,8 @@ import { sceneLogic } from 'scenes/sceneLogic'
 import { Scene } from 'scenes/sceneTypes'
 import { urls } from 'scenes/urls'
 
+import { dashboardsModel } from '~/models/dashboardsModel'
+
 import { navigationLogic } from '../navigation/navigationLogic'
 import type { navigation3000LogicType } from './navigationLogicType'
 import { dashboardsSidebarLogic } from './sidebars/dashboards'
@@ -312,8 +315,12 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
             (isNavCollapsedDesktop, mobileLayout): boolean => !mobileLayout && isNavCollapsedDesktop,
         ],
         navbarItems: [
-            () => [featureFlagLogic.selectors.featureFlags],
-            (featureFlags): NavbarItem[][] => {
+            () => [
+                featureFlagLogic.selectors.featureFlags,
+                dashboardsModel.selectors.dashboardsLoading,
+                dashboardsModel.selectors.pinnedDashboards,
+            ],
+            (featureFlags, dashboardsLoading, pinnedDashboards): NavbarItem[][] => {
                 const isUsingSidebar = featureFlags[FEATURE_FLAGS.POSTHOG_3000_NAV]
                 return [
                     [
@@ -329,6 +336,30 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
                             icon: <IconDashboard />,
                             logic: isUsingSidebar ? dashboardsSidebarLogic : undefined,
                             to: isUsingSidebar ? undefined : urls.dashboards(),
+                            sideAction: {
+                                identifier: 'pinned-dashboards-dropdown',
+                                dropdown: {
+                                    overlay: (
+                                        <LemonMenuOverlay
+                                            items={[
+                                                {
+                                                    title: 'Pinned dashboards',
+                                                    items: pinnedDashboards.map((dashboard) => ({
+                                                        label: dashboard.name,
+                                                        to: urls.dashboard(dashboard.id),
+                                                    })),
+                                                    footer: dashboardsLoading && (
+                                                        <div className="px-2 py-1 text-text-secondary-3000">
+                                                            <Spinner /> Loading…
+                                                        </div>
+                                                    ),
+                                                },
+                                            ]}
+                                        />
+                                    ),
+                                    placement: 'bottom-end',
+                                },
+                            },
                         },
                         {
                             identifier: Scene.Notebooks,
diff --git a/frontend/src/layout/navigation-3000/sidepanel/SidePanel.tsx b/frontend/src/layout/navigation-3000/sidepanel/SidePanel.tsx
index 85855e28b739a..b28915a8babe4 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/SidePanel.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/SidePanel.tsx
@@ -17,6 +17,7 @@ import { SidePanelActivation, SidePanelActivationIcon } from './panels/SidePanel
 import { SidePanelDocs } from './panels/SidePanelDocs'
 import { SidePanelFeaturePreviews } from './panels/SidePanelFeaturePreviews'
 import { SidePanelSettings } from './panels/SidePanelSettings'
+import { SidePanelStatus, SidePanelStatusIcon } from './panels/SidePanelStatus'
 import { SidePanelSupport } from './panels/SidePanelSupport'
 import { SidePanelWelcome } from './panels/SidePanelWelcome'
 import { sidePanelLogic } from './sidePanelLogic'
@@ -71,6 +72,11 @@ export const SIDE_PANEL_TABS: Record<SidePanelTab, { label: string; Icon: any; C
         Icon: IconConfetti,
         Content: SidePanelWelcome,
     },
+    [SidePanelTab.Status]: {
+        label: 'System status',
+        Icon: SidePanelStatusIcon,
+        Content: SidePanelStatus,
+    },
 }
 
 const DEFAULT_WIDTH = 512
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelDocs.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelDocs.tsx
index daaece9502404..300ccc2941089 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelDocs.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelDocs.tsx
@@ -13,7 +13,7 @@ type Menu = {
     url?: string
 }
 
-function SidePanelDocsSkeleton(): JSX.Element {
+export function SidePanelDocsSkeleton(): JSX.Element {
     return (
         <div className="absolute inset-0 p-4 space-y-2">
             <LemonSkeleton className="w-full h-10 mb-12" />
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelStatus.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelStatus.tsx
new file mode 100644
index 0000000000000..371b63cc013b7
--- /dev/null
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/SidePanelStatus.tsx
@@ -0,0 +1,68 @@
+import { IconCloud, IconExternal } from '@posthog/icons'
+import { LemonButton, Tooltip } from '@posthog/lemon-ui'
+import clsx from 'clsx'
+import { useActions, useValues } from 'kea'
+import { IconWithBadge } from 'lib/lemon-ui/icons'
+import { useState } from 'react'
+
+import { SidePanelPaneHeader } from '../components/SidePanelPaneHeader'
+import { sidePanelLogic } from '../sidePanelLogic'
+import { SidePanelDocsSkeleton } from './SidePanelDocs'
+import { sidePanelStatusLogic, STATUS_PAGE_BASE } from './sidePanelStatusLogic'
+
+export const SidePanelStatusIcon = (props: { className?: string }): JSX.Element => {
+    const { status, statusPage } = useValues(sidePanelStatusLogic)
+
+    let title = statusPage?.status.description
+    if (statusPage?.status.description === 'All Systems Operational') {
+        title = 'All systems operational' // Sentence-case Statuspage.io default message, which can't be changed
+    }
+
+    return (
+        <Tooltip title={title} placement="left">
+            <span {...props}>
+                <IconWithBadge
+                    content={status !== 'operational' ? '!' : '✓'}
+                    status={status.includes('outage') ? 'danger' : status.includes('degraded') ? 'warning' : 'success'}
+                >
+                    <IconCloud />
+                </IconWithBadge>
+            </span>
+        </Tooltip>
+    )
+}
+
+export const SidePanelStatus = (): JSX.Element => {
+    const { closeSidePanel } = useActions(sidePanelLogic)
+    const [ready, setReady] = useState(false)
+
+    return (
+        <>
+            <SidePanelPaneHeader>
+                <div className="flex-1" />
+                <LemonButton
+                    size="small"
+                    sideIcon={<IconExternal />}
+                    targetBlank
+                    // We can't use the normal `to` property as that is intercepted to open this panel :D
+                    onClick={() => {
+                        window.open(STATUS_PAGE_BASE, '_blank')?.focus()
+                        closeSidePanel()
+                    }}
+                >
+                    Open in new tab
+                </LemonButton>
+            </SidePanelPaneHeader>
+            <div className="relative flex-1 overflow-hidden">
+                <iframe
+                    src={STATUS_PAGE_BASE}
+                    title="Status"
+                    className={clsx('w-full h-full', !ready && 'hidden')}
+                    onLoad={() => setReady(true)}
+                />
+
+                {!ready && <SidePanelDocsSkeleton />}
+            </div>
+        </>
+    )
+}
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/sidePanelStatusLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/sidePanelStatusLogic.tsx
new file mode 100644
index 0000000000000..9918fdbd3af14
--- /dev/null
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/sidePanelStatusLogic.tsx
@@ -0,0 +1,159 @@
+import { actions, afterMount, beforeUnmount, connect, kea, listeners, path, reducers } from 'kea'
+import { loaders } from 'kea-loaders'
+import { FEATURE_FLAGS } from 'lib/constants'
+import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+
+import { sidePanelStateLogic } from '../sidePanelStateLogic'
+import type { sidePanelStatusLogicType } from './sidePanelStatusLogicType'
+
+export type SPIndicator = 'none' | 'minor' | 'major'
+
+export type SPComponentStatus = 'operational' | 'degraded_performance' | 'partial_outage' | 'major_outage'
+
+export interface SPSummary {
+    // page: SPPage
+    components: SPComponent[]
+    incidents: SPIncident[]
+    scheduled_maintenances: any[]
+    status: SPStatus
+}
+
+export interface SPComponent {
+    id: string
+    name: string
+    status: SPComponentStatus
+    created_at: Date
+    updated_at: Date
+    position: number
+    description: null | string
+    showcase: boolean
+    start_date: Date | null
+    group_id: null | string
+    page_id: string
+    group: boolean
+    only_show_if_degraded: boolean
+    components?: string[]
+}
+
+export interface SPIncident {
+    id: string
+    name: string
+    status: string
+    created_at: Date
+    updated_at: Date
+    monitoring_at: null
+    resolved_at: null
+    impact: string
+    shortlink: string
+    started_at: Date
+    page_id: string
+    incident_updates: SPIncidentUpdate[]
+    components: SPComponent[]
+    reminder_intervals: string
+}
+
+export interface SPIncidentUpdate {
+    id: string
+    status: string
+    body: string
+    incident_id: string
+    created_at: Date
+    updated_at: Date
+    display_at: Date
+    affected_components: SPAffectedComponent[]
+    deliver_notifications: boolean
+    custom_tweet: null
+    tweet_id: null
+}
+
+export interface SPAffectedComponent {
+    code: string
+    name: string
+    old_status: string
+    new_status: string
+}
+
+export interface SPStatus {
+    indicator: SPIndicator
+    description: string
+}
+
+export const STATUS_PAGE_BASE = 'https://status.posthog.com'
+
+// NOTE: Test account with some incidents - ask @benjackwhite for access
+// export const STATUS_PAGE_BASE = 'https://posthogtesting.statuspage.io'
+
+// Map the hostname to relevant groups (found via the summary.json endpoint)
+const RELEVANT_GROUPS_MAP = {
+    'us.posthog.com': ['41df083ftqt6', 'z0y6m9kyvy3j'],
+    'eu.posthog.com': ['c4d9jd1jcx3f', 'nfknrn2bf3yz'],
+    localhost: ['f58xx1143yvt', 't3rdjq2z0x7p'], // localhost has IDs for the test status page - that way we really only show it if local dev and overridden to use the other status page
+}
+
+export const REFRESH_INTERVAL = 60 * 1000 * 5 // 5 minutes
+
+export const sidePanelStatusLogic = kea<sidePanelStatusLogicType>([
+    path(['scenes', 'navigation', 'sidepanel', 'sidePanelStatusLogic']),
+    connect({
+        values: [featureFlagLogic, ['featureFlags']],
+        actions: [sidePanelStateLogic, ['openSidePanel', 'closeSidePanel']],
+    }),
+
+    actions({
+        loadStatusPage: true,
+    }),
+
+    reducers(() => ({
+        // Persisted copy to avoid flash effect on page load
+        status: [
+            'operational' as SPComponentStatus,
+            { persist: true },
+            {
+                loadStatusPageSuccess: (_, { statusPage }) => {
+                    const relevantGroups = RELEVANT_GROUPS_MAP[window.location.hostname]
+                    if (!relevantGroups) {
+                        return 'operational'
+                    }
+
+                    return (
+                        statusPage.components.find(
+                            ({ group_id, status }) => relevantGroups.includes(group_id) && status !== 'operational'
+                        )?.status || 'operational'
+                    )
+                },
+                loadStatusPageFailure: () => 'operational',
+            },
+        ],
+    })),
+
+    loaders(() => ({
+        statusPage: [
+            null as SPSummary | null,
+            {
+                loadStatusPage: async () => {
+                    const response = await fetch(`${STATUS_PAGE_BASE}/api/v2/summary.json`)
+                    const data: SPSummary = await response.json()
+
+                    return data
+                },
+            },
+        ],
+    })),
+
+    listeners(({ actions, cache }) => ({
+        loadStatusPageSuccess: () => {
+            clearTimeout(cache.timeout)
+            cache.timeout = setTimeout(() => actions.loadStatusPage(), REFRESH_INTERVAL)
+        },
+    })),
+
+    afterMount(({ actions, values }) => {
+        if (values.featureFlags[FEATURE_FLAGS.SIDEPANEL_STATUS]) {
+            actions.loadStatusPage()
+        }
+    }),
+
+    beforeUnmount(({ cache }) => {
+        clearTimeout(cache.timeout)
+    }),
+])
diff --git a/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
index 8f08d0e972ff1..50a69e41cc681 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
@@ -10,6 +10,7 @@ import { SidePanelTab } from '~/types'
 
 import { sidePanelActivityLogic } from './panels/activity/sidePanelActivityLogic'
 import { sidePanelDiscussionLogic } from './panels/discussion/sidePanelDiscussionLogic'
+import { sidePanelStatusLogic } from './panels/sidePanelStatusLogic'
 import type { sidePanelLogicType } from './sidePanelLogicType'
 import { sidePanelStateLogic } from './sidePanelStateLogic'
 
@@ -18,6 +19,7 @@ const ALWAYS_EXTRA_TABS = [
     SidePanelTab.FeaturePreviews,
     SidePanelTab.Activity,
     SidePanelTab.Welcome,
+    SidePanelTab.Status,
 ]
 
 export const sidePanelLogic = kea<sidePanelLogicType>([
@@ -37,6 +39,8 @@ export const sidePanelLogic = kea<sidePanelLogicType>([
             ['unreadCount'],
             sidePanelDiscussionLogic,
             ['commentCount', 'commentCountLoading'],
+            sidePanelStatusLogic,
+            ['status'],
         ],
         actions: [sidePanelStateLogic, ['closeSidePanel', 'openSidePanel']],
     }),
@@ -85,7 +89,6 @@ export const sidePanelLogic = kea<sidePanelLogicType>([
                 if (isCloudOrDev) {
                     tabs.push(SidePanelTab.Support)
                 }
-                tabs.push(SidePanelTab.Settings)
                 tabs.push(SidePanelTab.Activity)
                 if (isReady && !hasCompletedAllTasks) {
                     tabs.push(SidePanelTab.Activation)
@@ -94,15 +97,20 @@ export const sidePanelLogic = kea<sidePanelLogicType>([
                     tabs.push(SidePanelTab.Discussion)
                 }
                 tabs.push(SidePanelTab.FeaturePreviews)
+                tabs.push(SidePanelTab.Settings)
                 tabs.push(SidePanelTab.Welcome)
 
+                if (isCloudOrDev && featureflags[FEATURE_FLAGS.SIDEPANEL_STATUS]) {
+                    tabs.push(SidePanelTab.Status)
+                }
+
                 return tabs
             },
         ],
 
         visibleTabs: [
-            (s) => [s.enabledTabs, s.selectedTab, s.sidePanelOpen, s.commentCount, s.unreadCount],
-            (enabledTabs, selectedTab, sidePanelOpen, commentCount, unreadCount): SidePanelTab[] => {
+            (s) => [s.enabledTabs, s.selectedTab, s.sidePanelOpen, s.commentCount, s.unreadCount, s.status],
+            (enabledTabs, selectedTab, sidePanelOpen, commentCount, unreadCount, status): SidePanelTab[] => {
                 return enabledTabs.filter((tab) => {
                     if (tab === selectedTab && sidePanelOpen) {
                         return true
@@ -116,6 +124,10 @@ export const sidePanelLogic = kea<sidePanelLogicType>([
                         return true
                     }
 
+                    if (tab === SidePanelTab.Status && status !== 'operational') {
+                        return true
+                    }
+
                     // Hide certain tabs unless they are selected
                     if (ALWAYS_EXTRA_TABS.includes(tab)) {
                         return false
diff --git a/frontend/src/layout/navigation-3000/types.ts b/frontend/src/layout/navigation-3000/types.ts
index a843416a6d6e8..66909129d33b3 100644
--- a/frontend/src/layout/navigation-3000/types.ts
+++ b/frontend/src/layout/navigation-3000/types.ts
@@ -30,7 +30,7 @@ interface NavbarItemBase {
     icon: JSX.Element
     featureFlag?: (typeof FEATURE_FLAGS)[keyof typeof FEATURE_FLAGS]
     tag?: 'alpha' | 'beta' | 'new'
-    sideAction?: Pick<SideAction, 'icon' | 'to' | 'onClick' | 'tooltip'> & { identifier: string }
+    sideAction?: Pick<SideAction, 'icon' | 'to' | 'onClick' | 'tooltip' | 'dropdown'> & { identifier: string }
 }
 export interface SceneNavbarItem extends NavbarItemBase {
     to: string
diff --git a/frontend/src/lib/api.mock.ts b/frontend/src/lib/api.mock.ts
index 68b1fbd7a466d..7da459c7baf54 100644
--- a/frontend/src/lib/api.mock.ts
+++ b/frontend/src/lib/api.mock.ts
@@ -239,6 +239,8 @@ export const MOCK_DEFAULT_PLUGIN: PluginType = {
     },
     metrics: {},
     public_jobs: {},
+    // urls are hard-coded in frontend/src/scenes/pipeline/utils.tsx so it must be one of those URLs for tests to work
+    url: 'https://github.com/PostHog/downsampling-plugin',
 }
 
 export const MOCK_DEFAULT_PLUGIN_CONFIG: PluginConfigWithPluginInfo = {
diff --git a/frontend/src/lib/components/PayGateMini/PayGateMini.tsx b/frontend/src/lib/components/PayGateMini/PayGateMini.tsx
index f801f600cf045..1fc4ac3e22fbb 100644
--- a/frontend/src/lib/components/PayGateMini/PayGateMini.tsx
+++ b/frontend/src/lib/components/PayGateMini/PayGateMini.tsx
@@ -20,6 +20,7 @@ type PayGateSupportedFeatures =
     | AvailableFeature.PATHS_ADVANCED
     | AvailableFeature.SURVEYS_STYLING
     | AvailableFeature.SURVEYS_TEXT_HTML
+    | AvailableFeature.DATA_PIPELINES
 
 export interface PayGateMiniProps {
     feature: PayGateSupportedFeatures
@@ -83,6 +84,11 @@ const FEATURE_SUMMARIES: Record<
         umbrella: 'surveys customization',
         docsHref: 'https://posthog.com/docs/surveys',
     },
+    [AvailableFeature.DATA_PIPELINES]: {
+        description: 'Create export workflows to send your data to a destination of your choice.',
+        umbrella: 'data pipelines',
+        docsHref: 'https://posthog.com/docs/data-pipelines',
+    },
 }
 
 /** A sort of paywall for premium features.
@@ -143,8 +149,7 @@ export function PayGateMini({
                         ? '/organization/billing'
                         : undefined
                 }
-                type="secondary"
-                fullWidth
+                type="primary"
                 center
             >
                 {gateVariant === 'add-card'
diff --git a/frontend/src/lib/components/UnitPicker/CustomUnitModal.tsx b/frontend/src/lib/components/UnitPicker/CustomUnitModal.tsx
index 8491aafb0c61d..e3e4226744377 100644
--- a/frontend/src/lib/components/UnitPicker/CustomUnitModal.tsx
+++ b/frontend/src/lib/components/UnitPicker/CustomUnitModal.tsx
@@ -13,11 +13,11 @@ function chooseFormativeElementValue(
     trendsFilter: TrendsFilter | null | undefined
 ): string {
     if (formativeElement === 'prefix') {
-        return trendsFilter?.aggregation_axis_prefix || ''
+        return trendsFilter?.aggregationAxisPrefix || ''
     }
 
     if (formativeElement === 'postfix') {
-        return trendsFilter?.aggregation_axis_postfix || ''
+        return trendsFilter?.aggregationAxisPostfix || ''
     }
 
     return ''
diff --git a/frontend/src/lib/components/UnitPicker/UnitPicker.tsx b/frontend/src/lib/components/UnitPicker/UnitPicker.tsx
index 675aa251add3b..7a35b1d357269 100644
--- a/frontend/src/lib/components/UnitPicker/UnitPicker.tsx
+++ b/frontend/src/lib/components/UnitPicker/UnitPicker.tsx
@@ -29,7 +29,7 @@ export function UnitPicker(): JSX.Element {
     const { reportAxisUnitsChanged } = useActions(eventUsageLogic)
 
     const [isVisible, setIsVisible] = useState(false)
-    const [localAxisFormat, setLocalAxisFormat] = useState(trendsFilter?.aggregation_axis_format || undefined)
+    const [localAxisFormat, setLocalAxisFormat] = useState(trendsFilter?.aggregationAxisFormat || undefined)
     const [customUnitModal, setCustomUnitModal] = useState<'prefix' | 'postfix' | null>(null)
 
     const customUnitModalRef = useRef<HTMLDivElement | null>(null)
@@ -50,9 +50,9 @@ export function UnitPicker(): JSX.Element {
         setLocalAxisFormat(format)
 
         updateInsightFilter({
-            aggregation_axis_format: format,
-            aggregation_axis_prefix: prefix,
-            aggregation_axis_postfix: postfix,
+            aggregationAxisFormat: format,
+            aggregationAxisPrefix: prefix,
+            aggregationAxisPostfix: postfix,
         })
 
         reportAxisUnitsChanged({
@@ -72,11 +72,11 @@ export function UnitPicker(): JSX.Element {
         if (localAxisFormat) {
             displayValue = aggregationDisplayMap[localAxisFormat]
         }
-        if (trendsFilter?.aggregation_axis_prefix?.length) {
-            displayValue = `Prefix: ${trendsFilter?.aggregation_axis_prefix}`
+        if (trendsFilter?.aggregationAxisPrefix?.length) {
+            displayValue = `Prefix: ${trendsFilter?.aggregationAxisPrefix}`
         }
-        if (trendsFilter?.aggregation_axis_postfix?.length) {
-            displayValue = `Postfix: ${trendsFilter?.aggregation_axis_postfix}`
+        if (trendsFilter?.aggregationAxisPostfix?.length) {
+            displayValue = `Postfix: ${trendsFilter?.aggregationAxisPostfix}`
         }
         return displayValue
     }, [localAxisFormat, trendsFilter])
@@ -118,22 +118,22 @@ export function UnitPicker(): JSX.Element {
                                 <LemonDivider />
                                 <LemonButton
                                     onClick={() => setCustomUnitModal('prefix')}
-                                    active={!!trendsFilter?.aggregation_axis_prefix}
+                                    active={!!trendsFilter?.aggregationAxisPrefix}
                                     fullWidth
                                 >
                                     Custom prefix
-                                    {trendsFilter?.aggregation_axis_prefix
-                                        ? `: ${trendsFilter?.aggregation_axis_prefix}...`
+                                    {trendsFilter?.aggregationAxisPrefix
+                                        ? `: ${trendsFilter?.aggregationAxisPrefix}...`
                                         : '...'}
                                 </LemonButton>
                                 <LemonButton
                                     onClick={() => setCustomUnitModal('postfix')}
-                                    active={!!trendsFilter?.aggregation_axis_postfix}
+                                    active={!!trendsFilter?.aggregationAxisPostfix}
                                     fullWidth
                                 >
                                     Custom postfix
-                                    {trendsFilter?.aggregation_axis_postfix
-                                        ? `: ${trendsFilter?.aggregation_axis_postfix}...`
+                                    {trendsFilter?.aggregationAxisPostfix
+                                        ? `: ${trendsFilter?.aggregationAxisPostfix}...`
                                         : '...'}
                                 </LemonButton>
                             </>
diff --git a/frontend/src/lib/constants.tsx b/frontend/src/lib/constants.tsx
index 07763e3f9e24a..7efe560091311 100644
--- a/frontend/src/lib/constants.tsx
+++ b/frontend/src/lib/constants.tsx
@@ -191,8 +191,9 @@ export const FEATURE_FLAGS = {
     YEAR_IN_HOG: 'year-in-hog', // owner: #team-replay
     SESSION_REPLAY_EXPORT_MOBILE_DATA: 'session-replay-export-mobile-data', // owner: #team-replay
     DISCUSSIONS: 'discussions', // owner: #team-replay
-    REDIRECT_INGESTION_PRODUCT_ANALYTICS_ONBOARDING: 'redirect-ingestion-product-analytics-onboarding', // owner: @biancayang
+    REDIRECT_WEB_PRODUCT_ANALYTICS_ONBOARDING: 'redirect-web-product-analytics-onboarding', // owner: @biancayang
     RECRUIT_ANDROID_MOBILE_BETA_TESTERS: 'recruit-android-mobile-beta-testers', // owner: #team-replay
+    SIDEPANEL_STATUS: 'sidepanel-status', // owner: @benjackwhite
 } as const
 export type FeatureFlagKey = (typeof FEATURE_FLAGS)[keyof typeof FEATURE_FLAGS]
 
@@ -225,6 +226,7 @@ export const FEATURE_MINIMUM_PLAN: Partial<Record<AvailableFeature, LicensePlan>
     [AvailableFeature.SURVEYS_STYLING]: LicensePlan.Scale,
     [AvailableFeature.SURVEYS_MULTIPLE_QUESTIONS]: LicensePlan.Scale,
     [AvailableFeature.SURVEYS_TEXT_HTML]: LicensePlan.Scale,
+    [AvailableFeature.DATA_PIPELINES]: LicensePlan.Scale,
 }
 
 export const ENTITY_MATCH_TYPE = 'entities'
diff --git a/frontend/src/lib/lemon-ui/icons/icons.stories.tsx b/frontend/src/lib/lemon-ui/icons/icons.stories.tsx
index 2c7c61429d41f..c065b31e68392 100644
--- a/frontend/src/lib/lemon-ui/icons/icons.stories.tsx
+++ b/frontend/src/lib/lemon-ui/icons/icons.stories.tsx
@@ -38,7 +38,7 @@ interface IconDefinition {
 }
 
 const allIcons: IconDefinition[] = Object.entries(icons)
-    .filter(([key]) => key !== 'IconWithCount')
+    .filter(([key]) => key !== 'IconWithCount' && key !== 'IconWithBadge')
     .map(([key, Icon]) => ({ name: key, icon: Icon }))
     .sort((a, b) => a.name.localeCompare(b.name))
 
diff --git a/frontend/src/lib/lemon-ui/icons/icons.tsx b/frontend/src/lib/lemon-ui/icons/icons.tsx
index 838d286302d08..b7993fcd0a1ec 100644
--- a/frontend/src/lib/lemon-ui/icons/icons.tsx
+++ b/frontend/src/lib/lemon-ui/icons/icons.tsx
@@ -5,6 +5,12 @@ import clsx from 'clsx'
 import { LemonBadge, LemonBadgeProps } from 'lib/lemon-ui/LemonBadge'
 import { CSSProperties, PropsWithChildren, SVGAttributes } from 'react'
 
+interface IconWithBadgeProps {
+    content: LemonBadgeProps['content']
+    status?: LemonBadgeProps['status']
+    className?: string
+}
+
 interface IconWithCountProps {
     count: number
     showZero?: boolean
@@ -27,6 +33,20 @@ export function IconWithCount({
     )
 }
 
+export function IconWithBadge({
+    content,
+    children,
+    status = 'primary',
+    className,
+}: PropsWithChildren<IconWithBadgeProps>): JSX.Element {
+    return (
+        <span className={clsx('relative inline-flex', className)}>
+            {children}
+            <LemonBadge visible={!!content} content={content} size="small" position="top-right" status={status} />
+        </span>
+    )
+}
+
 export interface LemonIconProps {
     color?: string
     fontSize?: string
diff --git a/frontend/src/lib/utils/router-utils.ts b/frontend/src/lib/utils/router-utils.ts
index d9544b7c37e43..e9528228a4394 100644
--- a/frontend/src/lib/utils/router-utils.ts
+++ b/frontend/src/lib/utils/router-utils.ts
@@ -1,20 +1,31 @@
+import { TeamType } from '~/types'
+
 import { getCurrentTeamId } from './getAppContext'
 
-const pathsWithoutProjectId = ['api', 'me', 'instance', 'organization', 'preflight', 'login', 'signup']
+const pathsWithoutProjectId = [
+    'api',
+    'me',
+    'instance',
+    'organization',
+    'preflight',
+    'login',
+    'signup',
+    'create-organization',
+]
 
 function isPathWithoutProjectId(path: string): boolean {
     const firstPart = path.split('/')[1]
     return pathsWithoutProjectId.includes(firstPart)
 }
 
-function addProjectIdUnlessPresent(path: string): string {
+function addProjectIdUnlessPresent(path: string, teamId?: TeamType['id']): string {
     if (path.match(/^\/project\/\d+/)) {
         return path
     }
 
     let prefix = ''
     try {
-        prefix = `/project/${getCurrentTeamId()}`
+        prefix = `/project/${teamId ?? getCurrentTeamId()}`
         if (path == '/') {
             return prefix
         }
@@ -34,6 +45,8 @@ export function removeProjectIdIfPresent(path: string): string {
     return path
 }
 
-export function addProjectIdIfMissing(path: string): string {
-    return isPathWithoutProjectId(path) ? removeProjectIdIfPresent(path) : addProjectIdUnlessPresent(path)
+export function addProjectIdIfMissing(path: string, teamId?: TeamType['id']): string {
+    return isPathWithoutProjectId(removeProjectIdIfPresent(path))
+        ? removeProjectIdIfPresent(path)
+        : addProjectIdUnlessPresent(path, teamId)
 }
diff --git a/frontend/src/loadPostHogJS.tsx b/frontend/src/loadPostHogJS.tsx
index d56a7545adde3..1d64c1d9a2388 100644
--- a/frontend/src/loadPostHogJS.tsx
+++ b/frontend/src/loadPostHogJS.tsx
@@ -37,7 +37,7 @@ export function loadPostHogJS(): void {
                         posthog.opt_in_capturing()
                     }
                 },
-                __preview_measure_pageview_stats: true,
+                scroll_root_selector: ['main', 'html'],
             })
         )
 
diff --git a/frontend/src/queries/nodes/InsightQuery/utils/filtersToQueryNode.test.ts b/frontend/src/queries/nodes/InsightQuery/utils/filtersToQueryNode.test.ts
index abceb32d1c9b7..7af2bd379bb90 100644
--- a/frontend/src/queries/nodes/InsightQuery/utils/filtersToQueryNode.test.ts
+++ b/frontend/src/queries/nodes/InsightQuery/utils/filtersToQueryNode.test.ts
@@ -316,6 +316,7 @@ describe('filtersToQueryNode', () => {
                 formula: 'A+B',
                 shown_as: ShownAsValue.VOLUME,
                 display: ChartDisplayType.ActionsAreaGraph,
+                show_percent_stack_view: true,
             }
 
             const result = filtersToQueryNode(filters)
@@ -327,12 +328,13 @@ describe('filtersToQueryNode', () => {
                     show_legend: true,
                     hidden_legend_indexes: [0, 10],
                     compare: true,
-                    aggregation_axis_format: 'numeric',
-                    aggregation_axis_prefix: '£',
-                    aggregation_axis_postfix: '%',
-                    decimal_places: 8,
+                    aggregationAxisFormat: 'numeric',
+                    aggregationAxisPrefix: '£',
+                    aggregationAxisPostfix: '%',
+                    decimalPlaces: 8,
                     formula: 'A+B',
                     display: ChartDisplayType.ActionsAreaGraph,
+                    showPercentStackView: true,
                 },
                 breakdownFilter: {
                     breakdown_histogram_bin_count: 1,
@@ -576,6 +578,53 @@ describe('filtersToQueryNode', () => {
             }
             expect(result).toEqual(query)
         })
+
+        it('converts properties with the correct cohort structure', () => {
+            const properties: any = {
+                type: FilterLogicalOperator.And,
+                values: [
+                    {
+                        type: FilterLogicalOperator.And,
+                        values: [
+                            {
+                                key: 'id',
+                                type: PropertyFilterType.Cohort,
+                                value: 6,
+                                operator: null,
+                            },
+                        ],
+                    },
+                ],
+            }
+
+            const filters: Partial<FilterType> = {
+                insight: InsightType.TRENDS,
+                properties,
+            }
+
+            const result = filtersToQueryNode(filters)
+
+            const query: InsightQueryNode = {
+                kind: NodeKind.TrendsQuery,
+                properties: {
+                    type: FilterLogicalOperator.And,
+                    values: [
+                        {
+                            type: FilterLogicalOperator.And,
+                            values: [
+                                {
+                                    key: 'id',
+                                    type: PropertyFilterType.Cohort,
+                                    value: 6,
+                                },
+                            ],
+                        },
+                    ],
+                },
+                series: [],
+            }
+            expect(result).toEqual(query)
+        })
     })
 
     describe('example insights', () => {
diff --git a/frontend/src/queries/nodes/InsightQuery/utils/filtersToQueryNode.ts b/frontend/src/queries/nodes/InsightQuery/utils/filtersToQueryNode.ts
index 73f3b26e274e0..246d3677af7d4 100644
--- a/frontend/src/queries/nodes/InsightQuery/utils/filtersToQueryNode.ts
+++ b/frontend/src/queries/nodes/InsightQuery/utils/filtersToQueryNode.ts
@@ -126,6 +126,14 @@ const cleanProperties = (parentProperties: FilterType['properties']): InsightsQu
             }
         }
 
+        // Some saved insights have `"operator": null` defined in the properties, this
+        // breaks HogQL trends and Pydantic validation
+        if (filter.type === PropertyFilterType.Cohort) {
+            if ('operator' in filter) {
+                delete filter.operator
+            }
+        }
+
         return filter
     }
 
@@ -254,14 +262,15 @@ export const filtersToQueryNode = (filters: Partial<FilterType>): InsightQueryNo
             show_legend: filters.show_legend,
             hidden_legend_indexes: cleanHiddenLegendIndexes(filters.hidden_legend_keys),
             compare: filters.compare,
-            aggregation_axis_format: filters.aggregation_axis_format,
-            aggregation_axis_prefix: filters.aggregation_axis_prefix,
-            aggregation_axis_postfix: filters.aggregation_axis_postfix,
-            decimal_places: filters.decimal_places,
+            aggregationAxisFormat: filters.aggregation_axis_format,
+            aggregationAxisPrefix: filters.aggregation_axis_prefix,
+            aggregationAxisPostfix: filters.aggregation_axis_postfix,
+            decimalPlaces: filters.decimal_places,
             formula: filters.formula,
             display: filters.display,
             show_values_on_series: filters.show_values_on_series,
-            show_percent_stack_view: filters.show_percent_stack_view,
+            showPercentStackView: filters.show_percent_stack_view,
+            showLabelsOnSeries: filters.show_labels_on_series,
         })
     }
 
diff --git a/frontend/src/queries/nodes/InsightQuery/utils/queryNodeToFilter.test.ts b/frontend/src/queries/nodes/InsightQuery/utils/queryNodeToFilter.test.ts
index 81386be669a3e..a935c910522d5 100644
--- a/frontend/src/queries/nodes/InsightQuery/utils/queryNodeToFilter.test.ts
+++ b/frontend/src/queries/nodes/InsightQuery/utils/queryNodeToFilter.test.ts
@@ -56,13 +56,13 @@ describe('queryNodeToFilter', () => {
                 display: ChartDisplayType.ActionsBar,
                 // breakdown_histogram_bin_count?: TrendsFilterLegacy['breakdown_histogram_bin_count']
                 // show_legend?: TrendsFilterLegacy['show_legend']
-                // aggregation_axis_format?: TrendsFilterLegacy['aggregation_axis_format']
-                // aggregation_axis_prefix?: TrendsFilterLegacy['aggregation_axis_prefix']
-                // aggregation_axis_postfix?: TrendsFilterLegacy['aggregation_axis_postfix']
-                // decimal_places?: TrendsFilterLegacy['decimal_places']
+                aggregationAxisFormat: 'numeric',
+                aggregationAxisPrefix: 'M',
+                aggregationAxisPostfix: '$',
+                decimalPlaces: 5,
                 // show_values_on_series?: TrendsFilterLegacy['show_values_on_series']
-                // show_labels_on_series?: TrendsFilterLegacy['show_labels_on_series']
-                // show_percent_stack_view?: TrendsFilterLegacy['show_percent_stack_view']
+                showLabelsOnSeries: true,
+                showPercentStackView: true,
                 // hidden_legend_indexes?: TrendsFilterLegacy['hidden_legend_indexes']
             },
         }
@@ -78,6 +78,12 @@ describe('queryNodeToFilter', () => {
             display: ChartDisplayType.ActionsBar,
             formula: 'A + B',
             compare: true,
+            decimal_places: 5,
+            aggregation_axis_format: 'numeric',
+            aggregation_axis_prefix: 'M',
+            aggregation_axis_postfix: '$',
+            show_labels_on_series: true,
+            show_percent_stack_view: true,
         }
         expect(result).toEqual(filters)
     })
diff --git a/frontend/src/queries/nodes/InsightQuery/utils/queryNodeToFilter.ts b/frontend/src/queries/nodes/InsightQuery/utils/queryNodeToFilter.ts
index 7ea157508b39d..c4fa3b175e67c 100644
--- a/frontend/src/queries/nodes/InsightQuery/utils/queryNodeToFilter.ts
+++ b/frontend/src/queries/nodes/InsightQuery/utils/queryNodeToFilter.ts
@@ -151,7 +151,19 @@ export const queryNodeToFilter = (query: InsightQueryNode): Partial<FilterType>
     const legacyProps: TrendsFilterLegacy = {}
     if (isTrendsQuery(query)) {
         legacyProps.smoothing_intervals = insightFilter.smoothingIntervals
+        legacyProps.decimal_places = insightFilter.decimalPlaces
+        legacyProps.aggregation_axis_format = insightFilter.aggregationAxisFormat
+        legacyProps.aggregation_axis_postfix = insightFilter.aggregationAxisPostfix
+        legacyProps.aggregation_axis_prefix = insightFilter.aggregationAxisPrefix
+        legacyProps.show_labels_on_series = insightFilter.showLabelsOnSeries
+        legacyProps.show_percent_stack_view = insightFilter.showPercentStackView
         delete insightFilter.smoothingIntervals
+        delete insightFilter.decimalPlaces
+        delete insightFilter.aggregationAxisFormat
+        delete insightFilter.aggregationAxisPostfix
+        delete insightFilter.aggregationAxisPrefix
+        delete insightFilter.showLabelsOnSeries
+        delete insightFilter.showPercentStackView
     }
     Object.assign(filters, insightFilter)
     Object.assign(filters, legacyProps)
diff --git a/frontend/src/queries/nodes/InsightViz/InsightDisplayConfig.tsx b/frontend/src/queries/nodes/InsightViz/InsightDisplayConfig.tsx
index 4cbe9e56b4cbb..68869cf4e6c78 100644
--- a/frontend/src/queries/nodes/InsightViz/InsightDisplayConfig.tsx
+++ b/frontend/src/queries/nodes/InsightViz/InsightDisplayConfig.tsx
@@ -106,8 +106,8 @@ export function InsightDisplayConfig(): JSX.Element {
         (showPercentStackView && isPercentStackViewOn ? 1 : 0) +
         (!isPercentStackViewOn &&
         isTrends &&
-        trendsFilter?.aggregation_axis_format &&
-        trendsFilter.aggregation_axis_format !== 'numeric'
+        trendsFilter?.aggregationAxisFormat &&
+        trendsFilter.aggregationAxisFormat !== 'numeric'
             ? 1
             : 0) +
         (hasLegend && showLegend ? 1 : 0)
@@ -199,7 +199,7 @@ function DecimalPrecisionInput(): JSX.Element {
 
     const reportChange = useDebouncedCallback(() => {
         posthog.capture('decimal places changed', {
-            decimal_places: trendsFilter?.decimal_places,
+            decimal_places: trendsFilter?.decimalPlaces,
         })
     }, 500)
 
@@ -211,10 +211,10 @@ function DecimalPrecisionInput(): JSX.Element {
             min={0}
             max={9}
             defaultValue={DEFAULT_DECIMAL_PLACES}
-            value={trendsFilter?.decimal_places}
+            value={trendsFilter?.decimalPlaces}
             onChange={(value) => {
                 updateInsightFilter({
-                    decimal_places: value,
+                    decimalPlaces: value,
                 })
                 reportChange()
             }}
diff --git a/frontend/src/queries/nodes/InsightViz/utils.ts b/frontend/src/queries/nodes/InsightViz/utils.ts
index 55a6aa99f640f..a7fa870d8b355 100644
--- a/frontend/src/queries/nodes/InsightViz/utils.ts
+++ b/frontend/src/queries/nodes/InsightViz/utils.ts
@@ -107,7 +107,7 @@ export const getShowValueOnSeries = (query: InsightQueryNode): boolean | undefin
 
 export const getShowLabelsOnSeries = (query: InsightQueryNode): boolean | undefined => {
     if (isTrendsQuery(query)) {
-        return query.trendsFilter?.show_labels_on_series
+        return query.trendsFilter?.showLabelsOnSeries
     } else {
         return undefined
     }
@@ -115,7 +115,7 @@ export const getShowLabelsOnSeries = (query: InsightQueryNode): boolean | undefi
 
 export const getShowPercentStackView = (query: InsightQueryNode): boolean | undefined => {
     if (isTrendsQuery(query)) {
-        return query.trendsFilter?.show_percent_stack_view
+        return query.trendsFilter?.showPercentStackView
     } else {
         return undefined
     }
diff --git a/frontend/src/queries/schema.json b/frontend/src/queries/schema.json
index 87c95f8f3f52f..40df13d525209 100644
--- a/frontend/src/queries/schema.json
+++ b/frontend/src/queries/schema.json
@@ -1709,7 +1709,7 @@
             "description": "HogQL Query Options are automatically set per team. However, they can be overriden in the query.",
             "properties": {
                 "inCohortVia": {
-                    "enum": ["leftjoin", "subquery"],
+                    "enum": ["leftjoin", "subquery", "leftjoin_conjoined"],
                     "type": "string"
                 },
                 "materializationMode": {
@@ -3741,13 +3741,13 @@
         "TrendsFilter": {
             "additionalProperties": false,
             "properties": {
-                "aggregation_axis_format": {
+                "aggregationAxisFormat": {
                     "$ref": "#/definitions/AggregationAxisFormat"
                 },
-                "aggregation_axis_postfix": {
+                "aggregationAxisPostfix": {
                     "type": "string"
                 },
-                "aggregation_axis_prefix": {
+                "aggregationAxisPrefix": {
                     "type": "string"
                 },
                 "breakdown_histogram_bin_count": {
@@ -3756,7 +3756,7 @@
                 "compare": {
                     "type": "boolean"
                 },
-                "decimal_places": {
+                "decimalPlaces": {
                     "type": "number"
                 },
                 "display": {
@@ -3771,13 +3771,13 @@
                     },
                     "type": "array"
                 },
-                "show_labels_on_series": {
+                "showLabelsOnSeries": {
                     "type": "boolean"
                 },
-                "show_legend": {
+                "showPercentStackView": {
                     "type": "boolean"
                 },
-                "show_percent_stack_view": {
+                "show_legend": {
                     "type": "boolean"
                 },
                 "show_values_on_series": {
diff --git a/frontend/src/queries/schema.ts b/frontend/src/queries/schema.ts
index a3896933b2295..d705cc839240e 100644
--- a/frontend/src/queries/schema.ts
+++ b/frontend/src/queries/schema.ts
@@ -161,7 +161,7 @@ export interface DataNode extends Node {
 export interface HogQLQueryModifiers {
     personsOnEventsMode?: 'disabled' | 'v1_enabled' | 'v1_mixed' | 'v2_enabled'
     personsArgMaxVersion?: 'auto' | 'v1' | 'v2'
-    inCohortVia?: 'leftjoin' | 'subquery'
+    inCohortVia?: 'leftjoin' | 'subquery' | 'leftjoin_conjoined'
     materializationMode?: 'auto' | 'legacy_null_as_string' | 'legacy_null_as_null' | 'disabled'
 }
 
@@ -513,15 +513,15 @@ export type TrendsFilter = {
     compare?: TrendsFilterLegacy['compare']
     formula?: TrendsFilterLegacy['formula']
     display?: TrendsFilterLegacy['display']
-    breakdown_histogram_bin_count?: TrendsFilterLegacy['breakdown_histogram_bin_count']
     show_legend?: TrendsFilterLegacy['show_legend']
-    aggregation_axis_format?: TrendsFilterLegacy['aggregation_axis_format']
-    aggregation_axis_prefix?: TrendsFilterLegacy['aggregation_axis_prefix']
-    aggregation_axis_postfix?: TrendsFilterLegacy['aggregation_axis_postfix']
-    decimal_places?: TrendsFilterLegacy['decimal_places']
+    breakdown_histogram_bin_count?: TrendsFilterLegacy['breakdown_histogram_bin_count'] // TODO: fully move into BreakdownFilter
+    aggregationAxisFormat?: TrendsFilterLegacy['aggregation_axis_format']
+    aggregationAxisPrefix?: TrendsFilterLegacy['aggregation_axis_prefix']
+    aggregationAxisPostfix?: TrendsFilterLegacy['aggregation_axis_postfix']
+    decimalPlaces?: TrendsFilterLegacy['decimal_places']
     show_values_on_series?: TrendsFilterLegacy['show_values_on_series']
-    show_labels_on_series?: TrendsFilterLegacy['show_labels_on_series']
-    show_percent_stack_view?: TrendsFilterLegacy['show_percent_stack_view']
+    showLabelsOnSeries?: TrendsFilterLegacy['show_labels_on_series']
+    showPercentStackView?: TrendsFilterLegacy['show_percent_stack_view']
     hidden_legend_indexes?: TrendsFilterLegacy['hidden_legend_indexes']
 }
 
diff --git a/frontend/src/scenes/batch_exports/BatchExportBackfillModal.tsx b/frontend/src/scenes/batch_exports/BatchExportBackfillModal.tsx
index 3bdb8c51fce21..1c5ae84c4f2cb 100644
--- a/frontend/src/scenes/batch_exports/BatchExportBackfillModal.tsx
+++ b/frontend/src/scenes/batch_exports/BatchExportBackfillModal.tsx
@@ -4,10 +4,17 @@ import { Field } from 'lib/forms/Field'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 import { LemonCalendarSelectInput } from 'lib/lemon-ui/LemonCalendar/LemonCalendarSelect'
 import { LemonModal } from 'lib/lemon-ui/LemonModal'
+import { userLogic } from 'scenes/userLogic'
+
+import { AvailableFeature } from '~/types'
 
 import { batchExportLogic } from './batchExportLogic'
 
 export function BatchExportBackfillModal(): JSX.Element {
+    const { hasAvailableFeature } = useValues(userLogic)
+    if (!hasAvailableFeature(AvailableFeature.DATA_PIPELINES)) {
+        return <></>
+    }
     const { batchExportConfig, isBackfillModalOpen, isBackfillFormSubmitting } = useValues(batchExportLogic)
     const { closeBackfillModal } = useActions(batchExportLogic)
 
diff --git a/frontend/src/scenes/batch_exports/BatchExportEditForm.tsx b/frontend/src/scenes/batch_exports/BatchExportEditForm.tsx
index 92b5246510c71..0a5b7f66d6aac 100644
--- a/frontend/src/scenes/batch_exports/BatchExportEditForm.tsx
+++ b/frontend/src/scenes/batch_exports/BatchExportEditForm.tsx
@@ -11,10 +11,17 @@ import { LemonSelectMultiple } from 'lib/lemon-ui/LemonSelectMultiple/LemonSelec
 import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { userLogic } from 'scenes/userLogic'
+
+import { AvailableFeature } from '~/types'
 
 import { batchExportsEditLogic, BatchExportsEditLogicProps } from './batchExportEditLogic'
 
 export function BatchExportsEditForm(props: BatchExportsEditLogicProps): JSX.Element {
+    const { hasAvailableFeature } = useValues(userLogic)
+    if (!hasAvailableFeature(AvailableFeature.DATA_PIPELINES)) {
+        return <></>
+    }
     const logic = batchExportsEditLogic(props)
     const { isNew, batchExportConfigForm, isBatchExportConfigFormSubmitting, batchExportConfigLoading } =
         useValues(logic)
diff --git a/frontend/src/scenes/batch_exports/BatchExportEditScene.tsx b/frontend/src/scenes/batch_exports/BatchExportEditScene.tsx
index 43822ae065c8f..3d5f2edaa4236 100644
--- a/frontend/src/scenes/batch_exports/BatchExportEditScene.tsx
+++ b/frontend/src/scenes/batch_exports/BatchExportEditScene.tsx
@@ -1,6 +1,9 @@
 import { useValues } from 'kea'
 import { PageHeader } from 'lib/components/PageHeader'
 import { SceneExport } from 'scenes/sceneTypes'
+import { userLogic } from 'scenes/userLogic'
+
+import { AvailableFeature } from '~/types'
 
 import { BatchExportsEditForm } from './BatchExportEditForm'
 import { BatchExportsEditLogicProps } from './batchExportEditLogic'
@@ -15,6 +18,10 @@ export const scene: SceneExport = {
 }
 
 export function BatchExportsEditScene(): JSX.Element {
+    const { hasAvailableFeature } = useValues(userLogic)
+    if (!hasAvailableFeature(AvailableFeature.DATA_PIPELINES)) {
+        return <></>
+    }
     const { id } = useValues(batchExportsEditSceneLogic)
 
     return (
diff --git a/frontend/src/scenes/batch_exports/BatchExportScene.tsx b/frontend/src/scenes/batch_exports/BatchExportScene.tsx
index b02c42fdb1341..eac8dc5b260d5 100644
--- a/frontend/src/scenes/batch_exports/BatchExportScene.tsx
+++ b/frontend/src/scenes/batch_exports/BatchExportScene.tsx
@@ -26,8 +26,9 @@ import { useEffect, useState } from 'react'
 import { PipelineAppLogLevel } from 'scenes/pipeline/pipelineAppLogsLogic'
 import { SceneExport } from 'scenes/sceneTypes'
 import { urls } from 'scenes/urls'
+import { userLogic } from 'scenes/userLogic'
 
-import { BatchExportLogEntry } from '~/types'
+import { AvailableFeature, BatchExportLogEntry } from '~/types'
 
 import { BatchExportBackfillModal } from './BatchExportBackfillModal'
 import { batchExportLogic, BatchExportLogicProps, BatchExportTab } from './batchExportLogic'
@@ -44,6 +45,10 @@ export const scene: SceneExport = {
 }
 
 export function RunsTab(): JSX.Element {
+    const { hasAvailableFeature } = useValues(userLogic)
+    if (!hasAvailableFeature(AvailableFeature.DATA_PIPELINES)) {
+        return <></>
+    }
     const {
         batchExportRunsResponse,
         batchExportConfig,
diff --git a/frontend/src/scenes/batch_exports/BatchExports.stories.tsx b/frontend/src/scenes/batch_exports/BatchExports.stories.tsx
index a10466a01c79b..7545d46ba34ae 100644
--- a/frontend/src/scenes/batch_exports/BatchExports.stories.tsx
+++ b/frontend/src/scenes/batch_exports/BatchExports.stories.tsx
@@ -5,6 +5,8 @@ import { App } from 'scenes/App'
 import { urls } from 'scenes/urls'
 
 import { mswDecorator } from '~/mocks/browser'
+import { useAvailableFeatures } from '~/mocks/features'
+import { AvailableFeature } from '~/types'
 
 import { createExportServiceHandlers } from './__mocks__/api-mocks'
 
@@ -84,6 +86,7 @@ export default {
 } as Meta
 
 export const Exports: StoryFn = () => {
+    useAvailableFeatures([AvailableFeature.DATA_PIPELINES])
     useEffect(() => {
         router.actions.push(urls.batchExports())
     })
@@ -96,6 +99,7 @@ Exports.parameters = {
 }
 
 export const CreateExport: StoryFn = () => {
+    useAvailableFeatures([AvailableFeature.DATA_PIPELINES])
     useEffect(() => {
         router.actions.push(urls.batchExportNew())
     })
@@ -103,6 +107,7 @@ export const CreateExport: StoryFn = () => {
 }
 
 export const ViewExport: StoryFn = () => {
+    useAvailableFeatures([AvailableFeature.DATA_PIPELINES])
     useEffect(() => {
         router.actions.push(urls.batchExport('1'))
     })
diff --git a/frontend/src/scenes/batch_exports/BatchExportsListScene.tsx b/frontend/src/scenes/batch_exports/BatchExportsListScene.tsx
index f800bf0651fd1..4a245bbb5b5c0 100644
--- a/frontend/src/scenes/batch_exports/BatchExportsListScene.tsx
+++ b/frontend/src/scenes/batch_exports/BatchExportsListScene.tsx
@@ -5,6 +5,9 @@ import { IconEllipsis } from 'lib/lemon-ui/icons'
 import { LemonMenu, LemonMenuItems } from 'lib/lemon-ui/LemonMenu'
 import { SceneExport } from 'scenes/sceneTypes'
 import { urls } from 'scenes/urls'
+import { userLogic } from 'scenes/userLogic'
+
+import { AvailableFeature } from '~/types'
 
 import { batchExportsListLogic } from './batchExportsListLogic'
 import { BatchExportRunIcon, BatchExportTag } from './components'
@@ -14,6 +17,10 @@ export const scene: SceneExport = {
 }
 
 export function BatchExportsListScene(): JSX.Element {
+    const { hasAvailableFeature } = useValues(userLogic)
+    if (!hasAvailableFeature(AvailableFeature.DATA_PIPELINES)) {
+        return <></>
+    }
     return (
         <>
             <PageHeader
diff --git a/frontend/src/scenes/funnels/FunnelLineGraph.tsx b/frontend/src/scenes/funnels/FunnelLineGraph.tsx
index 56b54bb71b8f3..9efaa3e6741a5 100644
--- a/frontend/src/scenes/funnels/FunnelLineGraph.tsx
+++ b/frontend/src/scenes/funnels/FunnelLineGraph.tsx
@@ -64,7 +64,7 @@ export function FunnelLineGraph({
                         return `${count}%`
                     },
                 }}
-                trendsFilter={{ aggregation_axis_format: 'percentage' } as TrendsFilter}
+                trendsFilter={{ aggregationAxisFormat: 'percentage' } as TrendsFilter}
                 labelGroupType={aggregationGroupTypeIndex ?? 'people'}
                 incompletenessOffsetFromEnd={incompletenessOffsetFromEnd}
                 onClick={
diff --git a/frontend/src/scenes/insights/EditorFilters/PercentStackViewFilter.tsx b/frontend/src/scenes/insights/EditorFilters/PercentStackViewFilter.tsx
index 9e31687ef2971..88a4a688a553a 100644
--- a/frontend/src/scenes/insights/EditorFilters/PercentStackViewFilter.tsx
+++ b/frontend/src/scenes/insights/EditorFilters/PercentStackViewFilter.tsx
@@ -14,7 +14,7 @@ export function PercentStackViewFilter(): JSX.Element {
             className="p-1 px-2"
             checked={!!showPercentStackView}
             onChange={(checked) => {
-                updateInsightFilter({ show_percent_stack_view: checked })
+                updateInsightFilter({ showPercentStackView: checked })
             }}
             label={<span className="font-normal">Show as % of total</span>}
             size="small"
diff --git a/frontend/src/scenes/insights/aggregationAxisFormat.ts b/frontend/src/scenes/insights/aggregationAxisFormat.ts
index 4696d3e92e471..68d4d9ed245e8 100644
--- a/frontend/src/scenes/insights/aggregationAxisFormat.ts
+++ b/frontend/src/scenes/insights/aggregationAxisFormat.ts
@@ -15,14 +15,27 @@ export const INSIGHT_UNIT_OPTIONS: LemonSelectOptionLeaf<AggregationAxisFormat>[
     { value: 'percentage_scaled', label: 'Percent (0-1)' },
 ]
 
+// this function needs to support a trendsFilter as part of an insight query and
+// legacy trend filters, as we still return these as part of a data response
 export const formatAggregationAxisValue = (
     trendsFilter: TrendsFilter | null | undefined | Partial<TrendsFilterType>,
     value: number | string
 ): string => {
     value = Number(value)
-    let formattedValue = humanFriendlyNumber(value, trendsFilter?.decimal_places)
-    if (trendsFilter?.aggregation_axis_format) {
-        switch (trendsFilter?.aggregation_axis_format) {
+    const decimalPlaces =
+        (trendsFilter as TrendsFilter)?.decimalPlaces || (trendsFilter as Partial<TrendsFilterType>)?.decimal_places
+    const aggregationAxisFormat =
+        (trendsFilter as TrendsFilter)?.aggregationAxisFormat ||
+        (trendsFilter as Partial<TrendsFilterType>)?.aggregation_axis_format
+    const aggregationAxisPrefix =
+        (trendsFilter as TrendsFilter)?.aggregationAxisPrefix ||
+        (trendsFilter as Partial<TrendsFilterType>)?.aggregation_axis_prefix
+    const aggregationAxisPostfix =
+        (trendsFilter as TrendsFilter)?.aggregationAxisPostfix ||
+        (trendsFilter as Partial<TrendsFilterType>)?.aggregation_axis_postfix
+    let formattedValue = humanFriendlyNumber(value, decimalPlaces)
+    if (aggregationAxisFormat) {
+        switch (aggregationAxisFormat) {
             case 'duration':
                 formattedValue = humanFriendlyDuration(value)
                 break
@@ -40,9 +53,7 @@ export const formatAggregationAxisValue = (
                 break
         }
     }
-    return `${trendsFilter?.aggregation_axis_prefix || ''}${formattedValue}${
-        trendsFilter?.aggregation_axis_postfix || ''
-    }`
+    return `${aggregationAxisPrefix || ''}${formattedValue}${aggregationAxisPostfix || ''}`
 }
 
 export const formatPercentStackAxisValue = (
diff --git a/frontend/src/scenes/insights/aggregationAxisFormats.test.ts b/frontend/src/scenes/insights/aggregationAxisFormats.test.ts
index a86aa1bcc2c44..8f6a479739c42 100644
--- a/frontend/src/scenes/insights/aggregationAxisFormats.test.ts
+++ b/frontend/src/scenes/insights/aggregationAxisFormats.test.ts
@@ -24,9 +24,19 @@ describe('formatAggregationAxisValue', () => {
             },
             expected: '£3,940💖',
         },
+        {
+            candidate: 3940,
+            filters: {
+                aggregationAxisFormat: 'numeric',
+                aggregationAxisPrefix: '£',
+                aggregationAxisPostfix: '💖',
+            },
+            expected: '£3,940💖',
+        },
         { candidate: 0.8709423, filters: {}, expected: '0.87' },
         { candidate: 0.8709423, filters: { decimal_places: 2 }, expected: '0.87' },
         { candidate: 0.8709423, filters: { decimal_places: 3 }, expected: '0.871' },
+        { candidate: 0.8709423, filters: { decimalPlaces: 3 }, expected: '0.871' },
         { candidate: 0.8709423, filters: { decimal_places: 9 }, expected: '0.8709423' },
         { candidate: 0.8709423, filters: { decimal_places: -1 }, expected: '0.87' }, // Fall back to default for unsupported values
     ]
diff --git a/frontend/src/scenes/insights/insightLogic.ts b/frontend/src/scenes/insights/insightLogic.ts
index 9723ce8ec26b1..a0aa4b588eb5c 100644
--- a/frontend/src/scenes/insights/insightLogic.ts
+++ b/frontend/src/scenes/insights/insightLogic.ts
@@ -374,6 +374,7 @@ export const insightLogic = kea<insightLogicType>([
         /** filters for data that's being displayed, might not be same as `savedInsight.filters` or filters */
         loadedFilters: [(s) => [s.insight], (insight) => insight.filters],
         insightProps: [() => [(_, props) => props], (props): InsightLogicProps => props],
+        isInDashboardContext: [() => [(_, props) => props], ({ dashboardId }) => !!dashboardId],
         hasDashboardItemId: [
             () => [(_, props) => props],
             (props: InsightLogicProps) =>
@@ -412,13 +413,6 @@ export const insightLogic = kea<insightLogicType>([
                 )
             },
         ],
-        isInDashboardContext: [
-            () => [router.selectors.location],
-            ({ pathname }) =>
-                pathname.startsWith('/dashboard') ||
-                pathname.startsWith('/home') ||
-                pathname.startsWith('/shared-dashboard'),
-        ],
         allEventNames: [
             (s) => [s.filters, actionsModel.selectors.actions],
             (filters, actions: ActionType[]) => {
diff --git a/frontend/src/scenes/insights/insightSceneLogic.test.ts b/frontend/src/scenes/insights/insightSceneLogic.test.ts
index 1d3b68fa2300d..6214359aecb96 100644
--- a/frontend/src/scenes/insights/insightSceneLogic.test.ts
+++ b/frontend/src/scenes/insights/insightSceneLogic.test.ts
@@ -1,5 +1,7 @@
 import { combineUrl, router } from 'kea-router'
 import { expectLogic, partial } from 'kea-test-utils'
+import { MOCK_TEAM_ID } from 'lib/api.mock'
+import { addProjectIdIfMissing } from 'lib/utils/router-utils'
 import { insightSceneLogic } from 'scenes/insights/insightSceneLogic'
 import { urls } from 'scenes/urls'
 
@@ -36,7 +38,7 @@ describe('insightSceneLogic', () => {
         await expectLogic(router)
             .delay(1)
             .toMatchValues({
-                location: partial({ pathname: urls.insightNew() }),
+                location: partial({ pathname: addProjectIdIfMissing(urls.insightNew(), MOCK_TEAM_ID) }),
             })
     })
 
@@ -47,7 +49,11 @@ describe('insightSceneLogic', () => {
         await expectLogic(router)
             .delay(1)
             .toMatchValues({
-                location: partial({ pathname: urls.insightNew(), search: '', hash: '' }),
+                location: partial({
+                    pathname: addProjectIdIfMissing(urls.insightNew(), MOCK_TEAM_ID),
+                    search: '',
+                    hash: '',
+                }),
             })
 
         expect(logic.values.insightLogicRef?.logic.values.filters.insight).toEqual(InsightType.FUNNELS)
diff --git a/frontend/src/scenes/insights/utils.test.ts b/frontend/src/scenes/insights/utils.test.ts
index 94bad45af4386..9306f43c34db7 100644
--- a/frontend/src/scenes/insights/utils.test.ts
+++ b/frontend/src/scenes/insights/utils.test.ts
@@ -181,7 +181,7 @@ describe('formatAggregationValue', () => {
 
     it('uses render count when there is a value and property format is a no-op', () => {
         const fakeRenderCount = (x: number): string =>
-            formatAggregationAxisValue({ aggregation_axis_format: 'duration' }, x)
+            formatAggregationAxisValue({ aggregationAxisFormat: 'duration' }, x)
         const noOpFormatProperty = jest.fn((_, y) => y)
         const actual = formatAggregationValue('some name', 500, fakeRenderCount, noOpFormatProperty)
         expect(actual).toEqual('8m 20s')
@@ -189,7 +189,7 @@ describe('formatAggregationValue', () => {
 
     it('uses render count when there is a value and property format converts number to string', () => {
         const fakeRenderCount = (x: number): string =>
-            formatAggregationAxisValue({ aggregation_axis_format: 'duration' }, x)
+            formatAggregationAxisValue({ aggregationAxisFormat: 'duration' }, x)
         const noOpFormatProperty = jest.fn((_, y) => String(y))
         const actual = formatAggregationValue('some name', 500, fakeRenderCount, noOpFormatProperty)
         expect(actual).toEqual('8m 20s')
diff --git a/frontend/src/scenes/insights/utils/compareInsightQuery.ts b/frontend/src/scenes/insights/utils/compareInsightQuery.ts
index 682512f12127c..2fc863e4a7bcc 100644
--- a/frontend/src/scenes/insights/utils/compareInsightQuery.ts
+++ b/frontend/src/scenes/insights/utils/compareInsightQuery.ts
@@ -49,14 +49,15 @@ const cleanInsightQuery = (query: InsightQueryNode, ignoreVisualizationOnlyChang
         cleanedQuery[insightFilterKey] = {
             ...insightFilter,
             show_legend: undefined,
-            show_percent_stack_view: undefined,
+            showPercentStackView: undefined,
             show_values_on_series: undefined,
-            aggregation_axis_format: undefined,
-            aggregation_axis_prefix: undefined,
-            aggregation_axis_postfix: undefined,
-            decimal_places: undefined,
+            aggregationAxisFormat: undefined,
+            aggregationAxisPrefix: undefined,
+            aggregationAxisPostfix: undefined,
+            decimalPlaces: undefined,
             layout: undefined,
             toggledLifecycles: undefined,
+            showLabelsOnSeries: undefined,
         }
 
         if (isInsightQueryWithDisplay(cleanedQuery)) {
diff --git a/frontend/src/scenes/onboarding/Onboarding.tsx b/frontend/src/scenes/onboarding/Onboarding.tsx
index d0a31a536f730..baa86408cd5c5 100644
--- a/frontend/src/scenes/onboarding/Onboarding.tsx
+++ b/frontend/src/scenes/onboarding/Onboarding.tsx
@@ -1,6 +1,5 @@
 import { useActions, useValues } from 'kea'
-import { FEATURE_FLAGS, SESSION_REPLAY_MINIMUM_DURATION_OPTIONS } from 'lib/constants'
-import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { SESSION_REPLAY_MINIMUM_DURATION_OPTIONS } from 'lib/constants'
 import { useEffect, useState } from 'react'
 import { SceneExport } from 'scenes/sceneTypes'
 import { teamLogic } from 'scenes/teamLogic'
@@ -33,7 +32,6 @@ const OnboardingWrapper = ({ children }: { children: React.ReactNode }): JSX.Ele
     const { currentOnboardingStep, shouldShowBillingStep, shouldShowOtherProductsStep } = useValues(onboardingLogic)
     const { setAllOnboardingSteps } = useActions(onboardingLogic)
     const { product } = useValues(onboardingLogic)
-    const { featureFlags } = useValues(featureFlagLogic)
     const [allSteps, setAllSteps] = useState<JSX.Element[]>([])
 
     useEffect(() => {
@@ -66,10 +64,8 @@ const OnboardingWrapper = ({ children }: { children: React.ReactNode }): JSX.Ele
             const OtherProductsStep = <OnboardingOtherProductsStep stepKey={OnboardingStepKey.OTHER_PRODUCTS} />
             steps = [...steps, OtherProductsStep]
         }
-        if (featureFlags[FEATURE_FLAGS.INVITE_TEAM_MEMBER_ONBOARDING] === 'test') {
-            const inviteTeammatesStep = <OnboardingInviteTeammates stepKey={OnboardingStepKey.INVITE_TEAMMATES} />
-            steps = [...steps, inviteTeammatesStep]
-        }
+        const inviteTeammatesStep = <OnboardingInviteTeammates stepKey={OnboardingStepKey.INVITE_TEAMMATES} />
+        steps = [...steps, inviteTeammatesStep]
         setAllSteps(steps)
     }
 
diff --git a/frontend/src/scenes/onboarding/onboardingLogic.tsx b/frontend/src/scenes/onboarding/onboardingLogic.tsx
index fb4f01026d897..db35ae5614401 100644
--- a/frontend/src/scenes/onboarding/onboardingLogic.tsx
+++ b/frontend/src/scenes/onboarding/onboardingLogic.tsx
@@ -32,9 +32,9 @@ export type OnboardingStep = JSX.Element
 export const getProductUri = (productKey: ProductKey, featureFlags: FeatureFlagsSet): string => {
     switch (productKey) {
         case ProductKey.PRODUCT_ANALYTICS:
-            return featureFlags[FEATURE_FLAGS.REDIRECT_INGESTION_PRODUCT_ANALYTICS_ONBOARDING] === 'test'
-                ? combineUrl(urls.insights(), { onboarding_completed: true }).url
-                : combineUrl(urls.events(), { onboarding_completed: true }).url
+            return featureFlags[FEATURE_FLAGS.REDIRECT_WEB_PRODUCT_ANALYTICS_ONBOARDING] === 'test'
+                ? combineUrl(urls.webAnalytics(), { onboarding_completed: true }).url
+                : combineUrl(urls.insights(), { onboarding_completed: true }).url
         case ProductKey.SESSION_REPLAY:
             return urls.replay()
         case ProductKey.FEATURE_FLAGS:
diff --git a/frontend/src/scenes/pipeline/appsManagementLogic.tsx b/frontend/src/scenes/pipeline/appsManagementLogic.tsx
index 9d5a54f3e68c5..dc93431958a5b 100644
--- a/frontend/src/scenes/pipeline/appsManagementLogic.tsx
+++ b/frontend/src/scenes/pipeline/appsManagementLogic.tsx
@@ -10,43 +10,7 @@ import { PluginInstallationType, PluginType } from '~/types'
 
 import type { appsManagementLogicType } from './appsManagementLogicType'
 import { getInitialCode, SourcePluginKind } from './sourceAppInitialCode'
-import { loadPaginatedResults } from './utils'
-
-const GLOBAL_PLUGINS = new Set([
-    // frontend apps
-    'https://github.com/PostHog/bug-report-app',
-    'https://github.com/PostHog/early-access-features-app',
-    'https://github.com/PostHog/notification-bar-app',
-    'https://github.com/PostHog/pineapple-mode-app',
-    // filtering apps
-    'https://github.com/PostHog/downsampling-plugin',
-    'https://github.com/PostHog/posthog-filter-out-plugin',
-    // transformation apps
-    'https://github.com/PostHog/language-url-splitter-app',
-    'https://github.com/PostHog/posthog-app-url-parameters-to-event-properties',
-    'https://github.com/PostHog/posthog-plugin-geoip',
-    'https://github.com/PostHog/posthog-url-normalizer-plugin',
-    'https://github.com/PostHog/property-filter-plugin',
-    'https://github.com/PostHog/semver-flattener-plugin',
-    'https://github.com/PostHog/taxonomy-plugin',
-    'https://github.com/PostHog/timestamp-parser-plugin',
-    'https://github.com/PostHog/user-agent-plugin',
-    // export apps
-    'https://github.com/PostHog/customerio-plugin',
-    'https://github.com/PostHog/hubspot-plugin',
-    'https://github.com/PostHog/pace-posthog-integration',
-    'https://github.com/PostHog/posthog-avo-plugin',
-    'https://github.com/PostHog/posthog-engage-so-plugin',
-    'https://github.com/PostHog/posthog-intercom-plugin',
-    'https://github.com/PostHog/posthog-laudspeaker-app',
-    'https://github.com/PostHog/posthog-patterns-app',
-    'https://github.com/PostHog/posthog-twilio-plugin',
-    'https://github.com/PostHog/posthog-variance-plugin',
-    'https://github.com/PostHog/rudderstack-posthog-plugin',
-    'https://github.com/PostHog/salesforce-plugin',
-    'https://github.com/PostHog/sendgrid-plugin',
-    'https://github.com/posthog/posthog-plugin-replicator',
-])
+import { GLOBAL_PLUGINS, loadPaginatedResults } from './utils'
 
 function capturePluginEvent(event: string, plugin: PluginType, type: PluginInstallationType): void {
     posthog.capture(event, {
diff --git a/frontend/src/scenes/pipeline/utils.tsx b/frontend/src/scenes/pipeline/utils.tsx
index 51d2914e346cf..a46f463abb85f 100644
--- a/frontend/src/scenes/pipeline/utils.tsx
+++ b/frontend/src/scenes/pipeline/utils.tsx
@@ -9,6 +9,47 @@ import { BatchExportConfiguration, PluginConfigTypeNew, PluginLogEntryType, Plug
 
 import { PipelineAppLogLevel } from './pipelineAppLogsLogic'
 
+const PLUGINS_ALLOWED_WITHOUT_DATA_PIPELINES_ARR = [
+    // frontend apps
+    'https://github.com/PostHog/bug-report-app',
+    'https://github.com/PostHog/early-access-features-app',
+    'https://github.com/PostHog/notification-bar-app',
+    'https://github.com/PostHog/pineapple-mode-app',
+    // filtering apps
+    'https://github.com/PostHog/downsampling-plugin',
+    'https://github.com/PostHog/posthog-filter-out-plugin',
+    // transformation apps
+    'https://github.com/PostHog/language-url-splitter-app',
+    'https://github.com/PostHog/posthog-app-url-parameters-to-event-properties',
+    'https://github.com/PostHog/posthog-plugin-geoip',
+    'https://github.com/PostHog/posthog-url-normalizer-plugin',
+    'https://github.com/PostHog/property-filter-plugin',
+    'https://github.com/PostHog/semver-flattener-plugin',
+    'https://github.com/PostHog/taxonomy-plugin',
+    'https://github.com/PostHog/timestamp-parser-plugin',
+    'https://github.com/PostHog/user-agent-plugin',
+]
+export const PLUGINS_ALLOWED_WITHOUT_DATA_PIPELINES = new Set([...PLUGINS_ALLOWED_WITHOUT_DATA_PIPELINES_ARR])
+
+const GLOBAL_EXPORT_PLUGINS = [
+    // export apps
+    'https://github.com/PostHog/customerio-plugin',
+    'https://github.com/PostHog/hubspot-plugin',
+    'https://github.com/PostHog/pace-posthog-integration',
+    'https://github.com/PostHog/posthog-avo-plugin',
+    'https://github.com/PostHog/posthog-engage-so-plugin',
+    'https://github.com/PostHog/posthog-intercom-plugin',
+    'https://github.com/PostHog/posthog-laudspeaker-app',
+    'https://github.com/PostHog/posthog-patterns-app',
+    'https://github.com/PostHog/posthog-twilio-plugin',
+    'https://github.com/PostHog/posthog-variance-plugin',
+    'https://github.com/PostHog/rudderstack-posthog-plugin',
+    'https://github.com/PostHog/salesforce-plugin',
+    'https://github.com/PostHog/sendgrid-plugin',
+    'https://github.com/posthog/posthog-plugin-replicator',
+]
+export const GLOBAL_PLUGINS = new Set([...PLUGINS_ALLOWED_WITHOUT_DATA_PIPELINES_ARR, ...GLOBAL_EXPORT_PLUGINS])
+
 export function capturePluginEvent(event: string, plugin: PluginType, pluginConfig: PluginConfigTypeNew): void {
     posthog.capture(event, {
         plugin_id: plugin.id,
diff --git a/frontend/src/scenes/plugins/AppsScene.tsx b/frontend/src/scenes/plugins/AppsScene.tsx
index ba7da3db6bda2..d5fac563e981f 100644
--- a/frontend/src/scenes/plugins/AppsScene.tsx
+++ b/frontend/src/scenes/plugins/AppsScene.tsx
@@ -10,6 +10,7 @@ import { SceneExport } from 'scenes/sceneTypes'
 import { urls } from 'scenes/urls'
 import { userLogic } from 'scenes/userLogic'
 
+import { AvailableFeature } from '~/types'
 import { ActivityScope } from '~/types'
 
 import { canGloballyManagePlugins, canViewPlugins } from './access'
@@ -25,10 +26,12 @@ export const scene: SceneExport = {
 }
 
 export function AppsScene(): JSX.Element | null {
-    const { user } = useValues(userLogic)
+    const { user, hasAvailableFeature } = useValues(userLogic)
     const { pluginTab } = useValues(pluginsLogic)
     const { setPluginTab } = useActions(pluginsLogic)
 
+    const hasDataPipelines = hasAvailableFeature(AvailableFeature.DATA_PIPELINES)
+
     useEffect(() => {
         if (!canViewPlugins(user?.organization)) {
             window.location.href = '/'
@@ -44,7 +47,7 @@ export function AppsScene(): JSX.Element | null {
             <PageHeader
                 tabbedPage
                 buttons={
-                    pluginTab === PluginTab.BatchExports ? (
+                    hasDataPipelines && pluginTab === PluginTab.BatchExports ? (
                         <LemonButton type="primary" to={urls.batchExportNew()}>
                             Create export workflow
                         </LemonButton>
@@ -57,7 +60,11 @@ export function AppsScene(): JSX.Element | null {
                 onChange={(newKey) => setPluginTab(newKey)}
                 tabs={[
                     { key: PluginTab.Apps, label: 'Apps', content: <AppsTab /> },
-                    { key: PluginTab.BatchExports, label: 'Batch Exports', content: <BatchExportsTab /> },
+                    {
+                        key: PluginTab.BatchExports,
+                        label: 'Batch Exports',
+                        content: <BatchExportsTab />,
+                    },
                     {
                         key: PluginTab.History,
                         label: 'History',
diff --git a/frontend/src/scenes/plugins/tabs/apps/AppView.tsx b/frontend/src/scenes/plugins/tabs/apps/AppView.tsx
index baf4b83363845..ec6fea4eb64b0 100644
--- a/frontend/src/scenes/plugins/tabs/apps/AppView.tsx
+++ b/frontend/src/scenes/plugins/tabs/apps/AppView.tsx
@@ -3,13 +3,15 @@ import { useActions, useValues } from 'kea'
 import { IconEllipsis, IconErrorOutline, IconLegend, IconLink, IconSettings } from 'lib/lemon-ui/icons'
 import { LemonMenu, LemonMenuItem } from 'lib/lemon-ui/LemonMenu'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
+import { PLUGINS_ALLOWED_WITHOUT_DATA_PIPELINES } from 'scenes/pipeline/utils'
 import { PluginImage } from 'scenes/plugins/plugin/PluginImage'
 import { SuccessRateBadge } from 'scenes/plugins/plugin/SuccessRateBadge'
 import { pluginsLogic } from 'scenes/plugins/pluginsLogic'
 import { PluginRepositoryEntry, PluginTypeWithConfig } from 'scenes/plugins/types'
 import { urls } from 'scenes/urls'
+import { userLogic } from 'scenes/userLogic'
 
-import { PluginType } from '~/types'
+import { AvailableFeature, PluginType } from '~/types'
 
 import { PluginTags } from './components'
 
@@ -20,6 +22,13 @@ export function AppView({
 }): JSX.Element {
     const { showAppMetricsForPlugin, sortableEnabledPlugins } = useValues(pluginsLogic)
     const { editPlugin, toggleEnabled, openReorderModal } = useActions(pluginsLogic)
+    const { hasAvailableFeature } = useValues(userLogic)
+    if (!hasAvailableFeature(AvailableFeature.DATA_PIPELINES)) {
+        // If the app isn't in the allowed apps list don't show it
+        if (!plugin.url || !PLUGINS_ALLOWED_WITHOUT_DATA_PIPELINES.has(plugin.url)) {
+            return <></>
+        }
+    }
 
     const pluginConfig = 'pluginConfig' in plugin ? plugin.pluginConfig : null
     const isConfigured = !!pluginConfig?.id
diff --git a/frontend/src/scenes/plugins/tabs/batch-exports/BatchExportsTab.tsx b/frontend/src/scenes/plugins/tabs/batch-exports/BatchExportsTab.tsx
index 00907e6a84f4a..b32d465fe9aeb 100644
--- a/frontend/src/scenes/plugins/tabs/batch-exports/BatchExportsTab.tsx
+++ b/frontend/src/scenes/plugins/tabs/batch-exports/BatchExportsTab.tsx
@@ -1,5 +1,12 @@
+import { PayGateMini } from 'lib/components/PayGateMini/PayGateMini'
 import { BatchExportsList } from 'scenes/batch_exports/BatchExportsListScene'
 
+import { AvailableFeature } from '~/types'
+
 export function BatchExportsTab(): JSX.Element {
-    return <BatchExportsList />
+    return (
+        <PayGateMini feature={AvailableFeature.DATA_PIPELINES}>
+            <BatchExportsList />
+        </PayGateMini>
+    )
 }
diff --git a/frontend/src/scenes/retention/RetentionLineGraph.tsx b/frontend/src/scenes/retention/RetentionLineGraph.tsx
index f9ddce22272e6..4bdee944c6403 100644
--- a/frontend/src/scenes/retention/RetentionLineGraph.tsx
+++ b/frontend/src/scenes/retention/RetentionLineGraph.tsx
@@ -35,7 +35,7 @@ export function RetentionLineGraph({ inSharedMode = false }: RetentionLineGraphP
             inSharedMode={!!inSharedMode}
             showPersonsModal={false}
             labelGroupType={aggregationGroupTypeIndex}
-            trendsFilter={{ aggregation_axis_format: 'percentage' } as TrendsFilter}
+            trendsFilter={{ aggregationAxisFormat: 'percentage' } as TrendsFilter}
             tooltip={{
                 rowCutoff: 11, // 11 time units is hardcoded into retention insights
                 renderSeries: function _renderCohortPrefix(value) {
diff --git a/frontend/src/scenes/sceneLogic.ts b/frontend/src/scenes/sceneLogic.ts
index e1268c196f077..e5ce3e5fcaf52 100644
--- a/frontend/src/scenes/sceneLogic.ts
+++ b/frontend/src/scenes/sceneLogic.ts
@@ -3,7 +3,7 @@ import { router, urlToAction } from 'kea-router'
 import { commandBarLogic } from 'lib/components/CommandBar/commandBarLogic'
 import { BarStatus } from 'lib/components/CommandBar/types'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
-import { removeProjectIdIfPresent } from 'lib/utils/router-utils'
+import { addProjectIdIfMissing, removeProjectIdIfPresent } from 'lib/utils/router-utils'
 import posthog from 'posthog-js'
 import { emptySceneParams, preloadedScenes, redirects, routes, sceneConfigurations } from 'scenes/scenes'
 import { LoadedScene, Params, Scene, SceneConfig, SceneExport, SceneParams } from 'scenes/sceneTypes'
@@ -196,6 +196,14 @@ export const sceneLogic = kea<sceneLogicType>([
                 return
             }
 
+            // Redirect to the scene's canonical pathname if needed
+            const currentPathname = router.values.location.pathname
+            const canonicalPathname = addProjectIdIfMissing(router.values.location.pathname)
+            if (currentPathname !== canonicalPathname) {
+                router.actions.replace(canonicalPathname, router.values.searchParams, router.values.hashParams)
+                return
+            }
+
             if (user) {
                 // If user is already logged in, redirect away from unauthenticated-only routes (e.g. /signup)
                 if (sceneConfig.onlyUnauthenticated) {
diff --git a/frontend/src/scenes/scenes.ts b/frontend/src/scenes/scenes.ts
index 1a31744f33638..9519eb7e4985f 100644
--- a/frontend/src/scenes/scenes.ts
+++ b/frontend/src/scenes/scenes.ts
@@ -371,11 +371,17 @@ export const sceneConfigurations: Record<Scene, SceneConfig> = {
     },
 }
 
+const preserveParams = (url: string) => (_params: Params, searchParams: Params, hashParams: Params) => {
+    const combined = combineUrl(url, searchParams, hashParams)
+    return combined.url
+}
+
 // NOTE: These redirects will fully replace the URL. If you want to keep support for query and hash params then you should use the above `preserveParams` function.
 export const redirects: Record<
     string,
     string | ((params: Params, searchParams: Params, hashParams: Params) => string)
 > = {
+    '/home': urls.projectHomepage(),
     '/saved_insights': urls.savedInsights(),
     '/dashboards': urls.dashboards(),
     '/plugins': urls.projectApps(),
@@ -426,6 +432,8 @@ export const redirects: Record<
     '/organization/settings': urls.settings('organization'),
     '/me/settings': urls.settings('user'),
     '/pipeline': urls.pipeline(),
+    '/project/apps': preserveParams(urls.projectApps()),
+    '/project/apps/:id': ({ id }) => urls.projectApp(id),
 }
 
 export const routes: Record<string, Scene> = {
diff --git a/frontend/src/scenes/settings/SettingsMap.tsx b/frontend/src/scenes/settings/SettingsMap.tsx
index 4068b00a51bd6..c213acb7dc1e7 100644
--- a/frontend/src/scenes/settings/SettingsMap.tsx
+++ b/frontend/src/scenes/settings/SettingsMap.tsx
@@ -1,3 +1,5 @@
+import { AvailableFeature } from '~/types'
+
 import { Invites } from './organization/Invites'
 import { Members } from './organization/Members'
 import { OrganizationDangerZone } from './organization/OrganizationDangerZone'
@@ -158,6 +160,11 @@ export const SettingsMap: SettingSection[] = [
                 id: 'replay-ingestion',
                 title: 'Ingestion controls',
                 component: <ReplayCostControl />,
+                features: [
+                    AvailableFeature.SESSION_REPLAY_SAMPLING,
+                    AvailableFeature.FEATURE_FLAG_BASED_RECORDING,
+                    AvailableFeature.RECORDING_DURATION_MINIMUM,
+                ],
             },
         ],
     },
diff --git a/frontend/src/scenes/settings/project/ProjectSettings.tsx b/frontend/src/scenes/settings/project/ProjectSettings.tsx
index fef09768184af..fe017d501ab0f 100644
--- a/frontend/src/scenes/settings/project/ProjectSettings.tsx
+++ b/frontend/src/scenes/settings/project/ProjectSettings.tsx
@@ -9,6 +9,7 @@ import { JSSnippet } from 'lib/components/JSSnippet'
 import { IconRefresh } from 'lib/lemon-ui/icons'
 import { Link } from 'lib/lemon-ui/Link'
 import { useState } from 'react'
+import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { isAuthenticatedTeam, teamLogic } from 'scenes/teamLogic'
 
 import { TimezoneConfig } from './TimezoneConfig'
@@ -88,6 +89,8 @@ export function Bookmarklet(): JSX.Element {
 export function ProjectVariables(): JSX.Element {
     const { currentTeam, isTeamTokenResetAvailable } = useValues(teamLogic)
     const { resetToken } = useActions(teamLogic)
+    const { preflight } = useValues(preflightLogic)
+    const region = preflight?.region
 
     return (
         <div className="flex items-start gap-4 flex-wrap">
@@ -141,6 +144,15 @@ export function ProjectVariables(): JSX.Element {
                 </p>
                 <CodeSnippet thing="project ID">{String(currentTeam?.id || '')}</CodeSnippet>
             </div>
+            {region ? (
+                <div className="flex-1">
+                    <h3 id="project-region" className="min-w-[25rem]">
+                        Project Region
+                    </h3>
+                    <p>This is the region where your PostHog data is hosted.</p>
+                    <CodeSnippet thing="project region">{`${region} Cloud`}</CodeSnippet>
+                </div>
+            ) : null}
         </div>
     )
 }
diff --git a/frontend/src/scenes/settings/project/SessionRecordingSettings.tsx b/frontend/src/scenes/settings/project/SessionRecordingSettings.tsx
index 36cc71cf11e06..6cd78097ed669 100644
--- a/frontend/src/scenes/settings/project/SessionRecordingSettings.tsx
+++ b/frontend/src/scenes/settings/project/SessionRecordingSettings.tsx
@@ -1,14 +1,12 @@
-import { LemonBanner, LemonButton, LemonSelect, LemonSwitch, Link } from '@posthog/lemon-ui'
+import { LemonButton, LemonSelect, LemonSwitch, Link } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { AuthorizedUrlList } from 'lib/components/AuthorizedUrlList/AuthorizedUrlList'
 import { AuthorizedUrlListType } from 'lib/components/AuthorizedUrlList/authorizedUrlListLogic'
 import { FlaggedFeature } from 'lib/components/FlaggedFeature'
 import { FlagSelector } from 'lib/components/FlagSelector'
-import { supportLogic } from 'lib/components/Support/supportLogic'
 import { FEATURE_FLAGS, SESSION_REPLAY_MINIMUM_DURATION_OPTIONS } from 'lib/constants'
 import { IconCancel } from 'lib/lemon-ui/icons'
 import { LemonLabel } from 'lib/lemon-ui/LemonLabel/LemonLabel'
-import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { teamLogic } from 'scenes/teamLogic'
 import { urls } from 'scenes/urls'
 import { userLogic } from 'scenes/userLogic'
@@ -182,27 +180,12 @@ export function ReplayCostControl(): JSX.Element {
     const { updateCurrentTeam } = useActions(teamLogic)
     const { currentTeam } = useValues(teamLogic)
     const { hasAvailableFeature } = useValues(userLogic)
-    const { featureFlags } = useValues(featureFlagLogic)
-    const { openSupportForm } = useActions(supportLogic)
     const samplingControlFeatureEnabled = hasAvailableFeature(AvailableFeature.SESSION_REPLAY_SAMPLING)
     const recordingDurationMinimumFeatureEnabled = hasAvailableFeature(AvailableFeature.RECORDING_DURATION_MINIMUM)
     const featureFlagRecordingFeatureEnabled = hasAvailableFeature(AvailableFeature.FEATURE_FLAG_BASED_RECORDING)
-    const costControlFeaturesEnabled =
-        featureFlags[FEATURE_FLAGS.SESSION_RECORDING_SAMPLING] ||
-        samplingControlFeatureEnabled ||
-        recordingDurationMinimumFeatureEnabled ||
-        featureFlagRecordingFeatureEnabled
 
     return (
         <>
-            {!costControlFeaturesEnabled && (
-                <LemonBanner className="mb-2" type="warning">
-                    <Link onClick={() => openSupportForm({ kind: 'support', target_area: 'session_replay' })}>
-                        Contact support
-                    </Link>{' '}
-                    to enable these features.
-                </LemonBanner>
-            )}
             <p>
                 PostHog offers several tools to let you control the number of recordings you collect and which users you
                 collect recordings for.{' '}
@@ -214,161 +197,163 @@ export function ReplayCostControl(): JSX.Element {
                 </Link>
             </p>
 
-            <>
-                <div className="flex flex-row justify-between">
-                    <LemonLabel className="text-base">Sampling</LemonLabel>
-                    <LemonSelect
-                        disabledReason={!costControlFeaturesEnabled && 'Please contact support to enable this feature.'}
-                        onChange={(v) => {
-                            updateCurrentTeam({ session_recording_sample_rate: v })
-                        }}
-                        dropdownMatchSelectWidth={false}
-                        options={[
-                            {
-                                label: '100% (no sampling)',
-                                value: '1.00',
-                            },
-                            {
-                                label: '95%',
-                                value: '0.95',
-                            },
-                            {
-                                label: '90%',
-                                value: '0.90',
-                            },
-                            {
-                                label: '85%',
-                                value: '0.85',
-                            },
-                            {
-                                label: '80%',
-                                value: '0.80',
-                            },
-                            {
-                                label: '75%',
-                                value: '0.75',
-                            },
-                            {
-                                label: '70%',
-                                value: '0.70',
-                            },
-                            {
-                                label: '65%',
-                                value: '0.65',
-                            },
-                            {
-                                label: '60%',
-                                value: '0.60',
-                            },
-                            {
-                                label: '55%',
-                                value: '0.55',
-                            },
-                            {
-                                label: '50%',
-                                value: '0.50',
-                            },
-                            {
-                                label: '45%',
-                                value: '0.45',
-                            },
-                            {
-                                label: '40%',
-                                value: '0.40',
-                            },
-                            {
-                                label: '35%',
-                                value: '0.35',
-                            },
-                            {
-                                label: '30%',
-                                value: '0.30',
-                            },
-                            {
-                                label: '25%',
-                                value: '0.25',
-                            },
-                            {
-                                label: '20%',
-                                value: '0.20',
-                            },
-                            {
-                                label: '15%',
-                                value: '0.15',
-                            },
-                            {
-                                label: '10%',
-                                value: '0.10',
-                            },
-                            {
-                                label: '5%',
-                                value: '0.05',
-                            },
-                            {
-                                label: '0% (replay disabled)',
-                                value: '0.00',
-                            },
-                        ]}
-                        value={
-                            typeof currentTeam?.session_recording_sample_rate === 'string'
-                                ? currentTeam?.session_recording_sample_rate
-                                : '1.00'
-                        }
-                    />
-                </div>
-                <p>
-                    Use this setting to restrict the percentage of sessions that will be recorded. This is useful if you
-                    want to reduce the amount of data you collect. 100% means all sessions will be collected. 50% means
-                    roughly half of sessions will be collected.
-                </p>
-            </>
-            <>
-                <div className="flex flex-row justify-between">
-                    <LemonLabel className="text-base">Minimum session duration (seconds)</LemonLabel>
-                    <LemonSelect
-                        disabledReason={!costControlFeaturesEnabled && 'Please contact support to enable this feature.'}
-                        dropdownMatchSelectWidth={false}
-                        onChange={(v) => {
-                            updateCurrentTeam({ session_recording_minimum_duration_milliseconds: v })
-                        }}
-                        options={SESSION_REPLAY_MINIMUM_DURATION_OPTIONS}
-                        value={currentTeam?.session_recording_minimum_duration_milliseconds}
-                    />
-                </div>
-                <p>
-                    Setting a minimum session duration will ensure that only sessions that last longer than that value
-                    are collected. This helps you avoid collecting sessions that are too short to be useful.
-                </p>
-            </>
-            <>
-                <div className="flex flex-col space-y-2">
-                    <LemonLabel className="text-base">Enable recordings using feature flag</LemonLabel>
-                    <div className="flex flex-row justify-start">
-                        <FlagSelector
-                            value={currentTeam?.session_recording_linked_flag?.id ?? undefined}
-                            onChange={(id, key) => {
-                                updateCurrentTeam({ session_recording_linked_flag: { id, key } })
+            {samplingControlFeatureEnabled && (
+                <>
+                    <div className="flex flex-row justify-between">
+                        <LemonLabel className="text-base">Sampling</LemonLabel>
+                        <LemonSelect
+                            onChange={(v) => {
+                                updateCurrentTeam({ session_recording_sample_rate: v })
+                            }}
+                            dropdownMatchSelectWidth={false}
+                            options={[
+                                {
+                                    label: '100% (no sampling)',
+                                    value: '1.00',
+                                },
+                                {
+                                    label: '95%',
+                                    value: '0.95',
+                                },
+                                {
+                                    label: '90%',
+                                    value: '0.90',
+                                },
+                                {
+                                    label: '85%',
+                                    value: '0.85',
+                                },
+                                {
+                                    label: '80%',
+                                    value: '0.80',
+                                },
+                                {
+                                    label: '75%',
+                                    value: '0.75',
+                                },
+                                {
+                                    label: '70%',
+                                    value: '0.70',
+                                },
+                                {
+                                    label: '65%',
+                                    value: '0.65',
+                                },
+                                {
+                                    label: '60%',
+                                    value: '0.60',
+                                },
+                                {
+                                    label: '55%',
+                                    value: '0.55',
+                                },
+                                {
+                                    label: '50%',
+                                    value: '0.50',
+                                },
+                                {
+                                    label: '45%',
+                                    value: '0.45',
+                                },
+                                {
+                                    label: '40%',
+                                    value: '0.40',
+                                },
+                                {
+                                    label: '35%',
+                                    value: '0.35',
+                                },
+                                {
+                                    label: '30%',
+                                    value: '0.30',
+                                },
+                                {
+                                    label: '25%',
+                                    value: '0.25',
+                                },
+                                {
+                                    label: '20%',
+                                    value: '0.20',
+                                },
+                                {
+                                    label: '15%',
+                                    value: '0.15',
+                                },
+                                {
+                                    label: '10%',
+                                    value: '0.10',
+                                },
+                                {
+                                    label: '5%',
+                                    value: '0.05',
+                                },
+                                {
+                                    label: '0% (replay disabled)',
+                                    value: '0.00',
+                                },
+                            ]}
+                            value={
+                                typeof currentTeam?.session_recording_sample_rate === 'string'
+                                    ? currentTeam?.session_recording_sample_rate
+                                    : '1.00'
+                            }
+                        />
+                    </div>
+                    <p>
+                        Use this setting to restrict the percentage of sessions that will be recorded. This is useful if
+                        you want to reduce the amount of data you collect. 100% means all sessions will be collected.
+                        50% means roughly half of sessions will be collected.
+                    </p>
+                </>
+            )}
+            {recordingDurationMinimumFeatureEnabled && (
+                <>
+                    <div className="flex flex-row justify-between">
+                        <LemonLabel className="text-base">Minimum session duration (seconds)</LemonLabel>
+                        <LemonSelect
+                            dropdownMatchSelectWidth={false}
+                            onChange={(v) => {
+                                updateCurrentTeam({ session_recording_minimum_duration_milliseconds: v })
                             }}
-                            readOnly={!costControlFeaturesEnabled}
-                            disabledReason="Please contact support to enable this feature."
+                            options={SESSION_REPLAY_MINIMUM_DURATION_OPTIONS}
+                            value={currentTeam?.session_recording_minimum_duration_milliseconds}
                         />
-                        {currentTeam?.session_recording_linked_flag && (
-                            <LemonButton
-                                className="ml-2"
-                                icon={<IconCancel />}
-                                size="small"
-                                type="secondary"
-                                onClick={() => updateCurrentTeam({ session_recording_linked_flag: null })}
-                                title="Clear selected flag"
+                    </div>
+                    <p>
+                        Setting a minimum session duration will ensure that only sessions that last longer than that
+                        value are collected. This helps you avoid collecting sessions that are too short to be useful.
+                    </p>
+                </>
+            )}
+            {featureFlagRecordingFeatureEnabled && (
+                <>
+                    <div className="flex flex-col space-y-2">
+                        <LemonLabel className="text-base">Enable recordings using feature flag</LemonLabel>
+                        <div className="flex flex-row justify-start">
+                            <FlagSelector
+                                value={currentTeam?.session_recording_linked_flag?.id ?? undefined}
+                                onChange={(id, key) => {
+                                    updateCurrentTeam({ session_recording_linked_flag: { id, key } })
+                                }}
                             />
-                        )}
+                            {currentTeam?.session_recording_linked_flag && (
+                                <LemonButton
+                                    className="ml-2"
+                                    icon={<IconCancel />}
+                                    size="small"
+                                    type="secondary"
+                                    onClick={() => updateCurrentTeam({ session_recording_linked_flag: null })}
+                                    title="Clear selected flag"
+                                />
+                            )}
+                        </div>
                     </div>
-                </div>
-                <p>
-                    Linking a flag means that recordings will only be collected for users who have the flag enabled.
-                    Only supports release toggles (boolean flags).
-                </p>
-            </>
+                    <p>
+                        Linking a flag means that recordings will only be collected for users who have the flag enabled.
+                        Only supports release toggles (boolean flags).
+                    </p>
+                </>
+            )}
         </>
     )
 }
diff --git a/frontend/src/scenes/settings/project/SettingPersonsOnEvents.tsx b/frontend/src/scenes/settings/project/SettingPersonsOnEvents.tsx
index d5d96e08de8a5..8f17a1b88c6f8 100644
--- a/frontend/src/scenes/settings/project/SettingPersonsOnEvents.tsx
+++ b/frontend/src/scenes/settings/project/SettingPersonsOnEvents.tsx
@@ -9,16 +9,17 @@ export function SettingPersonsOnEvents(): JSX.Element {
     return (
         <>
             <p>
-                We have updated our data model to also store person properties directly on events, making queries
+                We have updated our data model to store person properties directly on events, making queries
                 significantly faster. This means that person properties will no longer be "timeless", but rather
                 point-in-time i.e. on filters we'll consider a person's properties at the time of the event, rather than
                 at present time. This may cause data to change on some of your insights, but will be the default way we
                 handle person properties going forward. For now, you can control whether you want this on or not, and
                 should feel free to let us know of any concerns you might have. If you do enable this, you should see
                 speed improvements of around 3-5x on average on most of your insights.
-                <Link to="https://github.com/PostHog/posthog/blob/75a2111f2c4f9183dd45f85c7b103c7b0524eabf/plugin-server/src/worker/ingestion/PoE.md">
-                    More info.
-                </Link>
+            </p>
+            <p>
+                Please note, <strong>you might need to change the way you send us events</strong> after enabling this
+                feature. <Link to="https://github.com/PostHog/meta/issues/173">Read more here.</Link>
             </p>
 
             <LemonSwitch
diff --git a/frontend/src/scenes/trends/viz/ActionsHorizontalBar.tsx b/frontend/src/scenes/trends/viz/ActionsHorizontalBar.tsx
index 41f26f7dfafa3..0937490e4422f 100644
--- a/frontend/src/scenes/trends/viz/ActionsHorizontalBar.tsx
+++ b/frontend/src/scenes/trends/viz/ActionsHorizontalBar.tsx
@@ -3,7 +3,7 @@ import { getSeriesColor } from 'lib/colors'
 import { PropertyKeyInfo } from 'lib/components/PropertyKeyInfo'
 import { useEffect, useState } from 'react'
 import { insightLogic } from 'scenes/insights/insightLogic'
-import { formatBreakdownLabel } from 'scenes/insights/utils'
+import { formatBreakdownLabel, isNullBreakdown, isOtherBreakdown } from 'scenes/insights/utils'
 
 import { cohortsModel } from '~/models/cohortsModel'
 import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
@@ -35,7 +35,9 @@ export function ActionsHorizontalBar({ showPersonsModal = true }: ChartParams):
 
         setData([
             {
-                labels: _data.map((item) => item.label),
+                labels: _data.map((item) =>
+                    isOtherBreakdown(item.label) ? 'Other' : isNullBreakdown(item.label) ? 'None' : item.label
+                ),
                 data: _data.map((item) => item.aggregated_value),
                 actions: _data.map((item) => item.action),
                 personsValues: _data.map((item) => item.persons),
diff --git a/frontend/src/scenes/urls.ts b/frontend/src/scenes/urls.ts
index 153374707fc42..691dfe4717363 100644
--- a/frontend/src/scenes/urls.ts
+++ b/frontend/src/scenes/urls.ts
@@ -147,12 +147,12 @@ export const urls = {
         combineUrl(`/app/${pluginConfigId}/history`, searchParams).url,
     appLogs: (pluginConfigId: string | number, searchParams?: Record<string, any>): string =>
         combineUrl(`/app/${pluginConfigId}/logs`, searchParams).url,
-    projectCreateFirst: (): string => '/create',
+    organizationCreateFirst: (): string => '/create-organization',
+    projectCreateFirst: (): string => '/organization/create-project',
     projectHomepage: (): string => '/',
     settings: (section: SettingSectionId | SettingLevelId = 'project', setting?: SettingId): string =>
         combineUrl(`/settings/${section}`, undefined, setting).url,
     organizationCreationConfirm: (): string => '/organization/confirm-creation',
-    organizationCreateFirst: (): string => '/organization/create',
     toolbarLaunch: (): string => '/toolbar',
     site: (url: string): string => `/site/${url === ':url' ? url : encodeURIComponent(url)}`,
     // Onboarding / setup routes
diff --git a/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts b/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts
index fd9fd99e661b2..98df4dd8c5fc0 100644
--- a/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts
+++ b/frontend/src/scenes/web-analytics/webAnalyticsLogic.ts
@@ -624,7 +624,7 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                                         ],
                                         trendsFilter: {
                                             display: ChartDisplayType.ActionsPie,
-                                            show_labels_on_series: true,
+                                            showLabelsOnSeries: true,
                                         },
                                         filterTestAccounts: true,
                                         properties: webAnalyticsFilters,
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index 2062f3278a4b0..a70ce538e12b2 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -93,6 +93,7 @@ export enum AvailableFeature {
     SURVEYS_STYLING = 'surveys_styling',
     SURVEYS_TEXT_HTML = 'surveys_text_html',
     SURVEYS_MULTIPLE_QUESTIONS = 'surveys_multiple_questions',
+    DATA_PIPELINES = 'data_pipelines',
     SESSION_REPLAY_SAMPLING = 'session_replay_sampling',
     RECORDING_DURATION_MINIMUM = 'replay_recording_duration_minimum',
     FEATURE_FLAG_BASED_RECORDING = 'replay_feature_flag_based_recording',
@@ -3616,4 +3617,5 @@ export enum SidePanelTab {
     FeaturePreviews = 'feature-previews',
     Activity = 'activity',
     Discussion = 'discussion',
+    Status = 'status',
 }
diff --git a/mypy-baseline.txt b/mypy-baseline.txt
index aa9cccb3e809a..7747af86b3112 100644
--- a/mypy-baseline.txt
+++ b/mypy-baseline.txt
@@ -163,7 +163,6 @@ posthog/hogql/transforms/property_types.py:0: error: Statement is unreachable  [
 posthog/hogql/transforms/property_types.py:0: error: Argument 2 to "_get_materialized_column" of "PropertySwapper" has incompatible type "str | int"; expected "str"  [arg-type]
 posthog/hogql/modifiers.py:0: error: Incompatible types in assignment (expression has type "PersonOnEventsMode", variable has type "PersonsOnEventsMode | None")  [assignment]
 posthog/hogql/modifiers.py:0: error: Incompatible types in assignment (expression has type "str", variable has type "PersonsArgMaxVersion | None")  [assignment]
-posthog/hogql/modifiers.py:0: error: Incompatible types in assignment (expression has type "str", variable has type "InCohortVia | None")  [assignment]
 posthog/hogql/functions/cohort.py:0: error: Argument 1 to "escape_clickhouse_string" has incompatible type "str | None"; expected "float | int | str | list[Any] | tuple[Any, ...] | date | datetime | UUID | UUIDT"  [arg-type]
 posthog/hogql/functions/cohort.py:0: error: Argument 1 to "escape_clickhouse_string" has incompatible type "str | None"; expected "float | int | str | list[Any] | tuple[Any, ...] | date | datetime | UUID | UUIDT"  [arg-type]
 posthog/hogql/functions/cohort.py:0: error: Incompatible types in assignment (expression has type "ValuesQuerySet[Cohort, tuple[int, bool | None]]", variable has type "ValuesQuerySet[Cohort, tuple[int, bool | None, str | None]]")  [assignment]
@@ -366,11 +365,6 @@ posthog/hogql/query.py:0: error: Argument 1 to "get_default_limit_for_context" h
 posthog/hogql/query.py:0: error: "SelectQuery" has no attribute "select_queries"  [attr-defined]
 posthog/hogql/query.py:0: error: Subclass of "SelectQuery" and "SelectUnionQuery" cannot exist: would have incompatible method signatures  [unreachable]
 posthog/hogql_queries/query_runner.py:0: error: Incompatible types in assignment (expression has type "HogQLQuery | TrendsQuery | LifecycleQuery | InsightActorsQuery | EventsQuery | ActorsQuery | RetentionQuery | SessionsTimelineQuery | WebOverviewQuery | WebTopClicksQuery | WebStatsTableQuery | StickinessQuery | BaseModel | dict[str, Any]", variable has type "HogQLQuery | TrendsQuery | LifecycleQuery | InsightActorsQuery | EventsQuery | ActorsQuery | RetentionQuery | SessionsTimelineQuery | WebOverviewQuery | WebTopClicksQuery | WebStatsTableQuery | StickinessQuery")  [assignment]
-posthog/hogql_queries/insights/trends/breakdown_values.py:0: error: Argument "chain" to "Field" has incompatible type "list[str]"; expected "list[str | int]"  [arg-type]
-posthog/hogql_queries/insights/trends/breakdown_values.py:0: note: "List" is invariant -- see https://mypy.readthedocs.io/en/stable/common_issues.html#variance
-posthog/hogql_queries/insights/trends/breakdown_values.py:0: note: Consider using "Sequence" instead, which is covariant
-posthog/hogql_queries/insights/trends/breakdown_values.py:0: error: Argument "breakdown_type" to "get_properties_chain" has incompatible type "str"; expected "Literal['person', 'session', 'group', 'event']"  [arg-type]
-posthog/hogql_queries/insights/trends/breakdown_values.py:0: error: Argument "breakdown_field" to "get_properties_chain" has incompatible type "str | float"; expected "str"  [arg-type]
 posthog/hogql_queries/insights/trends/breakdown_values.py:0: error: Incompatible types in assignment (expression has type "float | int", variable has type "int")  [assignment]
 posthog/hogql_queries/insights/trends/breakdown_values.py:0: error: Item "SelectUnionQuery" of "SelectQuery | SelectUnionQuery" has no attribute "select"  [union-attr]
 posthog/hogql_queries/insights/trends/breakdown_values.py:0: error: Value of type "list[Any] | None" is not indexable  [index]
@@ -380,19 +374,11 @@ posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "Bre
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown_type"  [union-attr]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown"  [union-attr]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Argument 1 to "parse_expr" has incompatible type "str | float | list[str | float] | Any | None"; expected "str"  [arg-type]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown"  [union-attr]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Argument 1 to "int" has incompatible type "str | float | list[str | float] | Any | None"; expected "str | Buffer | SupportsInt | SupportsIndex | SupportsTrunc"  [arg-type]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown_type"  [union-attr]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown"  [union-attr]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Argument 1 to "parse_expr" has incompatible type "str | float | list[str | float] | Any | None"; expected "str"  [arg-type]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Statement is unreachable  [unreachable]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown_type"  [union-attr]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown"  [union-attr]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown"  [union-attr]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Argument 1 to "int" has incompatible type "str | float | list[str | float] | Any | None"; expected "str | Buffer | SupportsInt | SupportsIndex | SupportsTrunc"  [arg-type]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown_type"  [union-attr]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown"  [union-attr]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Argument 1 to "parse_expr" has incompatible type "str | float | list[str | float] | Any | None"; expected "str"  [arg-type]
+posthog/hogql_queries/insights/trends/breakdown.py:0: error: Statement is unreachable  [unreachable]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Argument "exprs" to "Or" has incompatible type "list[CompareOperation]"; expected "list[Expr]"  [arg-type]
 posthog/hogql_queries/insights/trends/breakdown.py:0: note: "List" is invariant -- see https://mypy.readthedocs.io/en/stable/common_issues.html#variance
 posthog/hogql_queries/insights/trends/breakdown.py:0: note: Consider using "Sequence" instead, which is covariant
@@ -400,9 +386,6 @@ posthog/hogql_queries/insights/trends/breakdown.py:0: error: Incompatible types
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Incompatible types in assignment (expression has type "float", variable has type "int")  [assignment]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Incompatible types in assignment (expression has type "str", variable has type "int")  [assignment]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Incompatible types in assignment (expression has type "str", variable has type "int")  [assignment]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Argument "event_name" to "BreakdownValues" has incompatible type "str | None"; expected "str"  [arg-type]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown"  [union-attr]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Argument "breakdown_field" to "BreakdownValues" has incompatible type "str | float | list[str | float] | Any | None"; expected "str | float"  [arg-type]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown_type"  [union-attr]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Argument "breakdown_type" to "BreakdownValues" has incompatible type "BreakdownType | Any | None"; expected "str"  [arg-type]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown_histogram_bin_count"  [union-attr]
@@ -417,7 +400,6 @@ posthog/hogql_queries/insights/trends/breakdown.py:0: error: Argument "breakdown
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown"  [union-attr]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Argument "breakdown_field" to "get_properties_chain" has incompatible type "str | float | list[str | float] | Any | None"; expected "str"  [arg-type]
 posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown_group_type_index"  [union-attr]
-posthog/hogql_queries/insights/trends/breakdown.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown_type"  [union-attr]
 posthog/hogql_queries/hogql_query_runner.py:0: error: Statement is unreachable  [unreachable]
 posthog/hogql_queries/hogql_query_runner.py:0: error: Argument "placeholders" to "parse_select" has incompatible type "dict[str, Constant] | None"; expected "dict[str, Expr] | None"  [arg-type]
 posthog/hogql_queries/hogql_query_runner.py:0: error: Incompatible types in assignment (expression has type "Expr", variable has type "SelectQuery | SelectUnionQuery")  [assignment]
@@ -439,13 +421,9 @@ posthog/api/person.py:0: error: Argument 1 to "loads" has incompatible type "str
 posthog/api/person.py:0: error: Argument "user" to "log_activity" has incompatible type "User | AnonymousUser"; expected "User | None"  [arg-type]
 posthog/api/person.py:0: error: Argument "user" to "log_activity" has incompatible type "User | AnonymousUser"; expected "User | None"  [arg-type]
 posthog/hogql_queries/web_analytics/web_analytics_query_runner.py:0: error: Argument 1 to "append" of "list" has incompatible type "EventPropertyFilter"; expected "Expr"  [arg-type]
-posthog/hogql_queries/insights/trends/trends_query_runner.py:0: error: Return type "list[SelectQuery]" of "to_query" incompatible with return type "SelectQuery | SelectUnionQuery" in supertype "QueryRunner"  [override]
-posthog/hogql_queries/insights/trends/trends_query_runner.py:0: error: Incompatible return value type (got "list[SelectQuery | SelectUnionQuery]", expected "list[SelectQuery]")  [return-value]
 posthog/hogql_queries/insights/trends/trends_query_runner.py:0: error: Need type annotation for "timings" (hint: "timings: List[<type>] = ...")  [var-annotated]
 posthog/hogql_queries/insights/trends/trends_query_runner.py:0: error: Argument 1 to "extend" of "list" has incompatible type "list[QueryTiming] | None"; expected "Iterable[Any]"  [arg-type]
 posthog/hogql_queries/insights/trends/trends_query_runner.py:0: error: Statement is unreachable  [unreachable]
-posthog/hogql_queries/insights/trends/trends_query_runner.py:0: error: List item 0 has incompatible type "str | float | None"; expected "str | float"  [list-item]
-posthog/hogql_queries/insights/trends/trends_query_runner.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown"  [union-attr]
 posthog/hogql_queries/insights/trends/trends_query_runner.py:0: error: Argument 1 to "FormulaAST" has incompatible type "map[Any]"; expected "list[list[float]]"  [arg-type]
 posthog/hogql_queries/insights/trends/trends_query_runner.py:0: error: Argument 1 to "FormulaAST" has incompatible type "map[Any]"; expected "list[list[float]]"  [arg-type]
 posthog/hogql_queries/insights/trends/trends_query_runner.py:0: error: Item "None" of "BreakdownFilter | None" has no attribute "breakdown_type"  [union-attr]
@@ -634,11 +612,6 @@ posthog/hogql_queries/insights/test/test_events_query_runner.py:0: error: Item "
 posthog/hogql_queries/insights/test/test_events_query_runner.py:0: error: Item "None" of "Expr | None" has no attribute "exprs"  [union-attr]
 posthog/hogql_queries/insights/test/test_events_query_runner.py:0: error: Item "Expr" of "Expr | None" has no attribute "exprs"  [union-attr]
 posthog/hogql_queries/insights/test/test_events_query_runner.py:0: error: Item "None" of "Expr | None" has no attribute "exprs"  [union-attr]
-posthog/hogql/transforms/test/test_in_cohort.py:0: error: "TestInCohort" has no attribute "snapshot"  [attr-defined]
-posthog/hogql/transforms/test/test_in_cohort.py:0: error: Argument 1 to "len" has incompatible type "list[Any] | None"; expected "Sized"  [arg-type]
-posthog/hogql/transforms/test/test_in_cohort.py:0: error: Value of type "list[Any] | None" is not indexable  [index]
-posthog/hogql/transforms/test/test_in_cohort.py:0: error: "TestInCohort" has no attribute "snapshot"  [attr-defined]
-posthog/hogql/transforms/test/test_in_cohort.py:0: error: "TestInCohort" has no attribute "snapshot"  [attr-defined]
 posthog/hogql/test/test_timings.py:0: error: No overload variant of "__setitem__" of "list" matches argument types "int", "float"  [call-overload]
 posthog/hogql/test/test_timings.py:0: note: Possible overload variants:
 posthog/hogql/test/test_timings.py:0: note: def __setitem__(self, SupportsIndex, int, /) -> None
diff --git a/package.json b/package.json
index 23e8c1c50cab4..7f1bdf639cac8 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
         "@medv/finder": "^2.1.0",
         "@microlink/react-json-view": "^1.21.3",
         "@monaco-editor/react": "4.4.6",
-        "@posthog/icons": "0.4.11",
+        "@posthog/icons": "0.4.17",
         "@posthog/plugin-scaffold": "^1.4.4",
         "@react-hook/size": "^2.1.2",
         "@rrweb/types": "^2.0.0-alpha.11",
@@ -141,7 +141,7 @@
         "pmtiles": "^2.11.0",
         "postcss": "^8.4.31",
         "postcss-preset-env": "^9.3.0",
-        "posthog-js": "1.99.0",
+        "posthog-js": "1.100.0",
         "posthog-js-lite": "2.5.0",
         "prettier": "^2.8.8",
         "prop-types": "^15.7.2",
diff --git a/plugin-server/README.md b/plugin-server/README.md
index 16b8fb740a776..6dff75c60702b 100644
--- a/plugin-server/README.md
+++ b/plugin-server/README.md
@@ -13,11 +13,18 @@ Let's get you developing the plugin server in no time:
 
 1. Install dependencies and prepare for takeoff by running command `pnpm i`.
 
-1. Start a development instance of [PostHog](/PostHog/posthog) - [instructions here](https://posthog.com/docs/developing-locally). After all, this is the _PostHog_ Plugin Server, and it works in conjuction with the main server.
+1. Start a development instance of [PostHog](/PostHog/posthog) - [instructions
+   here](https://posthog.com/docs/developing-locally). After all, this is the _PostHog_ Plugin
+   Server, and it works in conjuction with the main server.
 
-1. Make sure that the plugin server is configured correctly (see [Configuration](#Configuration)). The following settings need to be the same for the plugin server and the main server: `DATABASE_URL`, `REDIS_URL`, `KAFKA_HOSTS`, `CLICKHOUSE_HOST`, `CLICKHOUSE_DATABASE`, `CLICKHOUSE_USER`, and `CLICKHOUSE_PASSWORD`. Their default values should work just fine in local development though.
+1. Make sure that the plugin server is configured correctly (see [Configuration](#Configuration)).
+   The following settings need to be the same for the plugin server and the main server:
+   `DATABASE_URL`, `REDIS_URL`, `KAFKA_HOSTS`, `CLICKHOUSE_HOST`, `CLICKHOUSE_DATABASE`,
+   `CLICKHOUSE_USER`, and `CLICKHOUSE_PASSWORD`. Their default values should work just fine in local
+   development though.
 
-1. Start the plugin server in autoreload mode with `pnpm start:dev`, or in compiled mode with `pnpm build && pnpm start:dist`, and develop away!
+1. Start the plugin server in autoreload mode with `pnpm start:dev`, or in compiled mode with `pnpm
+build && pnpm start:dist`, and develop away!
 
 1. Prepare for running tests with `pnpm setup:test`, which will run the
    necessary migrations. Run the tests themselves with `pnpm test:{1,2}`.
@@ -160,7 +167,7 @@ Let's talk about the main thread first. This has:
 1. `hub` – Handler of connections to required DBs and queues (ClickHouse, Kafka, Postgres, Redis), holds loaded plugins.
    Created via `hub.ts -> createHub`. Every thread has its own instance.
 
-1. `piscina` – Manager of tasks delegated to threads. `makePiscina` creates the manager, while `createWorker` creates the worker threads.
+1. `piscina` – This used to be a manager of tasks that were delegated to threads. It is now a shim over normal JS function calls that will be removed in the future.
 
 1. `pluginScheduleControl` – Controller of scheduled jobs. Responsible for adding Piscina tasks for scheduled jobs, when the time comes. The schedule information makes it into the controller when plugin VMs are created.
 
@@ -176,18 +183,6 @@ Let's talk about the main thread first. This has:
 
 1. `mmdbServer` – TCP server, which works as an interface between the GeoIP MMDB data reader located in main thread memory and plugins ran in worker threads of the same plugin server instance. This way the GeoIP reader is only loaded in one thread and can be used in all. Additionally this mechanism ensures that `mmdbServer` is ready before ingestion is started (database downloaded from [http-mmdb](https://github.com/PostHog/http-mmdb) and read), and keeps the database up to date in the background.
 
-### Worker threads
-
-This begins with `worker.ts` and `createWorker()`.
-
-`hub` is the same setup as in the main thread.
-
-New functions called here are:
-
-1. `setupPlugins` – Loads plugins and prepares them for lazy VM initialization.
-
-2. `createTaskRunner` – Creates a Piscina task runner that allows to operate on plugin VMs.
-
 > Note:
 > An `organization_id` is tied to a _company_ and its _installed plugins_, a `team_id` is tied to a _project_ and its _plugin configs_ (enabled/disabled+extra config).
 
@@ -215,7 +210,3 @@ We carry a node-rdkafka patch that adds cooperative rebalancing. To generate thi
 
     # in the plugin-server directory, target the temporary directory from the previous command
     pnpm patch-commit /private/var/folders/b7/bmmghlpx5qdd6gpyvmz1k1_m0000gn/T/6082767a6879b3b4e11182f944f5cca3
-
-## Questions?
-
-### [Join our Slack community. 🦔](https://posthog.com/slack)
diff --git a/plugin-server/src/main/ingestion-queues/on-event-handler-consumer.ts b/plugin-server/src/main/ingestion-queues/on-event-handler-consumer.ts
index 38653f698eaa6..b4d7e07e7da75 100644
--- a/plugin-server/src/main/ingestion-queues/on-event-handler-consumer.ts
+++ b/plugin-server/src/main/ingestion-queues/on-event-handler-consumer.ts
@@ -1,6 +1,7 @@
 import { Consumer, Kafka } from 'kafkajs'
 import * as schedule from 'node-schedule'
 import { AppMetrics } from 'worker/ingestion/app-metrics'
+import { RustyHook } from 'worker/rusty-hook'
 
 import { KAFKA_EVENTS_JSON, prefix as KAFKA_PREFIX } from '../../config/kafka-topics'
 import { Hub, PluginsServerConfig } from '../../types'
@@ -23,7 +24,7 @@ export const startAsyncOnEventHandlerConsumer = async ({
 }) => {
     /*
         Consumes analytics events from the Kafka topic `clickhouse_events_json`
-        and processes any onEvent plugin handlers configured for the team. 
+        and processes any onEvent plugin handlers configured for the team.
 
         At the moment this is just a wrapper around `IngestionConsumer`. We may
         want to further remove that abstraction in the future.
@@ -45,6 +46,7 @@ export const startAsyncWebhooksHandlerConsumer = async ({
     teamManager,
     organizationManager,
     serverConfig,
+    rustyHook,
     appMetrics,
 }: {
     kafka: Kafka
@@ -52,11 +54,12 @@ export const startAsyncWebhooksHandlerConsumer = async ({
     teamManager: TeamManager
     organizationManager: OrganizationManager
     serverConfig: PluginsServerConfig
+    rustyHook: RustyHook
     appMetrics: AppMetrics
 }) => {
     /*
         Consumes analytics events from the Kafka topic `clickhouse_events_json`
-        and processes any onEvent plugin handlers configured for the team. 
+        and processes any onEvent plugin handlers configured for the team.
 
         At the moment this is just a wrapper around `IngestionConsumer`. We may
         want to further remove that abstraction in the future.
@@ -78,6 +81,7 @@ export const startAsyncWebhooksHandlerConsumer = async ({
         postgres,
         teamManager,
         organizationManager,
+        rustyHook,
         appMetrics,
         serverConfig.EXTERNAL_REQUEST_TIMEOUT_MS
     )
diff --git a/plugin-server/src/main/pluginsServer.ts b/plugin-server/src/main/pluginsServer.ts
index f44567183e144..42cdee24b3bab 100644
--- a/plugin-server/src/main/pluginsServer.ts
+++ b/plugin-server/src/main/pluginsServer.ts
@@ -10,7 +10,7 @@ import { Counter } from 'prom-client'
 import v8Profiler from 'v8-profiler-next'
 
 import { getPluginServerCapabilities } from '../capabilities'
-import { defaultConfig, sessionRecordingConsumerConfig } from '../config/config'
+import { buildIntegerMatcher, defaultConfig, sessionRecordingConsumerConfig } from '../config/config'
 import { Hub, PluginServerCapabilities, PluginsServerConfig } from '../types'
 import { createHub, createKafkaClient, createKafkaProducerWrapper } from '../utils/db/hub'
 import { PostgresRouter } from '../utils/db/postgres'
@@ -24,6 +24,7 @@ import { OrganizationManager } from '../worker/ingestion/organization-manager'
 import { DeferredPersonOverrideWorker, FlatPersonOverrideWriter } from '../worker/ingestion/person-state'
 import { TeamManager } from '../worker/ingestion/team-manager'
 import Piscina, { makePiscina as defaultMakePiscina } from '../worker/piscina'
+import { RustyHook } from '../worker/rusty-hook'
 import { GraphileWorker } from './graphile-worker/graphile-worker'
 import { loadPluginSchedule } from './graphile-worker/schedule'
 import { startGraphileWorker } from './graphile-worker/worker-setup'
@@ -356,6 +357,13 @@ export async function startPluginsServer(
             const teamManager = hub?.teamManager ?? new TeamManager(postgres, serverConfig)
             const organizationManager = hub?.organizationManager ?? new OrganizationManager(postgres, teamManager)
             const KafkaProducerWrapper = hub?.kafkaProducer ?? (await createKafkaProducerWrapper(serverConfig))
+            const rustyHook =
+                hub?.rustyHook ??
+                new RustyHook(
+                    buildIntegerMatcher(serverConfig.RUSTY_HOOK_FOR_TEAMS, true),
+                    serverConfig.RUSTY_HOOK_URL,
+                    serverConfig.EXTERNAL_REQUEST_TIMEOUT_MS
+                )
             const appMetrics =
                 hub?.appMetrics ??
                 new AppMetrics(
@@ -371,6 +379,7 @@ export async function startPluginsServer(
                     teamManager: teamManager,
                     organizationManager: organizationManager,
                     serverConfig: serverConfig,
+                    rustyHook: rustyHook,
                     appMetrics: appMetrics,
                 })
 
diff --git a/plugin-server/src/types.ts b/plugin-server/src/types.ts
index 208e8cb48b43f..0031ec514f39a 100644
--- a/plugin-server/src/types.ts
+++ b/plugin-server/src/types.ts
@@ -17,6 +17,7 @@ import { Kafka } from 'kafkajs'
 import { DateTime } from 'luxon'
 import { Job } from 'node-schedule'
 import { VM } from 'vm2'
+import { RustyHook } from 'worker/rusty-hook'
 
 import { ObjectStorage } from './main/services/object_storage'
 import { DB } from './utils/db/db'
@@ -267,6 +268,7 @@ export interface Hub extends PluginsServerConfig {
     rootAccessManager: RootAccessManager
     eventsProcessor: EventsProcessor
     appMetrics: AppMetrics
+    rustyHook: RustyHook
     // geoip database, setup in workers
     mmdb?: ReaderModel
     // diagnostics
@@ -280,7 +282,6 @@ export interface Hub extends PluginsServerConfig {
     pluginConfigsToSkipElementsParsing: ValueMatcher<number>
     poeEmbraceJoinForTeams: ValueMatcher<number>
     poeWritesExcludeTeams: ValueMatcher<number>
-    rustyHookForTeams: ValueMatcher<number>
     // lookups
     eventsToDropByToken: Map<string, string[]>
 }
diff --git a/plugin-server/src/utils/db/hub.ts b/plugin-server/src/utils/db/hub.ts
index 9a7af116308a3..0e14d29bf5643 100644
--- a/plugin-server/src/utils/db/hub.ts
+++ b/plugin-server/src/utils/db/hub.ts
@@ -26,6 +26,7 @@ import { AppMetrics } from '../../worker/ingestion/app-metrics'
 import { OrganizationManager } from '../../worker/ingestion/organization-manager'
 import { EventsProcessor } from '../../worker/ingestion/process-event'
 import { TeamManager } from '../../worker/ingestion/team-manager'
+import { RustyHook } from '../../worker/rusty-hook'
 import { isTestEnv } from '../env-utils'
 import { status } from '../status'
 import { createRedisPool, UUIDT } from '../utils'
@@ -141,6 +142,11 @@ export async function createHub(
     const organizationManager = new OrganizationManager(postgres, teamManager)
     const pluginsApiKeyManager = new PluginsApiKeyManager(db)
     const rootAccessManager = new RootAccessManager(db)
+    const rustyHook = new RustyHook(
+        buildIntegerMatcher(serverConfig.RUSTY_HOOK_FOR_TEAMS, true),
+        serverConfig.RUSTY_HOOK_URL,
+        serverConfig.EXTERNAL_REQUEST_TIMEOUT_MS
+    )
 
     const enqueuePluginJob = async (job: EnqueuedPluginJob) => {
         // NOTE: we use the producer directly here rather than using the wrapper
@@ -185,11 +191,11 @@ export async function createHub(
         organizationManager,
         pluginsApiKeyManager,
         rootAccessManager,
+        rustyHook,
         conversionBufferEnabledTeams,
         pluginConfigsToSkipElementsParsing: buildIntegerMatcher(process.env.SKIP_ELEMENTS_PARSING_PLUGINS, true),
         poeEmbraceJoinForTeams: buildIntegerMatcher(process.env.POE_EMBRACE_JOIN_FOR_TEAMS, true),
         poeWritesExcludeTeams: buildIntegerMatcher(process.env.POE_WRITES_EXCLUDE_TEAMS, false),
-        rustyHookForTeams: buildIntegerMatcher(process.env.RUSTY_HOOK_FOR_TEAMS, true),
         eventsToDropByToken: createEventsToDropByToken(process.env.DROP_EVENTS_BY_TOKEN_DISTINCT_ID),
     }
 
diff --git a/plugin-server/src/worker/ingestion/hooks.ts b/plugin-server/src/worker/ingestion/hooks.ts
index c2a6c0536df46..3cc811bc795db 100644
--- a/plugin-server/src/worker/ingestion/hooks.ts
+++ b/plugin-server/src/worker/ingestion/hooks.ts
@@ -1,6 +1,7 @@
 import { captureException } from '@sentry/node'
 import { Histogram } from 'prom-client'
 import { format } from 'util'
+import { RustyHook } from 'worker/rusty-hook'
 
 import { Action, Hook, PostIngestionEvent, Team } from '../../types'
 import { PostgresRouter, PostgresUse } from '../../utils/db/postgres'
@@ -254,6 +255,7 @@ export class HookCommander {
     postgres: PostgresRouter
     teamManager: TeamManager
     organizationManager: OrganizationManager
+    rustyHook: RustyHook
     appMetrics: AppMetrics
     siteUrl: string
     /** Hook request timeout in ms. */
@@ -263,6 +265,7 @@ export class HookCommander {
         postgres: PostgresRouter,
         teamManager: TeamManager,
         organizationManager: OrganizationManager,
+        rustyHook: RustyHook,
         appMetrics: AppMetrics,
         timeout: number
     ) {
@@ -275,6 +278,7 @@ export class HookCommander {
             status.warn('⚠️', 'SITE_URL env is not set for webhooks')
             this.siteUrl = ''
         }
+        this.rustyHook = rustyHook
         this.appMetrics = appMetrics
         this.EXTERNAL_REQUEST_TIMEOUT = timeout
     }
@@ -350,6 +354,24 @@ export class HookCommander {
         const message = this.formatMessage(webhookUrl, action, event, team)
         end()
 
+        const body = JSON.stringify(message, undefined, 4)
+        const enqueuedInRustyHook = await this.rustyHook.enqueueIfEnabledForTeam({
+            webhook: {
+                url: webhookUrl,
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body,
+            },
+            teamId: event.teamId,
+            pluginId: -2, // -2 is hardcoded to mean webhooks
+            pluginConfigId: -2, // -2 is hardcoded to mean webhooks
+        })
+
+        if (enqueuedInRustyHook) {
+            // Rusty-Hook handles it from here, so we're done.
+            return
+        }
+
         const slowWarningTimeout = this.EXTERNAL_REQUEST_TIMEOUT * 0.7
         const timeout = setTimeout(() => {
             status.warn(
@@ -363,7 +385,7 @@ export class HookCommander {
             await instrumentWebhookStep('fetch', async () => {
                 const request = await trackedFetch(webhookUrl, {
                     method: 'POST',
-                    body: JSON.stringify(message, undefined, 4),
+                    body,
                     headers: { 'Content-Type': 'application/json' },
                     timeout: this.EXTERNAL_REQUEST_TIMEOUT,
                 })
@@ -425,6 +447,24 @@ export class HookCommander {
             data: { ...data, person: sendablePerson },
         }
 
+        const body = JSON.stringify(payload, undefined, 4)
+        const enqueuedInRustyHook = await this.rustyHook.enqueueIfEnabledForTeam({
+            webhook: {
+                url: hook.target,
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body,
+            },
+            teamId: event.teamId,
+            pluginId: -1, // -1 is hardcoded to mean resthooks
+            pluginConfigId: -1, // -1 is hardcoded to mean resthooks
+        })
+
+        if (enqueuedInRustyHook) {
+            // Rusty-Hook handles it from here, so we're done.
+            return
+        }
+
         const slowWarningTimeout = this.EXTERNAL_REQUEST_TIMEOUT * 0.7
         const timeout = setTimeout(() => {
             status.warn(
@@ -437,7 +477,7 @@ export class HookCommander {
         try {
             const request = await trackedFetch(hook.target, {
                 method: 'POST',
-                body: JSON.stringify(payload, undefined, 4),
+                body,
                 headers: { 'Content-Type': 'application/json' },
                 timeout: this.EXTERNAL_REQUEST_TIMEOUT,
             })
diff --git a/plugin-server/src/worker/metrics.ts b/plugin-server/src/worker/metrics.ts
new file mode 100644
index 0000000000000..3cd18b3521948
--- /dev/null
+++ b/plugin-server/src/worker/metrics.ts
@@ -0,0 +1,8 @@
+import { Summary } from 'prom-client'
+
+export const pluginActionMsSummary = new Summary({
+    name: 'plugin_action_ms',
+    help: 'Time to run plugin action',
+    labelNames: ['plugin_id', 'action', 'status'],
+    percentiles: [0.5, 0.9, 0.95, 0.99],
+})
diff --git a/plugin-server/src/worker/plugins/run.ts b/plugin-server/src/worker/plugins/run.ts
index 97341742e2711..4f0be132e0e06 100644
--- a/plugin-server/src/worker/plugins/run.ts
+++ b/plugin-server/src/worker/plugins/run.ts
@@ -1,20 +1,11 @@
 import { PluginEvent, PostHogEvent, ProcessedPluginEvent, Webhook } from '@posthog/plugin-scaffold'
-import * as Sentry from '@sentry/node'
-import fetch from 'node-fetch'
-import { Summary } from 'prom-client'
 
 import { Hub, PluginConfig, PluginTaskType, VMMethods } from '../../types'
 import { processError } from '../../utils/db/error'
 import { trackedFetch } from '../../utils/fetch'
 import { status } from '../../utils/status'
-import { IllegalOperationError, sleep } from '../../utils/utils'
-
-const pluginActionMsSummary = new Summary({
-    name: 'plugin_action_ms',
-    help: 'Time to run plugin action',
-    labelNames: ['plugin_id', 'action', 'status'],
-    percentiles: [0.5, 0.9, 0.95, 0.99],
-})
+import { IllegalOperationError } from '../../utils/utils'
+import { pluginActionMsSummary } from '../metrics'
 
 async function runSingleTeamPluginOnEvent(
     hub: Hub,
@@ -73,80 +64,6 @@ export async function runOnEvent(hub: Hub, event: ProcessedPluginEvent): Promise
     )
 }
 
-const RUSTY_HOOK_BASE_DELAY_MS = 100
-const MAX_RUSTY_HOOK_DELAY_MS = 30_000
-
-interface RustyWebhookPayload {
-    parameters: Webhook
-    metadata: {
-        team_id: number
-        plugin_id: number
-        plugin_config_id: number
-    }
-}
-
-async function enqueueInRustyHook(hub: Hub, webhook: Webhook, pluginConfig: PluginConfig) {
-    webhook.method ??= 'POST'
-    webhook.headers ??= {}
-
-    const rustyWebhookPayload: RustyWebhookPayload = {
-        parameters: webhook,
-        metadata: {
-            team_id: pluginConfig.team_id,
-            plugin_id: pluginConfig.plugin_id,
-            plugin_config_id: pluginConfig.id,
-        },
-    }
-    const body = JSON.stringify(rustyWebhookPayload, undefined, 4)
-
-    // We attempt to enqueue into the rusty-hook service until we succeed. This is deliberatly
-    // designed to block up the consumer if rusty-hook is down or if we deploy code that
-    // sends malformed requests. The entire purpose of rusty-hook is to reliably deliver webhooks,
-    // so we'd rather leave items in the Kafka topic until we manage to get them into rusty-hook.
-    let attempt = 0
-    while (true) {
-        const timer = new Date()
-        try {
-            attempt += 1
-            const response = await fetch(hub.RUSTY_HOOK_URL, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body,
-
-                // Sure, it's not an external request, but we should have a timeout and this is as
-                // good as any.
-                timeout: hub.EXTERNAL_REQUEST_TIMEOUT_MS,
-            })
-
-            if (response.ok) {
-                // Success, exit the loop.
-                pluginActionMsSummary
-                    .labels(pluginConfig.plugin_id.toString(), 'enqueueRustyHook', 'success')
-                    .observe(new Date().getTime() - timer.getTime())
-
-                break
-            }
-
-            // Throw to unify error handling below.
-            throw new Error(`rusty-hook returned ${response.status} ${response.statusText}: ${await response.text()}`)
-        } catch (error) {
-            pluginActionMsSummary
-                .labels(pluginConfig.plugin_id.toString(), 'enqueueRustyHook', 'error')
-                .observe(new Date().getTime() - timer.getTime())
-
-            const redactedWebhook = {
-                parameters: { ...rustyWebhookPayload.parameters, body: '<redacted>' },
-                metadata: rustyWebhookPayload.metadata,
-            }
-            status.error('🔴', 'Webhook enqueue to rusty-hook failed', { error, redactedWebhook, attempt })
-            Sentry.captureException(error, { extra: { redactedWebhook } })
-        }
-
-        const delayMs = Math.min(2 ** (attempt - 1) * RUSTY_HOOK_BASE_DELAY_MS, MAX_RUSTY_HOOK_DELAY_MS)
-        await sleep(delayMs)
-    }
-}
-
 async function runSingleTeamPluginComposeWebhook(
     hub: Hub,
     event: PostHogEvent,
@@ -175,8 +92,16 @@ async function runSingleTeamPluginComposeWebhook(
                 return
             }
 
-            if (hub.rustyHookForTeams?.(event.team_id)) {
-                return await enqueueInRustyHook(hub, webhook, pluginConfig)
+            const enqueuedInRustyHook = await hub.rustyHook.enqueueIfEnabledForTeam({
+                webhook,
+                teamId: event.team_id,
+                pluginId: pluginConfig.plugin_id,
+                pluginConfigId: pluginConfig.id,
+            })
+
+            if (enqueuedInRustyHook) {
+                // Rusty-Hook handles it from here, so we're done.
+                return
             }
 
             const request = await trackedFetch(webhook.url, {
diff --git a/plugin-server/src/worker/rusty-hook.ts b/plugin-server/src/worker/rusty-hook.ts
new file mode 100644
index 0000000000000..d71fae955db73
--- /dev/null
+++ b/plugin-server/src/worker/rusty-hook.ts
@@ -0,0 +1,114 @@
+import { Webhook } from '@posthog/plugin-scaffold'
+import * as Sentry from '@sentry/node'
+import fetch from 'node-fetch'
+
+import { ValueMatcher } from '../types'
+import { isProdEnv } from '../utils/env-utils'
+import { raiseIfUserProvidedUrlUnsafe } from '../utils/fetch'
+import { status } from '../utils/status'
+import { sleep } from '../utils/utils'
+import { pluginActionMsSummary } from './metrics'
+
+const RUSTY_HOOK_BASE_DELAY_MS = 100
+const MAX_RUSTY_HOOK_DELAY_MS = 30_000
+
+interface RustyWebhookPayload {
+    parameters: Webhook
+    metadata: {
+        team_id: number
+        plugin_id: number
+        plugin_config_id: number
+    }
+}
+
+export class RustyHook {
+    constructor(
+        private enabledForTeams: ValueMatcher<number>,
+        private serviceUrl: string,
+        private requestTimeoutMs: number
+    ) {}
+
+    public async enqueueIfEnabledForTeam({
+        webhook,
+        teamId,
+        pluginId,
+        pluginConfigId,
+    }: {
+        webhook: Webhook
+        teamId: number
+        pluginId: number
+        pluginConfigId: number
+    }): Promise<boolean> {
+        if (!this.enabledForTeams(teamId)) {
+            return false
+        }
+
+        webhook.method ??= 'POST'
+        webhook.headers ??= {}
+
+        if (isProdEnv() && !process.env.NODE_ENV?.includes('functional-tests')) {
+            await raiseIfUserProvidedUrlUnsafe(webhook.url)
+        }
+
+        const rustyWebhookPayload: RustyWebhookPayload = {
+            parameters: webhook,
+            metadata: {
+                team_id: teamId,
+                plugin_id: pluginId,
+                plugin_config_id: pluginConfigId,
+            },
+        }
+        const body = JSON.stringify(rustyWebhookPayload, undefined, 4)
+
+        // We attempt to enqueue into the rusty-hook service until we succeed. This is deliberatly
+        // designed to block up the consumer if rusty-hook is down or if we deploy code that
+        // sends malformed requests. The entire purpose of rusty-hook is to reliably deliver webhooks,
+        // so we'd rather leave items in the Kafka topic until we manage to get them into rusty-hook.
+        let attempt = 0
+        while (true) {
+            const timer = new Date()
+            try {
+                attempt += 1
+                const response = await fetch(this.serviceUrl, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body,
+
+                    // Sure, it's not an external request, but we should have a timeout and this is as
+                    // good as any.
+                    timeout: this.requestTimeoutMs,
+                })
+
+                if (response.ok) {
+                    // Success, exit the loop.
+                    pluginActionMsSummary
+                        .labels(pluginId.toString(), 'enqueueRustyHook', 'success')
+                        .observe(new Date().getTime() - timer.getTime())
+
+                    break
+                }
+
+                // Throw to unify error handling below.
+                throw new Error(
+                    `rusty-hook returned ${response.status} ${response.statusText}: ${await response.text()}`
+                )
+            } catch (error) {
+                pluginActionMsSummary
+                    .labels(pluginId.toString(), 'enqueueRustyHook', 'error')
+                    .observe(new Date().getTime() - timer.getTime())
+
+                const redactedWebhook = {
+                    parameters: { ...rustyWebhookPayload.parameters, body: '<redacted>' },
+                    metadata: rustyWebhookPayload.metadata,
+                }
+                status.error('🔴', 'Webhook enqueue to rusty-hook failed', { error, redactedWebhook, attempt })
+                Sentry.captureException(error, { extra: { redactedWebhook } })
+            }
+
+            const delayMs = Math.min(2 ** (attempt - 1) * RUSTY_HOOK_BASE_DELAY_MS, MAX_RUSTY_HOOK_DELAY_MS)
+            await sleep(delayMs)
+        }
+
+        return true
+    }
+}
diff --git a/plugin-server/tests/main/ingestion-queues/each-batch.test.ts b/plugin-server/tests/main/ingestion-queues/each-batch.test.ts
index 709262ed79aa6..a98490d00f4e9 100644
--- a/plugin-server/tests/main/ingestion-queues/each-batch.test.ts
+++ b/plugin-server/tests/main/ingestion-queues/each-batch.test.ts
@@ -209,7 +209,7 @@ describe('eachBatchX', () => {
                 queue.pluginsServer.postgres,
                 queue.pluginsServer.teamManager,
                 queue.pluginsServer.organizationManager,
-                new Set(),
+                queue.pluginsServer.rustyHook,
                 queue.pluginsServer.appMetrics,
                 queue.pluginsServer.EXTERNAL_REQUEST_TIMEOUT_MS
             )
diff --git a/plugin-server/tests/worker/ingestion/event-pipeline/event-pipeline-integration.test.ts b/plugin-server/tests/worker/ingestion/event-pipeline/event-pipeline-integration.test.ts
index f2603cee6fac3..10aba7b024bf6 100644
--- a/plugin-server/tests/worker/ingestion/event-pipeline/event-pipeline-integration.test.ts
+++ b/plugin-server/tests/worker/ingestion/event-pipeline/event-pipeline-integration.test.ts
@@ -52,6 +52,7 @@ describe('Event Pipeline integration test', () => {
             hub.db.postgres,
             hub.teamManager,
             hub.organizationManager,
+            hub.rustyHook,
             hub.appMetrics,
             hub.EXTERNAL_REQUEST_TIMEOUT_MS
         )
diff --git a/plugin-server/tests/worker/ingestion/hooks.test.ts b/plugin-server/tests/worker/ingestion/hooks.test.ts
index 36886c297920d..e4161e0e81fe0 100644
--- a/plugin-server/tests/worker/ingestion/hooks.test.ts
+++ b/plugin-server/tests/worker/ingestion/hooks.test.ts
@@ -490,6 +490,7 @@ describe('hooks', () => {
                 {} as any,
                 {} as any,
                 {} as any,
+                { enqueueIfEnabledForTeam: async () => Promise.resolve(false) },
                 { queueError: () => Promise.resolve(), queueMetric: () => Promise.resolve() } as unknown as AppMetrics,
                 20000
             )
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d39009e49ac26..3399b8efb1d2a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,8 +39,8 @@ dependencies:
     specifier: 4.4.6
     version: 4.4.6(monaco-editor@0.39.0)(react-dom@18.2.0)(react@18.2.0)
   '@posthog/icons':
-    specifier: 0.4.11
-    version: 0.4.11(react-dom@18.2.0)(react@18.2.0)
+    specifier: 0.4.17
+    version: 0.4.17(react-dom@18.2.0)(react@18.2.0)
   '@posthog/plugin-scaffold':
     specifier: ^1.4.4
     version: 1.4.4
@@ -240,8 +240,8 @@ dependencies:
     specifier: ^9.3.0
     version: 9.3.0(postcss@8.4.31)
   posthog-js:
-    specifier: 1.99.0
-    version: 1.99.0
+    specifier: 1.100.0
+    version: 1.100.0
   posthog-js-lite:
     specifier: 2.5.0
     version: 2.5.0
@@ -5080,8 +5080,8 @@ packages:
     resolution: {integrity: sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==}
     dev: false
 
-  /@posthog/icons@0.4.11(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-hpHDrBIZlnc4Z0d8BPjNkMf7gkmR3o7CQGcvXJ8fQzyOL07EU3I0LRfkRHhFaRaZdeDB4TkJkkSDJ8beyuhBPQ==}
+  /@posthog/icons@0.4.17(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-pTrNY1PaWYwKvA6QSwt3MkFewIyqSVeblZRX89hRrCqf9GzN6CzE6tNg8EasEJc9c/C+c/E2USiqaE+XZzWMgg==}
     peerDependencies:
       react: '>=16.14.0'
       react-dom: '>=16.14.0'
@@ -17233,8 +17233,8 @@ packages:
     resolution: {integrity: sha512-Urvlp0Vu9h3td0BVFWt0QXFJDoOZcaAD83XM9d91NKMKTVPZtfU0ysoxstIf5mw/ce9ZfuMgpWPaagrZI4rmSg==}
     dev: false
 
-  /posthog-js@1.99.0:
-    resolution: {integrity: sha512-tFbxQm+mf97GV36eWbehPH7aM6P2yl+TKfmT7sDFG6dneuqp37XgYKADXbIQ7Nlynm2BOlawjkkZYzC2Dt5fcg==}
+  /posthog-js@1.100.0:
+    resolution: {integrity: sha512-r2XZEiHQ9mBK7D1G9k57I8uYZ2kZTAJ0OCX6K/OOdCWN8jKPhw3h5F9No5weilP6eVAn+hrsy7NvPV7SCX7gMg==}
     dependencies:
       fflate: 0.4.8
     dev: false
diff --git a/posthog/admin.py b/posthog/admin.py
index a0495f0e765b7..228cd4b10fc06 100644
--- a/posthog/admin.py
+++ b/posthog/admin.py
@@ -423,6 +423,7 @@ class PluginConfigAdmin(admin.ModelAdmin):
     list_display_links = ("id", "plugin_name")
     list_filter = (
         ("enabled", admin.BooleanFieldListFilter),
+        ("deleted", admin.BooleanFieldListFilter),
         ("updated_at", admin.DateFieldListFilter),
         ("plugin", admin.RelatedOnlyFieldListFilter),
     )
diff --git a/posthog/api/plugin.py b/posthog/api/plugin.py
index a64c233b2daa5..393719411e8eb 100644
--- a/posthog/api/plugin.py
+++ b/posthog/api/plugin.py
@@ -340,7 +340,7 @@ def filter_queryset_by_parents_lookups(self, queryset):
                 | Q(is_global=True)
                 | Q(
                     id__in=PluginConfig.objects.filter(  # If a config exists the org can see the plugin
-                        team__organization_id=self.organization_id
+                        team__organization_id=self.organization_id, deleted=False
                     ).values_list("plugin_id", flat=True)
                 )
             )
diff --git a/posthog/api/test/__snapshots__/test_plugin.ambr b/posthog/api/test/__snapshots__/test_plugin.ambr
index fdb247349265e..cbc8481cb0673 100644
--- a/posthog/api/test/__snapshots__/test_plugin.ambr
+++ b/posthog/api/test/__snapshots__/test_plugin.ambr
@@ -64,7 +64,8 @@
            (SELECT U0."plugin_id"
             FROM "posthog_pluginconfig" U0
             INNER JOIN "posthog_team" U1 ON (U0."team_id" = U1."id")
-            WHERE U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid)) /*controller='organization_plugins-list',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/plugins/%3F%24'*/
+            WHERE (NOT U0."deleted"
+                   AND U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid))) /*controller='organization_plugins-list',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/plugins/%3F%24'*/
   '''
 # ---
 # name: TestPluginAPI.test_listing_plugins_is_not_nplus1.11
@@ -119,7 +120,8 @@
            (SELECT U0."plugin_id"
             FROM "posthog_pluginconfig" U0
             INNER JOIN "posthog_team" U1 ON (U0."team_id" = U1."id")
-            WHERE U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid))
+            WHERE (NOT U0."deleted"
+                   AND U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid)))
   LIMIT 100 /*controller='organization_plugins-list',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/plugins/%3F%24'*/
   '''
 # ---
@@ -221,7 +223,8 @@
            (SELECT U0."plugin_id"
             FROM "posthog_pluginconfig" U0
             INNER JOIN "posthog_team" U1 ON (U0."team_id" = U1."id")
-            WHERE U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid)) /*controller='organization_plugins-list',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/plugins/%3F%24'*/
+            WHERE (NOT U0."deleted"
+                   AND U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid))) /*controller='organization_plugins-list',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/plugins/%3F%24'*/
   '''
 # ---
 # name: TestPluginAPI.test_listing_plugins_is_not_nplus1.17
@@ -276,7 +279,8 @@
            (SELECT U0."plugin_id"
             FROM "posthog_pluginconfig" U0
             INNER JOIN "posthog_team" U1 ON (U0."team_id" = U1."id")
-            WHERE U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid))
+            WHERE (NOT U0."deleted"
+                   AND U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid)))
   LIMIT 100 /*controller='organization_plugins-list',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/plugins/%3F%24'*/
   '''
 # ---
@@ -402,7 +406,8 @@
            (SELECT U0."plugin_id"
             FROM "posthog_pluginconfig" U0
             INNER JOIN "posthog_team" U1 ON (U0."team_id" = U1."id")
-            WHERE U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid)) /*controller='organization_plugins-list',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/plugins/%3F%24'*/
+            WHERE (NOT U0."deleted"
+                   AND U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid))) /*controller='organization_plugins-list',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/plugins/%3F%24'*/
   '''
 # ---
 # name: TestPluginAPI.test_listing_plugins_is_not_nplus1.23
@@ -457,7 +462,8 @@
            (SELECT U0."plugin_id"
             FROM "posthog_pluginconfig" U0
             INNER JOIN "posthog_team" U1 ON (U0."team_id" = U1."id")
-            WHERE U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid))
+            WHERE (NOT U0."deleted"
+                   AND U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid)))
   LIMIT 100 /*controller='organization_plugins-list',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/plugins/%3F%24'*/
   '''
 # ---
@@ -491,7 +497,8 @@
            (SELECT U0."plugin_id"
             FROM "posthog_pluginconfig" U0
             INNER JOIN "posthog_team" U1 ON (U0."team_id" = U1."id")
-            WHERE U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid)) /*controller='organization_plugins-list',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/plugins/%3F%24'*/
+            WHERE (NOT U0."deleted"
+                   AND U1."organization_id" = '00000000-0000-0000-0000-000000000000'::uuid))) /*controller='organization_plugins-list',route='api/organizations/%28%3FP%3Cparent_lookup_organization_id%3E%5B%5E/.%5D%2B%29/plugins/%3F%24'*/
   '''
 # ---
 # name: TestPluginAPI.test_listing_plugins_is_not_nplus1.6
diff --git a/posthog/celery.py b/posthog/celery.py
index 69d961edf8ffd..3526c61567a45 100644
--- a/posthog/celery.py
+++ b/posthog/celery.py
@@ -343,7 +343,7 @@ def setup_periodic_tasks(sender: Celery, **kwargs):
         )
 
     sender.add_periodic_task(
-        crontab(minute="23", hour="*"),
+        crontab(minute="*/20"),
         check_data_import_row_limits.s(),
         name="check external data rows synced",
     )
diff --git a/posthog/hogql/functions/cohort.py b/posthog/hogql/functions/cohort.py
index eb9c71993a0e5..07e701bac6391 100644
--- a/posthog/hogql/functions/cohort.py
+++ b/posthog/hogql/functions/cohort.py
@@ -26,8 +26,10 @@ def cohort(node: ast.Expr, args: List[ast.Expr], context: HogQLContext) -> ast.E
 
     from posthog.models import Cohort
 
-    if isinstance(arg.value, int) and not isinstance(arg.value, bool):
-        cohorts = Cohort.objects.filter(id=arg.value, team_id=context.team_id).values_list("id", "is_static", "name")
+    if (isinstance(arg.value, int) or isinstance(arg.value, float)) and not isinstance(arg.value, bool):
+        cohorts = Cohort.objects.filter(id=int(arg.value), team_id=context.team_id).values_list(
+            "id", "is_static", "name"
+        )
         if len(cohorts) == 1:
             context.add_notice(
                 start=arg.start,
diff --git a/posthog/hogql/modifiers.py b/posthog/hogql/modifiers.py
index fd49ba2bc270c..20b451d978fd0 100644
--- a/posthog/hogql/modifiers.py
+++ b/posthog/hogql/modifiers.py
@@ -1,6 +1,6 @@
 from typing import Optional, TYPE_CHECKING
 
-from posthog.schema import HogQLQueryModifiers, MaterializationMode
+from posthog.schema import HogQLQueryModifiers, InCohortVia, MaterializationMode
 from posthog.utils import PersonOnEventsMode
 
 if TYPE_CHECKING:
@@ -22,7 +22,7 @@ def create_default_modifiers_for_team(
         modifiers.personsArgMaxVersion = "auto"
 
     if modifiers.inCohortVia is None:
-        modifiers.inCohortVia = "subquery"
+        modifiers.inCohortVia = InCohortVia.subquery
 
     if modifiers.materializationMode is None or modifiers.materializationMode == MaterializationMode.auto:
         modifiers.materializationMode = MaterializationMode.legacy_null_as_null
diff --git a/posthog/hogql/printer.py b/posthog/hogql/printer.py
index 1e2c574846e35..428ab73a70811 100644
--- a/posthog/hogql/printer.py
+++ b/posthog/hogql/printer.py
@@ -33,7 +33,7 @@
 from posthog.hogql.modifiers import create_default_modifiers_for_team
 from posthog.hogql.resolver import ResolverException, resolve_types
 from posthog.hogql.resolver_utils import lookup_field_by_name
-from posthog.hogql.transforms.in_cohort import resolve_in_cohorts
+from posthog.hogql.transforms.in_cohort import resolve_in_cohorts, resolve_in_cohorts_conjoined
 from posthog.hogql.transforms.lazy_tables import resolve_lazy_tables
 from posthog.hogql.transforms.property_types import resolve_property_types
 from posthog.hogql.visitor import Visitor, clone_expr
@@ -41,7 +41,7 @@
 from posthog.models.team.team import WeekStartDay
 from posthog.models.team import Team
 from posthog.models.utils import UUIDT
-from posthog.schema import MaterializationMode
+from posthog.schema import InCohortVia, MaterializationMode
 from posthog.utils import PersonOnEventsMode
 
 
@@ -99,9 +99,12 @@ def prepare_ast_for_printing(
     with context.timings.measure("create_hogql_database"):
         context.database = context.database or create_hogql_database(context.team_id, context.modifiers)
 
+    if context.modifiers.inCohortVia == InCohortVia.leftjoin_conjoined:
+        with context.timings.measure("resolve_in_cohorts_conjoined"):
+            resolve_in_cohorts_conjoined(node, dialect, context, stack)
     with context.timings.measure("resolve_types"):
         node = resolve_types(node, context, dialect=dialect, scopes=[node.type for node in stack] if stack else None)
-    if context.modifiers.inCohortVia == "leftjoin":
+    if context.modifiers.inCohortVia == InCohortVia.leftjoin:
         with context.timings.measure("resolve_in_cohorts"):
             resolve_in_cohorts(node, dialect, stack, context)
     if dialect == "clickhouse":
diff --git a/posthog/hogql/transforms/in_cohort.py b/posthog/hogql/transforms/in_cohort.py
index a565391e309f3..3d1a075212282 100644
--- a/posthog/hogql/transforms/in_cohort.py
+++ b/posthog/hogql/transforms/in_cohort.py
@@ -1,10 +1,11 @@
-from typing import List, Optional, cast, Literal
+from typing import List, Optional, Tuple, cast, Literal
+
 
 from posthog.hogql import ast
 from posthog.hogql.context import HogQLContext
 from posthog.hogql.errors import HogQLException
 from posthog.hogql.escape_sql import escape_clickhouse_string
-from posthog.hogql.parser import parse_expr
+from posthog.hogql.parser import parse_expr, parse_select
 from posthog.hogql.resolver import resolve_types
 from posthog.hogql.visitor import TraversingVisitor, clone_expr
 
@@ -18,6 +19,247 @@ def resolve_in_cohorts(
     InCohortResolver(stack=stack, dialect=dialect, context=context).visit(node)
 
 
+def resolve_in_cohorts_conjoined(
+    node: ast.Expr,
+    dialect: Literal["hogql", "clickhouse"],
+    context: HogQLContext,
+    stack: Optional[List[ast.SelectQuery]] = None,
+):
+    MultipleInCohortResolver(stack=stack, dialect=dialect, context=context).visit(node)
+
+
+class CohortCompareOperationTraverser(TraversingVisitor):
+    ops: List[ast.CompareOperation] = []
+
+    def __init__(self, expr: ast.Expr):
+        self.ops = []
+        super().visit(expr)
+
+    def visit_compare_operation(self, node: ast.CompareOperation):
+        if node.op == ast.CompareOperationOp.InCohort or node.op == ast.CompareOperationOp.NotInCohort:
+            self.ops.append(node)
+
+
+StaticOrDynamic = Literal["dynamic"] | Literal["static"]
+
+
+class MultipleInCohortResolver(TraversingVisitor):
+    dialect: Literal["hogql", "clickhouse"]
+
+    def __init__(
+        self,
+        dialect: Literal["hogql", "clickhouse"],
+        context: HogQLContext,
+        stack: Optional[List[ast.SelectQuery]] = None,
+    ):
+        super().__init__()
+        self.stack: List[ast.SelectQuery] = stack or []
+        self.context = context
+        self.dialect = dialect
+
+    def visit_select_query(self, node: ast.SelectQuery):
+        self.stack.append(node)
+
+        super().visit_select_query(node)
+
+        if node.where is not None:
+            compare_operations = CohortCompareOperationTraverser(node.where).ops
+            self._execute(node, compare_operations)
+
+        self.stack.pop()
+
+    def _execute(self, node: ast.SelectQuery, compare_operations: List[ast.CompareOperation]):
+        if len(compare_operations) == 0:
+            return
+
+        cohorts = self._resolve_cohorts(compare_operations)
+        self._add_join(cohorts=cohorts, select=node, compare_operations=compare_operations)
+
+        for compare_node in compare_operations:
+            compare_node.op = ast.CompareOperationOp.Eq
+            compare_node.left = ast.Constant(value=1)
+            compare_node.right = ast.Constant(value=1)
+
+    def _resolve_cohorts(
+        self, compare_operations: List[ast.CompareOperation]
+    ) -> List[Tuple[int, StaticOrDynamic, int]]:
+        from posthog.models import Cohort
+
+        cohorts: List[Tuple[int, StaticOrDynamic, int]] = []
+
+        for node in compare_operations:
+            arg = node.right
+            if not isinstance(arg, ast.Constant):
+                raise HogQLException("IN COHORT only works with constant arguments", node=arg)
+
+            if (isinstance(arg.value, int) or isinstance(arg.value, float)) and not isinstance(arg.value, bool):
+                int_cohorts = Cohort.objects.filter(id=int(arg.value), team_id=self.context.team_id).values_list(
+                    "id", "is_static", "version"
+                )
+                if len(int_cohorts) == 1:
+                    if node.op == ast.CompareOperationOp.NotInCohort:
+                        raise HogQLException("NOT IN COHORT is not supported by this cohort mode")
+
+                    id = int_cohorts[0][0]
+                    is_static = int_cohorts[0][1]
+                    version = int_cohorts[0][2] or 0
+
+                    cohorts.append((id, "static" if is_static else "dynamic", version))
+                    continue
+                raise HogQLException(f"Could not find cohort with id {arg.value}", node=arg)
+
+            if isinstance(arg.value, str):
+                str_cohorts = Cohort.objects.filter(name=arg.value, team_id=self.context.team_id).values_list(
+                    "id", "is_static", "version"
+                )
+                if len(str_cohorts) == 1:
+                    if node.op == ast.CompareOperationOp.NotInCohort:
+                        raise HogQLException("NOT IN COHORT is not supported by this cohort mode")
+
+                    id = str_cohorts[0][0]
+                    is_static = str_cohorts[0][1]
+                    version = str_cohorts[0][2] or 0
+
+                    cohorts.append((id, "static" if is_static else "dynamic", version))
+                    continue
+                elif len(str_cohorts) > 1:
+                    raise HogQLException(f"Found multiple cohorts with name '{arg.value}'", node=arg)
+                raise HogQLException(f"Could not find a cohort with the name '{arg.value}'", node=arg)
+
+            raise HogQLException("cohort() takes exactly one string or integer argument", node=arg)
+
+        return cohorts
+
+    def _add_join(
+        self,
+        cohorts: List[Tuple[int, StaticOrDynamic, int]],
+        select: ast.SelectQuery,
+        compare_operations: List[ast.CompareOperation],
+    ):
+        must_add_join = True
+        last_join = select.select_from
+
+        while last_join:
+            if isinstance(last_join.table, ast.Field) and last_join.table.chain[0] == "__in_cohort":
+                must_add_join = False
+                break
+            if last_join.next_join:
+                last_join = last_join.next_join
+            else:
+                break
+
+        if must_add_join:
+            static_cohorts = list(filter(lambda cohort: cohort[1] == "static", cohorts))
+            dynamic_cohorts = list(filter(lambda cohort: cohort[1] == "dynamic", cohorts))
+
+            any_static = len(static_cohorts) > 0
+            any_dynamic = len(dynamic_cohorts) > 0
+
+            def get_static_cohort_clause():
+                return ast.CompareOperation(
+                    left=ast.Field(chain=["cohort_id"]),
+                    op=ast.CompareOperationOp.In,
+                    right=ast.Array(exprs=[ast.Constant(value=id) for id, is_static, version in static_cohorts]),
+                )
+
+            def get_dynamic_cohort_clause():
+                cohort_or = ast.Or(
+                    exprs=[
+                        ast.And(
+                            exprs=[
+                                ast.CompareOperation(
+                                    left=ast.Field(chain=["cohort_id"]),
+                                    op=ast.CompareOperationOp.Eq,
+                                    right=ast.Constant(value=id),
+                                ),
+                                ast.CompareOperation(
+                                    left=ast.Field(chain=["version"]),
+                                    op=ast.CompareOperationOp.Eq,
+                                    right=ast.Constant(value=version),
+                                ),
+                            ]
+                        )
+                        for id, is_static, version in dynamic_cohorts
+                    ]
+                )
+
+                if len(cohort_or.exprs) == 1:
+                    return cohort_or.exprs[0]
+
+                return cohort_or
+
+            # TODO: Extract these `SELECT` clauses out into their own vars and inject
+            # via placeholders once the HogQL SELECT placeholders functionality is done
+            if any_static and any_dynamic:
+                static_clause = get_static_cohort_clause()
+                dynamic_clause = get_dynamic_cohort_clause()
+
+                table_query = parse_select(
+                    """
+                        SELECT person_id AS cohort_person_id, 1 AS matched, cohort_id
+                        FROM static_cohort_people
+                        WHERE {static_clause}
+                        UNION ALL
+                        SELECT person_id AS cohort_person_id, 1 AS matched, cohort_id
+                        FROM raw_cohort_people
+                        WHERE {dynamic_clause}
+                    """,
+                    placeholders={"static_clause": static_clause, "dynamic_clause": dynamic_clause},
+                )
+            elif any_static:
+                clause = get_static_cohort_clause()
+                table_query = parse_select(
+                    """
+                        SELECT person_id AS cohort_person_id, 1 AS matched, cohort_id
+                        FROM static_cohort_people
+                        WHERE {cohort_clause}
+                    """,
+                    placeholders={"cohort_clause": clause},
+                )
+            else:
+                clause = get_dynamic_cohort_clause()
+                table_query = parse_select(
+                    """
+                        SELECT person_id AS cohort_person_id, 1 AS matched, cohort_id
+                        FROM raw_cohort_people
+                        WHERE {cohort_clause}
+                    """,
+                    placeholders={"cohort_clause": clause},
+                )
+
+            new_join = ast.JoinExpr(
+                alias=f"__in_cohort",
+                table=table_query,
+                join_type="LEFT JOIN",
+                next_join=None,
+                constraint=ast.JoinConstraint(
+                    expr=ast.CompareOperation(
+                        op=ast.CompareOperationOp.Eq,
+                        left=ast.Constant(value=1),
+                        right=ast.Constant(value=1),
+                    )
+                ),
+            )
+
+            new_join.constraint.expr.left = ast.Field(chain=[f"__in_cohort", "cohort_person_id"])  # type: ignore
+            new_join.constraint.expr.right = clone_expr(compare_operations[0].left)  # type: ignore
+            if last_join:
+                last_join.next_join = new_join
+            else:
+                select.select_from = new_join
+
+        cohort_match_compare_op = ast.CompareOperation(
+            left=ast.Field(chain=["__in_cohort", "matched"]),
+            op=ast.CompareOperationOp.Eq,
+            right=ast.Constant(value=1),
+        )
+
+        if select.where is not None:
+            select.where = ast.And(exprs=[select.where, cohort_match_compare_op])
+        else:
+            select.where = cohort_match_compare_op
+
+
 class InCohortResolver(TraversingVisitor):
     def __init__(
         self,
@@ -43,8 +285,8 @@ def visit_compare_operation(self, node: ast.CompareOperation):
 
             from posthog.models import Cohort
 
-            if isinstance(arg.value, int) and not isinstance(arg.value, bool):
-                cohorts = Cohort.objects.filter(id=arg.value, team_id=self.context.team_id).values_list(
+            if (isinstance(arg.value, int) or isinstance(arg.value, float)) and not isinstance(arg.value, bool):
+                cohorts = Cohort.objects.filter(id=int(arg.value), team_id=self.context.team_id).values_list(
                     "id", "is_static", "name"
                 )
                 if len(cohorts) == 1:
diff --git a/posthog/hogql/transforms/test/__snapshots__/test_in_cohort.ambr b/posthog/hogql/transforms/test/__snapshots__/test_in_cohort.ambr
index 35f094ef7b162..6644b850bb35c 100644
--- a/posthog/hogql/transforms/test/__snapshots__/test_in_cohort.ambr
+++ b/posthog/hogql/transforms/test/__snapshots__/test_in_cohort.ambr
@@ -1,4 +1,76 @@
 # serializer version: 1
+# name: TestInCohort.test_in_cohort_conjoined_dynamic
+  '''
+  -- ClickHouse
+  
+  SELECT events.event AS event 
+  FROM events LEFT JOIN (
+  SELECT cohortpeople.person_id AS cohort_person_id, 1 AS matched, cohortpeople.cohort_id AS cohort_id 
+  FROM cohortpeople 
+  WHERE and(equals(cohortpeople.team_id, 420), equals(cohortpeople.cohort_id, 1), equals(cohortpeople.version, 0))) AS __in_cohort ON equals(__in_cohort.cohort_person_id, events.person_id) 
+  WHERE and(equals(events.team_id, 420), and(1, equals(events.event, %(hogql_val_0)s)), ifNull(equals(__in_cohort.matched, 1), 0)) 
+  LIMIT 100 
+  SETTINGS readonly=2, max_execution_time=60, allow_experimental_object_type=1
+  
+  -- HogQL
+  
+  SELECT event 
+  FROM events LEFT JOIN (
+  SELECT person_id AS cohort_person_id, 1 AS matched, cohort_id 
+  FROM raw_cohort_people 
+  WHERE and(equals(cohort_id, 1), equals(version, 0))) AS __in_cohort ON equals(__in_cohort.cohort_person_id, person_id) 
+  WHERE and(and(1, equals(event, 'RANDOM_TEST_ID::UUID')), equals(__in_cohort.matched, 1)) 
+  LIMIT 100
+  '''
+# ---
+# name: TestInCohort.test_in_cohort_conjoined_int
+  '''
+  -- ClickHouse
+  
+  SELECT events.event AS event 
+  FROM events LEFT JOIN (
+  SELECT person_static_cohort.person_id AS cohort_person_id, 1 AS matched, person_static_cohort.cohort_id AS cohort_id 
+  FROM person_static_cohort 
+  WHERE and(equals(person_static_cohort.team_id, 420), in(person_static_cohort.cohort_id, [2]))) AS __in_cohort ON equals(__in_cohort.cohort_person_id, events.person_id) 
+  WHERE and(equals(events.team_id, 420), 1, ifNull(equals(__in_cohort.matched, 1), 0)) 
+  LIMIT 100 
+  SETTINGS readonly=2, max_execution_time=60, allow_experimental_object_type=1
+  
+  -- HogQL
+  
+  SELECT event 
+  FROM events LEFT JOIN (
+  SELECT person_id AS cohort_person_id, 1 AS matched, cohort_id 
+  FROM static_cohort_people 
+  WHERE in(cohort_id, [2])) AS __in_cohort ON equals(__in_cohort.cohort_person_id, person_id) 
+  WHERE and(1, equals(__in_cohort.matched, 1)) 
+  LIMIT 100
+  '''
+# ---
+# name: TestInCohort.test_in_cohort_conjoined_string
+  '''
+  -- ClickHouse
+  
+  SELECT events.event AS event 
+  FROM events LEFT JOIN (
+  SELECT person_static_cohort.person_id AS cohort_person_id, 1 AS matched, person_static_cohort.cohort_id AS cohort_id 
+  FROM person_static_cohort 
+  WHERE and(equals(person_static_cohort.team_id, 420), in(person_static_cohort.cohort_id, [3]))) AS __in_cohort ON equals(__in_cohort.cohort_person_id, events.person_id) 
+  WHERE and(equals(events.team_id, 420), 1, ifNull(equals(__in_cohort.matched, 1), 0)) 
+  LIMIT 100 
+  SETTINGS readonly=2, max_execution_time=60, allow_experimental_object_type=1
+  
+  -- HogQL
+  
+  SELECT event 
+  FROM events LEFT JOIN (
+  SELECT person_id AS cohort_person_id, 1 AS matched, cohort_id 
+  FROM static_cohort_people 
+  WHERE in(cohort_id, [3])) AS __in_cohort ON equals(__in_cohort.cohort_person_id, person_id) 
+  WHERE and(1, equals(__in_cohort.matched, 1)) 
+  LIMIT 100
+  '''
+# ---
 # name: TestInCohort.test_in_cohort_dynamic
   '''
   -- ClickHouse
@@ -7,10 +79,10 @@
   FROM events LEFT JOIN (
   SELECT cohortpeople.person_id AS person_id, 1 AS matched 
   FROM cohortpeople 
-  WHERE and(equals(cohortpeople.team_id, 420), equals(cohortpeople.cohort_id, 1)) 
+  WHERE and(equals(cohortpeople.team_id, 420), equals(cohortpeople.cohort_id, 4)) 
   GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version 
-  HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0)) AS in_cohort__1 ON equals(in_cohort__1.person_id, events.person_id) 
-  WHERE and(equals(events.team_id, 420), ifNull(equals(in_cohort__1.matched, 1), 0), equals(events.event, %(hogql_val_0)s)) 
+  HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0)) AS in_cohort__4 ON equals(in_cohort__4.person_id, events.person_id) 
+  WHERE and(equals(events.team_id, 420), ifNull(equals(in_cohort__4.matched, 1), 0), equals(events.event, %(hogql_val_0)s)) 
   LIMIT 100 
   SETTINGS readonly=2, max_execution_time=60, allow_experimental_object_type=1
   
@@ -20,10 +92,10 @@
   FROM events LEFT JOIN (
   SELECT person_id, 1 AS matched 
   FROM raw_cohort_people 
-  WHERE equals(cohort_id, 1) 
+  WHERE equals(cohort_id, 4) 
   GROUP BY person_id, cohort_id, version 
-  HAVING greater(sum(sign), 0)) AS in_cohort__1 ON equals(in_cohort__1.person_id, person_id) 
-  WHERE and(equals(in_cohort__1.matched, 1), equals(event, 'RANDOM_TEST_ID::UUID')) 
+  HAVING greater(sum(sign), 0)) AS in_cohort__4 ON equals(in_cohort__4.person_id, person_id) 
+  WHERE and(equals(in_cohort__4.matched, 1), equals(event, 'RANDOM_TEST_ID::UUID')) 
   LIMIT 100
   '''
 # ---
@@ -35,8 +107,8 @@
   FROM events LEFT JOIN (
   SELECT person_static_cohort.person_id AS person_id, 1 AS matched 
   FROM person_static_cohort 
-  WHERE and(equals(person_static_cohort.team_id, 420), equals(person_static_cohort.cohort_id, 2))) AS in_cohort__2 ON equals(in_cohort__2.person_id, events.person_id) 
-  WHERE and(equals(events.team_id, 420), ifNull(equals(in_cohort__2.matched, 1), 0)) 
+  WHERE and(equals(person_static_cohort.team_id, 420), equals(person_static_cohort.cohort_id, 5))) AS in_cohort__5 ON equals(in_cohort__5.person_id, events.person_id) 
+  WHERE and(equals(events.team_id, 420), ifNull(equals(in_cohort__5.matched, 1), 0)) 
   LIMIT 100 
   SETTINGS readonly=2, max_execution_time=60, allow_experimental_object_type=1
   
@@ -46,8 +118,8 @@
   FROM events LEFT JOIN (
   SELECT person_id, 1 AS matched 
   FROM static_cohort_people 
-  WHERE equals(cohort_id, 2)) AS in_cohort__2 ON equals(in_cohort__2.person_id, person_id) 
-  WHERE equals(in_cohort__2.matched, 1) 
+  WHERE equals(cohort_id, 5)) AS in_cohort__5 ON equals(in_cohort__5.person_id, person_id) 
+  WHERE equals(in_cohort__5.matched, 1) 
   LIMIT 100
   '''
 # ---
@@ -59,8 +131,8 @@
   FROM events LEFT JOIN (
   SELECT person_static_cohort.person_id AS person_id, 1 AS matched 
   FROM person_static_cohort 
-  WHERE and(equals(person_static_cohort.team_id, 420), equals(person_static_cohort.cohort_id, 3))) AS in_cohort__3 ON equals(in_cohort__3.person_id, events.person_id) 
-  WHERE and(equals(events.team_id, 420), ifNull(equals(in_cohort__3.matched, 1), 0)) 
+  WHERE and(equals(person_static_cohort.team_id, 420), equals(person_static_cohort.cohort_id, 6))) AS in_cohort__6 ON equals(in_cohort__6.person_id, events.person_id) 
+  WHERE and(equals(events.team_id, 420), ifNull(equals(in_cohort__6.matched, 1), 0)) 
   LIMIT 100 
   SETTINGS readonly=2, max_execution_time=60, allow_experimental_object_type=1
   
@@ -70,8 +142,8 @@
   FROM events LEFT JOIN (
   SELECT person_id, 1 AS matched 
   FROM static_cohort_people 
-  WHERE equals(cohort_id, 3)) AS in_cohort__3 ON equals(in_cohort__3.person_id, person_id) 
-  WHERE equals(in_cohort__3.matched, 1) 
+  WHERE equals(cohort_id, 6)) AS in_cohort__6 ON equals(in_cohort__6.person_id, person_id) 
+  WHERE equals(in_cohort__6.matched, 1) 
   LIMIT 100
   '''
 # ---
diff --git a/posthog/hogql/transforms/test/test_in_cohort.py b/posthog/hogql/transforms/test/test_in_cohort.py
index 5563ab3eda7e6..2fe6b6cc16c13 100644
--- a/posthog/hogql/transforms/test/test_in_cohort.py
+++ b/posthog/hogql/transforms/test/test_in_cohort.py
@@ -9,7 +9,7 @@
 from posthog.models import Cohort
 from posthog.models.cohort.util import recalculate_cohortpeople
 from posthog.models.utils import UUIDT
-from posthog.schema import HogQLQueryModifiers
+from posthog.schema import HogQLQueryModifiers, InCohortVia
 from posthog.test.base import (
     BaseTest,
     _create_person,
@@ -48,11 +48,11 @@ def test_in_cohort_dynamic(self):
         response = execute_hogql_query(
             f"SELECT event FROM events WHERE person_id IN COHORT {cohort.pk} AND event='{random_uuid}'",
             self.team,
-            modifiers=HogQLQueryModifiers(inCohortVia="leftjoin"),
+            modifiers=HogQLQueryModifiers(inCohortVia=InCohortVia.leftjoin),
         )
-        assert pretty_print_response_in_tests(response, self.team.pk) == self.snapshot
-        self.assertEqual(len(response.results), 1)
-        self.assertEqual(response.results[0][0], random_uuid)
+        assert pretty_print_response_in_tests(response, self.team.pk) == self.snapshot  # type: ignore
+        self.assertEqual(len(response.results or []), 1)
+        self.assertEqual((response.results or [])[0][0], random_uuid)
 
     @pytest.mark.usefixtures("unittest_snapshot")
     @override_settings(PERSON_ON_EVENTS_OVERRIDE=True, PERSON_ON_EVENTS_V2_OVERRIDE=False)
@@ -64,9 +64,9 @@ def test_in_cohort_static(self):
         response = execute_hogql_query(
             f"SELECT event FROM events WHERE person_id IN COHORT {cohort.pk}",
             self.team,
-            modifiers=HogQLQueryModifiers(inCohortVia="leftjoin"),
+            modifiers=HogQLQueryModifiers(inCohortVia=InCohortVia.leftjoin),
         )
-        assert pretty_print_response_in_tests(response, self.team.pk) == self.snapshot
+        assert pretty_print_response_in_tests(response, self.team.pk) == self.snapshot  # type: ignore
 
     @pytest.mark.usefixtures("unittest_snapshot")
     @override_settings(PERSON_ON_EVENTS_OVERRIDE=True, PERSON_ON_EVENTS_V2_OVERRIDE=False)
@@ -79,20 +79,91 @@ def test_in_cohort_strings(self):
         response = execute_hogql_query(
             f"SELECT event FROM events WHERE person_id IN COHORT 'my cohort'",
             self.team,
-            modifiers=HogQLQueryModifiers(inCohortVia="leftjoin"),
+            modifiers=HogQLQueryModifiers(inCohortVia=InCohortVia.leftjoin),
         )
-        assert pretty_print_response_in_tests(response, self.team.pk) == self.snapshot
+        assert pretty_print_response_in_tests(response, self.team.pk) == self.snapshot  # type: ignore
 
     @pytest.mark.usefixtures("unittest_snapshot")
     @override_settings(PERSON_ON_EVENTS_OVERRIDE=True, PERSON_ON_EVENTS_V2_OVERRIDE=True)
     def test_in_cohort_error(self):
         with self.assertRaises(HogQLException) as e:
-            execute_hogql_query(f"SELECT event FROM events WHERE person_id IN COHORT true", self.team)
+            execute_hogql_query(
+                f"SELECT event FROM events WHERE person_id IN COHORT true",
+                self.team,
+                modifiers=HogQLQueryModifiers(inCohortVia=InCohortVia.subquery),
+            )
+        self.assertEqual(str(e.exception), "cohort() takes exactly one string or integer argument")
+
+        with self.assertRaises(HogQLException) as e:
+            execute_hogql_query(
+                f"SELECT event FROM events WHERE person_id IN COHORT 'blabla'",
+                self.team,
+                modifiers=HogQLQueryModifiers(inCohortVia=InCohortVia.subquery),
+            )
+        self.assertEqual(str(e.exception), "Could not find a cohort with the name 'blabla'")
+
+    @pytest.mark.usefixtures("unittest_snapshot")
+    @override_settings(PERSON_ON_EVENTS_OVERRIDE=True, PERSON_ON_EVENTS_V2_OVERRIDE=False)
+    def test_in_cohort_conjoined_string(self):
+        Cohort.objects.create(
+            team=self.team,
+            name="my cohort",
+            is_static=True,
+        )
+        response = execute_hogql_query(
+            f"SELECT event FROM events WHERE person_id IN COHORT 'my cohort'",
+            self.team,
+            modifiers=HogQLQueryModifiers(inCohortVia=InCohortVia.leftjoin_conjoined),
+        )
+        assert pretty_print_response_in_tests(response, self.team.pk) == self.snapshot  # type: ignore
+
+    @pytest.mark.usefixtures("unittest_snapshot")
+    @override_settings(PERSON_ON_EVENTS_OVERRIDE=True, PERSON_ON_EVENTS_V2_OVERRIDE=False)
+    def test_in_cohort_conjoined_int(self):
+        cohort = Cohort.objects.create(
+            team=self.team,
+            is_static=True,
+        )
+        response = execute_hogql_query(
+            f"SELECT event FROM events WHERE person_id IN COHORT {cohort.pk}",
+            self.team,
+            modifiers=HogQLQueryModifiers(inCohortVia=InCohortVia.leftjoin_conjoined),
+        )
+        assert pretty_print_response_in_tests(response, self.team.pk) == self.snapshot  # type: ignore
+
+    @pytest.mark.usefixtures("unittest_snapshot")
+    @override_settings(PERSON_ON_EVENTS_OVERRIDE=True, PERSON_ON_EVENTS_V2_OVERRIDE=False)
+    def test_in_cohort_conjoined_dynamic(self):
+        random_uuid = self._create_random_events()
+        cohort = Cohort.objects.create(
+            team=self.team,
+            groups=[{"properties": [{"key": "$os", "value": "Chrome", "type": "person"}]}],
+        )
+        recalculate_cohortpeople(cohort, pending_version=0)
+        response = execute_hogql_query(
+            f"SELECT event FROM events WHERE person_id IN COHORT {cohort.pk} AND event='{random_uuid}'",
+            self.team,
+            modifiers=HogQLQueryModifiers(inCohortVia=InCohortVia.leftjoin_conjoined),
+        )
+        assert pretty_print_response_in_tests(response, self.team.pk) == self.snapshot  # type: ignore
+        self.assertEqual(len(response.results or []), 1)
+        self.assertEqual((response.results or [])[0][0], random_uuid)
+
+    @pytest.mark.usefixtures("unittest_snapshot")
+    @override_settings(PERSON_ON_EVENTS_OVERRIDE=True, PERSON_ON_EVENTS_V2_OVERRIDE=True)
+    def test_in_cohort_conjoined_error(self):
+        with self.assertRaises(HogQLException) as e:
+            execute_hogql_query(
+                f"SELECT event FROM events WHERE person_id IN COHORT true",
+                self.team,
+                modifiers=HogQLQueryModifiers(inCohortVia=InCohortVia.leftjoin_conjoined),
+            )
         self.assertEqual(str(e.exception), "cohort() takes exactly one string or integer argument")
 
         with self.assertRaises(HogQLException) as e:
             execute_hogql_query(
                 f"SELECT event FROM events WHERE person_id IN COHORT 'blabla'",
                 self.team,
+                modifiers=HogQLQueryModifiers(inCohortVia=InCohortVia.leftjoin_conjoined),
             )
         self.assertEqual(str(e.exception), "Could not find a cohort with the name 'blabla'")
diff --git a/posthog/hogql_queries/insights/test/__snapshots__/test_lifecycle_query_runner.ambr b/posthog/hogql_queries/insights/test/__snapshots__/test_lifecycle_query_runner.ambr
index ef3b23794866d..2159fb2c49d5b 100644
--- a/posthog/hogql_queries/insights/test/__snapshots__/test_lifecycle_query_runner.ambr
+++ b/posthog/hogql_queries/insights/test/__snapshots__/test_lifecycle_query_runner.ambr
@@ -79,7 +79,7 @@
            WHERE and(equals(events.team_id, 2), greaterOrEquals(toTimeZone(events.timestamp, 'UTC'), minus(toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 00:00:00', 6, 'UTC'))), toIntervalDay(1))), less(toTimeZone(events.timestamp, 'UTC'), plus(toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-19 23:59:59', 6, 'UTC'))), toIntervalDay(1))), ifNull(in(person_id,
                                                                                                                                                                                                                                                                                                                                                                                                             (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                                                              FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                                                             WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 4))
+                                                                                                                                                                                                                                                                                                                                                                                                             WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 7))
                                                                                                                                                                                                                                                                                                                                                                                                              GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                                                              HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0), equals(events.event, '$pageview'))
            GROUP BY person_id)
diff --git a/posthog/hogql_queries/insights/trends/breakdown.py b/posthog/hogql_queries/insights/trends/breakdown.py
index 2f2370de0204f..d719b4b1ca598 100644
--- a/posthog/hogql_queries/insights/trends/breakdown.py
+++ b/posthog/hogql_queries/insights/trends/breakdown.py
@@ -17,7 +17,7 @@
 from posthog.hogql_queries.utils.query_date_range import QueryDateRange
 from posthog.models.filters.mixins.utils import cached_property
 from posthog.models.team.team import Team
-from posthog.schema import ActionsNode, EventsNode, TrendsQuery
+from posthog.schema import ActionsNode, EventsNode, HogQLQueryModifiers, InCohortVia, TrendsQuery
 
 
 class Breakdown:
@@ -26,6 +26,7 @@ class Breakdown:
     series: EventsNode | ActionsNode
     query_date_range: QueryDateRange
     timings: HogQLTimings
+    modifiers: HogQLQueryModifiers
     events_filter: ast.Expr
 
     def __init__(
@@ -35,6 +36,7 @@ def __init__(
         series: EventsNode | ActionsNode,
         query_date_range: QueryDateRange,
         timings: HogQLTimings,
+        modifiers: HogQLQueryModifiers,
         events_filter: ast.Expr,
     ):
         self.team = team
@@ -42,6 +44,7 @@ def __init__(
         self.series = series
         self.query_date_range = query_date_range
         self.timings = timings
+        self.modifiers = modifiers
         self.events_filter = events_filter
 
     @cached_property
@@ -70,8 +73,14 @@ def column_expr(self) -> ast.Expr:
                 expr=parse_expr(self.query.breakdownFilter.breakdown),
             )
         elif self.query.breakdownFilter.breakdown_type == "cohort":
+            if self.modifiers.inCohortVia == InCohortVia.leftjoin_conjoined:
+                return ast.Alias(
+                    alias="breakdown_value",
+                    expr=ast.Field(chain=["__in_cohort", "cohort_id"]),
+                )
+
             cohort_breakdown = (
-                0 if self.query.breakdownFilter.breakdown == "all" else int(self.query.breakdownFilter.breakdown)
+                0 if self.query.breakdownFilter.breakdown == "all" else int(self.query.breakdownFilter.breakdown)  # type: ignore
             )
             return ast.Alias(
                 alias="breakdown_value",
@@ -91,17 +100,44 @@ def column_expr(self) -> ast.Expr:
         return ast.Alias(alias="breakdown_value", expr=self._get_breakdown_transform_func)
 
     def events_where_filter(self) -> ast.Expr | None:
-        if self.query.breakdownFilter.breakdown_type == "cohort":
+        if (
+            self.query.breakdownFilter is not None
+            and self.query.breakdownFilter.breakdown is not None
+            and self.query.breakdownFilter.breakdown_type == "cohort"
+        ):
             if self.query.breakdownFilter.breakdown == "all":
                 return None
 
+            if isinstance(self.query.breakdownFilter.breakdown, List):
+                or_clause = ast.Or(
+                    exprs=[
+                        ast.CompareOperation(
+                            left=ast.Field(chain=["person", "id"]),
+                            op=ast.CompareOperationOp.InCohort,
+                            right=ast.Constant(value=breakdown),
+                        )
+                        for breakdown in self.query.breakdownFilter.breakdown
+                    ]
+                )
+                if len(self.query.breakdownFilter.breakdown) > 1:
+                    return or_clause
+                elif len(self.query.breakdownFilter.breakdown) == 1:
+                    return or_clause.exprs[0]
+                else:
+                    return ast.Constant(value=True)
+
             return ast.CompareOperation(
                 left=ast.Field(chain=["person", "id"]),
                 op=ast.CompareOperationOp.InCohort,
-                right=ast.Constant(value=int(self.query.breakdownFilter.breakdown)),
+                right=ast.Constant(value=self.query.breakdownFilter.breakdown),
             )
 
-        if self.query.breakdownFilter.breakdown_type == "hogql":
+        if (
+            self.query.breakdownFilter is not None
+            and self.query.breakdownFilter.breakdown is not None
+            and self.query.breakdownFilter.breakdown_type == "hogql"
+            and isinstance(self.query.breakdownFilter.breakdown, str)
+        ):
             left = parse_expr(self.query.breakdownFilter.breakdown)
         else:
             left = ast.Field(chain=self._properties_chain)
@@ -176,8 +212,8 @@ def _get_breakdown_values(self) -> List[str | int]:
         with self.timings.measure("breakdown_values_query"):
             breakdown = BreakdownValues(
                 team=self.team,
-                event_name=series_event_name(self.series),
-                breakdown_field=self.query.breakdownFilter.breakdown,
+                event_name=series_event_name(self.series) or "",
+                breakdown_field=self.query.breakdownFilter.breakdown,  # type: ignore
                 breakdown_type=self.query.breakdownFilter.breakdown_type,
                 query_date_range=self.query_date_range,
                 events_filter=self.events_filter,
diff --git a/posthog/hogql_queries/insights/trends/breakdown_values.py b/posthog/hogql_queries/insights/trends/breakdown_values.py
index 870d1d3fb44dd..b1cd87868590a 100644
--- a/posthog/hogql_queries/insights/trends/breakdown_values.py
+++ b/posthog/hogql_queries/insights/trends/breakdown_values.py
@@ -17,7 +17,7 @@
 class BreakdownValues:
     team: Team
     event_name: str
-    breakdown_field: Union[str, float]
+    breakdown_field: Union[str, float, List[Union[str, float]]]
     breakdown_type: str
     query_date_range: QueryDateRange
     events_filter: ast.Expr
@@ -31,7 +31,7 @@ def __init__(
         self,
         team: Team,
         event_name: str,
-        breakdown_field: Union[str, float],
+        breakdown_field: Union[str, float, List[Union[str, float]]],
         query_date_range: QueryDateRange,
         breakdown_type: str,
         events_filter: ast.Expr,
@@ -58,7 +58,10 @@ def get_breakdown_values(self) -> List[str | int]:
             if self.breakdown_field == "all":
                 return [0]
 
-            return [int(self.breakdown_field)]
+            if isinstance(self.breakdown_field, List):
+                return [value if isinstance(value, str) else int(value) for value in self.breakdown_field]
+
+            return [self.breakdown_field if isinstance(self.breakdown_field, str) else int(self.breakdown_field)]
 
         if self.breakdown_type == "hogql":
             select_field = ast.Alias(
@@ -70,8 +73,8 @@ def get_breakdown_values(self) -> List[str | int]:
                 alias="value",
                 expr=ast.Field(
                     chain=get_properties_chain(
-                        breakdown_type=self.breakdown_type,
-                        breakdown_field=self.breakdown_field,
+                        breakdown_type=self.breakdown_type,  # type: ignore
+                        breakdown_field=str(self.breakdown_field),
                         group_type_index=self.group_type_index,
                     )
                 ),
diff --git a/posthog/hogql_queries/insights/trends/query_builder.py b/posthog/hogql_queries/insights/trends/query_builder.py
index e8350f23c4081..90c6d6488046c 100644
--- a/posthog/hogql_queries/insights/trends/query_builder.py
+++ b/posthog/hogql_queries/insights/trends/query_builder.py
@@ -13,7 +13,7 @@
 from posthog.models.action.action import Action
 from posthog.models.filters.mixins.utils import cached_property
 from posthog.models.team.team import Team
-from posthog.schema import ActionsNode, EventsNode, TrendsQuery
+from posthog.schema import ActionsNode, EventsNode, HogQLQueryModifiers, TrendsQuery
 
 
 class TrendsQueryBuilder:
@@ -22,6 +22,7 @@ class TrendsQueryBuilder:
     query_date_range: QueryDateRange
     series: EventsNode | ActionsNode
     timings: HogQLTimings
+    modifiers: HogQLQueryModifiers
 
     def __init__(
         self,
@@ -30,12 +31,14 @@ def __init__(
         query_date_range: QueryDateRange,
         series: EventsNode | ActionsNode,
         timings: HogQLTimings,
+        modifiers: HogQLQueryModifiers,
     ):
         self.query = trends_query
         self.team = team
         self.query_date_range = query_date_range
         self.series = series
         self.timings = timings
+        self.modifiers = modifiers
 
     def build_query(self) -> ast.SelectQuery | ast.SelectUnionQuery:
         if self._trends_display.should_aggregate_values():
@@ -448,6 +451,7 @@ def _breakdown(self):
             series=self.series,
             query_date_range=self.query_date_range,
             timings=self.timings,
+            modifiers=self.modifiers,
             events_filter=self._events_filter(ignore_breakdowns=True),
         )
 
diff --git a/posthog/hogql_queries/insights/trends/test/__snapshots__/test_trends.ambr b/posthog/hogql_queries/insights/trends/test/__snapshots__/test_trends.ambr
index 68b58b6d9b72e..aa5870b1810f5 100644
--- a/posthog/hogql_queries/insights/trends/test/__snapshots__/test_trends.ambr
+++ b/posthog/hogql_queries/insights/trends/test/__snapshots__/test_trends.ambr
@@ -85,7 +85,7 @@
         WHERE and(equals(e.team_id, 2), greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-01 00:00:00', 6, 'UTC')))), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-07 23:59:59', 6, 'UTC'))), ifNull(equals(e__pdi__person.`properties___$bool_prop`, 'x'), 0), and(equals(e.event, 'sign up'), ifNull(in(e__pdi.person_id,
                                                                                                                                                                                                                                                                                                                                                                                                                                      (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                                                                                       FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                                                                                      WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 5))
+                                                                                                                                                                                                                                                                                                                                                                                                                                      WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 8))
                                                                                                                                                                                                                                                                                                                                                                                                                                       GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                                                                                       HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)))
         GROUP BY day_start)
@@ -172,7 +172,7 @@
         WHERE and(equals(e.team_id, 2), greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-01 00:00:00', 6, 'UTC')))), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-07 23:59:59', 6, 'UTC'))), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.person_properties, '$bool_prop'), ''), 'null'), '^"|"$', ''), 'x'), 0), and(equals(e.event, 'sign up'), ifNull(in(ifNull(nullIf(e__override.override_person_id, '00000000-0000-0000-0000-000000000000'), e.person_id),
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 6))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 9))
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)))
         GROUP BY day_start)
@@ -688,7 +688,7 @@
      WHERE and(equals(e.team_id, 2), equals(e.event, '$pageview'), and(or(ifNull(equals(e__pdi__person.properties___name, 'p1'), 0), ifNull(equals(e__pdi__person.properties___name, 'p2'), 0), ifNull(equals(e__pdi__person.properties___name, 'p3'), 0)), ifNull(in(e__pdi.person_id,
                                                                                                                                                                                                                                                                         (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                          FROM cohortpeople
-                                                                                                                                                                                                                                                                         WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 25))
+                                                                                                                                                                                                                                                                         WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 28))
                                                                                                                                                                                                                                                                          GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                          HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)))
      GROUP BY value
@@ -757,7 +757,7 @@
               WHERE and(equals(e.team_id, 2), and(and(equals(e.event, '$pageview'), and(or(ifNull(equals(e__pdi__person.properties___name, 'p1'), 0), ifNull(equals(e__pdi__person.properties___name, 'p2'), 0), ifNull(equals(e__pdi__person.properties___name, 'p3'), 0)), ifNull(in(e__pdi.person_id,
                                                                                                                                                                                                                                                                                          (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                           FROM cohortpeople
-                                                                                                                                                                                                                                                                                          WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 25))
+                                                                                                                                                                                                                                                                                          WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 28))
                                                                                                                                                                                                                                                                                           GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                           HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0))), or(ifNull(equals(transform(ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, 'key'), ''), 'null'), '^"|"$', ''), '$$_posthog_breakdown_null_$$'), ['$$_posthog_breakdown_other_$$', 'val'], ['$$_posthog_breakdown_other_$$', 'val'], '$$_posthog_breakdown_other_$$'), '$$_posthog_breakdown_other_$$'), 0), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, 'key'), ''), 'null'), '^"|"$', ''), 'val'), 0))), ifNull(greaterOrEquals(timestamp, minus(assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-01 00:00:00', 6, 'UTC')), toIntervalDay(7))), 0), ifNull(lessOrEquals(timestamp, assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-12 23:59:59', 6, 'UTC'))), 0))
               GROUP BY timestamp, actor_id,
@@ -1592,7 +1592,7 @@
      WHERE and(equals(e.team_id, 2), greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2019-12-28 13:01:01', 6, 'UTC')))), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-04 23:59:59', 6, 'UTC'))), and(equals(e.event, 'sign up'), ifNull(in(e__pdi.person_id,
                                                                                                                                                                                                                                                                                                                                                                 (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                  FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                 WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 38))
+                                                                                                                                                                                                                                                                                                                                                                 WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 41))
                                                                                                                                                                                                                                                                                                                                                                  GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                  HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)))
      GROUP BY value
@@ -1640,7 +1640,7 @@
         WHERE and(equals(e.team_id, 2), greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2019-12-28 13:01:01', 6, 'UTC')))), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-04 23:59:59', 6, 'UTC'))), and(equals(e.event, 'sign up'), ifNull(in(e__pdi.person_id,
                                                                                                                                                                                                                                                                                                                                                                    (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                     FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                    WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 38))
+                                                                                                                                                                                                                                                                                                                                                                    WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 41))
                                                                                                                                                                                                                                                                                                                                                                     GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                     HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)), or(ifNull(equals(transform(ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$some_property'), ''), 'null'), '^"|"$', ''), '$$_posthog_breakdown_null_$$'), ['$$_posthog_breakdown_other_$$', 'value', 'other_value'], ['$$_posthog_breakdown_other_$$', 'value', 'other_value'], '$$_posthog_breakdown_other_$$'), '$$_posthog_breakdown_other_$$'), 0), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$some_property'), ''), 'null'), '^"|"$', ''), 'value'), 0), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$some_property'), ''), 'null'), '^"|"$', ''), 'other_value'), 0)))
         GROUP BY day_start,
@@ -1691,7 +1691,7 @@
      WHERE and(equals(e.team_id, 2), greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2019-12-28 13:01:01', 6, 'UTC')))), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-04 23:59:59', 6, 'UTC'))), and(equals(e.event, 'sign up'), ifNull(in(ifNull(nullIf(e__override.override_person_id, '00000000-0000-0000-0000-000000000000'), e.person_id),
                                                                                                                                                                                                                                                                                                                                                                 (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                  FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                 WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 39))
+                                                                                                                                                                                                                                                                                                                                                                 WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 42))
                                                                                                                                                                                                                                                                                                                                                                  GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                  HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)))
      GROUP BY value
@@ -1738,7 +1738,7 @@
         WHERE and(equals(e.team_id, 2), greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull('2019-12-28 13:01:01', 6, 'UTC')))), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), assumeNotNull(parseDateTime64BestEffortOrNull('2020-01-04 23:59:59', 6, 'UTC'))), and(equals(e.event, 'sign up'), ifNull(in(ifNull(nullIf(e__override.override_person_id, '00000000-0000-0000-0000-000000000000'), e.person_id),
                                                                                                                                                                                                                                                                                                                                                                    (SELECT cohortpeople.person_id AS person_id
                                                                                                                                                                                                                                                                                                                                                                     FROM cohortpeople
-                                                                                                                                                                                                                                                                                                                                                                    WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 39))
+                                                                                                                                                                                                                                                                                                                                                                    WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 42))
                                                                                                                                                                                                                                                                                                                                                                     GROUP BY cohortpeople.person_id, cohortpeople.cohort_id, cohortpeople.version
                                                                                                                                                                                                                                                                                                                                                                     HAVING ifNull(greater(sum(cohortpeople.sign), 0), 0))), 0)), or(ifNull(equals(transform(ifNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$some_property'), ''), 'null'), '^"|"$', ''), '$$_posthog_breakdown_null_$$'), ['$$_posthog_breakdown_other_$$', 'value', 'other_value'], ['$$_posthog_breakdown_other_$$', 'value', 'other_value'], '$$_posthog_breakdown_other_$$'), '$$_posthog_breakdown_other_$$'), 0), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$some_property'), ''), 'null'), '^"|"$', ''), 'value'), 0), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$some_property'), ''), 'null'), '^"|"$', ''), 'other_value'), 0)))
         GROUP BY day_start,
diff --git a/posthog/hogql_queries/insights/trends/test/test_query_builder.py b/posthog/hogql_queries/insights/trends/test/test_query_builder.py
index 31457a8a5bb2c..c978c9f2767a5 100644
--- a/posthog/hogql_queries/insights/trends/test/test_query_builder.py
+++ b/posthog/hogql_queries/insights/trends/test/test_query_builder.py
@@ -1,5 +1,6 @@
 from datetime import datetime
 from freezegun import freeze_time
+from posthog.hogql.modifiers import create_default_modifiers_for_team
 
 from posthog.hogql.query import execute_hogql_query
 from posthog.hogql.timings import HogQLTimings
@@ -45,6 +46,7 @@ def get_response(self, trends_query: TrendsQuery) -> HogQLQueryResponse:
         )
 
         timings = HogQLTimings()
+        modifiers = create_default_modifiers_for_team(self.team)
 
         query_builder = TrendsQueryBuilder(
             trends_query=trends_query,
@@ -52,6 +54,7 @@ def get_response(self, trends_query: TrendsQuery) -> HogQLQueryResponse:
             query_date_range=query_date_range,
             series=trends_query.series[0],
             timings=timings,
+            modifiers=modifiers,
         )
 
         query = query_builder.build_query()
diff --git a/posthog/hogql_queries/insights/trends/trends_query_runner.py b/posthog/hogql_queries/insights/trends/trends_query_runner.py
index 9b38c6e644404..cb4b5f5ca654d 100644
--- a/posthog/hogql_queries/insights/trends/trends_query_runner.py
+++ b/posthog/hogql_queries/insights/trends/trends_query_runner.py
@@ -39,6 +39,7 @@
     ChartDisplayType,
     EventsNode,
     HogQLQueryResponse,
+    InCohortVia,
     TrendsQuery,
     TrendsQueryResponse,
     HogQLQueryModifiers,
@@ -83,7 +84,7 @@ def _refresh_frequency(self):
 
         return refresh_frequency
 
-    def to_query(self) -> List[ast.SelectQuery]:
+    def to_query(self) -> List[ast.SelectQuery | ast.SelectUnionQuery]:  # type: ignore
         queries = []
         with self.timings.measure("trends_query"):
             for series in self.series:
@@ -98,6 +99,7 @@ def to_query(self) -> List[ast.SelectQuery]:
                     query_date_range=query_date_range,
                     series=series.series,
                     timings=self.timings,
+                    modifiers=self.modifiers,
                 )
                 queries.append(query_builder.build_query())
 
@@ -118,6 +120,7 @@ def to_actors_query(self) -> ast.SelectQuery | ast.SelectUnionQuery:
                     query_date_range=query_date_range,
                     series=series.series,
                     timings=self.timings,
+                    modifiers=self.modifiers,
                 )
                 queries.append(query_builder.build_persons_query())
 
@@ -341,17 +344,21 @@ def setup_series(self) -> List[SeriesWithExtras]:
             for series in self.query.series
         ]
 
-        if self.query.breakdownFilter is not None and self.query.breakdownFilter.breakdown_type == "cohort":
+        if (
+            self.modifiers.inCohortVia != InCohortVia.leftjoin_conjoined
+            and self.query.breakdownFilter is not None
+            and self.query.breakdownFilter.breakdown_type == "cohort"
+        ):
             updated_series = []
             if isinstance(self.query.breakdownFilter.breakdown, List):
                 cohort_ids = self.query.breakdownFilter.breakdown
             else:
-                cohort_ids = [self.query.breakdownFilter.breakdown]
+                cohort_ids = [self.query.breakdownFilter.breakdown]  # type: ignore
 
             for cohort_id in cohort_ids:
                 for series in series_with_extras:
                     copied_query = deepcopy(self.query)
-                    copied_query.breakdownFilter.breakdown = cohort_id
+                    copied_query.breakdownFilter.breakdown = cohort_id  # type: ignore
 
                     updated_series.append(
                         SeriesWithExtras(
diff --git a/posthog/hogql_queries/insights/trends/utils.py b/posthog/hogql_queries/insights/trends/utils.py
index 1510a87a76bef..cd877757b2e24 100644
--- a/posthog/hogql_queries/insights/trends/utils.py
+++ b/posthog/hogql_queries/insights/trends/utils.py
@@ -12,7 +12,7 @@ def get_properties_chain(
     breakdown_type: Union[Literal["person"], Literal["session"], Literal["group"], Literal["event"]],
     breakdown_field: str,
     group_type_index: Optional[float | int],
-) -> List[str]:
+) -> List[str | int]:
     if breakdown_type == "person":
         return ["person", "properties", breakdown_field]
 
diff --git a/posthog/hogql_queries/legacy_compatibility/filter_to_query.py b/posthog/hogql_queries/legacy_compatibility/filter_to_query.py
index 64914418df817..1b3c1213d77ea 100644
--- a/posthog/hogql_queries/legacy_compatibility/filter_to_query.py
+++ b/posthog/hogql_queries/legacy_compatibility/filter_to_query.py
@@ -318,14 +318,15 @@ def _insight_filter(filter: Dict):
                 # show_legend=filter.get('show_legend'),
                 # hidden_legend_indexes=cleanHiddenLegendIndexes(filter.get('hidden_legend_keys')),
                 compare=filter.get("compare"),
-                aggregation_axis_format=filter.get("aggregation_axis_format"),
-                aggregation_axis_prefix=filter.get("aggregation_axis_prefix"),
-                aggregation_axis_postfix=filter.get("aggregation_axis_postfix"),
-                decimal_places=filter.get("decimal_places"),
+                aggregationAxisFormat=filter.get("aggregation_axis_format"),
+                aggregationAxisPrefix=filter.get("aggregation_axis_prefix"),
+                aggregationAxisPostfix=filter.get("aggregation_axis_postfix"),
+                decimalPlaces=filter.get("decimal_places"),
                 formula=filter.get("formula"),
                 display=clean_display(filter.get("display")),
                 show_values_on_series=filter.get("show_values_on_series"),
-                show_percent_stack_view=filter.get("show_percent_stack_view"),
+                showPercentStackView=filter.get("show_percent_stack_view"),
+                showLabelsOnSeries=filter.get("show_label_on_series"),
             )
         }
     elif _insight_type(filter) == "FUNNELS":
diff --git a/posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py b/posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py
index f466eeee28af7..6fdf7d838fd3d 100644
--- a/posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py
+++ b/posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py
@@ -1295,12 +1295,12 @@ def test_trends_filter(self):
             TrendsFilter(
                 smoothingIntervals=2,
                 compare=True,
-                aggregation_axis_format=AggregationAxisFormat.duration_ms,
-                aggregation_axis_prefix="pre",
-                aggregation_axis_postfix="post",
+                aggregationAxisFormat=AggregationAxisFormat.duration_ms,
+                aggregationAxisPrefix="pre",
+                aggregationAxisPostfix="post",
                 formula="A + B",
                 display=ChartDisplayType.ActionsAreaGraph,
-                decimal_places=5,
+                decimalPlaces=5,
             ),
         )
 
diff --git a/posthog/schema.py b/posthog/schema.py
index 6ab56dbed4f6f..c8df43c2e0345 100644
--- a/posthog/schema.py
+++ b/posthog/schema.py
@@ -267,6 +267,7 @@ class HogQLNotice(BaseModel):
 class InCohortVia(str, Enum):
     leftjoin = "leftjoin"
     subquery = "subquery"
+    leftjoin_conjoined = "leftjoin_conjoined"
 
 
 class MaterializationMode(str, Enum):
@@ -642,18 +643,18 @@ class TrendsFilter(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
-    aggregation_axis_format: Optional[AggregationAxisFormat] = None
-    aggregation_axis_postfix: Optional[str] = None
-    aggregation_axis_prefix: Optional[str] = None
+    aggregationAxisFormat: Optional[AggregationAxisFormat] = None
+    aggregationAxisPostfix: Optional[str] = None
+    aggregationAxisPrefix: Optional[str] = None
     breakdown_histogram_bin_count: Optional[float] = None
     compare: Optional[bool] = None
-    decimal_places: Optional[float] = None
+    decimalPlaces: Optional[float] = None
     display: Optional[ChartDisplayType] = None
     formula: Optional[str] = None
     hidden_legend_indexes: Optional[List[float]] = None
-    show_labels_on_series: Optional[bool] = None
+    showLabelsOnSeries: Optional[bool] = None
+    showPercentStackView: Optional[bool] = None
     show_legend: Optional[bool] = None
-    show_percent_stack_view: Optional[bool] = None
     show_values_on_series: Optional[bool] = None
     smoothingIntervals: Optional[float] = None
 
diff --git a/posthog/tasks/warehouse.py b/posthog/tasks/warehouse.py
index de48d10a28bdc..bab541d47bcab 100644
--- a/posthog/tasks/warehouse.py
+++ b/posthog/tasks/warehouse.py
@@ -10,7 +10,7 @@
 
 logger = structlog.get_logger(__name__)
 
-MONTHLY_LIMIT = 1_000_000
+MONTHLY_LIMIT = 5_000_000
 
 
 def check_synced_row_limits() -> None:
@@ -22,6 +22,8 @@ def check_synced_row_limits() -> None:
 @app.task(ignore_result=True)
 def check_synced_row_limits_of_team(team_id: int) -> None:
     logger.info("Checking synced row limits of team", team_id=team_id)
+
+    # TODO: Can change this to be billing period based once billing is integrated
     start_of_month = datetime.datetime.now().replace(day=1, hour=0, minute=0, second=0, microsecond=0)
     rows_synced_list = [
         x