diff --git a/bin/docker-worker-celery b/bin/docker-worker-celery
index 5d1e7567fcabe..bbd9949d88352 100755
--- a/bin/docker-worker-celery
+++ b/bin/docker-worker-celery
@@ -71,6 +71,10 @@ FLAGS+=("-n node@%h")
 # On Heroku $WEB_CONCURRENCY contains suggested number of forks per dyno type
 # https://github.com/heroku/heroku-buildpack-python/blob/main/vendor/WEB_CONCURRENCY.sh
 [[ -n "${WEB_CONCURRENCY}" ]]    && FLAGS+=" --concurrency $WEB_CONCURRENCY"
+# Restart worker process after it processes this many tasks (to mitigate memory leaks)
+[[ -n "${CELERY_MAX_TASKS_PER_CHILD}" ]]    && FLAGS+=" --max-tasks-per-child $CELERY_MAX_TASKS_PER_CHILD"
+# Restart worker process after it exceeds this much memory usage (to mitigate memory leaks)
+[[ -n "${CELERY_MAX_MEMORY_PER_CHILD}" ]]    && FLAGS+=" --max-memory-per-child $CELERY_MAX_MEMORY_PER_CHILD"
 
 if [[ -z "${CELERY_WORKER_QUEUES}" ]]; then
   source ./bin/celery-queues.env
diff --git a/cypress/e2e/featureFlags.cy.ts b/cypress/e2e/featureFlags.cy.ts
index 78f0bcd0ab8bd..e4f7e35edb718 100644
--- a/cypress/e2e/featureFlags.cy.ts
+++ b/cypress/e2e/featureFlags.cy.ts
@@ -119,8 +119,9 @@ describe('Feature Flags', () => {
         // select "add filter" and "property"
         cy.get('[data-attr=property-select-toggle-0').click()
 
-        // select the third property
+        // select the first property
         cy.get('[data-attr=taxonomic-filter-searchfield]').click()
+        cy.get('[data-attr=taxonomic-filter-searchfield]').type('is_demo')
         cy.get('[data-attr=taxonomic-tab-person_properties]').click()
         // select numeric $browser_version
         cy.get('[data-attr=prop-filter-person_properties-2]').click({ force: true })
diff --git a/cypress/e2e/trends.cy.ts b/cypress/e2e/trends.cy.ts
index a1aa9d31a5594..36809958d7c25 100644
--- a/cypress/e2e/trends.cy.ts
+++ b/cypress/e2e/trends.cy.ts
@@ -24,7 +24,7 @@ describe('Trends', () => {
         cy.get('[data-attr=trend-element-subject-1]').click()
         cy.get('[data-attr=taxonomic-tab-actions]').click()
         cy.get('[data-attr=taxonomic-filter-searchfield]').click().type('home')
-        cy.contains('Hogflix homepage view').click({ force: true })
+        cy.contains('Hogflix homepage view').click()
 
         // then
         cy.get('[data-attr=trend-line-graph]').should('exist')
@@ -66,15 +66,15 @@ describe('Trends', () => {
     it('Apply specific filter on default pageview event', () => {
         cy.get('[data-attr=trend-element-subject-0]').click()
         cy.get('[data-attr=taxonomic-filter-searchfield]').click().type('Pageview')
-        cy.get('.taxonomic-infinite-list').find('.taxonomic-list-row').contains('Pageview').click({ force: true })
+        cy.get('.taxonomic-infinite-list').find('.taxonomic-list-row').contains('Pageview').click()
         cy.get('[data-attr=trend-element-subject-0]').should('have.text', 'Pageview')
 
         // Apply a property filter
         cy.get('[data-attr=show-prop-filter-0]').click()
         cy.get('[data-attr=property-select-toggle-0]').click()
-        cy.get('[data-attr=prop-filter-event_properties-1]').click({ force: true })
+        cy.get('[data-attr=prop-filter-event_properties-1]').click()
 
-        cy.get('[data-attr=prop-val]').click({ force: true })
+        cy.get('[data-attr=prop-val]').click()
         // cypress is odd and even though when a human clicks this the right dropdown opens
         // in the test that doesn't happen
         cy.get('body').then(($body) => {
@@ -88,14 +88,14 @@ describe('Trends', () => {
     it('Apply 1 overall filter', () => {
         cy.get('[data-attr=trend-element-subject-0]').click()
         cy.get('[data-attr=taxonomic-filter-searchfield]').click().type('Pageview')
-        cy.get('.taxonomic-infinite-list').find('.taxonomic-list-row').contains('Pageview').click({ force: true })
+        cy.get('.taxonomic-infinite-list').find('.taxonomic-list-row').contains('Pageview').click()
         cy.get('[data-attr=trend-element-subject-0]').should('have.text', 'Pageview')
 
         cy.get('[data-attr$=add-filter-group]').click()
         cy.get('[data-attr=property-select-toggle-0]').click()
         cy.get('[data-attr=taxonomic-filter-searchfield]').click()
-        cy.get('[data-attr=prop-filter-event_properties-1]').click({ force: true })
-        cy.get('[data-attr=prop-val]').click({ force: true })
+        cy.get('[data-attr=prop-filter-event_properties-1]').click()
+        cy.get('[data-attr=prop-val]').click()
         // cypress is odd and even though when a human clicks this the right dropdown opens
         // in the test that doesn't happen
         cy.get('body').then(($body) => {
@@ -103,7 +103,7 @@ describe('Trends', () => {
                 cy.get('[data-attr=taxonomic-value-select]').click()
             }
         })
-        cy.get('[data-attr=prop-val-0]').click({ force: true })
+        cy.get('[data-attr=prop-val-0]').click()
 
         cy.get('[data-attr=trend-line-graph]', { timeout: 8000 }).should('exist')
     })
@@ -117,14 +117,14 @@ describe('Trends', () => {
 
     it('Apply pie filter', () => {
         cy.get('[data-attr=chart-filter]').click()
-        cy.get('.Popover').find('.LemonButton').contains('Pie').click({ force: true })
+        cy.get('.Popover').find('.LemonButton').contains('Pie').click()
 
         cy.get('[data-attr=trend-pie-graph]').should('exist')
     })
 
     it('Apply table filter', () => {
         cy.get('[data-attr=chart-filter]').click()
-        cy.get('.Popover').find('.LemonButton').contains('Table').click({ force: true })
+        cy.get('.Popover').find('.LemonButton').contains('Table').click()
 
         cy.get('[data-attr=insights-table-graph]').should('exist')
 
@@ -144,7 +144,7 @@ describe('Trends', () => {
 
     it('Apply property breakdown', () => {
         cy.get('[data-attr=add-breakdown-button]').click()
-        cy.get('[data-attr=prop-filter-event_properties-1]').click({ force: true })
+        cy.get('[data-attr=prop-filter-event_properties-1]').click()
         cy.get('[data-attr=trend-line-graph]').should('exist')
     })
 
@@ -154,4 +154,16 @@ describe('Trends', () => {
         cy.contains('All Users*').click()
         cy.get('[data-attr=trend-line-graph]').should('exist')
     })
+
+    it('Show warning on MAU math in total value insight', () => {
+        cy.get('[data-attr=chart-filter]').click()
+        cy.get('.Popover').find('.LemonButton').contains('Pie').click()
+        cy.get('[data-attr=trend-pie-graph]').should('exist') // Make sure the pie chart is loaded before proceeding
+
+        cy.get('[data-attr=math-selector-0]').click()
+        cy.get('[data-attr=math-monthly_active-0] .LemonIcon').should('exist') // This should be the warning icon
+
+        cy.get('[data-attr=math-monthly_active-0]').trigger('mouseenter') // Activate warning tooltip
+        cy.get('.Tooltip').contains('we recommend using "Unique users" here instead').should('exist')
+    })
 })
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit--light.png b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit--light.png
index effe9ed3b3aaf..ce6b88c8b832a 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit--light.png and b/frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit--light.png differ
diff --git a/frontend/src/layout/FeaturePreviews/featurePreviewsLogic.test.ts b/frontend/src/layout/FeaturePreviews/featurePreviewsLogic.test.ts
index f0ff2f6404de7..3bd8f0590f20d 100644
--- a/frontend/src/layout/FeaturePreviews/featurePreviewsLogic.test.ts
+++ b/frontend/src/layout/FeaturePreviews/featurePreviewsLogic.test.ts
@@ -2,6 +2,7 @@ import { expectLogic } from 'kea-test-utils'
 import { MOCK_DEFAULT_USER } from 'lib/api.mock'
 import { userLogic } from 'scenes/userLogic'
 
+import { useMocks } from '~/mocks/jest'
 import { initKeaTests } from '~/test/init'
 
 import { featurePreviewsLogic } from './featurePreviewsLogic'
@@ -10,6 +11,11 @@ describe('featurePreviewsLogic', () => {
     let logic: ReturnType<typeof featurePreviewsLogic.build>
 
     beforeEach(() => {
+        useMocks({
+            post: {
+                'https://posthoghelp.zendesk.com/api/v2/requests.json': [200, {}],
+            },
+        })
         initKeaTests()
         logic = featurePreviewsLogic()
         logic.mount()
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/activation/activationLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/activation/activationLogic.ts
index e8afd00aea1ed..b0be99d68f438 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/activation/activationLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/activation/activationLogic.ts
@@ -2,6 +2,7 @@ import { actions, connect, events, kea, listeners, path, reducers, selectors } f
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import api from 'lib/api'
+import { reverseProxyCheckerLogic } from 'lib/components/ReverseProxyChecker/reverseProxyCheckerLogic'
 import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 import posthog from 'posthog-js'
 import { membersLogic } from 'scenes/organization/membersLogic'
@@ -58,6 +59,8 @@ export const activationLogic = kea<activationLogicType>([
             ['insights'],
             dashboardsModel,
             ['rawDashboards'],
+            reverseProxyCheckerLogic,
+            ['hasReverseProxy'],
         ],
         actions: [
             inviteLogic,
@@ -193,6 +196,7 @@ export const activationLogic = kea<activationLogicType>([
                 s.customEventsCount,
                 s.installedPlugins,
                 s.currentTeamSkippedTasks,
+                s.hasReverseProxy,
             ],
             (
                 currentTeam,
@@ -202,7 +206,8 @@ export const activationLogic = kea<activationLogicType>([
                 dashboards,
                 customEventsCount,
                 installedPlugins,
-                skippedTasks
+                skippedTasks,
+                hasReverseProxy
             ) => {
                 const tasks: ActivationTaskType[] = []
                 for (const task of Object.values(ActivationTasks)) {
@@ -286,7 +291,7 @@ export const activationLogic = kea<activationLogicType>([
                                 id: ActivationTasks.SetUpReverseProxy,
                                 name: 'Set up a reverse proxy',
                                 description: 'Send your events from your own domain to avoid tracking blockers',
-                                completed: false,
+                                completed: hasReverseProxy || false,
                                 canSkip: true,
                                 skipped: skippedTasks.includes(ActivationTasks.SetUpReverseProxy),
                                 url: 'https://posthog.com/docs/advanced/proxy',
diff --git a/frontend/src/lib/components/AnnotationsOverlay/annotationsOverlayLogic.test.ts b/frontend/src/lib/components/AnnotationsOverlay/annotationsOverlayLogic.test.ts
index 02d59125c852f..b5ec3468d12f1 100644
--- a/frontend/src/lib/components/AnnotationsOverlay/annotationsOverlayLogic.test.ts
+++ b/frontend/src/lib/components/AnnotationsOverlay/annotationsOverlayLogic.test.ts
@@ -143,6 +143,7 @@ function useInsightMocks(interval: string = 'day', timezone: string = 'UTC'): vo
             [`/api/projects/:team_id/insights/${MOCK_INSIGHT_NUMERIC_ID}`]: () => {
                 return [200, insight]
             },
+            '/api/users/@me/': [200, {}],
         },
     })
 }
@@ -162,6 +163,7 @@ function useAnnotationsMocks(): void {
                     MOCK_ANNOTATION_PROJECT_SCOPED_FROM_INSIGHT_3,
                 ],
             },
+            '/api/users/@me/': [200, {}],
         },
     })
 }
@@ -171,6 +173,7 @@ describe('annotationsOverlayLogic', () => {
 
     beforeEach(() => {
         useAnnotationsMocks()
+        initKeaTests()
     })
 
     afterEach(() => {
@@ -178,8 +181,6 @@ describe('annotationsOverlayLogic', () => {
     })
 
     it('loads annotations on mount', async () => {
-        initKeaTests()
-
         useInsightMocks()
 
         logic = annotationsOverlayLogic({
@@ -193,8 +194,6 @@ describe('annotationsOverlayLogic', () => {
     })
 
     describe('relevantAnnotations', () => {
-        initKeaTests()
-
         it('returns annotations scoped to the insight for a saved insight', async () => {
             useInsightMocks()
 
@@ -224,8 +223,6 @@ describe('annotationsOverlayLogic', () => {
         })
 
         it('returns annotations scoped to the project for a new insight', async () => {
-            initKeaTests()
-
             useInsightMocks()
 
             logic = annotationsOverlayLogic({
@@ -250,8 +247,6 @@ describe('annotationsOverlayLogic', () => {
         })
 
         it('excludes annotations that are outside of insight date range', async () => {
-            initKeaTests()
-
             useInsightMocks()
 
             logic = annotationsOverlayLogic({
@@ -506,8 +501,6 @@ describe('annotationsOverlayLogic', () => {
         }
 
         it(`merges groups when one tick covers more than one date (UTC)`, async () => {
-            initKeaTests(true, MOCK_DEFAULT_TEAM)
-
             useInsightMocks()
 
             logic = annotationsOverlayLogic({
@@ -572,8 +565,6 @@ describe('annotationsOverlayLogic', () => {
         })
 
         it(`merges groups when one tick covers more than one hour (UTC)`, async () => {
-            initKeaTests(true, MOCK_DEFAULT_TEAM)
-
             useInsightMocks('hour')
 
             logic = annotationsOverlayLogic({
diff --git a/frontend/src/lib/components/AuthorizedUrlList/authorizedUrlListLogic.test.ts b/frontend/src/lib/components/AuthorizedUrlList/authorizedUrlListLogic.test.ts
index b21f9012925bb..772646e28882a 100644
--- a/frontend/src/lib/components/AuthorizedUrlList/authorizedUrlListLogic.test.ts
+++ b/frontend/src/lib/components/AuthorizedUrlList/authorizedUrlListLogic.test.ts
@@ -27,6 +27,9 @@ describe('the authorized urls list logic', () => {
                     return [200, { result: ['result from api'] }]
                 },
             },
+            patch: {
+                '/api/projects/:team': [200, {}],
+            },
         })
         initKeaTests()
         logic = authorizedUrlListLogic({
diff --git a/frontend/src/lib/components/CustomerLogo.tsx b/frontend/src/lib/components/CustomerLogo.tsx
new file mode 100644
index 0000000000000..659f739d1d7dc
--- /dev/null
+++ b/frontend/src/lib/components/CustomerLogo.tsx
@@ -0,0 +1,23 @@
+interface CustomerProps {
+    image: string
+    alt: string
+    className?: string
+}
+
+interface LogoProps {
+    src: string
+    alt: string
+    className?: string
+}
+
+const Logo = ({ src, alt, className = '' }: LogoProps): JSX.Element => (
+    <img className={`bg-transparent w-full px-3 py-3 h-10 ${className}`} src={src} alt={alt} />
+)
+
+export const CustomerLogo = ({ image, alt, className = '' }: CustomerProps): JSX.Element => {
+    return (
+        <li className="flex items-center justify-center w-full">
+            <Logo className={className} src={image} alt={alt} />
+        </li>
+    )
+}
diff --git a/frontend/src/lib/components/PropertyFilters/components/TaxonomicPropertyFilter.tsx b/frontend/src/lib/components/PropertyFilters/components/TaxonomicPropertyFilter.tsx
index 644b01f74b063..d416c1e0502c3 100644
--- a/frontend/src/lib/components/PropertyFilters/components/TaxonomicPropertyFilter.tsx
+++ b/frontend/src/lib/components/PropertyFilters/components/TaxonomicPropertyFilter.tsx
@@ -9,7 +9,6 @@ import { propertyFilterLogic } from 'lib/components/PropertyFilters/propertyFilt
 import { PropertyFilterInternalProps } from 'lib/components/PropertyFilters/types'
 import {
     isGroupPropertyFilter,
-    isPersonPropertyFilter,
     isPropertyFilterWithOperator,
     PROPERTY_FILTER_TYPE_TO_TAXONOMIC_FILTER_GROUP_TYPE,
     propertyFilterTypeToTaxonomicFilterType,
@@ -64,7 +63,7 @@ export function TaxonomicPropertyFilter({
         value,
         item
     ) => {
-        selectItem(taxonomicGroup, value, item)
+        selectItem(taxonomicGroup, value, item?.propertyFilterType)
         if (
             taxonomicGroup.type === TaxonomicFilterGroupType.Cohorts ||
             taxonomicGroup.type === TaxonomicFilterGroupType.HogQLExpression
@@ -215,7 +214,6 @@ export function TaxonomicPropertyFilter({
                                             value: newValue || null,
                                             operator: newOperator,
                                             type: filter?.type,
-                                            ...(isPersonPropertyFilter(filter) ? { table: filter?.table } : {}),
                                             ...(isGroupPropertyFilter(filter)
                                                 ? { group_type_index: filter.group_type_index }
                                                 : {}),
diff --git a/frontend/src/lib/components/PropertyFilters/components/taxonomicPropertyFilterLogic.ts b/frontend/src/lib/components/PropertyFilters/components/taxonomicPropertyFilterLogic.ts
index 48760e5ab6747..aa1a1ca685cc7 100644
--- a/frontend/src/lib/components/PropertyFilters/components/taxonomicPropertyFilterLogic.ts
+++ b/frontend/src/lib/components/PropertyFilters/components/taxonomicPropertyFilterLogic.ts
@@ -51,10 +51,14 @@ export const taxonomicPropertyFilterLogic = kea<taxonomicPropertyFilterLogicType
         ],
     })),
     actions({
-        selectItem: (taxonomicGroup: TaxonomicFilterGroup, propertyKey?: TaxonomicFilterValue, item?: any) => ({
+        selectItem: (
+            taxonomicGroup: TaxonomicFilterGroup,
+            propertyKey?: TaxonomicFilterValue,
+            itemPropertyFilterType?: PropertyFilterType
+        ) => ({
             taxonomicGroup,
             propertyKey,
-            item,
+            itemPropertyFilterType,
         }),
         openDropdown: true,
         closeDropdown: true,
@@ -89,8 +93,7 @@ export const taxonomicPropertyFilterLogic = kea<taxonomicPropertyFilterLogicType
         ],
     }),
     listeners(({ actions, values, props }) => ({
-        selectItem: ({ taxonomicGroup, propertyKey, item }) => {
-            const itemPropertyFilterType = item?.propertyFilterType as PropertyFilterType
+        selectItem: ({ taxonomicGroup, propertyKey, itemPropertyFilterType }) => {
             const propertyType = itemPropertyFilterType ?? taxonomicFilterTypeToPropertyFilterType(taxonomicGroup.type)
             if (propertyKey && propertyType) {
                 if (propertyType === PropertyFilterType.Cohort) {
@@ -126,8 +129,8 @@ export const taxonomicPropertyFilterLogic = kea<taxonomicPropertyFilterLogicType
                     }
                     const operator =
                         property_name_to_default_operator_override[propertyKey] ||
-                        property_value_type_to_default_operator_override[propertyValueType ?? ''] ||
                         (isPropertyFilterWithOperator(values.filter) ? values.filter.operator : null) ||
+                        property_value_type_to_default_operator_override[propertyValueType ?? ''] ||
                         PropertyOperator.Exact
 
                     const isGroupNameFilter = taxonomicGroup.type.startsWith(TaxonomicFilterGroupType.GroupNamesPrefix)
@@ -139,7 +142,6 @@ export const taxonomicPropertyFilterLogic = kea<taxonomicPropertyFilterLogicType
                         operator,
                         type: propertyType as AnyPropertyFilter['type'] as any, // bad | pipe chain :(
                         group_type_index: taxonomicGroup.groupTypeIndex,
-                        table: item.table,
                     }
                     props.propertyFilterLogic.actions.setFilter(props.filterIndex, property)
                 }
diff --git a/frontend/src/lib/components/ReverseProxyChecker/reverseProxyCheckerLogic.test.ts b/frontend/src/lib/components/ReverseProxyChecker/reverseProxyCheckerLogic.test.ts
new file mode 100644
index 0000000000000..5ea635b7e4f90
--- /dev/null
+++ b/frontend/src/lib/components/ReverseProxyChecker/reverseProxyCheckerLogic.test.ts
@@ -0,0 +1,63 @@
+import { expectLogic } from 'kea-test-utils'
+
+import { useMocks } from '~/mocks/jest'
+import { initKeaTests } from '~/test/init'
+
+import { reverseProxyCheckerLogic } from './reverseProxyCheckerLogic'
+
+const hasReverseProxyValues = [['https://proxy.example.com'], [null]]
+const doesNotHaveReverseProxyValues = [[null], [null]]
+
+const useMockedValues = (results: (string | null)[][]): void => {
+    useMocks({
+        post: {
+            '/api/projects/:team/query': () => [
+                200,
+                {
+                    results,
+                },
+            ],
+        },
+    })
+}
+
+describe('reverseProxyCheckerLogic', () => {
+    let logic: ReturnType<typeof reverseProxyCheckerLogic.build>
+
+    beforeEach(() => {
+        initKeaTests()
+        localStorage.clear()
+        logic = reverseProxyCheckerLogic()
+    })
+
+    afterEach(() => {
+        logic.unmount()
+    })
+
+    it('should not have a reverse proxy set - when no data', async () => {
+        useMockedValues([])
+
+        logic.mount()
+        await expectLogic(logic).toFinishAllListeners().toMatchValues({
+            hasReverseProxy: false,
+        })
+    })
+
+    it('should not have a reverse proxy set - when data with no lib_custom_api_host values', async () => {
+        useMockedValues(doesNotHaveReverseProxyValues)
+
+        logic.mount()
+        await expectLogic(logic).toFinishAllListeners().toMatchValues({
+            hasReverseProxy: false,
+        })
+    })
+
+    it('should have a reverse proxy set', async () => {
+        useMockedValues(hasReverseProxyValues)
+
+        logic.mount()
+        await expectLogic(logic).toFinishAllListeners().toMatchValues({
+            hasReverseProxy: true,
+        })
+    })
+})
diff --git a/frontend/src/lib/components/ReverseProxyChecker/reverseProxyCheckerLogic.ts b/frontend/src/lib/components/ReverseProxyChecker/reverseProxyCheckerLogic.ts
new file mode 100644
index 0000000000000..6b945e5c94c48
--- /dev/null
+++ b/frontend/src/lib/components/ReverseProxyChecker/reverseProxyCheckerLogic.ts
@@ -0,0 +1,49 @@
+import { afterMount, kea, path, reducers } from 'kea'
+import { loaders } from 'kea-loaders'
+import api from 'lib/api'
+
+import { HogQLQuery, NodeKind } from '~/queries/schema'
+import { hogql } from '~/queries/utils'
+
+import type { reverseProxyCheckerLogicType } from './reverseProxyCheckerLogicType'
+
+const CHECK_INTERVAL_MS = 1000 * 60 * 60 // 1 hour
+
+export const reverseProxyCheckerLogic = kea<reverseProxyCheckerLogicType>([
+    path(['components', 'ReverseProxyChecker', 'reverseProxyCheckerLogic']),
+    loaders({
+        hasReverseProxy: [
+            false as boolean | null,
+            {
+                loadHasReverseProxy: async () => {
+                    const query: HogQLQuery = {
+                        kind: NodeKind.HogQLQuery,
+                        query: hogql`SELECT properties.$lib_custom_api_host AS lib_custom_api_host
+                                FROM events
+                                WHERE timestamp >= now() - INTERVAL 1 DAY 
+                                AND timestamp <= now()
+                                ORDER BY timestamp DESC
+                                limit 10`,
+                    }
+
+                    const res = await api.query(query)
+                    return !!res.results?.find((x) => !!x[0])
+                },
+            },
+        ],
+    }),
+    reducers({
+        lastCheckedTimestamp: [
+            0,
+            { persist: true },
+            {
+                loadHasReverseProxySuccess: () => Date.now(),
+            },
+        ],
+    }),
+    afterMount(({ actions, values }) => {
+        if (values.lastCheckedTimestamp < Date.now() - CHECK_INTERVAL_MS) {
+            actions.loadHasReverseProxy()
+        }
+    }),
+])
diff --git a/frontend/src/lib/components/Subscriptions/subscriptionLogic.test.ts b/frontend/src/lib/components/Subscriptions/subscriptionLogic.test.ts
index 820e8eb7d9786..1adc197e2c03c 100644
--- a/frontend/src/lib/components/Subscriptions/subscriptionLogic.test.ts
+++ b/frontend/src/lib/components/Subscriptions/subscriptionLogic.test.ts
@@ -32,6 +32,7 @@ describe('subscriptionLogic', () => {
         useMocks({
             get: {
                 '/api/projects/:team/subscriptions/1': fixtureSubscriptionResponse(1),
+                '/api/projects/:team/integrations': { count: 0, results: [] },
             },
         })
         initKeaTests()
diff --git a/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.tsx b/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.tsx
index b5904b8957056..cc3e727f7b10d 100644
--- a/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.tsx
+++ b/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.tsx
@@ -28,8 +28,7 @@ import { cohortsModel } from '~/models/cohortsModel'
 import { dashboardsModel } from '~/models/dashboardsModel'
 import { groupPropertiesModel } from '~/models/groupPropertiesModel'
 import { groupsModel } from '~/models/groupsModel'
-import { personPropertiesModel } from '~/models/personPropertiesModel'
-import { updateListOfPropertyDefinitions } from '~/models/propertyDefinitionsModel'
+import { updatePropertyDefinitions } from '~/models/propertyDefinitionsModel'
 import { AnyDataNode, DatabaseSchemaQueryResponseField, NodeKind } from '~/queries/schema'
 import {
     ActionType,
@@ -77,7 +76,7 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
     props({} as TaxonomicFilterLogicProps),
     key((props) => `${props.taxonomicFilterLogicKey}`),
     path(['lib', 'components', 'TaxonomicFilter', 'taxonomicFilterLogic']),
-    connect((props: TaxonomicFilterLogicProps) => ({
+    connect({
         values: [
             teamLogic,
             ['currentTeamId'],
@@ -87,13 +86,8 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
             ['allGroupProperties'],
             dataWarehouseSceneLogic,
             ['externalTables'],
-            personPropertiesModel({
-                propertyAllowList: props.propertyAllowList,
-                taxonomicFilterLogicKey: props.taxonomicFilterLogicKey,
-            }),
-            ['combinedPersonProperties'],
         ],
-    })),
+    }),
     actions(() => ({
         moveUp: true,
         moveDown: true,
@@ -171,7 +165,6 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
                 s.metadataSource,
                 s.excludedProperties,
                 s.propertyAllowList,
-                s.taxonomicFilterLogicKey,
             ],
             (
                 teamId,
@@ -181,8 +174,7 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
                 schemaColumns,
                 metadataSource,
                 excludedProperties,
-                propertyAllowList,
-                taxonomicFilterLogicKey
+                propertyAllowList
             ): TaxonomicFilterGroup[] => {
                 const groups: TaxonomicFilterGroup[] = [
                     {
@@ -333,15 +325,14 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
                         name: 'Person properties',
                         searchPlaceholder: 'person properties',
                         type: TaxonomicFilterGroupType.PersonProperties,
-                        logic: personPropertiesModel({ propertyAllowList, taxonomicFilterLogicKey }),
-                        value: 'combinedPersonProperties',
+                        endpoint: combineUrl(`api/projects/${teamId}/property_definitions`, {
+                            type: 'person',
+                            properties: propertyAllowList?.[TaxonomicFilterGroupType.PersonProperties]
+                                ? propertyAllowList[TaxonomicFilterGroupType.PersonProperties].join(',')
+                                : undefined,
+                        }).url,
                         getName: (personProperty: PersonProperty) => personProperty.name,
-                        getValue: (personProperty: PersonProperty) => {
-                            if (personProperty.table) {
-                                return personProperty.id
-                            }
-                            return personProperty.name
-                        },
+                        getValue: (personProperty: PersonProperty) => personProperty.name,
                         propertyAllowList: propertyAllowList?.[TaxonomicFilterGroupType.PersonProperties],
                         ...propertyTaxonomicGroupProps(true),
                     },
@@ -707,7 +698,14 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
                     groupType === TaxonomicFilterGroupType.NumericalEventProperties)
             ) {
                 const propertyDefinitions: PropertyDefinition[] = results.results as PropertyDefinition[]
-                updateListOfPropertyDefinitions(propertyDefinitions, groupType)
+                const apiType = groupType === TaxonomicFilterGroupType.PersonProperties ? 'person' : 'event'
+                const newPropertyDefinitions = Object.fromEntries(
+                    propertyDefinitions.map((propertyDefinition) => [
+                        `${apiType}/${propertyDefinition.name}`,
+                        propertyDefinition,
+                    ])
+                )
+                updatePropertyDefinitions(newPropertyDefinitions)
             }
         },
     })),
diff --git a/frontend/src/lib/components/TaxonomicFilter/types.ts b/frontend/src/lib/components/TaxonomicFilter/types.ts
index a3edff51c16f0..964847c6eacaf 100644
--- a/frontend/src/lib/components/TaxonomicFilter/types.ts
+++ b/frontend/src/lib/components/TaxonomicFilter/types.ts
@@ -1,5 +1,5 @@
 import Fuse from 'fuse.js'
-import { BuiltLogic, LogicWrapper } from 'kea'
+import { LogicWrapper } from 'kea'
 import { DataWarehouseTableType } from 'scenes/data-warehouse/types'
 import { LocalFilter } from 'scenes/insights/filters/ActionFilter/entityFilterLogic'
 
@@ -61,7 +61,7 @@ export interface TaxonomicFilterGroup {
     scopedEndpoint?: string
     expandLabel?: (props: { count: number; expandedCount: number }) => React.ReactNode
     options?: Record<string, any>[]
-    logic?: LogicWrapper | BuiltLogic
+    logic?: LogicWrapper
     value?: string
     searchAlias?: string
     valuesEndpoint?: (key: string) => string
diff --git a/frontend/src/lib/components/VersionChecker/versionCheckerLogic.ts b/frontend/src/lib/components/VersionChecker/versionCheckerLogic.ts
index cc26d0eff45fc..ce53ba46d5db8 100644
--- a/frontend/src/lib/components/VersionChecker/versionCheckerLogic.ts
+++ b/frontend/src/lib/components/VersionChecker/versionCheckerLogic.ts
@@ -7,7 +7,7 @@ import { hogql } from '~/queries/utils'
 
 import type { versionCheckerLogicType } from './versionCheckerLogicType'
 
-const CHECK_INTERVAL_MS = 1000 * 60 * 60 // 6 hour
+const CHECK_INTERVAL_MS = 1000 * 60 * 60 * 6 // 6 hour
 
 export type SDKVersion = {
     version: string
diff --git a/frontend/src/lib/constants.tsx b/frontend/src/lib/constants.tsx
index f9d7a552e6be7..292fcb5d957b7 100644
--- a/frontend/src/lib/constants.tsx
+++ b/frontend/src/lib/constants.tsx
@@ -1,15 +1,23 @@
 import { LemonSelectOptions } from '@posthog/lemon-ui'
 
-import { ChartDisplayType, Region, SSOProvider } from '../types'
+import { ChartDisplayCategory, ChartDisplayType, Region, SSOProvider } from '../types'
+
+// Sync with backend DISPLAY_TYPES_TO_CATEGORIES
+export const DISPLAY_TYPES_TO_CATEGORIES: Record<ChartDisplayType, ChartDisplayCategory> = {
+    [ChartDisplayType.ActionsLineGraph]: ChartDisplayCategory.TimeSeries,
+    [ChartDisplayType.ActionsBar]: ChartDisplayCategory.TimeSeries,
+    [ChartDisplayType.ActionsAreaGraph]: ChartDisplayCategory.TimeSeries,
+    [ChartDisplayType.ActionsLineGraphCumulative]: ChartDisplayCategory.CumulativeTimeSeries,
+    [ChartDisplayType.BoldNumber]: ChartDisplayCategory.TotalValue,
+    [ChartDisplayType.ActionsPie]: ChartDisplayCategory.TotalValue,
+    [ChartDisplayType.ActionsBarValue]: ChartDisplayCategory.TotalValue,
+    [ChartDisplayType.ActionsTable]: ChartDisplayCategory.TotalValue,
+    [ChartDisplayType.WorldMap]: ChartDisplayCategory.TotalValue,
+}
+export const NON_TIME_SERIES_DISPLAY_TYPES = Object.entries(DISPLAY_TYPES_TO_CATEGORIES)
+    .filter(([, category]) => category === ChartDisplayCategory.TotalValue)
+    .map(([displayType]) => displayType as ChartDisplayType)
 
-/** Display types which don't allow grouping by unit of time. Sync with backend NON_TIME_SERIES_DISPLAY_TYPES. */
-export const NON_TIME_SERIES_DISPLAY_TYPES = [
-    ChartDisplayType.ActionsTable,
-    ChartDisplayType.ActionsPie,
-    ChartDisplayType.ActionsBarValue,
-    ChartDisplayType.WorldMap,
-    ChartDisplayType.BoldNumber,
-]
 /** Display types for which `breakdown` is hidden and ignored. Sync with backend NON_BREAKDOWN_DISPLAY_TYPES. */
 export const NON_BREAKDOWN_DISPLAY_TYPES = [ChartDisplayType.BoldNumber]
 /** Display types which only work with a single series. */
@@ -149,7 +157,7 @@ export const FEATURE_FLAGS = {
     POSTHOG_3000_NAV: 'posthog-3000-nav', // owner: @Twixes
     HEDGEHOG_MODE: 'hedgehog-mode', // owner: @benjackwhite
     HEDGEHOG_MODE_DEBUG: 'hedgehog-mode-debug', // owner: @benjackwhite
-    GENERIC_SIGNUP_BENEFITS: 'generic-signup-benefits', // experiment, owner: @raquelmsmith
+    SIGNUP_BENEFITS: 'signup-benefits', // experiment, owner: @zlwaterfield
     WEB_ANALYTICS: 'web-analytics', // owner @robbie-c #team-web-analytics
     WEB_ANALYTICS_SAMPLING: 'web-analytics-sampling', // owner @robbie-c #team-web-analytics
     HIGH_FREQUENCY_BATCH_EXPORTS: 'high-frequency-batch-exports', // owner: @tomasfarias
diff --git a/frontend/src/lib/customers/airbus.svg b/frontend/src/lib/customers/airbus.svg
new file mode 100644
index 0000000000000..ff18cae1c8c0f
--- /dev/null
+++ b/frontend/src/lib/customers/airbus.svg
@@ -0,0 +1 @@
+<svg id="Calque_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 36" fill="currentColor"><path class="st0" d="M92.4 12.3C92.4 5.7 88.1.7 79.2.7H61.3v34.5h8.4v-27h9.5c3.5 0 4.8 2 4.8 4.3 0 2.4-1.3 4.3-4.8 4.3h-8.1l11.6 18.4h9.6s-7.9-12.4-7.8-12.4c4.8-1.1 7.9-4.5 7.9-10.5M47.3.7h8.4v34.5h-8.4zM20.4.7L2.8 35.3h9.5l2.8-5.8h14.2l-3.5-7.3h-7.1l5.2-10.6h.1l11.8 23.7h9.7L27.9.7zM123.1 17.3c2.7-1.5 4.1-3.8 4.1-7.3 0-5.6-4.2-9.3-11.1-9.3H96.4v34.5h20.4c7.1 0 11.8-3.8 11.8-9.7.1-4-2.2-7-5.5-8.2M104.8 8H116c1.7 0 3 1.3 3 3s-1.3 3-3 3h-11.2V8zm11.5 20h-11.5v-7h11.5c2 0 3.6 1.5 3.6 3.5s-1.6 3.5-3.6 3.5M155.2 20c0 5.2-2.4 8.1-7.2 8.1-4.7 0-7.1-2.9-7.1-8.1V.7h-8.6v18.7c0 10.7 5.6 16.6 15.8 16.6s15.8-5.9 15.8-16.6V.7h-8.6V20zM186.3 14.5c-8-1.9-9.7-2.1-9.7-4.4 0-1.8 2-2.6 5.4-2.6 4.5 0 9.2 1.1 11.9 2.8l2.7-7C193 1.3 188 0 182 0c-8.9 0-13.9 4.4-13.9 10.4 0 6.4 3.7 9 12.3 10.8 6.7 1.5 8.1 2.4 8.1 4.3 0 2-1.8 2.9-5.5 2.9-5.3 0-10-1.3-13.8-3.4l-2.6 7.4c4.2 2.2 10.4 3.6 16.6 3.6 8.7 0 13.9-4 13.9-10.8.1-5.5-3.4-9-10.8-10.7"/></svg>
\ No newline at end of file
diff --git a/frontend/src/lib/customers/hasura.svg b/frontend/src/lib/customers/hasura.svg
new file mode 100644
index 0000000000000..1eb0373ecf1f4
--- /dev/null
+++ b/frontend/src/lib/customers/hasura.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 174 51"><path d="M70.23 29.133h-3.366c-.528 0-.924-.463-.924-.925V17.572c0-.529-.461-.925-.923-.925h-2.903c-.528 0-.924.462-.924.925v26.887c0 .528.462.925.924.925h2.903c.528 0 .923-.463.923-.925V34.021c0-.528.462-.925.924-.925h3.365c.528 0 .924.463.924.925v10.504c0 .529.462.925.923.925h2.904c.527 0 .923-.463.923-.925V17.572c0-.529-.462-.925-.923-.925h-2.904c-.527 0-.923.462-.923.925v10.57c0 .528-.396.99-.924.99ZM85.144 17.44l-4.751 26.887c-.066.528.33 1.057.858 1.057h2.903c.462 0 .858-.33.858-.793l.791-4.889c.066-.462.462-.792.858-.792h3.695c.462 0 .858.33.858.793l.857 4.954c.066.463.462.793.858.793h3.035c.594 0 1.056-.529.858-1.123L91.873 17.44c-.066-.463-.462-.793-.857-.793h-4.949c-.462 0-.792.33-.923.793Zm4.42 17.44h-1.913c-.594 0-.924-.529-.858-1.057l.858-9.91c.198-1.056 1.65-1.056 1.781 0l.924 9.91c.132.529-.264 1.057-.792 1.057ZM109.879 28.736h-3.233c-.593 0-.923-.264-.923-.925v-6.21c0-.594.33-.925.923-.925h1.914c.594 0 .924.265.924.925v2.907c0 .529.461.925.923.925h3.035c.528 0 .924-.463.924-.925v-3.633c0-2.841-1.518-4.294-4.553-4.294h-4.354c-3.035 0-4.553 1.453-4.553 4.294v7.398c0 2.841 1.518 4.36 4.487 4.36h3.233c.594 0 .924.265.924.925v6.87c0 .595-.264.926-.924.926h-1.914c-.593 0-.923-.264-.923-.925v-2.907c0-.528-.462-.925-.924-.925h-3.035c-.528 0-.924.463-.924.925v3.634c0 2.84 1.518 4.294 4.553 4.294h4.288c3.036 0 4.553-1.454 4.553-4.294v-7.994c.066-2.973-1.517-4.426-4.421-4.426ZM127.904 40.43c0 .594-.264.924-.924.924h-2.573c-.594 0-.923-.264-.923-.925V17.572c0-.529-.462-.925-.924-.925h-3.035c-.528 0-.924.462-.924.925v23.452c0 2.84 1.518 4.294 4.553 4.294h4.948c3.035 0 4.553-1.454 4.553-4.294V17.572c0-.529-.462-.925-.924-.925h-2.837c-.528 0-.924.462-.924.925l-.066 22.857ZM151.787 29.727V20.94c0-2.84-1.517-4.294-4.552-4.294h-8.577c-.528 0-.924.463-.924.925v26.887c0 .529.462.925.924.925h2.903c.528 0 .923-.462.923-.925v-9.446c0-.529.462-.925.924-.925.33 0 .66.264.858.594l3.761 10.108c.198.33.527.594.857.594h3.167c.594 0 1.122-.594.858-1.189l-3.629-9.38c-.198-.463.066-.925.528-1.19 1.188-.66 1.979-2.048 1.979-3.897Zm-4.816-8.126v7.531c0 .595-.33.925-.924.925h-2.639c-.528 0-.924-.462-.924-.925v-7.53c0-.53.462-.926.924-.926h2.639c.594 0 .924.33.924.925ZM167.541 16.646h-4.948c-.462 0-.858.33-.858.793l-4.75 26.887c-.066.529.33 1.057.857 1.057h2.904c.461 0 .857-.33.857-.792l.792-4.889c.066-.462.462-.793.858-.793h3.695c.461 0 .857.33.857.793l.858 4.955c.066.462.462.792.858.792h3.035c.594 0 1.056-.528.858-1.123l-4.949-26.887c-.132-.462-.462-.793-.924-.793Zm-1.517 18.233h-1.782c-.593 0-.923-.528-.857-1.056l.857-9.05c.198-1.058 1.65-1.058 1.782 0l.924 9.05c.066.528-.33 1.056-.924 1.056ZM42.644 16.779c1.451-3.502 1.451-10.636-.462-16.12-.528-.99-1.98-.66-2.046.397v.396c-.33 5.22-2.243 8.06-5.08 9.447-.462.198-1.188.198-1.65-.132-3.364-2.114-7.323-3.37-11.612-3.37-4.288 0-8.247 1.256-11.612 3.37-.462.264-.99.33-1.452.132-2.903-1.057-4.882-4.228-5.212-9.513V.99C3.452-.067 1.934-.397 1.473.594-.441 6.143-.375 13.277 1.01 16.779c.725 1.717.725 3.7.132 5.483C.35 24.508-.045 27.018.02 29.529.285 41.023 10.05 50.8 21.531 50.999c12.14.132 22.036-9.645 22.036-21.8a21.83 21.83 0 0 0-1.121-6.937c-.594-1.784-.528-3.766.198-5.483Zm-21.114 29C12.69 45.583 5.431 38.382 5.3 29.53c-.199-9.447 7.455-17.11 16.824-16.912 8.841.132 16.099 7.399 16.23 16.251.199 9.38-7.455 17.044-16.824 16.912Z" fill="currentColor"/><path d="m24.372 27.414-3.893-6.011c-.594-.991-1.913-1.255-2.903-.66-.594.396-.99 1.056-.99 1.783 0 .396.132.793.33 1.123l2.64 4.096a.897.897 0 0 1-.067.99l-4.09 4.493a2.098 2.098 0 0 0 .132 2.973c.395.33.923.528 1.451.528.594 0 1.122-.264 1.518-.66l3.035-3.568c.264-.264.66-.264.857.066l2.178 3.105c.132.264.33.463.593.595.726.528 1.65.528 2.376.066.594-.397.99-1.057.99-1.784 0-.396-.133-.793-.33-1.123l-3.827-6.012Z" fill="currentColor"/></svg>
\ No newline at end of file
diff --git a/frontend/src/lib/customers/staples.svg b/frontend/src/lib/customers/staples.svg
new file mode 100644
index 0000000000000..0e1ff76715798
--- /dev/null
+++ b/frontend/src/lib/customers/staples.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 198 36"><g clip-path="url(#a)" fill="currentColor"><path d="M73.95 11.576c-3.023-.637-6.128-1.31-6.128-3.737 0-2.676 2.825-3.237 5.238-3.237 2.521.014 5.008.58 7.287 1.656l.217.106a.13.13 0 0 0 .17-.054l2.178-3.841a.127.127 0 0 0-.013-.148.129.129 0 0 0-.041-.032l-.233-.116C79.34.687 76.266 0 72.96 0c-6.422 0-10.572 3.104-10.572 7.914 0 5.54 4.653 7.263 9.675 8.298 3.163.652 6.226 1.297 6.226 3.824 0 2.73-3.038 3.311-5.628 3.311-2.738 0-5.483-.798-8.397-2.442l-.091-.053a.13.13 0 0 0-.145.008.13.13 0 0 0-.034.04L61.74 24.89a.13.13 0 0 0 .046.174l.094.056a22.202 22.202 0 0 0 10.791 2.868c7.031 0 11.063-2.912 11.063-7.99-.004-6.34-5.628-7.545-9.782-8.423ZM100.086 22.933a.117.117 0 0 0-.026-.045.134.134 0 0 0-.093-.044.132.132 0 0 0-.051.009l-.287.11c-1.126.434-1.903.62-3.528.62-1.886 0-3.112-1.016-3.112-2.587v-9.57h6.73a.129.129 0 0 0 .13-.13V7.426a.128.128 0 0 0-.128-.128h-6.724V2.25a.128.128 0 0 0-.129-.128h-4.927a.128.128 0 0 0-.128.13v5.042H83.79a.129.129 0 0 0-.129.13v3.88a.127.127 0 0 0 .08.121.13.13 0 0 0 .05.01h4.023v10.086c0 4.05 2.716 6.467 7.263 6.467 2.642 0 4.186-.548 5.795-1.21l.305-.131a.132.132 0 0 0 .066-.066.13.13 0 0 0 .004-.093l-1.162-3.556ZM44.326.569H6.348C2.75.569 0 3.485 0 7.079v20.254a.139.139 0 0 0 .139.139h4.91a.14.14 0 0 0 .14-.14V6.778h40.3v20.556a.138.138 0 0 0 .139.139h4.916a.14.14 0 0 0 .139-.14V7.08c0-3.594-2.744-6.51-6.357-6.51ZM123.102 23.695h-.781c-.965 0-1.477-.526-1.477-1.517v-8.013c0-4.967-2.698-7.388-8.277-7.388a20.695 20.695 0 0 0-8.923 1.863.128.128 0 0 0-.071.157l1.231 3.75a.117.117 0 0 0 .026.045.124.124 0 0 0 .042.031.134.134 0 0 0 .102.004c2.712-1.07 5.132-1.655 6.821-1.655 1.918 0 3.865.354 3.865 2.97v1.115s-.306.023-6.463.517c-6.157.495-7.056 4.795-7.056 6.538 0 3.46 2.756 5.879 6.703 5.879a11.26 11.26 0 0 0 7.498-2.717c.461.962 1.764 2.576 5.319 2.576h1.453a.132.132 0 0 0 .05-.009.123.123 0 0 0 .042-.028.123.123 0 0 0 .039-.091v-3.899a.136.136 0 0 0-.011-.053.131.131 0 0 0-.132-.075Zm-7.445-1.892c-2.282 1.612-3.905 2.277-5.572 2.277-1.735 0-2.905-.894-2.905-2.225 0-.565.066-2.34 2.53-2.655 2.463-.315 5.943-.753 5.943-.753l.004 3.356ZM189.815 15.246c-3.32-.582-4.959-.888-4.959-2.446 0-.925.439-2.149 4.03-2.149 2.213.002 4.39.56 6.329 1.623l.139.072a.132.132 0 0 0 .173-.05l1.926-3.335a.132.132 0 0 0 .011-.102.12.12 0 0 0-.026-.046.12.12 0 0 0-.041-.032l-.162-.079c-2.325-1.066-4.554-1.945-8.322-1.945-5.763 0-8.939 2.218-8.939 6.245 0 4.582 4.271 5.675 8.273 6.337 3.54.586 4.964 1.082 4.964 2.64 0 1.42-1.372 2.11-4.302 2.11-2.698 0-5.444-1.143-7.283-2.103l-.116-.056a.131.131 0 0 0-.17.054l-1.911 3.369a.12.12 0 0 0-.016.048.124.124 0 0 0 .027.097.12.12 0 0 0 .038.033l.115.062c3.009 1.554 6.225 2.376 9.316 2.376 6.032 0 9.091-2.126 9.091-6.32.002-4.572-4.046-5.679-8.185-6.403ZM136.877 6.778c-2.343 0-4.323.771-6.226 2.43V7.424a.125.125 0 0 0-.038-.09.127.127 0 0 0-.091-.038h-4.93a.132.132 0 0 0-.092.038.123.123 0 0 0-.037.092V35.87c0 .017.003.034.009.05.007.016.016.03.029.043a.124.124 0 0 0 .093.037h4.922a.132.132 0 0 0 .093-.037.136.136 0 0 0 .028-.042.12.12 0 0 0 .01-.05V25.629c1.812 1.503 4.08 2.363 6.226 2.363 5.504 0 9.339-4.36 9.339-10.605.004-5.95-4.099-10.608-9.335-10.608Zm-1.297 16.814c-1.801 0-3.32-.847-4.935-2.744v-7.105c1.66-1.777 3.19-2.568 4.935-2.568 3.31 0 5.448 2.438 5.448 6.209 0 3.712-2.19 6.208-5.448 6.208ZM154.074.569h-4.927a.13.13 0 0 0-.13.13v26.642c0 .072.058.13.13.13h4.927a.13.13 0 0 0 .131-.13V.7a.13.13 0 0 0-.131-.13ZM175.362 22.013a.132.132 0 0 0-.174-.05l-.168.091c-1.679.88-3.194 1.768-6.376 1.768-3.451 0-5.794-1.915-6.263-5.12h14.616a.129.129 0 0 0 .131-.129v-1.409c0-6.415-3.841-10.386-10.026-10.386-5.925 0-10.065 4.424-10.065 10.76 0 6.253 4.477 10.453 11.138 10.453 3.162.042 6.272-.799 8.98-2.427l.087-.056a.132.132 0 0 0 .056-.079.137.137 0 0 0-.014-.095l-1.922-3.321Zm-8.212-11.045c2.698 0 4.358 1.4 4.802 4.048h-9.546c.456-2.614 2.142-4.048 4.744-4.048Z"/></g><defs><clipPath id="a"><path fill="currentColor" d="M0 0h198v36H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/frontend/src/lib/customers/y-combinator.svg b/frontend/src/lib/customers/y-combinator.svg
new file mode 100644
index 0000000000000..1d19c5ff15d4a
--- /dev/null
+++ b/frontend/src/lib/customers/y-combinator.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 212 44"><path fill-rule="evenodd" clip-rule="evenodd" d="M0 0h43.862v44H0V0Zm12.867 10.707 7.603 14.226v9.24h2.924V25.08l7.603-14.373H27.78l-4.386 8.946c-.293.44-.585.88-.731 1.32-.084.338-.217.579-.342.806-.093.167-.181.328-.243.514-.073-.073-.11-.183-.146-.293-.037-.11-.073-.22-.146-.293-.074-.147-.11-.257-.147-.367a2.529 2.529 0 0 0-.146-.367v-.146l-.146-.147a2.881 2.881 0 0 1-.12-.28c-.048-.125-.082-.216-.172-.307-.147-.146-.293-.293-.293-.44l-4.386-8.946h-3.51Z" fill="currentColor"/><path d="M63.893 8.507c2.193 0 4.094.586 5.556 1.76l-1.462 1.76c-1.316-.88-2.632-1.467-4.24-1.467-2.486 0-4.386 1.32-5.41 3.813-.585 1.467-.877 3.374-.877 5.867 0 1.907.292 3.52.73 4.693 1.17 2.787 3.071 4.107 5.995 4.107 1.609 0 3.07-.44 4.387-1.467l1.462 1.907c-1.901 1.173-3.948 1.76-6.141 1.76-2.632 0-4.825-1.027-6.58-3.227-1.754-2.053-2.485-4.84-2.485-8.213 0-3.373.877-6.013 2.632-8.213 1.608-1.907 3.801-3.08 6.433-3.08ZM72.226 23.027c0-2.64.585-4.694 1.9-6.16 1.317-1.467 2.925-2.347 4.972-2.347 2.34 0 4.24.88 5.556 2.787 1.023 1.466 1.462 3.52 1.462 6.013 0 2.933-.877 5.28-2.486 6.747-1.17 1.026-2.631 1.613-4.386 1.613-2.193 0-3.801-.733-5.117-2.347-1.316-1.466-1.9-3.666-1.9-6.306Zm10.235-4.254c-.731-1.32-1.755-2.053-3.363-2.053s-2.632.587-3.363 1.76c-.585.88-.731 2.347-.731 4.253 0 2.494.292 4.254 1.023 5.28.731 1.027 1.755 1.614 3.217 1.614 1.755 0 2.924-.88 3.509-2.494.292-.88.439-2.053.439-3.52.146-2.2-.147-3.813-.731-4.84ZM90.795 19.067c0-1.614-.146-2.934-.585-3.96l2.486-.587c.438.733.584 1.613.584 2.347v.146c.585-.586 1.17-1.173 2.047-1.613 1.024-.587 1.9-.88 2.778-.88 1.316 0 2.486.587 3.217 1.613.146.294.438.734.585 1.027 1.754-1.76 3.362-2.64 5.117-2.64 1.169 0 2.193.44 2.924 1.173.731.88 1.17 1.907 1.17 3.08v12.174h-2.632V18.92c0-1.613-.731-2.347-2.047-2.347-.731 0-1.608.294-2.339.88-.293.294-.878.734-1.609 1.32l-.292.294v11.88h-2.778v-11.44c0-1.027-.146-1.76-.439-2.054-.438-.44-.877-.586-1.608-.586-1.17 0-2.485.733-4.094 2.2v12.026h-2.485V19.067ZM115.65 7.92l2.632-.587c.293 1.174.439 2.494.439 4.107v5.427c1.462-1.467 3.07-2.2 4.678-2.2 1.901 0 3.509.733 4.533 2.2 1.169 1.466 1.754 3.52 1.754 6.013 0 2.64-.585 4.693-1.754 6.307-1.17 1.613-2.778 2.346-4.679 2.346a5.15 5.15 0 0 1-2.485-.586c-.878-.44-1.462-.88-1.901-1.467-.146.733-.292 1.32-.439 1.76h-2.485c.292-.733.438-2.053.438-4.107v-15.4c-.146-1.76-.292-3.08-.731-3.813Zm4.24 9.973a4.457 4.457 0 0 0-1.169 1.174v8.36c1.023 1.32 2.339 1.906 3.947 1.906 1.316 0 2.34-.44 2.924-1.466.732-1.174 1.17-2.787 1.17-5.134 0-2.053-.292-3.52-1.023-4.4-.585-.88-1.609-1.32-3.071-1.32-.877-.146-1.9.147-2.778.88ZM133.487 9.973c0-.586.146-1.026.585-1.466.438-.44.877-.587 1.462-.587s1.023.147 1.462.587c.438.44.585.88.585 1.466 0 .587-.147 1.027-.585 1.467-.439.44-.877.587-1.462.587s-1.024-.147-1.462-.587c-.439-.44-.585-.88-.585-1.467Zm.585 21.12V14.96l2.631-.44v16.573h-2.631ZM142.406 19.067c0-1.174 0-1.907-.146-2.2 0-.44-.292-.88-.585-1.614l2.486-.733c.438.88.585 1.613.585 2.493 1.608-1.613 3.362-2.493 5.117-2.493.877 0 1.608.147 2.339.587.731.44 1.316 1.026 1.608 1.76.293.586.439 1.173.439 1.906v12.32h-2.485v-11c0-1.32-.147-2.2-.585-2.64a2.42 2.42 0 0 0-1.755-.733c-.585 0-1.462.293-2.339.733a8.525 8.525 0 0 0-2.193 1.614v12.026h-2.486V19.067ZM160.096 18.48l-1.316-1.76c2.193-1.467 4.387-2.2 6.726-2.2 2.339 0 3.801.88 4.532 2.493.293.587.293 1.467.293 2.787v.88l-.147 5.28v.733c0 .88 0 1.467.147 1.907.146.587.585 1.027 1.169 1.32l-1.316 1.76c-1.169-.44-1.9-1.173-2.193-2.347-1.462 1.467-3.07 2.2-4.678 2.2-1.609 0-2.924-.44-3.948-1.32-.877-.733-1.316-1.906-1.316-3.373 0-1.907.731-3.227 2.193-4.253 1.462-1.027 3.656-1.467 6.287-1.467h1.17v-1.173c0-1.32-.146-2.2-.585-2.494-.585-.586-1.17-.88-2.193-.88-.877 0-1.901.294-3.07.734-.439.293-1.024.733-1.755 1.173Zm7.749 8.653.146-4.253h-1.315c-2.34 0-3.802.44-4.679 1.32-.585.587-.877 1.467-.877 2.64 0 1.907.877 2.933 2.778 2.933 1.754-.146 3.07-1.026 3.947-2.64ZM178.665 14.96h4.094l-.731 2.053h-3.363v10.414c0 .88.147 1.466.439 1.906.292.294.877.587 1.608.587.585 0 1.17-.147 1.609-.293l.292 1.613c-.877.44-1.754.587-2.778.587-2.485 0-3.655-1.174-3.655-3.667V17.013h-2.193V14.96h2.047v-.293c0-.294.146-1.467.292-3.374v-.44l2.632-.586c-.293 1.76-.293 3.373-.293 4.693ZM185.392 23.027c0-2.64.584-4.694 1.9-6.16 1.17-1.467 2.924-2.347 4.971-2.347 2.34 0 4.24.88 5.556 2.787 1.024 1.466 1.462 3.52 1.462 6.013 0 2.933-.877 5.28-2.485 6.747-1.17 1.026-2.632 1.613-4.386 1.613-2.194 0-3.802-.733-5.118-2.347-1.169-1.466-1.9-3.666-1.9-6.306Zm10.38-4.254c-.731-1.32-1.754-2.053-3.362-2.053-1.609 0-2.632.587-3.363 1.76-.585.88-.731 2.347-.731 4.253 0 2.494.292 4.254 1.023 5.28.731 1.027 1.755 1.614 3.217 1.614 1.754 0 2.924-.88 3.509-2.494.292-.88.438-2.053.438-3.52 0-2.2-.292-3.813-.731-4.84ZM204.104 18.773c0-1.466-.146-2.64-.584-3.52l2.485-.733c.439.88.585 1.613.585 2.493v.294c1.316-1.76 2.778-2.64 4.532-2.64.293 0 .585 0 .878.146l-1.024 2.787c-.292-.147-.585-.147-.731-.147-.585 0-1.316.147-1.901.587-.584.44-1.169.88-1.462 1.467a5.493 5.493 0 0 0-.292 1.76v10.12h-2.486V18.773Z" fill="currentColor"/></svg>
\ No newline at end of file
diff --git a/frontend/src/lib/lemon-ui/LemonSelect/LemonSelect.tsx b/frontend/src/lib/lemon-ui/LemonSelect/LemonSelect.tsx
index 49e6c6c59190c..8e06a932310ab 100644
--- a/frontend/src/lib/lemon-ui/LemonSelect/LemonSelect.tsx
+++ b/frontend/src/lib/lemon-ui/LemonSelect/LemonSelect.tsx
@@ -154,6 +154,7 @@ export function LemonSelect<T extends string | number | boolean | null>({
                           }
                         : null
                 }
+                tooltip={activeLeaf?.tooltip}
                 {...buttonProps}
             >
                 <span className="flex flex-1">
diff --git a/frontend/src/mocks/handlers.ts b/frontend/src/mocks/handlers.ts
index 3b4d5c2577a7e..e155aa67cf805 100644
--- a/frontend/src/mocks/handlers.ts
+++ b/frontend/src/mocks/handlers.ts
@@ -10,6 +10,7 @@ import {
     MOCK_PERSON_PROPERTIES,
     MOCK_SECOND_ORGANIZATION_MEMBER,
 } from 'lib/api.mock'
+import { ResponseComposition, RestContext, RestRequest } from 'msw'
 
 import { getAvailableFeatures } from '~/mocks/features'
 import { SharingConfigurationType } from '~/types'
@@ -25,6 +26,19 @@ export const toPaginatedResponse = (results: any[]): typeof EMPTY_PAGINATED_RESP
     previous: null,
 })
 
+// this really returns MaybePromise<ResponseFunction<any>>
+// but MSW doesn't export MaybePromise 🤷
+function posthogCORSResponse(req: RestRequest, res: ResponseComposition, ctx: RestContext): any {
+    return res(
+        ctx.status(200),
+        ctx.json('ok'),
+        // some of our tests try to make requests via posthog-js e.g. userLogic calls identify
+        // they have to have CORS allowed, or they pass but print noise to the console
+        ctx.set('Access-Control-Allow-Origin', req.referrer.length ? req.referrer : 'http://localhost'),
+        ctx.set('Access-Control-Allow-Credentials', 'true')
+    )
+}
+
 export const defaultMocks: Mocks = {
     get: {
         '/api/projects/:team_id/activity_log/important_changes/': EMPTY_PAGINATED_RESPONSE,
@@ -108,12 +122,13 @@ export const defaultMocks: Mocks = {
         },
     },
     post: {
-        'https://us.i.posthog.com/e/': (): MockSignature => [200, 'ok'],
-        '/e/': (): MockSignature => [200, 'ok'],
-        'https://us.i.posthog.com/decide/': (): MockSignature => [200, 'ok'],
-        '/decide/': (): MockSignature => [200, 'ok'],
-        'https://us.i.posthog.com/engage/': (): MockSignature => [200, 'ok'],
+        'https://us.i.posthog.com/e/': (req, res, ctx): MockSignature => posthogCORSResponse(req, res, ctx),
+        '/e/': (req, res, ctx): MockSignature => posthogCORSResponse(req, res, ctx),
+        'https://us.i.posthog.com/decide/': (req, res, ctx): MockSignature => posthogCORSResponse(req, res, ctx),
+        '/decide/': (req, res, ctx): MockSignature => posthogCORSResponse(req, res, ctx),
+        'https://us.i.posthog.com/engage/': (req, res, ctx): MockSignature => posthogCORSResponse(req, res, ctx),
         '/api/projects/:team_id/insights/:insight_id/viewed/': (): MockSignature => [201, null],
+        'api/projects/:team_id/query': [200, { results: [] }],
     },
 }
 export const handlers = mocksToHandlers(defaultMocks)
diff --git a/frontend/src/models/personPropertiesModel.ts b/frontend/src/models/personPropertiesModel.ts
deleted file mode 100644
index f319095c3ba81..0000000000000
--- a/frontend/src/models/personPropertiesModel.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { connect, events, kea, key, listeners, path, props, selectors } from 'kea'
-import { loaders } from 'kea-loaders'
-import { combineUrl, router } from 'kea-router'
-import api from 'lib/api'
-import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
-import { FEATURE_FLAGS } from 'lib/constants'
-import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { dataWarehouseJoinsLogic } from 'scenes/data-warehouse/external/dataWarehouseJoinsLogic'
-import { teamLogic } from 'scenes/teamLogic'
-
-import { updateListOfPropertyDefinitions } from '~/models/propertyDefinitionsModel'
-import { PersonProperty, PropertyDefinition } from '~/types'
-
-import type { personPropertiesModelType } from './personPropertiesModelType'
-import { PersonPropertiesModelProps } from './types'
-
-const WHITELISTED = ['/insights', '/events', '/sessions', '/dashboard', '/person']
-
-export const personPropertiesModel = kea<personPropertiesModelType>([
-    props({} as PersonPropertiesModelProps),
-    path(['models', 'personPropertiesModel']),
-    key((props) => props.taxonomicFilterLogicKey),
-    connect({
-        values: [
-            teamLogic,
-            ['currentTeamId'],
-            dataWarehouseJoinsLogic,
-            ['columnsJoinedToPersons'],
-            featureFlagLogic,
-            ['featureFlags'],
-        ],
-    }),
-    loaders(({ values }) => ({
-        personProperties: [
-            [] as PersonProperty[],
-            {
-                loadPersonProperties: async () => {
-                    const url = combineUrl(`api/projects/${values.currentTeamId}/property_definitions`, {
-                        type: 'person',
-                        properties: values.propertyAllowList?.[TaxonomicFilterGroupType.PersonProperties]
-                            ? values.propertyAllowList[TaxonomicFilterGroupType.PersonProperties].join(',')
-                            : undefined,
-                    }).url
-                    return (await api.get(url)).results
-                },
-            },
-        ],
-    })),
-    listeners(() => ({
-        loadPersonPropertiesSuccess: ({ personProperties }) => {
-            updateListOfPropertyDefinitions(
-                personProperties as PropertyDefinition[],
-                TaxonomicFilterGroupType.PersonProperties
-            )
-        },
-    })),
-    selectors(() => ({
-        combinedPersonProperties: [
-            (s) => [s.personProperties, s.columnsJoinedToPersons, s.featureFlags],
-            (personProperties, columnsJoinedToPersons, featureFlags) => {
-                // Hack to make sure person properties only show data warehouse in specific instances for now
-                if (
-                    featureFlags[FEATURE_FLAGS.DATA_WAREHOUSE] &&
-                    WHITELISTED.some((path) => router.values.location.pathname.includes(path))
-                ) {
-                    return [...personProperties, ...columnsJoinedToPersons]
-                }
-                return [...personProperties]
-            },
-        ],
-        propertyAllowList: [
-            () => [(_, props) => props.propertyAllowList],
-            (propertyAllowList) => propertyAllowList as PersonPropertiesModelProps['propertyAllowList'],
-        ],
-    })),
-    events(({ actions }) => ({
-        afterMount: actions.loadPersonProperties,
-    })),
-])
diff --git a/frontend/src/models/propertyDefinitionsModel.ts b/frontend/src/models/propertyDefinitionsModel.ts
index b7bba27261714..338e60a5e956f 100644
--- a/frontend/src/models/propertyDefinitionsModel.ts
+++ b/frontend/src/models/propertyDefinitionsModel.ts
@@ -1,6 +1,6 @@
 import { actions, kea, listeners, path, reducers, selectors } from 'kea'
 import api, { ApiMethodOptions } from 'lib/api'
-import { TaxonomicFilterGroupType, TaxonomicFilterValue } from 'lib/components/TaxonomicFilter/types'
+import { TaxonomicFilterValue } from 'lib/components/TaxonomicFilter/types'
 import { dayjs } from 'lib/dayjs'
 import { captureTimeToSeeData } from 'lib/internalMetrics'
 import { colonDelimitedDuration } from 'lib/utils'
@@ -46,18 +46,6 @@ export const updatePropertyDefinitions = (propertyDefinitions: PropertyDefinitio
     propertyDefinitionsModel.findMounted()?.actions.updatePropertyDefinitions(propertyDefinitions)
 }
 
-export const updateListOfPropertyDefinitions = (
-    results: PropertyDefinition[],
-    groupType: TaxonomicFilterGroupType
-): void => {
-    const propertyDefinitions: PropertyDefinition[] = results
-    const apiType = groupType === TaxonomicFilterGroupType.PersonProperties ? 'person' : 'event'
-    const newPropertyDefinitions = Object.fromEntries(
-        propertyDefinitions.map((propertyDefinition) => [`${apiType}/${propertyDefinition.name}`, propertyDefinition])
-    )
-    updatePropertyDefinitions(newPropertyDefinitions)
-}
-
 export type PropValue = {
     id?: number
     name?: string | boolean
diff --git a/frontend/src/models/types.ts b/frontend/src/models/types.ts
deleted file mode 100644
index b3f4c22f60d4d..0000000000000
--- a/frontend/src/models/types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
-
-export interface PersonPropertiesModelProps {
-    propertyAllowList?: { [key in TaxonomicFilterGroupType]?: string[] } // only return properties in this list, currently only working for EventProperties and PersonProperties
-    taxonomicFilterLogicKey: string
-}
diff --git a/frontend/src/queries/nodes/DataNode/dataNodeLogic.queryCancellation.test.ts b/frontend/src/queries/nodes/DataNode/dataNodeLogic.queryCancellation.test.ts
index 55a417bdff91e..ead4227a3c793 100644
--- a/frontend/src/queries/nodes/DataNode/dataNodeLogic.queryCancellation.test.ts
+++ b/frontend/src/queries/nodes/DataNode/dataNodeLogic.queryCancellation.test.ts
@@ -39,6 +39,9 @@ describe('dataNodeLogic - query cancellation', () => {
                     )
                 },
             },
+            delete: {
+                '/api/projects/:team_id/query/uuid-first': [200, {}],
+            },
         })
     })
     afterEach(() => logic?.unmount())
diff --git a/frontend/src/queries/query.ts b/frontend/src/queries/query.ts
index f866b2f336d31..e2149303733b6 100644
--- a/frontend/src/queries/query.ts
+++ b/frontend/src/queries/query.ts
@@ -222,7 +222,7 @@ export async function query<N extends DataNode = DataNode>(
                 if (hogQLInsightsLiveCompareEnabled) {
                     const legacyFunction = (): any => {
                         try {
-                            return legacyUrl ? fetchLegacyUrl : fetchLegacyInsights
+                            return legacyUrl ? fetchLegacyUrl() : fetchLegacyInsights()
                         } catch (e) {
                             console.error('Error fetching legacy insights', e)
                         }
@@ -258,11 +258,17 @@ export async function query<N extends DataNode = DataNode>(
                         res2 = res2[0]?.people.map((n: any) => n.id)
                         res1 = res1.map((n: any) => n[0].id)
                         // Sort, since the order of the results is not guaranteed
+                        const bv = (v: any): string =>
+                            [null, 'null', 'none', '9007199254740990', 9007199254740990].includes(v)
+                                ? '$$_posthog_breakdown_null_$$'
+                                : ['Other', '9007199254740991', 9007199254740991].includes(v)
+                                ? '$$_posthog_breakdown_other_$$'
+                                : String(v)
                         res1.sort((a: any, b: any) =>
-                            (a.breakdown_value ?? a.label ?? a).localeCompare(b.breakdown_value ?? b.label ?? b)
+                            bv(a.breakdown_value ?? a.label ?? a).localeCompare(bv(b.breakdown_value ?? b.label ?? b))
                         )
                         res2.sort((a: any, b: any) =>
-                            (a.breakdown_value ?? a.label ?? a).localeCompare(b.breakdown_value ?? b.label ?? b)
+                            bv(a.breakdown_value ?? a.label ?? a).localeCompare(bv(b.breakdown_value ?? b.label ?? b))
                         )
                     }
 
diff --git a/frontend/src/queries/schema.json b/frontend/src/queries/schema.json
index 400ef8d1774e3..eeac4bb951269 100644
--- a/frontend/src/queries/schema.json
+++ b/frontend/src/queries/schema.json
@@ -501,14 +501,14 @@
         "ChartDisplayType": {
             "enum": [
                 "ActionsLineGraph",
-                "ActionsLineGraphCumulative",
+                "ActionsBar",
                 "ActionsAreaGraph",
-                "ActionsTable",
+                "ActionsLineGraphCumulative",
+                "BoldNumber",
                 "ActionsPie",
-                "ActionsBar",
                 "ActionsBarValue",
-                "WorldMap",
-                "BoldNumber"
+                "ActionsTable",
+                "WorldMap"
             ],
             "type": "string"
         },
@@ -3460,9 +3460,6 @@
                 "operator": {
                     "$ref": "#/definitions/PropertyOperator"
                 },
-                "table": {
-                    "type": "string"
-                },
                 "type": {
                     "const": "person",
                     "description": "Person properties",
diff --git a/frontend/src/queries/schema.ts b/frontend/src/queries/schema.ts
index 9bd04dd3c62a9..fc45ff6ecadcb 100644
--- a/frontend/src/queries/schema.ts
+++ b/frontend/src/queries/schema.ts
@@ -4,6 +4,7 @@ import {
     Breakdown,
     BreakdownKeyType,
     BreakdownType,
+    ChartDisplayCategory,
     ChartDisplayType,
     CountPerActorMathType,
     EventPropertyFilter,
@@ -26,6 +27,8 @@ import {
     TrendsFilterType,
 } from '~/types'
 
+export { ChartDisplayCategory }
+
 // Type alias for number to be reflected as integer in json-schema.
 /** @asType integer */
 type integer = number
diff --git a/frontend/src/scenes/authentication/signup/SignupContainer.tsx b/frontend/src/scenes/authentication/signup/SignupContainer.tsx
index 3113cde8b3702..0544f035d60a1 100644
--- a/frontend/src/scenes/authentication/signup/SignupContainer.tsx
+++ b/frontend/src/scenes/authentication/signup/SignupContainer.tsx
@@ -2,15 +2,21 @@ import { IconCheckCircle } from '@posthog/icons'
 import { useValues } from 'kea'
 import { router } from 'kea-router'
 import { BridgePage } from 'lib/components/BridgePage/BridgePage'
+import { CustomerLogo } from 'lib/components/CustomerLogo'
 import { CLOUD_HOSTNAMES, FEATURE_FLAGS } from 'lib/constants'
 import { Link } from 'lib/lemon-ui/Link'
-import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { featureFlagLogic, FeatureFlagsSet } from 'lib/logic/featureFlagLogic'
+import { ReactNode } from 'react'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { SceneExport } from 'scenes/sceneTypes'
 import { userLogic } from 'scenes/userLogic'
 
 import { Region } from '~/types'
 
+import airbus from '../../../lib/customers/airbus.svg'
+import hasura from '../../../lib/customers/hasura.svg'
+import staples from '../../../lib/customers/staples.svg'
+import yCombinator from '../../../lib/customers/y-combinator.svg'
 import { SignupForm } from './signupForm/SignupForm'
 
 export const scene: SceneExport = {
@@ -46,51 +52,82 @@ export function SignupContainer(): JSX.Element | null {
     ) : null
 }
 
+type ProductBenefit = {
+    benefit: string
+    description: string | ReactNode
+}
+
+const getProductBenefits = (featureFlags: FeatureFlagsSet): ProductBenefit[] => {
+    const signupBenefitsFlag = featureFlags[FEATURE_FLAGS.SIGNUP_BENEFITS]
+    switch (signupBenefitsFlag) {
+        case 'generic-language':
+            return [
+                {
+                    benefit: 'Free usage every month - even on paid plans',
+                    description: '1M free events, 5K free session recordings, and more. Every month. Forever.',
+                },
+                {
+                    benefit: 'Start collecting data immediately',
+                    description: 'Integrate with developer-friendly APIs or a low-code web snippet.',
+                },
+                {
+                    benefit: 'Join industry leaders that run on PostHog',
+                    description:
+                        'Airbus, Hasura, Y Combinator, Staples, and thousands more trust PostHog as their Product OS.',
+                },
+            ]
+        case 'logos':
+            return [
+                {
+                    benefit: '1M events free every month',
+                    description: 'Product analytics, feature flags, experiments, and more.',
+                },
+                {
+                    benefit: 'Start collecting events immediately',
+                    description: 'Integrate with developer-friendly APIs or use our easy autocapture script.',
+                },
+                {
+                    benefit: 'Join industry leaders that run on PostHog',
+                    description: (
+                        <div className="grid grid-cols-2 gap-2 mt-2">
+                            {[airbus, hasura, yCombinator, staples].map((company, i) => (
+                                <span key={i}>
+                                    <CustomerLogo image={company} alt={company} />
+                                </span>
+                            ))}
+                        </div>
+                    ),
+                },
+            ]
+        default:
+            return [
+                {
+                    benefit: 'Free for 1M events every month',
+                    description: 'Product analytics, feature flags, experiments, and more.',
+                },
+                {
+                    benefit: 'Start collecting events immediately',
+                    description: 'Integrate with developer-friendly APIs or use our easy autocapture script.',
+                },
+                {
+                    benefit: 'Join industry leaders that run on PostHog',
+                    description:
+                        'Airbus, Hasura, Y Combinator, Staples, and thousands more trust PostHog as their Product OS.',
+                },
+            ]
+    }
+}
+
 export function SignupLeftContainer(): JSX.Element {
     const { preflight } = useValues(preflightLogic)
     const { featureFlags } = useValues(featureFlagLogic)
 
-    const showGenericSignupBenefits: boolean = featureFlags[FEATURE_FLAGS.GENERIC_SIGNUP_BENEFITS] === 'test'
-
     const getRegionUrl = (region: string): string => {
         const { pathname, search, hash } = router.values.currentLocation
         return `https://${CLOUD_HOSTNAMES[region]}${pathname}${search}${hash}`
     }
 
-    const productBenefits: {
-        benefit: string
-        description: string
-    }[] = showGenericSignupBenefits
-        ? [
-              {
-                  benefit: 'Free usage every month - even on paid plans',
-                  description: '1M free events, 5K free session recordings, and more. Every month. Forever.',
-              },
-              {
-                  benefit: 'Start collecting data immediately',
-                  description: 'Integrate with developer-friendly APIs or low-code web snippet.',
-              },
-              {
-                  benefit: 'Join industry leaders that run on PostHog',
-                  description:
-                      'ClickHouse, Airbus, Hasura, Y Combinator, and thousands more trust PostHog as their Product OS.',
-              },
-          ]
-        : [
-              {
-                  benefit: 'Free for 1M events every month',
-                  description: 'Product analytics, feature flags, experiments, and more.',
-              },
-              {
-                  benefit: 'Start collecting events immediately',
-                  description: 'Integrate with developer-friendly APIs or use our easy autocapture script.',
-              },
-              {
-                  benefit: 'Join industry leaders that run on PostHog',
-                  description:
-                      'ClickHouse, Airbus, Hasura, Y Combinator, and thousands more trust PostHog as their Product OS.',
-              },
-          ]
+    const productBenefits = getProductBenefits(featureFlags)
 
     return (
         <>
diff --git a/frontend/src/scenes/data-management/events/DefinitionHeader.tsx b/frontend/src/scenes/data-management/events/DefinitionHeader.tsx
index 5dcbc8c3604d1..9ecf8b43ce2ed 100644
--- a/frontend/src/scenes/data-management/events/DefinitionHeader.tsx
+++ b/frontend/src/scenes/data-management/events/DefinitionHeader.tsx
@@ -1,4 +1,4 @@
-import { IconBadge, IconBolt, IconCursor, IconEye, IconLeave, IconList, IconLogomark, IconServer } from '@posthog/icons'
+import { IconBadge, IconBolt, IconCursor, IconEye, IconLeave, IconList, IconLogomark } from '@posthog/icons'
 import { PropertyKeyInfo } from 'lib/components/PropertyKeyInfo'
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 import { IconSelectAll } from 'lib/lemon-ui/icons'
@@ -24,14 +24,6 @@ export function getPropertyDefinitionIcon(definition: PropertyDefinition): JSX.E
             </Tooltip>
         )
     }
-    if (definition.table) {
-        return (
-            <Tooltip title="Linked column from data warehouse table">
-                <IconServer className="taxonomy-icon taxonomy-icon-muted" />
-            </Tooltip>
-        )
-    }
-
     return (
         <Tooltip title="Event property">
             <IconList className="taxonomy-icon taxonomy-icon-muted" />
diff --git a/frontend/src/scenes/data-warehouse/external/dataWarehouseJoinsLogic.ts b/frontend/src/scenes/data-warehouse/external/dataWarehouseJoinsLogic.ts
index 6c6a3af715664..b5f493b2d7f17 100644
--- a/frontend/src/scenes/data-warehouse/external/dataWarehouseJoinsLogic.ts
+++ b/frontend/src/scenes/data-warehouse/external/dataWarehouseJoinsLogic.ts
@@ -1,19 +1,13 @@
-import { afterMount, connect, kea, path, selectors } from 'kea'
+import { afterMount, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 import api from 'lib/api'
-import { capitalizeFirstLetter } from 'lib/utils'
 
-import { DatabaseSchemaQueryResponseField } from '~/queries/schema'
-import { DataWarehouseViewLink, PropertyDefinition, PropertyType } from '~/types'
+import { DataWarehouseViewLink } from '~/types'
 
 import type { dataWarehouseJoinsLogicType } from './dataWarehouseJoinsLogicType'
-import { dataWarehouseSceneLogic } from './dataWarehouseSceneLogic'
 
 export const dataWarehouseJoinsLogic = kea<dataWarehouseJoinsLogicType>([
     path(['scenes', 'data-warehouse', 'external', 'dataWarehouseJoinsLogic']),
-    connect(() => ({
-        values: [dataWarehouseSceneLogic, ['externalTablesMap']],
-    })),
     loaders({
         joins: [
             [] as DataWarehouseViewLink[],
@@ -25,40 +19,6 @@ export const dataWarehouseJoinsLogic = kea<dataWarehouseJoinsLogicType>([
             },
         ],
     }),
-    selectors({
-        personTableJoins: [(s) => [s.joins], (joins) => joins.filter((join) => join.source_table_name === 'persons')],
-        tablesJoinedToPersons: [
-            (s) => [s.externalTablesMap, s.personTableJoins],
-            (externalTablesMap, personTableJoins) => {
-                return personTableJoins.map((join: DataWarehouseViewLink) => {
-                    // valid join should have a joining table name
-                    const table = externalTablesMap[join.joining_table_name as string]
-                    return {
-                        table,
-                        join,
-                    }
-                })
-            },
-        ],
-        columnsJoinedToPersons: [
-            (s) => [s.tablesJoinedToPersons],
-            (tablesJoinedToPersons) => {
-                return tablesJoinedToPersons.reduce((acc, { table, join }) => {
-                    if (table) {
-                        acc.push(
-                            ...table.columns.map((column: DatabaseSchemaQueryResponseField) => ({
-                                id: column.key,
-                                name: join.field_name + ': ' + column.key,
-                                table: join.field_name,
-                                property_type: capitalizeFirstLetter(column.type) as PropertyType,
-                            }))
-                        )
-                    }
-                    return acc
-                }, [] as PropertyDefinition[])
-            },
-        ],
-    }),
     afterMount(({ actions }) => {
         actions.loadJoins()
     }),
diff --git a/frontend/src/scenes/funnels/funnelCorrelationFeedbackLogic.test.ts b/frontend/src/scenes/funnels/funnelCorrelationFeedbackLogic.test.ts
index b88946646be5c..0ac26e5540b5e 100644
--- a/frontend/src/scenes/funnels/funnelCorrelationFeedbackLogic.test.ts
+++ b/frontend/src/scenes/funnels/funnelCorrelationFeedbackLogic.test.ts
@@ -1,6 +1,7 @@
 import { expectLogic } from 'kea-test-utils'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import posthog from 'posthog-js'
+import { teamLogic } from 'scenes/teamLogic'
 
 import { useAvailableFeatures } from '~/mocks/features'
 import { initKeaTests } from '~/test/init'
@@ -14,6 +15,7 @@ describe('funnelCorrelationFeedbackLogic', () => {
     beforeEach(() => {
         useAvailableFeatures([AvailableFeature.CORRELATION_ANALYSIS])
         initKeaTests(false)
+        teamLogic.mount()
     })
 
     const defaultProps: InsightLogicProps = {
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.tsx b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.tsx
index b27d271f53d24..8ebb237640060 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.tsx
+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilter.tsx
@@ -7,13 +7,22 @@ import { IconPlusSmall } from '@posthog/icons'
 import clsx from 'clsx'
 import { BindLogic, useActions, useValues } from 'kea'
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
+import { DISPLAY_TYPES_TO_CATEGORIES as DISPLAY_TYPES_TO_CATEGORY } from 'lib/constants'
 import { LemonButton, LemonButtonProps } from 'lib/lemon-ui/LemonButton'
 import { verticalSortableListCollisionDetection } from 'lib/sortable'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import React, { useEffect } from 'react'
 import { RenameModal } from 'scenes/insights/filters/ActionFilter/RenameModal'
+import { isTrendsFilter } from 'scenes/insights/sharedUtils'
 
-import { ActionFilter as ActionFilterType, FilterType, FunnelExclusionLegacy, InsightType, Optional } from '~/types'
+import {
+    ActionFilter as ActionFilterType,
+    ChartDisplayType,
+    FilterType,
+    FunnelExclusionLegacy,
+    InsightType,
+    Optional,
+} from '~/types'
 
 import { teamLogic } from '../../../teamLogic'
 import { ActionFilterRow, MathAvailability } from './ActionFilterRow/ActionFilterRow'
@@ -147,6 +156,9 @@ export const ActionFilter = React.forwardRef<HTMLDivElement, ActionFilterProps>(
         mathAvailability,
         customRowSuffix,
         hasBreakdown: !!filters.breakdown,
+        trendsDisplayCategory: isTrendsFilter(filters)
+            ? DISPLAY_TYPES_TO_CATEGORY[filters.display || ChartDisplayType.ActionsLineGraph]
+            : null,
         actionsTaxonomicGroupTypes,
         propertiesTaxonomicGroupTypes,
         propertyFiltersPopover,
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx
index bca5a483baf48..0cb3eaeb086b3 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx
+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow.tsx
@@ -3,7 +3,7 @@ import './ActionFilterRow.scss'
 import { DraggableSyntheticListeners } from '@dnd-kit/core'
 import { useSortable } from '@dnd-kit/sortable'
 import { CSS } from '@dnd-kit/utilities'
-import { IconCopy, IconFilter, IconPencil, IconTrash } from '@posthog/icons'
+import { IconCopy, IconFilter, IconPencil, IconTrash, IconWarning } from '@posthog/icons'
 import { LemonSelect, LemonSelectOption, LemonSelectOptions } from '@posthog/lemon-ui'
 import { BuiltLogic, useActions, useValues } from 'kea'
 import { EntityFilterInfo } from 'lib/components/EntityFilterInfo'
@@ -39,6 +39,7 @@ import {
     ActionFilter,
     ActionFilter as ActionFilterType,
     BaseMathType,
+    ChartDisplayCategory,
     CountPerActorMathType,
     EntityType,
     EntityTypes,
@@ -115,6 +116,7 @@ export interface ActionFilterRowProps {
         renameRowButton,
         deleteButton,
     }: Record<string, JSX.Element | string | undefined>) => JSX.Element // build your own row given these components
+    trendsDisplayCategory: ChartDisplayCategory | null
 }
 
 export function ActionFilterRow({
@@ -142,6 +144,7 @@ export function ActionFilterRow({
     disabled = false,
     readOnly = false,
     renderRow,
+    trendsDisplayCategory,
 }: ActionFilterRowProps): JSX.Element {
     const { entityFilterVisible } = useValues(logic)
     const {
@@ -377,6 +380,7 @@ export function ActionFilterRow({
                                         disabled={readOnly}
                                         style={{ maxWidth: '100%', width: 'initial' }}
                                         mathAvailability={mathAvailability}
+                                        trendsDisplayCategory={trendsDisplayCategory}
                                     />
                                     {mathDefinitions[math || BaseMathType.TotalCount]?.category ===
                                         MathCategory.PropertyValue && (
@@ -514,6 +518,7 @@ interface MathSelectorProps {
     disabled?: boolean
     disabledReason?: string
     onMathSelect: (index: number, value: any) => any
+    trendsDisplayCategory: ChartDisplayCategory | null
     style?: React.CSSProperties
 }
 
@@ -525,11 +530,14 @@ function isCountPerActorMath(math: string | undefined): math is CountPerActorMat
     return !!math && math in COUNT_PER_ACTOR_MATH_DEFINITIONS
 }
 
+const TRAILING_MATH_TYPES = new Set<string>([BaseMathType.WeeklyActiveUsers, BaseMathType.MonthlyActiveUsers])
+
 function useMathSelectorOptions({
     math,
     index,
     mathAvailability,
     onMathSelect,
+    trendsDisplayCategory,
 }: MathSelectorProps): LemonSelectOptions<string> {
     const mountedInsightDataLogic = insightDataLogic.findMounted()
     const query = mountedInsightDataLogic?.values?.query
@@ -550,19 +558,33 @@ function useMathSelectorOptions({
         mathAvailability != MathAvailability.ActorsOnly ? staticMathDefinitions : staticActorsOnlyMathDefinitions
     )
         .filter(([key]) => {
-            if (!isStickiness) {
-                return true
+            if (isStickiness) {
+                // Remove WAU and MAU from stickiness insights
+                return !TRAILING_MATH_TYPES.has(key)
+            }
+            return true
+        })
+        .map(([key, definition]) => {
+            const shouldWarnAboutTrailingMath =
+                TRAILING_MATH_TYPES.has(key) && trendsDisplayCategory === ChartDisplayCategory.TotalValue
+            return {
+                value: key,
+                icon: shouldWarnAboutTrailingMath ? <IconWarning /> : undefined,
+                label: definition.name,
+                tooltip: !shouldWarnAboutTrailingMath ? (
+                    definition.description
+                ) : (
+                    <>
+                        <p>{definition.description}</p>
+                        <i>
+                            In total value insights, it's usually not clear what date range "{definition.name}" refers
+                            to. For full clarity, we recommend using "Unique users" here instead.
+                        </i>
+                    </>
+                ),
+                'data-attr': `math-${key}-${index}`,
             }
-
-            // Remove WAU and MAU from stickiness insights
-            return key !== BaseMathType.WeeklyActiveUsers && key !== BaseMathType.MonthlyActiveUsers
         })
-        .map(([key, definition]) => ({
-            value: key,
-            label: definition.name,
-            tooltip: definition.description,
-            'data-attr': `math-${key}-${index}`,
-        }))
 
     if (mathAvailability !== MathAvailability.ActorsOnly) {
         options.splice(1, 0, {
@@ -580,7 +602,6 @@ function useMathSelectorOptions({
                         options={Object.entries(COUNT_PER_ACTOR_MATH_DEFINITIONS).map(([key, definition]) => ({
                             value: key,
                             label: definition.shortName,
-                            tooltip: definition.description,
                             'data-attr': `math-${key}-${index}`,
                         }))}
                         onClick={(e) => e.stopPropagation()}
diff --git a/frontend/src/scenes/insights/insightVizDataLogic.test.ts b/frontend/src/scenes/insights/insightVizDataLogic.test.ts
index d1de2cd7b8af5..a0a535c7e1686 100644
--- a/frontend/src/scenes/insights/insightVizDataLogic.test.ts
+++ b/frontend/src/scenes/insights/insightVizDataLogic.test.ts
@@ -23,6 +23,7 @@ describe('insightVizDataLogic', () => {
         useMocks({
             get: {
                 '/api/projects/:team_id/insights/trend': [],
+                '/api/projects/:team_id/insights/': { results: [{}] },
             },
         })
         initKeaTests()
diff --git a/frontend/src/scenes/notebooks/Nodes/utils.test.tsx b/frontend/src/scenes/notebooks/Nodes/utils.test.tsx
index af46f229b2cd8..09cfe7c1ceebd 100644
--- a/frontend/src/scenes/notebooks/Nodes/utils.test.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/utils.test.tsx
@@ -1,6 +1,6 @@
 import { NodeViewProps } from '@tiptap/core'
 import { useSyncedAttributes } from './utils'
-import { renderHook, act } from '@testing-library/react-hooks'
+import { renderHook, act } from '@testing-library/react'
 
 describe('notebook node utils', () => {
     jest.useFakeTimers()
diff --git a/frontend/src/scenes/paths/pathsDataLogic.test.ts b/frontend/src/scenes/paths/pathsDataLogic.test.ts
index 99e97de3b031f..e22ec58c79aae 100644
--- a/frontend/src/scenes/paths/pathsDataLogic.test.ts
+++ b/frontend/src/scenes/paths/pathsDataLogic.test.ts
@@ -1,6 +1,7 @@
 import { expectLogic } from 'kea-test-utils'
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 import { pathsDataLogic } from 'scenes/paths/pathsDataLogic'
+import { teamLogic } from 'scenes/teamLogic'
 
 import { initKeaTests } from '~/test/init'
 import { InsightLogicProps, InsightType, PathType } from '~/types'
@@ -25,6 +26,7 @@ async function initPathsDataLogic(): Promise<void> {
 describe('pathsDataLogic', () => {
     beforeEach(async () => {
         initKeaTests(false)
+        teamLogic.mount()
         await initPathsDataLogic()
     })
 
diff --git a/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx b/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx
index 8442cdd4a28aa..5741c225a66a0 100644
--- a/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx
+++ b/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx
@@ -1,7 +1,8 @@
-import { LemonButton, LemonDivider, LemonTabs, LemonTag, LemonTagType, Link } from '@posthog/lemon-ui'
+import { LemonButton, LemonDivider, LemonTabs, LemonTag, LemonTagType } from '@posthog/lemon-ui'
 import clsx from 'clsx'
 import { CodeSnippet, Language } from 'lib/components/CodeSnippet'
 import { Dayjs, dayjs } from 'lib/dayjs'
+import { Link } from 'lib/lemon-ui/Link'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { humanFriendlyMilliseconds, humanizeBytes, isURL } from 'lib/utils'
 import { Fragment, useState } from 'react'
diff --git a/frontend/src/scenes/session-recordings/player/inspector/playerInspectorLogic.test.ts b/frontend/src/scenes/session-recordings/player/inspector/playerInspectorLogic.test.ts
index 236cc3b5b8dc5..4f0bf12fc81cd 100644
--- a/frontend/src/scenes/session-recordings/player/inspector/playerInspectorLogic.test.ts
+++ b/frontend/src/scenes/session-recordings/player/inspector/playerInspectorLogic.test.ts
@@ -2,6 +2,7 @@ import { expectLogic } from 'kea-test-utils'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { playerInspectorLogic } from 'scenes/session-recordings/player/inspector/playerInspectorLogic'
 
+import { useMocks } from '~/mocks/jest'
 import { initKeaTests } from '~/test/init'
 
 const playerLogicProps = { sessionRecordingId: '1', playerKey: 'playlist' }
@@ -10,6 +11,11 @@ describe('playerInspectorLogic', () => {
     let logic: ReturnType<typeof playerInspectorLogic.build>
 
     beforeEach(() => {
+        useMocks({
+            get: {
+                'api/projects/:team_id/session_recordings/1/': {},
+            },
+        })
         initKeaTests()
         featureFlagLogic.mount()
         logic = playerInspectorLogic(playerLogicProps)
diff --git a/frontend/src/scenes/session-recordings/playlist/sessionRecordingsPlaylistLogic.test.ts b/frontend/src/scenes/session-recordings/playlist/sessionRecordingsPlaylistLogic.test.ts
index ccbc8d962f1da..4e5002f5dabf7 100644
--- a/frontend/src/scenes/session-recordings/playlist/sessionRecordingsPlaylistLogic.test.ts
+++ b/frontend/src/scenes/session-recordings/playlist/sessionRecordingsPlaylistLogic.test.ts
@@ -29,6 +29,8 @@ describe('sessionRecordingsPlaylistLogic', () => {
                     ],
                 },
 
+                'api/projects/:team/property_definitions/seen_together': { $pageview: true },
+
                 '/api/projects/:team/session_recordings': (req) => {
                     const { searchParams } = req.url
                     if (
diff --git a/frontend/src/scenes/trends/persons-modal/peronsModalLogic.test.ts b/frontend/src/scenes/trends/persons-modal/peronsModalLogic.test.ts
index 70958019ed94c..f2666ba43f58f 100644
--- a/frontend/src/scenes/trends/persons-modal/peronsModalLogic.test.ts
+++ b/frontend/src/scenes/trends/persons-modal/peronsModalLogic.test.ts
@@ -1,5 +1,6 @@
 import { expectLogic } from 'kea-test-utils'
 
+import { useMocks } from '~/mocks/jest'
 import { initKeaTests } from '~/test/init'
 
 import { personsModalLogic } from './personsModalLogic'
@@ -8,6 +9,11 @@ describe('personsModalLogic', () => {
     let logic: ReturnType<typeof personsModalLogic.build>
 
     beforeEach(() => {
+        useMocks({
+            get: {
+                'api/projects/:team_id/persons/trends': {},
+            },
+        })
         initKeaTests()
     })
 
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index 131598f9a79d2..a583fe34c26d2 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -672,7 +672,6 @@ export interface EventPropertyFilter extends BasePropertyFilter {
 export interface PersonPropertyFilter extends BasePropertyFilter {
     type: PropertyFilterType.Person
     operator: PropertyOperator
-    table?: string
 }
 
 export interface DataWarehousePropertyFilter extends BasePropertyFilter {
@@ -1838,14 +1837,19 @@ export interface DatedAnnotationType extends Omit<AnnotationType, 'date_marker'>
 
 export enum ChartDisplayType {
     ActionsLineGraph = 'ActionsLineGraph',
-    ActionsLineGraphCumulative = 'ActionsLineGraphCumulative',
+    ActionsBar = 'ActionsBar',
     ActionsAreaGraph = 'ActionsAreaGraph',
-    ActionsTable = 'ActionsTable',
+    ActionsLineGraphCumulative = 'ActionsLineGraphCumulative',
+    BoldNumber = 'BoldNumber',
     ActionsPie = 'ActionsPie',
-    ActionsBar = 'ActionsBar',
     ActionsBarValue = 'ActionsBarValue',
+    ActionsTable = 'ActionsTable',
     WorldMap = 'WorldMap',
-    BoldNumber = 'BoldNumber',
+}
+export enum ChartDisplayCategory {
+    TimeSeries = 'TimeSeries',
+    CumulativeTimeSeries = 'CumulativeTimeSeries',
+    TotalValue = 'TotalValue',
 }
 
 export type BreakdownType = 'cohort' | 'person' | 'event' | 'group' | 'session' | 'hogql' | 'data_warehouse'
@@ -2808,9 +2812,6 @@ export interface PropertyDefinition {
     verified?: boolean
     verified_at?: string
     verified_by?: string
-
-    // For Data warehouse person properties
-    table?: string
 }
 
 export enum PropertyDefinitionState {
@@ -2823,10 +2824,9 @@ export enum PropertyDefinitionState {
 export type Definition = EventDefinition | PropertyDefinition
 
 export interface PersonProperty {
-    id: string | number
+    id: number
     name: string
     count: number
-    table?: string
 }
 
 export type GroupTypeIndex = 0 | 1 | 2 | 3 | 4
diff --git a/plugin-server/src/main/ingestion-queues/session-recording/utils.ts b/plugin-server/src/main/ingestion-queues/session-recording/utils.ts
index 53ce953e5bd92..2c5637726743e 100644
--- a/plugin-server/src/main/ingestion-queues/session-recording/utils.ts
+++ b/plugin-server/src/main/ingestion-queues/session-recording/utils.ts
@@ -255,38 +255,34 @@ export const reduceRecordingMessages = (messages: IncomingRecordingMessage[]): I
     const reducedMessages: Record<string, IncomingRecordingMessage> = {}
 
     for (const message of messages) {
-        const clonedMessage = cloneObject(message)
-        const key = `${clonedMessage.team_id}-${clonedMessage.session_id}`
+        const key = `${message.team_id}-${message.session_id}`
         if (!reducedMessages[key]) {
-            reducedMessages[key] = clonedMessage
+            reducedMessages[key] = cloneObject(message)
         } else {
             const existingMessage = reducedMessages[key]
-            for (const [windowId, events] of Object.entries(clonedMessage.eventsByWindowId)) {
+            for (const [windowId, events] of Object.entries(message.eventsByWindowId)) {
                 if (existingMessage.eventsByWindowId[windowId]) {
                     existingMessage.eventsByWindowId[windowId].push(...events)
                 } else {
                     existingMessage.eventsByWindowId[windowId] = events
                 }
             }
-            existingMessage.metadata.rawSize += clonedMessage.metadata.rawSize
+            existingMessage.metadata.rawSize += message.metadata.rawSize
 
             // Update the events ranges
             existingMessage.metadata.lowOffset = Math.min(
                 existingMessage.metadata.lowOffset,
-                clonedMessage.metadata.lowOffset
+                message.metadata.lowOffset
             )
 
             existingMessage.metadata.highOffset = Math.max(
                 existingMessage.metadata.highOffset,
-                clonedMessage.metadata.highOffset
+                message.metadata.highOffset
             )
 
             // Update the events ranges
-            existingMessage.eventsRange.start = Math.min(
-                existingMessage.eventsRange.start,
-                clonedMessage.eventsRange.start
-            )
-            existingMessage.eventsRange.end = Math.max(existingMessage.eventsRange.end, clonedMessage.eventsRange.end)
+            existingMessage.eventsRange.start = Math.min(existingMessage.eventsRange.start, message.eventsRange.start)
+            existingMessage.eventsRange.end = Math.max(existingMessage.eventsRange.end, message.eventsRange.end)
         }
     }
 
diff --git a/plugin-server/src/types.ts b/plugin-server/src/types.ts
index 114547cfe605f..d70238307eaac 100644
--- a/plugin-server/src/types.ts
+++ b/plugin-server/src/types.ts
@@ -868,7 +868,6 @@ export interface EventPropertyFilter extends PropertyFilterWithOperator {
 /** Sync with posthog/frontend/src/types.ts */
 export interface PersonPropertyFilter extends PropertyFilterWithOperator {
     type: 'person'
-    table?: string
 }
 
 /** Sync with posthog/frontend/src/types.ts */
diff --git a/posthog/hogql/database/schema/channel_type.py b/posthog/hogql/database/schema/channel_type.py
index 4954cc5be2b29..1552a0e6aa6d4 100644
--- a/posthog/hogql/database/schema/channel_type.py
+++ b/posthog/hogql/database/schema/channel_type.py
@@ -63,7 +63,10 @@ def create_channel_type_expr(
     gad_source: ast.Expr,
 ) -> ast.Expr:
     def wrap_with_null_if_empty(expr: ast.Expr) -> ast.Expr:
-        return ast.Call(name="nullIf", args=[expr, ast.Constant(value="")])
+        return ast.Call(
+            name="nullIf",
+            args=[ast.Call(name="nullIf", args=[expr, ast.Constant(value="")]), ast.Constant(value="null")],
+        )
 
     return parse_expr(
         """
diff --git a/posthog/hogql/database/schema/test/test_channel_type.py b/posthog/hogql/database/schema/test/test_channel_type.py
index 10cd4ea4ae009..97dba3e13ba38 100644
--- a/posthog/hogql/database/schema/test/test_channel_type.py
+++ b/posthog/hogql/database/schema/test/test_channel_type.py
@@ -121,6 +121,21 @@ def test_direct_empty_string(self):
             ),
         )
 
+    def test_direct_null_string(self):
+        self.assertEqual(
+            "Direct",
+            self._get_initial_channel_type(
+                {
+                    "$initial_referring_domain": "$direct",
+                    "$initial_utm_source": "null",
+                    "$initial_utm_medium": "null",
+                    "$initial_utm_campaign": "null",
+                    "$initial_gclid": "null",
+                    "$initial_gad_source": "null",
+                }
+            ),
+        )
+
     def test_cross_network(self):
         self.assertEqual(
             "Cross Network",
diff --git a/posthog/hogql/property.py b/posthog/hogql/property.py
index ba9f92443b4e8..98019cdaa54b7 100644
--- a/posthog/hogql/property.py
+++ b/posthog/hogql/property.py
@@ -147,10 +147,7 @@ def property_to_expr(
         value = property.value
 
         if property.type == "person" and scope != "person":
-            if property.table:
-                chain = ["person", property.table]
-            else:
-                chain = ["person", "properties"]
+            chain = ["person", "properties"]
         elif property.type == "group":
             chain = [f"group_{property.group_type_index}", "properties"]
         elif property.type == "data_warehouse":
diff --git a/posthog/models/property/property.py b/posthog/models/property/property.py
index 4bd44646ec4a9..d0e0f94439cf5 100644
--- a/posthog/models/property/property.py
+++ b/posthog/models/property/property.py
@@ -202,7 +202,6 @@ class Property:
     total_periods: Optional[int]
     min_periods: Optional[int]
     negation: Optional[bool] = False
-    table: Optional[str]
     _data: Dict
 
     def __init__(
@@ -225,7 +224,6 @@ def __init__(
         seq_time_value: Optional[int] = None,
         seq_time_interval: Optional[OperatorInterval] = None,
         negation: Optional[bool] = None,
-        table: Optional[str] = None,
         **kwargs,
     ) -> None:
         self.key = key
@@ -243,7 +241,6 @@ def __init__(
         self.seq_time_value = seq_time_value
         self.seq_time_interval = seq_time_interval
         self.negation = None if negation is None else str_to_bool(negation)
-        self.table = table
 
         if value is None and self.operator in ["is_set", "is_not_set"]:
             self.value = self.operator
diff --git a/posthog/schema.py b/posthog/schema.py
index 9d83587351683..17ad11fc4f236 100644
--- a/posthog/schema.py
+++ b/posthog/schema.py
@@ -121,14 +121,14 @@ class ChartAxis(BaseModel):
 
 class ChartDisplayType(str, Enum):
     ActionsLineGraph = "ActionsLineGraph"
-    ActionsLineGraphCumulative = "ActionsLineGraphCumulative"
+    ActionsBar = "ActionsBar"
     ActionsAreaGraph = "ActionsAreaGraph"
-    ActionsTable = "ActionsTable"
+    ActionsLineGraphCumulative = "ActionsLineGraphCumulative"
+    BoldNumber = "BoldNumber"
     ActionsPie = "ActionsPie"
-    ActionsBar = "ActionsBar"
     ActionsBarValue = "ActionsBarValue"
+    ActionsTable = "ActionsTable"
     WorldMap = "WorldMap"
-    BoldNumber = "BoldNumber"
 
 
 class CohortPropertyFilter(BaseModel):
@@ -1369,7 +1369,6 @@ class PersonPropertyFilter(BaseModel):
     key: str
     label: Optional[str] = None
     operator: PropertyOperator
-    table: Optional[str] = None
     type: Literal["person"] = Field(default="person", description="Person properties")
     value: Optional[Union[str, float, List[Union[str, float]]]] = None