diff --git a/cypress/e2e/surveys.cy.ts b/cypress/e2e/surveys.cy.ts
index 17805c09a8684..641f9b7a9a2b3 100644
--- a/cypress/e2e/surveys.cy.ts
+++ b/cypress/e2e/surveys.cy.ts
@@ -165,4 +165,58 @@ describe('Surveys', () => {
         cy.get('[data-attr=delete-survey]').click()
         cy.get('.Toastify__toast-body').contains('Survey deleted').should('be.visible')
     })
+
+    it('creates a new multiple choice survey with an open-ended choice', () => {
+        cy.get('h1').should('contain', 'Surveys')
+        cy.get('[data-attr=new-survey]').click()
+        cy.get('[data-attr=new-blank-survey]').click()
+
+        // add a multiple choice question with an open-ended question
+        cy.get('[data-attr=survey-name]').focus().type(name).should('have.value', name)
+        cy.get('[data-attr="survey-question-type-0"]').click()
+        cy.contains('Multiple choice select').click()
+        cy.get('button').contains('Add open-ended choice').click()
+
+        // check default open-ended choice form input and appearance after
+        // open-ended choice was added
+        cy.get('.LemonInput__input[value="Other"]')
+        cy.get('.choice-option').eq(3).contains('Other:')
+        cy.get('.choice-option').eq(3).find('input[type="text"]').should('have.value', '')
+
+        // typing in open-ended question's appearance automatically checks the
+        // checkbox
+        cy.get('.choice-option').eq(3).find('input[type="checkbox"]').should('not.be.checked')
+        cy.get('.choice-option').eq(3).find('input[type="text"]').type('Outreach')
+        cy.get('.choice-option').eq(3).find('input[type="checkbox"]').should('be.checked')
+
+        // clicking on open-ended question's appearance label unchecks or checks
+        // the checkbox
+        cy.get('.choice-option').eq(3).click()
+        cy.get('.choice-option').eq(3).find('input[type="checkbox"]').should('not.be.checked')
+        cy.get('.choice-option').eq(3).click()
+        cy.get('.choice-option').eq(3).find('input[type="checkbox"]').should('be.checked')
+
+        // removing text in open-ended question's appearance automatically
+        // unchecks the checkbox
+        cy.get('.choice-option').eq(3).find('input[type="text"]').clear()
+
+        // open-ended question label doesn't change even if appearance input
+        // changes
+        cy.get('.LemonInput__input[value="Other"]')
+
+        // change open-ended choice after the label was added
+        cy.contains('Choices').parent().find('input[type="text"]').eq(3).clear()
+        cy.contains('Choices').parent().find('input[type="text"]').eq(3).type('First Choice')
+        cy.get('.choice-option').eq(3).contains('First Choice:')
+
+        // attempt to create and save survey
+        cy.get('[data-attr=save-survey]').first().click()
+
+        // after save there should be a launch button
+        cy.get('button[data-attr="launch-survey"]').should('have.text', 'Launch')
+
+        cy.clickNavMenu('surveys')
+        cy.get('[data-attr=surveys-table]').should('contain', name)
+        cy.get(`[data-row-key="${name}"]`).contains(name).click()
+    })
 })
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index b2ce0bb71285c..ce2feaa10d600 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -33,6 +33,7 @@ beforeEach(() => {
                 'surveys-new-creation-flow': true,
                 'surveys-results-visualizations': true,
                 'auto-redirect': true,
+                'surveys-open-choice': true,
                 notebooks: true,
             })
         )
diff --git a/frontend/__snapshots__/components-compact-list--compact-list.png b/frontend/__snapshots__/components-compact-list--compact-list.png
index 4a4b5e8704410..49cbfb2048571 100644
Binary files a/frontend/__snapshots__/components-compact-list--compact-list.png and b/frontend/__snapshots__/components-compact-list--compact-list.png differ
diff --git a/frontend/__snapshots__/exporter-exporter--trends-number-insight.png b/frontend/__snapshots__/exporter-exporter--trends-number-insight.png
index e661eaa4de199..67b2a70ddeb75 100644
Binary files a/frontend/__snapshots__/exporter-exporter--trends-number-insight.png and b/frontend/__snapshots__/exporter-exporter--trends-number-insight.png differ
diff --git a/frontend/__snapshots__/lemon-ui-textfit--basic.png b/frontend/__snapshots__/lemon-ui-textfit--basic.png
new file mode 100644
index 0000000000000..269bfc9cfad86
Binary files /dev/null and b/frontend/__snapshots__/lemon-ui-textfit--basic.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png b/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png
index bf6d08b1cb083..cb3513e97394d 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png and b/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png b/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png
index 87cd957353f8c..d42c385e3c023 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png and b/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png differ
diff --git a/frontend/__snapshots__/scenes-app-feature-flags--edit-multi-variate-feature-flag.png b/frontend/__snapshots__/scenes-app-feature-flags--edit-multi-variate-feature-flag.png
index 45cc7c6c7b4d5..4638e3c252629 100644
Binary files a/frontend/__snapshots__/scenes-app-feature-flags--edit-multi-variate-feature-flag.png and b/frontend/__snapshots__/scenes-app-feature-flags--edit-multi-variate-feature-flag.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-number--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-number--webkit.png
index a4feb23317dd1..2615d368706cd 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-number--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-number--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-number-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-number-edit--webkit.png
index a34e6e1d5e272..635203fb3d413 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-number-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-number-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-number-edit.png b/frontend/__snapshots__/scenes-app-insights--trends-number-edit.png
index d9cf620c1a161..6924135553179 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-number-edit.png and b/frontend/__snapshots__/scenes-app-insights--trends-number-edit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-number.png b/frontend/__snapshots__/scenes-app-insights--trends-number.png
index 03b2456ee4782..693dd022b93e9 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-number.png and b/frontend/__snapshots__/scenes-app-insights--trends-number.png differ
diff --git a/frontend/__snapshots__/scenes-app-project-homepage--project-homepage.png b/frontend/__snapshots__/scenes-app-project-homepage--project-homepage.png
index 5850c12954b74..84eb120b096bf 100644
Binary files a/frontend/__snapshots__/scenes-app-project-homepage--project-homepage.png and b/frontend/__snapshots__/scenes-app-project-homepage--project-homepage.png differ
diff --git a/frontend/__snapshots__/scenes-app-saved-insights--list-view.png b/frontend/__snapshots__/scenes-app-saved-insights--list-view.png
index ae911ef6d0319..8bfe21cb3985b 100644
Binary files a/frontend/__snapshots__/scenes-app-saved-insights--list-view.png and b/frontend/__snapshots__/scenes-app-saved-insights--list-view.png differ
diff --git a/frontend/src/layout/navigation-3000/Navigation.scss b/frontend/src/layout/navigation-3000/Navigation.scss
index cccca30bc0e4b..74236f4e9a7fc 100644
--- a/frontend/src/layout/navigation-3000/Navigation.scss
+++ b/frontend/src/layout/navigation-3000/Navigation.scss
@@ -57,14 +57,9 @@
         z-index: var(--z-main-nav);
 
         .LemonButton {
-            min-height: 2.25rem !important; // Reduce minimum height
-
-            > span {
+            .LemonButton__chrome {
                 padding: 0.25rem !important;
-            }
-
-            .LemonButton__content {
-                font-size: 0.813rem;
+                font-size: 0.8125rem;
             }
         }
 
@@ -77,7 +72,7 @@
         }
 
         li + li {
-            margin-top: 0.25rem;
+            margin-top: -1px;
         }
     }
 }
diff --git a/frontend/src/layout/navigation-3000/components/Breadcrumbs.scss b/frontend/src/layout/navigation-3000/components/Breadcrumbs.scss
index 0cf4e5a260384..51124686f5429 100644
--- a/frontend/src/layout/navigation-3000/components/Breadcrumbs.scss
+++ b/frontend/src/layout/navigation-3000/components/Breadcrumbs.scss
@@ -37,7 +37,7 @@
 
 .Breadcrumbs3000__crumbs {
     height: 1rem;
-    margin-top: 0.25rem;
+    margin-top: calc(0.25rem * (1 - var(--breadcrumbs-compaction-rate)));
     display: flex;
     align-items: center;
     overflow: visible;
diff --git a/frontend/src/layout/navigation-3000/components/Navbar.tsx b/frontend/src/layout/navigation-3000/components/Navbar.tsx
index 33f73e869b6fa..c620d0c9b927f 100644
--- a/frontend/src/layout/navigation-3000/components/Navbar.tsx
+++ b/frontend/src/layout/navigation-3000/components/Navbar.tsx
@@ -3,7 +3,6 @@ import { LemonBadge } from '@posthog/lemon-ui'
 import { useActions, useValues } from 'kea'
 import { commandBarLogic } from 'lib/components/CommandBar/commandBarLogic'
 import { Resizer } from 'lib/components/Resizer/Resizer'
-import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
 import { Popover } from 'lib/lemon-ui/Popover'
 import { ProfilePicture } from 'lib/lemon-ui/ProfilePicture'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
@@ -14,7 +13,6 @@ import { userLogic } from 'scenes/userLogic'
 
 import { navigationLogic } from '~/layout/navigation/navigationLogic'
 import { SitePopoverOverlay } from '~/layout/navigation/TopBar/SitePopover'
-import { KeyboardShortcut } from '~/layout/navigation-3000/components/KeyboardShortcut'
 
 import { navigation3000Logic } from '../navigationLogic'
 import { themeLogic } from '../themeLogic'
@@ -47,7 +45,6 @@ export function Navbar(): JSX.Element {
     const { toggleSearchBar } = useActions(commandBarLogic)
 
     const containerRef = useRef<HTMLDivElement | null>(null)
-    const isUsingNewNav = useFeatureFlag('POSTHOG_3000_NAV')
 
     return (
         <nav className="Navbar3000" ref={containerRef}>
@@ -89,15 +86,7 @@ export function Navbar(): JSX.Element {
                             icon={<IconSearch />}
                             title="Search"
                             onClick={toggleSearchBar}
-                            sideIcon={
-                                !isUsingNewNav ? (
-                                    <span className="text-xs">
-                                        <KeyboardShortcut shift k />
-                                    </span>
-                                ) : (
-                                    <></>
-                                )
-                            }
+                            keyboardShortcut={{ command: true, k: true }}
                         />
                         <NavbarButton
                             icon={<ThemeIcon />}
diff --git a/frontend/src/layout/navigation-3000/components/NavbarButton.tsx b/frontend/src/layout/navigation-3000/components/NavbarButton.tsx
index 04536b853e6d3..51996b0419c3f 100644
--- a/frontend/src/layout/navigation-3000/components/NavbarButton.tsx
+++ b/frontend/src/layout/navigation-3000/components/NavbarButton.tsx
@@ -10,11 +10,11 @@ import { sceneLogic } from 'scenes/sceneLogic'
 import { SidebarChangeNoticeContent, useSidebarChangeNotices } from '~/layout/navigation/SideBar/SidebarChangeNotice'
 
 import { navigation3000Logic } from '../navigationLogic'
+import { KeyboardShortcut, KeyboardShortcutProps } from './KeyboardShortcut'
 
 export interface NavbarButtonProps {
     identifier: string
     icon: ReactElement
-    sideIcon?: ReactElement
     title?: string
     shortTitle?: string
     tag?: 'alpha' | 'beta'
@@ -22,94 +22,107 @@ export interface NavbarButtonProps {
     to?: string
     persistentTooltip?: boolean
     active?: boolean
+    keyboardShortcut?: KeyboardShortcutProps
 }
 
 export const NavbarButton: FunctionComponent<NavbarButtonProps> = React.forwardRef<
     HTMLButtonElement,
     NavbarButtonProps
->(({ identifier, shortTitle, title, tag, onClick, persistentTooltip, ...buttonProps }, ref): JSX.Element => {
-    const { aliasedActiveScene } = useValues(sceneLogic)
-    const { isNavCollapsed } = useValues(navigation3000Logic)
-    const isUsingNewNav = useFeatureFlag('POSTHOG_3000_NAV')
+>(
+    (
+        { identifier, shortTitle, title, tag, onClick, persistentTooltip, keyboardShortcut, ...buttonProps },
+        ref
+    ): JSX.Element => {
+        const { aliasedActiveScene } = useValues(sceneLogic)
+        const { isNavCollapsed } = useValues(navigation3000Logic)
+        const isUsingNewNav = useFeatureFlag('POSTHOG_3000_NAV')
 
-    const [hasBeenClicked, setHasBeenClicked] = useState(false)
+        const [hasBeenClicked, setHasBeenClicked] = useState(false)
 
-    const here = aliasedActiveScene === identifier
-    const isNavCollapsedActually = isNavCollapsed || isUsingNewNav
+        const here = aliasedActiveScene === identifier
+        const isNavCollapsedActually = isNavCollapsed || isUsingNewNav
 
-    if (!isUsingNewNav) {
-        buttonProps.active = here
-    }
+        if (!isUsingNewNav) {
+            buttonProps.active = here
+        }
 
-    let content: JSX.Element | string | undefined
-    if (!isNavCollapsedActually) {
-        content = shortTitle || title
-        if (tag) {
-            if (tag === 'alpha') {
-                content = (
-                    <>
-                        <span className="grow">{content}</span>
-                        <LemonTag type="completion" size="small" className="ml-2">
-                            ALPHA
-                        </LemonTag>
-                    </>
-                )
-            } else if (tag === 'beta') {
-                content = (
-                    <>
-                        <span className="grow">{content}</span>
-                        <LemonTag type="warning" size="small" className="ml-2">
-                            BETA
-                        </LemonTag>
-                    </>
-                )
+        let content: JSX.Element | string | undefined
+        if (!isNavCollapsedActually) {
+            content = shortTitle || title
+            if (tag) {
+                if (tag === 'alpha') {
+                    content = (
+                        <>
+                            <span className="grow">{content}</span>
+                            <LemonTag type="completion" size="small" className="ml-2">
+                                ALPHA
+                            </LemonTag>
+                        </>
+                    )
+                } else if (tag === 'beta') {
+                    content = (
+                        <>
+                            <span className="grow">{content}</span>
+                            <LemonTag type="warning" size="small" className="ml-2">
+                                BETA
+                            </LemonTag>
+                        </>
+                    )
+                }
             }
         }
-    }
 
-    const buttonContent = (
-        <LemonButton
-            ref={ref}
-            data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
-            onMouseEnter={() => setHasBeenClicked(false)}
-            onClick={() => {
-                setHasBeenClicked(true)
-                onClick?.()
-            }}
-            className={clsx('NavbarButton', isUsingNewNav && here && 'NavbarButton--here')}
-            fullWidth
-            type="secondary"
-            stealth={true}
-            {...buttonProps}
-        >
-            {content}
-        </LemonButton>
-    )
+        const buttonContent = (
+            <LemonButton
+                ref={ref}
+                data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
+                onMouseEnter={() => setHasBeenClicked(false)}
+                onClick={() => {
+                    setHasBeenClicked(true)
+                    onClick?.()
+                }}
+                className={clsx('NavbarButton', isUsingNewNav && here && 'NavbarButton--here')}
+                fullWidth
+                type="secondary"
+                stealth={true}
+                sideIcon={
+                    !isNavCollapsedActually && keyboardShortcut ? (
+                        <span className="text-xs">
+                            <KeyboardShortcut {...keyboardShortcut} />
+                        </span>
+                    ) : null
+                }
+                {...buttonProps}
+            >
+                {content}
+            </LemonButton>
+        )
 
-    const [notices, onAcknowledged] = useSidebarChangeNotices({ identifier })
+        const [notices, onAcknowledged] = useSidebarChangeNotices({ identifier })
 
-    return (
-        <li className="w-full">
-            {notices.length ? (
-                <Tooltip
-                    title={<SidebarChangeNoticeContent notices={notices} onAcknowledged={onAcknowledged} />}
-                    placement={notices[0].placement ?? 'right'}
-                    delayMs={0}
-                    visible={true}
-                >
-                    {buttonContent}
-                </Tooltip>
-            ) : (
-                <Tooltip
-                    title={isNavCollapsedActually ? (here ? `${title} (you are here)` : title) : null}
-                    placement="right"
-                    delayMs={0}
-                    visible={!persistentTooltip && hasBeenClicked ? false : undefined} // Force-hide tooltip after button click
-                >
-                    {buttonContent}
-                </Tooltip>
-            )}
-        </li>
-    )
-})
+        return (
+            <li className="w-full">
+                {notices.length ? (
+                    <Tooltip
+                        title={<SidebarChangeNoticeContent notices={notices} onAcknowledged={onAcknowledged} />}
+                        placement={notices[0].placement ?? 'right'}
+                        delayMs={0}
+                        visible={true}
+                    >
+                        {buttonContent}
+                    </Tooltip>
+                ) : (
+                    <Tooltip
+                        title={isNavCollapsedActually ? (here ? `${title} (you are here)` : title) : null}
+                        placement="right"
+                        delayMs={0}
+                        visible={!persistentTooltip && hasBeenClicked ? false : undefined} // Force-hide tooltip after button click
+                    >
+                        {buttonContent}
+                    </Tooltip>
+                )}
+            </li>
+        )
+    }
+)
 NavbarButton.displayName = 'NavbarButton'
diff --git a/frontend/src/lib/components/CompactList/CompactList.scss b/frontend/src/lib/components/CompactList/CompactList.scss
index 930ea6f17b1b1..5c0e76c6093a3 100644
--- a/frontend/src/lib/components/CompactList/CompactList.scss
+++ b/frontend/src/lib/components/CompactList/CompactList.scss
@@ -1,7 +1,7 @@
 .compact-list {
     border-radius: var(--radius);
     border: 1px solid var(--border);
-    height: calc(19.5rem + 1px);
+    height: calc(19.25rem);
     background: var(--bg-light);
     box-sizing: content-box;
     display: flex;
@@ -22,23 +22,13 @@
         }
     }
 
-    .spacer-container {
-        padding: 0 1rem;
-    }
-
     .scrollable-list {
         flex: 1;
-        overflow: auto auto;
-        padding: 0 0.5rem 0.5rem;
+        overflow: auto;
+        padding: 0 0.5rem;
     }
 
     .LemonButton {
         font-family: var(--font-sans) !important;
     }
-
-    .secondary-text {
-        .posthog-3000 & {
-            color: var(--text-secondary);
-        }
-    }
 }
diff --git a/frontend/src/lib/components/CompactList/CompactList.tsx b/frontend/src/lib/components/CompactList/CompactList.tsx
index 630d88cc4596d..eaa3f392c1013 100644
--- a/frontend/src/lib/components/CompactList/CompactList.tsx
+++ b/frontend/src/lib/components/CompactList/CompactList.tsx
@@ -29,7 +29,7 @@ export function CompactList({
                 <h3>{title}</h3>
                 {viewAllURL && <LemonButton to={viewAllURL}>View all</LemonButton>}
             </div>
-            <div className="spacer-container">
+            <div className="mx-2">
                 <LemonDivider />
             </div>
             <div className="scrollable-list">
diff --git a/frontend/src/lib/components/PageHeader.tsx b/frontend/src/lib/components/PageHeader.tsx
index bf9215aac778f..365b00def6c2a 100644
--- a/frontend/src/lib/components/PageHeader.tsx
+++ b/frontend/src/lib/components/PageHeader.tsx
@@ -1,9 +1,8 @@
 import clsx from 'clsx'
 import { useValues } from 'kea'
-import { FEATURE_FLAGS } from 'lib/constants'
 import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
+import { Within3000PageHeaderContext } from 'lib/lemon-ui/LemonButton/LemonButton'
 import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
-import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { createPortal } from 'react-dom'
 import { DraggableToNotebook, DraggableToNotebookProps } from 'scenes/notebooks/AddToNotebook/DraggableToNotebook'
 
@@ -32,13 +31,9 @@ export function PageHeader({
 }: PageHeaderProps): JSX.Element | null {
     const is3000 = useFeatureFlag('POSTHOG_3000')
     const { actionsContainer } = useValues(breadcrumbsLogic)
-    const { featureFlags } = useValues(featureFlagLogic)
-
-    const has3000 = featureFlags[FEATURE_FLAGS.POSTHOG_3000]
 
     return (
         <>
-            {}
             {(!is3000 || description) && (
                 <div className="page-title-row flex justify-between" style={style}>
                     <div className="min-w-0">
@@ -55,10 +50,18 @@ export function PageHeader({
                     {!is3000 && <div className="page-buttons">{buttons}</div>}
                 </div>
             )}
-            {is3000 && buttons && actionsContainer && createPortal(buttons, actionsContainer)}
+            {is3000 &&
+                buttons &&
+                actionsContainer &&
+                createPortal(
+                    <Within3000PageHeaderContext.Provider value={is3000}>
+                        {buttons}
+                    </Within3000PageHeaderContext.Provider>,
+                    actionsContainer
+                )}
 
             {caption && <div className={clsx('page-caption', tabbedPage && 'tabbed')}>{caption}</div>}
-            {delimited && <LemonDivider className={has3000 ? 'hidden' : 'my-4'} />}
+            {delimited && <LemonDivider className={is3000 ? 'hidden' : 'my-4'} />}
         </>
     )
 }
diff --git a/frontend/src/lib/constants.tsx b/frontend/src/lib/constants.tsx
index 69c5a65aaa2f8..e49b8f3f9387b 100644
--- a/frontend/src/lib/constants.tsx
+++ b/frontend/src/lib/constants.tsx
@@ -178,6 +178,7 @@ export const FEATURE_FLAGS = {
     NETWORK_PAYLOAD_CAPTURE: 'network-payload-capture', // owner: #team-monitoring
     FEATURE_FLAG_COHORT_CREATION: 'feature-flag-cohort-creation', // owner: @neilkakkar #team-feature-success
     INSIGHT_HORIZONTAL_CONTROLS: 'insight-horizontal-controls', // owner: @benjackwhite
+    SURVEYS_OPEN_CHOICE: 'surveys-open-choice', // owner: @ssoonmi, #team-feature-success
 } as const
 export type FeatureFlagKey = (typeof FEATURE_FLAGS)[keyof typeof FEATURE_FLAGS]
 
diff --git a/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss b/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss
index 3165f8c8d6fb6..2a23964cfc0f9 100644
--- a/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss
+++ b/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss
@@ -102,8 +102,7 @@
         }
     }
 
-    &.LemonButton--small,
-    .Breadcrumbs3000 & {
+    &.LemonButton--small {
         gap: 0.25rem;
 
         > span {
diff --git a/frontend/src/lib/lemon-ui/LemonButton/LemonButton.tsx b/frontend/src/lib/lemon-ui/LemonButton/LemonButton.tsx
index d15b256a41f2c..087f10ea8558f 100644
--- a/frontend/src/lib/lemon-ui/LemonButton/LemonButton.tsx
+++ b/frontend/src/lib/lemon-ui/LemonButton/LemonButton.tsx
@@ -111,6 +111,7 @@ export const LemonButton: React.FunctionComponent<LemonButtonProps & React.RefAt
             ref
         ): JSX.Element => {
             const [popoverVisibility, popoverPlacement] = useContext(PopoverReferenceContext) || [false, null]
+            const within3000PageHeader = useContext(Within3000PageHeaderContext)
 
             if (!active && popoverVisibility) {
                 active = true
@@ -129,6 +130,9 @@ export const LemonButton: React.FunctionComponent<LemonButtonProps & React.RefAt
                 icon = <Spinner textColored />
                 disabled = true // Cannot interact with a loading button
             }
+            if (within3000PageHeader) {
+                size = 'small'
+            }
 
             let tooltipContent: TooltipProps['title']
             if (disabledReason) {
@@ -186,7 +190,7 @@ export const LemonButton: React.FunctionComponent<LemonButtonProps & React.RefAt
                     {...linkDependentProps}
                     {...buttonProps}
                 >
-                    <span>
+                    <span className="LemonButton__chrome">
                         {icon ? <span className="LemonButton__icon">{icon}</span> : null}
                         {children ? <span className="LemonButton__content">{children}</span> : null}
                         {sideIcon ? <span className="LemonButton__icon">{sideIcon}</span> : null}
@@ -212,6 +216,8 @@ export const LemonButton: React.FunctionComponent<LemonButtonProps & React.RefAt
     )
 LemonButton.displayName = 'LemonButton'
 
+export const Within3000PageHeaderContext = React.createContext<boolean>(false)
+
 export type SideAction = Pick<
     LemonButtonProps,
     'onClick' | 'to' | 'disabled' | 'icon' | 'type' | 'tooltip' | 'data-attr' | 'aria-label' | 'status' | 'targetBlank'
diff --git a/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss b/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss
index 59778e361760e..70fa6ad667194 100644
--- a/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss
+++ b/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss
@@ -6,7 +6,7 @@
         border-width: 0;
         border-style: solid;
         border-color: transparent;
-        min-height: 2em;
+        min-height: 2.125rem;
         padding: 0;
         position: relative;
         outline: none;
@@ -14,7 +14,7 @@
         border-radius: 6px;
         cursor: pointer;
 
-        > span {
+        .LemonButton__chrome {
             border-radius: 6px;
             font-size: 0.875rem;
             display: flex;
@@ -23,13 +23,12 @@
             align-items: center;
             justify-content: flex-start;
             background: none;
-            border-width: 1px;
             border-style: solid;
             border-color: transparent;
             font-weight: 500;
             gap: 0.5rem;
             line-height: 1.5rem;
-            min-height: 2em;
+            min-height: 2.125rem;
             position: relative;
             text-align: left;
             transition: var(--transition);
@@ -41,48 +40,53 @@
             }
         }
 
+        &.LemonButton--full-width {
+            .LemonButton__chrome {
+                padding-left: 0.5rem;
+                padding-right: 0.5rem;
+            }
+        }
+
         &.LemonButton--xsmall {
             min-height: 1.5rem;
             padding-left: 0;
+            font-size: 0.8125rem;
 
-            > span {
+            .LemonButton__chrome {
                 min-height: 1.5rem;
                 padding: 0.125rem 0.375rem;
             }
 
-            &.LemonButton--has-icon:not(.LemonButton--no-padding),
-            &.LemonButton--no-content:not(.LemonButton--no-padding) {
-                > span {
+            &.LemonButton--has-icon:not(.LemonButton--no-content, .LemonButton--no-padding) {
+                .LemonButton__chrome {
                     padding-left: 0.25rem;
                 }
             }
 
-            &.LemonButton--has-side-icon:not(.LemonButton--no-padding),
-            &.LemonButton--no-content:not(.LemonButton--no-padding) {
-                > span {
+            &.LemonButton--has-side-icon:not(.LemonButton--no-content, .LemonButton--no-padding) {
+                .LemonButton__chrome {
                     padding-right: 0.25rem;
                 }
             }
         }
 
         &.LemonButton--small {
-            min-height: 1.8rem;
+            min-height: 1.75rem;
+            font-size: 0.8125rem;
 
-            > span {
-                min-height: 1.8rem;
+            .LemonButton__chrome {
+                min-height: 1.75rem;
                 padding: 0.25rem 0.5rem;
             }
 
-            &.LemonButton--has-icon:not(.LemonButton--no-padding),
-            &.LemonButton--no-content:not(.LemonButton--no-padding) {
-                > span {
+            &.LemonButton--has-icon:not(.LemonButton--no-content, .LemonButton--no-padding) {
+                .LemonButton__chrome {
                     padding-left: 0.375rem;
                 }
             }
 
-            &.LemonButton--has-side-icon:not(.LemonButton--no-padding),
-            &.LemonButton--no-content:not(.LemonButton--no-padding) {
-                > span {
+            &.LemonButton--has-side-icon:not(.LemonButton--no-content, .LemonButton--no-padding) {
+                .LemonButton__chrome {
                     padding-right: 0.375rem;
                 }
             }
@@ -91,26 +95,24 @@
         &.LemonButton--large {
             min-height: 2.5rem;
 
-            > span {
+            .LemonButton__chrome {
                 gap: 0.75rem;
                 min-height: 2.5rem;
                 padding: 0.5rem 1rem;
             }
 
-            &.LemonButton--has-icon:not(.LemonButton--no-padding),
-            &.LemonButton--no-content:not(.LemonButton--no-padding) {
+            &.LemonButton--has-icon:not(.LemonButton--no-content, .LemonButton--no-padding) {
                 padding-left: 0;
 
-                > span {
+                .LemonButton__chrome {
                     padding-left: 0.75rem;
                 }
             }
 
-            &.LemonButton--has-side-icon:not(.LemonButton--no-padding),
-            &.LemonButton--no-content:not(.LemonButton--no-padding) {
+            &.LemonButton--has-side-icon:not(.LemonButton--no-content, .LemonButton--no-padding) {
                 padding-right: 0;
 
-                > span {
+                .LemonButton__chrome {
                     padding-right: 0.75rem;
                 }
             }
@@ -120,7 +122,7 @@
             padding: 0;
             min-height: 0;
 
-            > span {
+            .LemonButton__chrome {
                 padding: 0;
                 min-height: 0;
             }
@@ -130,20 +132,21 @@
             border-width: 1px;
             padding-bottom: 1px;
 
-            > span {
+            .LemonButton__chrome {
+                border-width: 1px;
                 margin: 0 -1px;
                 top: -1px;
             }
 
             &:not([aria-disabled='true']):hover,
             &.LemonButton--active {
-                > span {
+                .LemonButton__chrome {
                     top: -1.5px;
                 }
             }
 
             &:not([aria-disabled='true']):active {
-                > span {
+                .LemonButton__chrome {
                     top: -0.5px;
                 }
             }
@@ -153,7 +156,7 @@
             background: var(--primary-3000-frame-bg);
             border-color: var(--primary-3000-frame-border);
 
-            > span {
+            .LemonButton__chrome {
                 background: var(--primary-3000-button-bg);
                 border-color: var(--primary-3000-button-border);
                 color: #111;
@@ -170,18 +173,18 @@
             background: var(--secondary-3000-frame-bg);
             border-color: var(--secondary-3000-frame-border);
 
-            &:not([aria-disabled='true']):hover > span {
+            &:not([aria-disabled='true']):hover .LemonButton__chrome {
                 border-color: var(--secondary-3000-button-border-hover);
             }
 
-            > span {
+            .LemonButton__chrome {
                 color: var(--default);
                 background: var(--accent-3000);
                 border-color: var(--secondary-3000-button-border);
             }
 
             &.LemonButton--active {
-                > span {
+                .LemonButton__chrome {
                     color: var(--default);
                     background: var(--bg-light);
                     border-color: var(--secondary-3000-button-border-hover);
@@ -191,7 +194,7 @@
 
         &.LemonButton--is-stealth:not(.LemonButton--active) {
             &:hover {
-                > span {
+                .LemonButton__chrome {
                     border-color: var(--secondary-3000-button-border);
                 }
             }
@@ -200,7 +203,7 @@
                 background-color: transparent;
                 border-color: transparent;
 
-                > span {
+                .LemonButton__chrome {
                     background-color: transparent;
                     border-color: transparent;
                     color: var(--muted);
@@ -243,19 +246,19 @@
         border-top-right-radius: 5px;
         border-bottom-right-radius: 5px;
 
-        & .LemonButton {
+        .LemonButton {
             background: none !important;
             border: none !important;
             padding-bottom: 0 !important;
             margin: 0 auto !important;
             height: 100%;
+        }
 
-            > span {
-                margin: auto !important;
-                top: 0 !important;
-                background: none !important;
-                border: none !important;
-            }
+        .LemonButton__chrome {
+            margin: auto !important;
+            top: 0 !important;
+            background: none !important;
+            border: none !important;
         }
 
         &:not([aria-disabled='true']):hover {
diff --git a/frontend/src/lib/lemon-ui/LemonTable/LemonTable.scss b/frontend/src/lib/lemon-ui/LemonTable/LemonTable.scss
index 6e37c6cd5eecc..4bffbac72b20e 100644
--- a/frontend/src/lib/lemon-ui/LemonTable/LemonTable.scss
+++ b/frontend/src/lib/lemon-ui/LemonTable/LemonTable.scss
@@ -173,14 +173,14 @@
                 padding-bottom: 0.5rem;
 
                 .posthog-3000 & {
-                    padding-top: 0.3rem;
-                    padding-bottom: 0.3rem;
+                    padding-top: 0.3125rem;
+                    padding-bottom: 0.3125rem;
                 }
 
                 .LemonButton {
                     .posthog-3000 & {
-                        margin-top: -0.2rem;
-                        margin-bottom: -0.2rem;
+                        margin-top: -0.25rem;
+                        margin-bottom: -0.25rem;
                     }
                 }
             }
diff --git a/frontend/src/lib/lemon-ui/Tooltip/Tooltip.tsx b/frontend/src/lib/lemon-ui/Tooltip/Tooltip.tsx
index db93725b50cd0..87b6182f61d81 100644
--- a/frontend/src/lib/lemon-ui/Tooltip/Tooltip.tsx
+++ b/frontend/src/lib/lemon-ui/Tooltip/Tooltip.tsx
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-imports
 import { Tooltip as AntdTooltip } from 'antd'
 import { TooltipProps as AntdTooltipProps } from 'antd/lib/tooltip'
 import React, { useState } from 'react'
diff --git a/frontend/src/scenes/dashboard/Dashboard.tsx b/frontend/src/scenes/dashboard/Dashboard.tsx
index cad193b0c0866..80310d43f6f2c 100644
--- a/frontend/src/scenes/dashboard/Dashboard.tsx
+++ b/frontend/src/scenes/dashboard/Dashboard.tsx
@@ -121,22 +121,20 @@ function DashboardScene(): JSX.Element {
                             DashboardPlacement.Export,
                             DashboardPlacement.FeatureFlag,
                         ].includes(placement) && (
-                            <div className="flex space-x-4">
-                                <div className="flex shrink-0 items-center h-8">
-                                    <DateFilter
-                                        showCustom
-                                        dateFrom={dashboardFilters?.date_from ?? undefined}
-                                        dateTo={dashboardFilters?.date_to ?? undefined}
-                                        onChange={setDates}
-                                        disabled={!canEditDashboard}
-                                        makeLabel={(key) => (
-                                            <>
-                                                <IconCalendar />
-                                                <span className="hide-when-small"> {key}</span>
-                                            </>
-                                        )}
-                                    />
-                                </div>
+                            <div className="flex space-x-4 items-center">
+                                <DateFilter
+                                    showCustom
+                                    dateFrom={dashboardFilters?.date_from ?? undefined}
+                                    dateTo={dashboardFilters?.date_to ?? undefined}
+                                    onChange={setDates}
+                                    disabled={!canEditDashboard}
+                                    makeLabel={(key) => (
+                                        <>
+                                            <IconCalendar />
+                                            <span className="hide-when-small"> {key}</span>
+                                        </>
+                                    )}
+                                />
                                 <PropertyFilters
                                     onChange={setProperties}
                                     pageKey={'dashboard_' + dashboard?.id}
diff --git a/frontend/src/scenes/insights/views/BoldNumber/BoldNumber.scss b/frontend/src/scenes/insights/views/BoldNumber/BoldNumber.scss
index 0691356cacf30..510dc8b1bceb4 100644
--- a/frontend/src/scenes/insights/views/BoldNumber/BoldNumber.scss
+++ b/frontend/src/scenes/insights/views/BoldNumber/BoldNumber.scss
@@ -2,42 +2,30 @@
 
 .BoldNumber {
     width: 100%;
-    padding: 2rem 0 3rem;
+    padding: 2rem 3rem 3rem;
     display: flex;
     align-items: center;
     justify-content: center;
     flex-direction: column;
     flex: 1;
 
-    @include screen($md) {
-        padding: 3rem 0 5rem;
-
-        .InsightCard & {
-            padding: 2rem 0;
-        }
-    }
-}
-
-.BoldNumber__value {
-    width: 100%;
-    text-align: center;
-    padding: 0 2rem;
-    margin: 0 auto;
-    line-height: 1;
-    font-weight: 700;
-    letter-spacing: -0.025em;
-
     .InsightCard & {
-        padding: 0 1rem;
+        padding: 1rem;
     }
 
     @include screen($md) {
-        padding: 0 5rem;
+        padding: 3rem 5rem 5rem;
 
         .InsightCard & {
-            padding: 0 2rem;
+            padding: 2rem;
         }
     }
+
+    .BoldNumber__value {
+        font-weight: 700;
+        width: 100%;
+        letter-spacing: -0.025em;
+    }
 }
 
 .BoldNumber__comparison {
diff --git a/frontend/src/scenes/insights/views/BoldNumber/BoldNumber.tsx b/frontend/src/scenes/insights/views/BoldNumber/BoldNumber.tsx
index f03a12aff60f7..f4b79b2a4c8b7 100644
--- a/frontend/src/scenes/insights/views/BoldNumber/BoldNumber.tsx
+++ b/frontend/src/scenes/insights/views/BoldNumber/BoldNumber.tsx
@@ -1,4 +1,5 @@
 import './BoldNumber.scss'
+import './BoldNumber.scss'
 
 import { LemonRow, Link } from '@posthog/lemon-ui'
 import clsx from 'clsx'
@@ -8,6 +9,7 @@ import { IconFlare, IconTrendingDown, IconTrendingFlat, IconTrendingUp } from 'l
 import { percentage } from 'lib/utils'
 import { useLayoutEffect, useRef, useState } from 'react'
 import { useEffect } from 'react'
+import React from 'react'
 import { formatAggregationAxisValue } from 'scenes/insights/aggregationAxisFormat'
 import { InsightEmptyState } from 'scenes/insights/EmptyStates'
 import { InsightTooltip } from 'scenes/insights/InsightTooltip/InsightTooltip'
@@ -19,7 +21,7 @@ import { ChartParams, TrendResult } from '~/types'
 
 import { insightLogic } from '../../insightLogic'
 import { ensureTooltip } from '../LineGraph/LineGraph'
-import Textfit from './Textfit'
+import { Textfit } from './Textfit'
 
 /** The tooltip is offset by a few pixels from the cursor to give it some breathing room. */
 const BOLD_NUMBER_TOOLTIP_OFFSET_PX = 8
@@ -94,29 +96,29 @@ export function BoldNumber({ showPersonsModal = true }: ChartParams): JSX.Elemen
 
     return resultSeries ? (
         <div className="BoldNumber">
-            <Textfit min={32} max={120}>
-                <div
-                    className={clsx('BoldNumber__value', showPersonsModal ? 'cursor-pointer' : 'cursor-default')}
-                    onClick={
-                        // != is intentional to catch undefined too
-                        showPersonsModal && resultSeries.aggregated_value != null
-                            ? () => {
-                                  if (resultSeries.persons?.url) {
-                                      openPersonsModal({
-                                          url: resultSeries.persons?.url,
-                                          title: <PropertyKeyInfo value={resultSeries.label} disablePopover />,
-                                      })
-                                  }
+            <div
+                className={clsx('BoldNumber__value', showPersonsModal ? 'cursor-pointer' : 'cursor-default')}
+                onClick={
+                    // != is intentional to catch undefined too
+                    showPersonsModal && resultSeries.aggregated_value != null
+                        ? () => {
+                              if (resultSeries.persons?.url) {
+                                  openPersonsModal({
+                                      url: resultSeries.persons?.url,
+                                      title: <PropertyKeyInfo value={resultSeries.label} disablePopover />,
+                                  })
                               }
-                            : undefined
-                    }
-                    onMouseLeave={() => setIsTooltipShown(false)}
-                    ref={valueRef}
-                    onMouseEnter={() => setIsTooltipShown(true)}
-                >
+                          }
+                        : undefined
+                }
+                onMouseLeave={() => setIsTooltipShown(false)}
+                ref={valueRef}
+                onMouseEnter={() => setIsTooltipShown(true)}
+            >
+                <Textfit min={32} max={120}>
                     {formatAggregationAxisValue(trendsFilter, resultSeries.aggregated_value)}
-                </div>
-            </Textfit>
+                </Textfit>
+            </div>
             {showComparison && <BoldNumberComparison showPersonsModal={showPersonsModal} />}
         </div>
     ) : (
diff --git a/frontend/src/scenes/insights/views/BoldNumber/Textfit.stories.tsx b/frontend/src/scenes/insights/views/BoldNumber/Textfit.stories.tsx
new file mode 100644
index 0000000000000..69d3a534095dd
--- /dev/null
+++ b/frontend/src/scenes/insights/views/BoldNumber/Textfit.stories.tsx
@@ -0,0 +1,26 @@
+import { Meta, StoryFn, StoryObj } from '@storybook/react'
+
+import { Textfit } from './Textfit'
+
+type Story = StoryObj<typeof Textfit>
+const meta: Meta<typeof Textfit> = {
+    title: 'Lemon UI/TextFit',
+    component: Textfit,
+    tags: ['autodocs'],
+    args: {
+        min: 20,
+        max: 150,
+        children: '10000000',
+    },
+}
+export default meta
+
+const Template: StoryFn<typeof Textfit> = (props) => {
+    return (
+        <div className="resize w-100 h-50 overflow-hidden border rounded">
+            <Textfit {...props} />
+        </div>
+    )
+}
+
+export const Basic: Story = Template.bind({})
diff --git a/frontend/src/scenes/insights/views/BoldNumber/Textfit.tsx b/frontend/src/scenes/insights/views/BoldNumber/Textfit.tsx
index 8d05cea3b4e59..b76f20f920ea3 100644
--- a/frontend/src/scenes/insights/views/BoldNumber/Textfit.tsx
+++ b/frontend/src/scenes/insights/views/BoldNumber/Textfit.tsx
@@ -1,83 +1,77 @@
-// Adapted from https://github.com/malte-wessel/react-textfit
-// which is no longer maintained and does not support React 18
+import { useRef } from 'react'
+import useResizeObserver from 'use-resize-observer'
 
-import { useEffect, useRef, useState } from 'react'
-
-// Calculate width without padding.
-const innerWidth = (el: HTMLDivElement): number => {
-    const style = window.getComputedStyle(el, null)
-    // Hidden iframe in Firefox returns null, https://github.com/malte-wessel/react-textfit/pull/34
-    if (!style) {
-        return el.clientWidth
-    }
-
-    return (
-        el.clientWidth -
-        parseInt(style.getPropertyValue('padding-left'), 10) -
-        parseInt(style.getPropertyValue('padding-right'), 10)
-    )
+export type TextfitProps = {
+    min: number
+    max: number
+    children: string
 }
 
-const assertElementFitsWidth = (el: HTMLDivElement, width: number): boolean => el.scrollWidth - 1 <= width
-
-const Textfit = ({ min, max, children }: { min: number; max: number; children: React.ReactNode }): JSX.Element => {
+export const Textfit = ({ min, max, children }: TextfitProps): JSX.Element => {
     const parentRef = useRef<HTMLDivElement>(null)
     const childRef = useRef<HTMLDivElement>(null)
-
-    const [fontSize, setFontSize] = useState<number>()
+    const fontSizeRef = useRef<number>(min)
 
     let resizeTimer: NodeJS.Timeout
 
-    const handleWindowResize = (): void => {
+    const updateFontSize = (size: number): void => {
+        fontSizeRef.current = size
+        childRef.current!.style.fontSize = `${size}px`
+    }
+
+    const handleResize = (): void => {
         clearTimeout(resizeTimer)
         resizeTimer = setTimeout(() => {
-            const el = parentRef.current
-            const wrapper = childRef.current
+            const parent = parentRef.current
+            const child = childRef.current
+
+            if (!parent || !child) {
+                return
+            }
 
-            if (el && wrapper) {
-                const originalWidth = innerWidth(el)
+            let mid
+            let low = min
+            let high = max
 
-                let mid
-                let low = min
-                let high = max
+            while (low <= high) {
+                mid = Math.floor((low + high) / 2)
+                updateFontSize(mid)
+                const childRect = child.getBoundingClientRect()
+                const parentRect = parent.getBoundingClientRect()
 
-                while (low <= high) {
-                    mid = Math.floor((low + high) / 2)
-                    setFontSize(mid)
+                const childFitsParent = childRect.width <= parentRect.width && childRect.height <= parentRect.height
 
-                    if (assertElementFitsWidth(wrapper, originalWidth)) {
-                        low = mid + 1
-                    } else {
-                        high = mid - 1
-                    }
+                if (childFitsParent) {
+                    low = mid + 1
+                } else {
+                    high = mid - 1
                 }
-                mid = Math.min(low, high)
+            }
+            mid = Math.min(low, high)
 
-                // Ensure we hit the user-supplied limits
-                mid = Math.max(mid, min)
-                mid = Math.min(mid, max)
+            // Ensure we hit the user-supplied limits
+            mid = Math.max(mid, min)
+            mid = Math.min(mid, max)
 
-                setFontSize(mid)
-            }
-        }, 10)
+            updateFontSize(mid)
+        }, 50)
     }
 
-    useEffect(() => {
-        window.addEventListener('resize', handleWindowResize)
-        return () => window.removeEventListener('resize', handleWindowResize)
-    }, [])
-
-    useEffect(() => handleWindowResize(), [parentRef, childRef])
+    useResizeObserver<HTMLDivElement>({
+        ref: parentRef,
+        onResize: () => handleResize(),
+    })
 
     return (
-        // eslint-disable-next-line react/forbid-dom-props
-        <div ref={parentRef} style={{ lineHeight: 1, fontSize: fontSize }}>
-            {/* eslint-disable-next-line react/forbid-dom-props */}
-            <div ref={childRef} style={{ whiteSpace: 'nowrap', display: 'inline-block' }}>
+        <div
+            ref={parentRef}
+            className="w-full h-full flex items-center justify-center"
+            // eslint-disable-next-line react/forbid-dom-props
+            style={{ lineHeight: 1, fontSize: fontSizeRef.current }}
+        >
+            <div ref={childRef} className="whitespace-nowrap">
                 {children}
             </div>
         </div>
     )
 }
-
-export default Textfit
diff --git a/frontend/src/scenes/project-homepage/ProjectHomePageCompactListItem.tsx b/frontend/src/scenes/project-homepage/ProjectHomePageCompactListItem.tsx
index 2ea324dfaf8b5..cefd3e82870bc 100644
--- a/frontend/src/scenes/project-homepage/ProjectHomePageCompactListItem.tsx
+++ b/frontend/src/scenes/project-homepage/ProjectHomePageCompactListItem.tsx
@@ -17,13 +17,13 @@ export function ProjectHomePageCompactListItem({
     suffix,
 }: RecentItemRowProps): JSX.Element {
     return (
-        <LemonButton fullWidth to={to} onClick={onClick}>
-            <div className="flex items-center justify-between h-10 overflow-hidden gap-2 flex-1">
-                {prefix ? <span className="shrink-0">{prefix}</span> : null}
+        <LemonButton fullWidth to={to} onClick={onClick} className="h-12">
+            <div className="flex items-start justify-between overflow-hidden gap-2 flex-1">
+                {prefix ? <span className="flex shrink-0 text-muted text-xl">{prefix}</span> : null}
 
-                <div className="truncate space-y-1 flex-1">
-                    <div className="text-link font-semibold truncate">{title}</div>
-                    <div className="truncate text-default font-normal secondary-text">{subtitle}</div>
+                <div className="truncate space-y-0.5 flex-1">
+                    <div className="text-link truncate">{title}</div>
+                    <div className="truncate text-muted font-normal text-xs">{subtitle}</div>
                 </div>
 
                 {suffix ? <span className="shrink-0">{suffix}</span> : null}
diff --git a/frontend/src/scenes/saved-insights/SavedInsights.scss b/frontend/src/scenes/saved-insights/SavedInsights.scss
index 84e02c0b92476..a50d141741fc7 100644
--- a/frontend/src/scenes/saved-insights/SavedInsights.scss
+++ b/frontend/src/scenes/saved-insights/SavedInsights.scss
@@ -5,9 +5,14 @@
         padding-bottom: 0.75rem !important;
         padding-top: 0.75rem !important;
 
-        &.icon-column .LemonSkeleton {
-            height: 2rem;
-            width: 2rem;
+        &.icon-column {
+            font-size: 1.5rem;
+            color: var(--muted);
+
+            .LemonSkeleton {
+                height: 2rem;
+                width: 2rem;
+            }
         }
     }
 
diff --git a/frontend/src/scenes/saved-insights/SavedInsights.tsx b/frontend/src/scenes/saved-insights/SavedInsights.tsx
index 95728c2f578bf..8b5efc9cfe5f5 100644
--- a/frontend/src/scenes/saved-insights/SavedInsights.tsx
+++ b/frontend/src/scenes/saved-insights/SavedInsights.tsx
@@ -306,7 +306,7 @@ export function InsightIcon({ insight }: { insight: InsightModel }): JSX.Element
     }
     const insightMetadata = INSIGHT_TYPES_METADATA[insightType]
     if (insightMetadata && insightMetadata.icon) {
-        return <insightMetadata.icon style={{ display: 'block', fontSize: '1rem' }} />
+        return <insightMetadata.icon />
     }
     return null
 }
diff --git a/frontend/src/scenes/surveys/EditSurvey.scss b/frontend/src/scenes/surveys/EditSurvey.scss
index 2995d06667887..67fe48acdefa9 100644
--- a/frontend/src/scenes/surveys/EditSurvey.scss
+++ b/frontend/src/scenes/surveys/EditSurvey.scss
@@ -7,3 +7,12 @@
         background: var(--border-light);
     }
 }
+
+.question-choice-open-ended-footer {
+    position: absolute;
+    bottom: -5px;
+    left: 6px;
+    font-size: 10px;
+    background-color: var(--bg-3000);
+    padding: 0 5px;
+}
diff --git a/frontend/src/scenes/surveys/SurveyAppearance.scss b/frontend/src/scenes/surveys/SurveyAppearance.scss
index 32ee384fc1d83..7dd612f0a5e4e 100644
--- a/frontend/src/scenes/surveys/SurveyAppearance.scss
+++ b/frontend/src/scenes/surveys/SurveyAppearance.scss
@@ -226,12 +226,13 @@
     opacity: 1 !important;
 }
 
-.multiple-choice-options input[type='checkbox']:checked + label {
+.multiple-choice-options input:checked + label {
     font-weight: bold;
+    border: 1.5px solid rgb(0 0 0 / 100%);
 }
 
-.multiple-choice-options input:checked + label {
-    border: 1.5px solid rgb(0 0 0);
+.multiple-choice-options input:checked + label input {
+    font-weight: bold;
 }
 
 .multiple-choice-options label {
@@ -243,6 +244,26 @@
     background: white;
 }
 
+.multiple-choice-options .choice-option-open label {
+    padding-right: 30px;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    max-width: 100%;
+}
+
+.multiple-choice-options .choice-option-open input:disabled + label {
+    opacity: 0.6;
+}
+
+.multiple-choice-options .choice-option-open label input {
+    position: relative;
+    opacity: 1;
+    flex-grow: 1;
+    border: 0;
+    outline: 0;
+}
+
 .thank-you-message {
     position: relative;
     bottom: 0;
diff --git a/frontend/src/scenes/surveys/SurveyAppearance.tsx b/frontend/src/scenes/surveys/SurveyAppearance.tsx
index c98574af938d9..81067c0ea06d1 100644
--- a/frontend/src/scenes/surveys/SurveyAppearance.tsx
+++ b/frontend/src/scenes/surveys/SurveyAppearance.tsx
@@ -529,6 +529,64 @@ export function SurveyRatingAppearance({
     )
 }
 
+const OpenEndedChoice = ({
+    label,
+    initialChecked,
+    inputType,
+    index,
+}: {
+    label: string
+    initialChecked: boolean
+    inputType: string
+    textColor: string
+    index: number
+}): JSX.Element => {
+    const textRef = useRef<HTMLInputElement | null>(null)
+    const checkRef = useRef<HTMLInputElement | null>(null)
+
+    return (
+        <div
+            className="choice-option choice-option-open"
+            onClick={() => {
+                if (checkRef.current?.checked || checkRef.current?.disabled) {
+                    textRef.current?.focus()
+                }
+            }}
+        >
+            <input
+                id={`${label}-${index}`}
+                ref={checkRef}
+                type={inputType}
+                disabled={!initialChecked || !checkRef.current?.value}
+                defaultChecked={initialChecked}
+                name="choice"
+            />
+            <label htmlFor={`${label}-${index}`}>
+                <span>{label}:</span>
+                <input
+                    ref={textRef}
+                    type="text"
+                    maxLength={100}
+                    onClick={(e) => e.stopPropagation()}
+                    onChange={(e) => {
+                        if (checkRef.current) {
+                            checkRef.current.value = e.target.value
+                            if (e.target.value) {
+                                checkRef.current.disabled = false
+                                checkRef.current.checked = true
+                            } else {
+                                checkRef.current.disabled = true
+                                checkRef.current.checked = false
+                            }
+                        }
+                    }}
+                />
+            </label>
+            <span className="choice-check">{check}</span>
+        </div>
+    )
+}
+
 export function SurveyMultipleChoiceAppearance({
     multipleChoiceQuestion,
     appearance,
@@ -587,18 +645,29 @@ export function SurveyMultipleChoiceAppearance({
                     />
                 )}
                 <div className="multiple-choice-options">
-                    {(multipleChoiceQuestion.choices || []).map((choice, idx) => (
-                        <div className="choice-option" key={idx}>
-                            <input
-                                {...(initialChecked ? { checked: initialChecked.includes(idx) } : null)}
-                                type={inputType}
-                                name="choice"
-                                value={choice}
+                    {(multipleChoiceQuestion.choices || []).map((choice, idx) =>
+                        multipleChoiceQuestion?.hasOpenChoice && idx === multipleChoiceQuestion.choices?.length - 1 ? (
+                            <OpenEndedChoice
+                                key={idx}
+                                index={idx}
+                                initialChecked={!!initialChecked?.includes(idx)}
+                                inputType={inputType}
+                                label={choice}
+                                textColor={textColor}
                             />
-                            <label>{choice}</label>
-                            <span className="choice-check">{check}</span>
-                        </div>
-                    ))}
+                        ) : (
+                            <div className="choice-option" key={idx}>
+                                <input
+                                    {...(initialChecked ? { defaultChecked: initialChecked.includes(idx) } : null)}
+                                    type={inputType}
+                                    name="choice"
+                                    value={choice}
+                                />
+                                <label>{choice}</label>
+                                <span className="choice-check">{check}</span>
+                            </div>
+                        )
+                    )}
                 </div>
                 <div className="bottom-section">
                     <div className="buttons">
diff --git a/frontend/src/scenes/surveys/SurveyEdit.tsx b/frontend/src/scenes/surveys/SurveyEdit.tsx
index 64d2e0aad64ae..456350e651a54 100644
--- a/frontend/src/scenes/surveys/SurveyEdit.tsx
+++ b/frontend/src/scenes/surveys/SurveyEdit.tsx
@@ -452,82 +452,186 @@ export default function SurveyEdit(): JSX.Element {
                                                                     question.type ===
                                                                         SurveyQuestionType.MultipleChoice) && (
                                                                     <div className="flex flex-col gap-2">
-                                                                        <Field name="choices" label="Choices">
+                                                                        <Field name="hasOpenChoice">
                                                                             {({
-                                                                                value,
-                                                                                onChange,
-                                                                            }: {
-                                                                                value: string[]
-                                                                                onChange: (newValue: string[]) => void
+                                                                                value: hasOpenChoice,
+                                                                                onChange: toggleHasOpenChoice,
                                                                             }) => (
-                                                                                <div className="flex flex-col gap-2">
-                                                                                    {(value || []).map(
-                                                                                        (
-                                                                                            choice: string,
-                                                                                            index: number
-                                                                                        ) => (
-                                                                                            <div
-                                                                                                className="flex flex-row gap-2"
-                                                                                                key={index}
-                                                                                            >
-                                                                                                <LemonInput
-                                                                                                    value={choice}
-                                                                                                    fullWidth
-                                                                                                    onChange={(val) => {
-                                                                                                        const newChoices =
-                                                                                                            [...value]
-                                                                                                        newChoices[
-                                                                                                            index
-                                                                                                        ] = val
-                                                                                                        onChange(
-                                                                                                            newChoices
-                                                                                                        )
-                                                                                                    }}
-                                                                                                />
-                                                                                                <LemonButton
-                                                                                                    icon={
-                                                                                                        <IconDelete />
-                                                                                                    }
-                                                                                                    size="small"
-                                                                                                    status="muted"
-                                                                                                    noPadding
-                                                                                                    onClick={() => {
-                                                                                                        const newChoices =
-                                                                                                            [...value]
-                                                                                                        newChoices.splice(
-                                                                                                            index,
-                                                                                                            1
-                                                                                                        )
-                                                                                                        onChange(
-                                                                                                            newChoices
-                                                                                                        )
-                                                                                                    }}
-                                                                                                />
+                                                                                <Field name="choices" label="Choices">
+                                                                                    {({ value, onChange }) => (
+                                                                                        <div className="flex flex-col gap-2">
+                                                                                            {(value || []).map(
+                                                                                                (
+                                                                                                    choice: string,
+                                                                                                    index: number
+                                                                                                ) => {
+                                                                                                    const isOpenChoice =
+                                                                                                        hasOpenChoice &&
+                                                                                                        index ===
+                                                                                                            value?.length -
+                                                                                                                1
+                                                                                                    return (
+                                                                                                        <div
+                                                                                                            className="flex flex-row gap-2 relative"
+                                                                                                            key={index}
+                                                                                                        >
+                                                                                                            <LemonInput
+                                                                                                                value={
+                                                                                                                    choice
+                                                                                                                }
+                                                                                                                fullWidth
+                                                                                                                onChange={(
+                                                                                                                    val
+                                                                                                                ) => {
+                                                                                                                    const newChoices =
+                                                                                                                        [
+                                                                                                                            ...value,
+                                                                                                                        ]
+                                                                                                                    newChoices[
+                                                                                                                        index
+                                                                                                                    ] =
+                                                                                                                        val
+                                                                                                                    onChange(
+                                                                                                                        newChoices
+                                                                                                                    )
+                                                                                                                }}
+                                                                                                            />
+                                                                                                            {isOpenChoice && (
+                                                                                                                <span className="question-choice-open-ended-footer">
+                                                                                                                    open-ended
+                                                                                                                </span>
+                                                                                                            )}
+                                                                                                            <LemonButton
+                                                                                                                icon={
+                                                                                                                    <IconDelete />
+                                                                                                                }
+                                                                                                                size="small"
+                                                                                                                status="muted"
+                                                                                                                noPadding
+                                                                                                                onClick={() => {
+                                                                                                                    const newChoices =
+                                                                                                                        [
+                                                                                                                            ...value,
+                                                                                                                        ]
+                                                                                                                    newChoices.splice(
+                                                                                                                        index,
+                                                                                                                        1
+                                                                                                                    )
+                                                                                                                    onChange(
+                                                                                                                        newChoices
+                                                                                                                    )
+                                                                                                                    if (
+                                                                                                                        isOpenChoice
+                                                                                                                    ) {
+                                                                                                                        toggleHasOpenChoice(
+                                                                                                                            false
+                                                                                                                        )
+                                                                                                                    }
+                                                                                                                }}
+                                                                                                            />
+                                                                                                        </div>
+                                                                                                    )
+                                                                                                }
+                                                                                            )}
+                                                                                            <div className="w-fit flex flex-row flex-wrap gap-2">
+                                                                                                {(value || []).length <
+                                                                                                    6 && (
+                                                                                                    <>
+                                                                                                        <LemonButton
+                                                                                                            icon={
+                                                                                                                <IconPlusMini />
+                                                                                                            }
+                                                                                                            type="secondary"
+                                                                                                            fullWidth={
+                                                                                                                false
+                                                                                                            }
+                                                                                                            onClick={() => {
+                                                                                                                if (
+                                                                                                                    !value
+                                                                                                                ) {
+                                                                                                                    onChange(
+                                                                                                                        [
+                                                                                                                            '',
+                                                                                                                        ]
+                                                                                                                    )
+                                                                                                                } else if (
+                                                                                                                    hasOpenChoice
+                                                                                                                ) {
+                                                                                                                    const newChoices =
+                                                                                                                        value.slice(
+                                                                                                                            0,
+                                                                                                                            -1
+                                                                                                                        )
+                                                                                                                    newChoices.push(
+                                                                                                                        ''
+                                                                                                                    )
+                                                                                                                    newChoices.push(
+                                                                                                                        value[
+                                                                                                                            value.length -
+                                                                                                                                1
+                                                                                                                        ]
+                                                                                                                    )
+                                                                                                                    onChange(
+                                                                                                                        newChoices
+                                                                                                                    )
+                                                                                                                } else {
+                                                                                                                    onChange(
+                                                                                                                        [
+                                                                                                                            ...value,
+                                                                                                                            '',
+                                                                                                                        ]
+                                                                                                                    )
+                                                                                                                }
+                                                                                                            }}
+                                                                                                        >
+                                                                                                            Add choice
+                                                                                                        </LemonButton>
+                                                                                                        {featureFlags[
+                                                                                                            FEATURE_FLAGS
+                                                                                                                .SURVEYS_OPEN_CHOICE
+                                                                                                        ] &&
+                                                                                                            !hasOpenChoice && (
+                                                                                                                <LemonButton
+                                                                                                                    icon={
+                                                                                                                        <IconPlusMini />
+                                                                                                                    }
+                                                                                                                    type="secondary"
+                                                                                                                    fullWidth={
+                                                                                                                        false
+                                                                                                                    }
+                                                                                                                    onClick={() => {
+                                                                                                                        if (
+                                                                                                                            !value
+                                                                                                                        ) {
+                                                                                                                            onChange(
+                                                                                                                                [
+                                                                                                                                    'Other',
+                                                                                                                                ]
+                                                                                                                            )
+                                                                                                                        } else {
+                                                                                                                            onChange(
+                                                                                                                                [
+                                                                                                                                    ...value,
+                                                                                                                                    'Other',
+                                                                                                                                ]
+                                                                                                                            )
+                                                                                                                        }
+                                                                                                                        toggleHasOpenChoice(
+                                                                                                                            true
+                                                                                                                        )
+                                                                                                                    }}
+                                                                                                                >
+                                                                                                                    Add
+                                                                                                                    open-ended
+                                                                                                                    choice
+                                                                                                                </LemonButton>
+                                                                                                            )}
+                                                                                                    </>
+                                                                                                )}
                                                                                             </div>
-                                                                                        )
+                                                                                        </div>
                                                                                     )}
-                                                                                    <div className="w-fit">
-                                                                                        {(value || []).length < 6 && (
-                                                                                            <LemonButton
-                                                                                                icon={<IconPlusMini />}
-                                                                                                type="secondary"
-                                                                                                fullWidth={false}
-                                                                                                onClick={() => {
-                                                                                                    if (!value) {
-                                                                                                        onChange([''])
-                                                                                                    } else {
-                                                                                                        onChange([
-                                                                                                            ...value,
-                                                                                                            '',
-                                                                                                        ])
-                                                                                                    }
-                                                                                                }}
-                                                                                            >
-                                                                                                Add choice
-                                                                                            </LemonButton>
-                                                                                        )}
-                                                                                    </div>
-                                                                                </div>
+                                                                                </Field>
                                                                             )}
                                                                         </Field>
                                                                     </div>
diff --git a/frontend/src/scenes/surveys/surveyLogic.test.ts b/frontend/src/scenes/surveys/surveyLogic.test.ts
index 77719f03bdba4..6661f3d359760 100644
--- a/frontend/src/scenes/surveys/surveyLogic.test.ts
+++ b/frontend/src/scenes/surveys/surveyLogic.test.ts
@@ -5,7 +5,7 @@ import { useMocks } from '~/mocks/jest'
 import { initKeaTests } from '~/test/init'
 import { Survey, SurveyQuestionType, SurveyType } from '~/types'
 
-const SURVEY: Survey = {
+const MULTIPLE_CHOICE_SURVEY: Survey = {
     id: '018b22a3-09b1-0000-2f5b-1bd8352ceec9',
     name: 'Multiple Choice survey',
     description: '',
@@ -16,7 +16,7 @@ const SURVEY: Survey = {
     questions: [
         {
             type: SurveyQuestionType.MultipleChoice,
-            choices: ['Tutorials', 'Customer case studies', 'Product announcements'],
+            choices: ['Tutorials', 'Customer case studies', 'Product announcements', 'Other'],
             question: 'Which types of content would you like to see more of?',
             description: '',
         },
@@ -50,7 +50,244 @@ const SURVEY: Survey = {
     targeting_flag_filters: undefined,
 }
 
-describe('survey logic', () => {
+const SINGLE_CHOICE_SURVEY: Survey = {
+    id: '118b22a3-09b1-0000-2f5b-1bd8352ceec9',
+    name: 'Single Choice survey',
+    description: '',
+    type: SurveyType.Popover,
+    linked_flag: null,
+    linked_flag_id: null,
+    targeting_flag: null,
+    questions: [
+        {
+            type: SurveyQuestionType.SingleChoice,
+            choices: ['Yes', 'No'],
+            question: 'Would you like us to continue this feature?',
+            description: '',
+        },
+    ],
+    conditions: null,
+    appearance: {
+        position: 'right',
+        whiteLabel: false,
+        borderColor: '#c9c6c6',
+        placeholder: '',
+        backgroundColor: '#eeeded',
+        submitButtonText: 'Submit',
+        ratingButtonColor: 'white',
+        submitButtonColor: 'black',
+        thankYouMessageHeader: 'Thank you for your feedback!',
+        displayThankYouMessage: true,
+        ratingButtonActiveColor: 'black',
+    },
+    created_at: '2023-10-12T06:46:32.113745Z',
+    created_by: {
+        id: 1,
+        uuid: '018aa8a6-10e8-0000-dba2-0e956f7bae38',
+        distinct_id: 'TGqg9Cn4jLkj9X87oXni9ZPBD6VbOxMtGV1GfJeB5LO',
+        first_name: 'test',
+        email: 'test@posthog.com',
+        is_email_verified: false,
+    },
+    start_date: '2023-10-12T06:46:34.482000Z',
+    end_date: null,
+    archived: false,
+    targeting_flag_filters: undefined,
+}
+
+const MULTIPLE_CHOICE_SURVEY_WITH_OPEN_CHOICE: Survey = {
+    id: '018b22a3-09b1-0000-2f5b-1bd8352ceec9',
+    name: 'Multiple Choice survey',
+    description: '',
+    type: SurveyType.Popover,
+    linked_flag: null,
+    linked_flag_id: null,
+    targeting_flag: null,
+    questions: [
+        {
+            type: SurveyQuestionType.MultipleChoice,
+            choices: ['Tutorials', 'Customer case studies', 'Product announcements', 'Other'],
+            question: 'Which types of content would you like to see more of?',
+            description: '',
+            hasOpenChoice: true,
+        },
+    ],
+    conditions: null,
+    appearance: {
+        position: 'right',
+        whiteLabel: false,
+        borderColor: '#c9c6c6',
+        placeholder: '',
+        backgroundColor: '#eeeded',
+        submitButtonText: 'Submit',
+        ratingButtonColor: 'white',
+        submitButtonColor: 'black',
+        thankYouMessageHeader: 'Thank you for your feedback!',
+        displayThankYouMessage: true,
+        ratingButtonActiveColor: 'black',
+    },
+    created_at: '2023-10-12T06:46:32.113745Z',
+    created_by: {
+        id: 1,
+        uuid: '018aa8a6-10e8-0000-dba2-0e956f7bae38',
+        distinct_id: 'TGqg9Cn4jLkj9X87oXni9ZPBD6VbOxMtGV1GfJeB5LO',
+        first_name: 'test',
+        email: 'test@posthog.com',
+        is_email_verified: false,
+    },
+    start_date: '2023-10-12T06:46:34.482000Z',
+    end_date: null,
+    archived: false,
+    targeting_flag_filters: undefined,
+}
+
+const SINGLE_CHOICE_SURVEY_WITH_OPEN_CHOICE: Survey = {
+    id: '118b22a3-09b1-0000-2f5b-1bd8352ceec9',
+    name: 'Single Choice survey',
+    description: '',
+    type: SurveyType.Popover,
+    linked_flag: null,
+    linked_flag_id: null,
+    targeting_flag: null,
+    questions: [
+        {
+            type: SurveyQuestionType.SingleChoice,
+            choices: ['Yes', 'No', 'Maybe (explain)'],
+            question: 'Would you like us to continue this feature?',
+            description: '',
+            hasOpenChoice: true,
+        },
+    ],
+    conditions: null,
+    appearance: {
+        position: 'right',
+        whiteLabel: false,
+        borderColor: '#c9c6c6',
+        placeholder: '',
+        backgroundColor: '#eeeded',
+        submitButtonText: 'Submit',
+        ratingButtonColor: 'white',
+        submitButtonColor: 'black',
+        thankYouMessageHeader: 'Thank you for your feedback!',
+        displayThankYouMessage: true,
+        ratingButtonActiveColor: 'black',
+    },
+    created_at: '2023-10-12T06:46:32.113745Z',
+    created_by: {
+        id: 1,
+        uuid: '018aa8a6-10e8-0000-dba2-0e956f7bae38',
+        distinct_id: 'TGqg9Cn4jLkj9X87oXni9ZPBD6VbOxMtGV1GfJeB5LO',
+        first_name: 'test',
+        email: 'test@posthog.com',
+        is_email_verified: false,
+    },
+    start_date: '2023-10-12T06:46:34.482000Z',
+    end_date: null,
+    archived: false,
+    targeting_flag_filters: undefined,
+}
+
+describe('multiple choice survey logic', () => {
+    let logic: ReturnType<typeof surveyLogic.build>
+
+    beforeEach(() => {
+        initKeaTests()
+        logic = surveyLogic({ id: 'new' })
+        logic.mount()
+
+        useMocks({
+            get: {
+                '/api/projects/:team/surveys/': () => [200, { results: [] }],
+                '/api/projects/:team/surveys/responses_count': () => [200, {}],
+            },
+            post: {
+                '/api/projects/:team/query/': () => [
+                    200,
+                    {
+                        results: [
+                            [336, '"Tutorials"'],
+                            [312, '"Customer case studies"'],
+                            [20, '"Other"'],
+                        ],
+                    },
+                ],
+            },
+        })
+    })
+
+    describe('main', () => {
+        it('post processes return values', async () => {
+            await expectLogic(logic, () => {
+                logic.actions.loadSurveySuccess(MULTIPLE_CHOICE_SURVEY)
+            }).toDispatchActions(['loadSurveySuccess'])
+
+            await expectLogic(logic, () => {
+                logic.actions.loadSurveyMultipleChoiceResults({ questionIndex: 0 })
+            })
+                .toFinishAllListeners()
+                .toMatchValues({
+                    surveyMultipleChoiceResults: {
+                        0: {
+                            labels: ['Tutorials', 'Customer case studies', 'Other', 'Product announcements'],
+                            data: [336, 312, 20, 0],
+                        },
+                    },
+                })
+        })
+    })
+})
+
+describe('single choice survey logic', () => {
+    let logic: ReturnType<typeof surveyLogic.build>
+
+    beforeEach(() => {
+        initKeaTests()
+        logic = surveyLogic({ id: 'new' })
+        logic.mount()
+
+        useMocks({
+            get: {
+                '/api/projects/:team/surveys/': () => [200, { results: [] }],
+                '/api/projects/:team/surveys/responses_count': () => [200, {}],
+            },
+            post: {
+                '/api/projects/:team/query/': () => [
+                    200,
+                    {
+                        results: [
+                            ['"Yes"', 101],
+                            ['"No"', 1],
+                        ],
+                    },
+                ],
+            },
+        })
+    })
+
+    describe('main', () => {
+        it('post processes return values', async () => {
+            await expectLogic(logic, () => {
+                logic.actions.loadSurveySuccess(SINGLE_CHOICE_SURVEY)
+            }).toDispatchActions(['loadSurveySuccess'])
+
+            await expectLogic(logic, () => {
+                logic.actions.loadSurveySingleChoiceResults({ questionIndex: 1 })
+            })
+                .toFinishAllListeners()
+                .toMatchValues({
+                    surveySingleChoiceResults: {
+                        1: {
+                            labels: ['"Yes"', '"No"'],
+                            data: [101, 1],
+                            total: 102,
+                        },
+                    },
+                })
+        })
+    })
+})
+
+describe('multiple choice survey with open choice logic', () => {
     let logic: ReturnType<typeof surveyLogic.build>
 
     beforeEach(() => {
@@ -70,6 +307,7 @@ describe('survey logic', () => {
                         results: [
                             [336, '"Tutorials"'],
                             [312, '"Customer case studies"'],
+                            [20, '"Other choice"'],
                         ],
                     },
                 ],
@@ -80,7 +318,7 @@ describe('survey logic', () => {
     describe('main', () => {
         it('post processes return values', async () => {
             await expectLogic(logic, () => {
-                logic.actions.loadSurveySuccess(SURVEY)
+                logic.actions.loadSurveySuccess(MULTIPLE_CHOICE_SURVEY_WITH_OPEN_CHOICE)
             }).toDispatchActions(['loadSurveySuccess'])
 
             await expectLogic(logic, () => {
@@ -90,8 +328,58 @@ describe('survey logic', () => {
                 .toMatchValues({
                     surveyMultipleChoiceResults: {
                         0: {
-                            labels: ['Tutorials', 'Customer case studies', 'Product announcements'],
-                            data: [336, 312, 0],
+                            labels: ['Tutorials', 'Customer case studies', 'Other choice', 'Product announcements'],
+                            data: [336, 312, 20, 0],
+                        },
+                    },
+                })
+        })
+    })
+})
+
+describe('single choice survey with open choice logic', () => {
+    let logic: ReturnType<typeof surveyLogic.build>
+
+    beforeEach(() => {
+        initKeaTests()
+        logic = surveyLogic({ id: 'new' })
+        logic.mount()
+
+        useMocks({
+            get: {
+                '/api/projects/:team/surveys/': () => [200, { results: [] }],
+                '/api/projects/:team/surveys/responses_count': () => [200, {}],
+            },
+            post: {
+                '/api/projects/:team/query/': () => [
+                    200,
+                    {
+                        results: [
+                            ['"Yes"', 101],
+                            ['"Only if I could customize my choices"', 1],
+                        ],
+                    },
+                ],
+            },
+        })
+    })
+
+    describe('main', () => {
+        it('post processes return values', async () => {
+            await expectLogic(logic, () => {
+                logic.actions.loadSurveySuccess(SINGLE_CHOICE_SURVEY_WITH_OPEN_CHOICE)
+            }).toDispatchActions(['loadSurveySuccess'])
+
+            await expectLogic(logic, () => {
+                logic.actions.loadSurveySingleChoiceResults({ questionIndex: 1 })
+            })
+                .toFinishAllListeners()
+                .toMatchValues({
+                    surveySingleChoiceResults: {
+                        1: {
+                            labels: ['"Yes"', '"Only if I could customize my choices"'],
+                            data: [101, 1],
+                            total: 102,
                         },
                     },
                 })
diff --git a/frontend/src/scenes/surveys/surveyLogic.tsx b/frontend/src/scenes/surveys/surveyLogic.tsx
index f6da43d62fea6..889f7849eee1e 100644
--- a/frontend/src/scenes/surveys/surveyLogic.tsx
+++ b/frontend/src/scenes/surveys/surveyLogic.tsx
@@ -336,9 +336,10 @@ export const surveyLogic = kea<surveyLogicType>([
                     return [r[0], r[1].slice(1, r[1].length - 1)]
                 })
 
-                // Zero-fill
-                question.choices.forEach((choice) => {
-                    if (results?.length && !results.some((r) => r[1] === choice)) {
+                // Zero-fill choices that are not open-ended
+                question.choices.forEach((choice, idx) => {
+                    const isOpenChoice = idx == question.choices.length - 1 && question?.hasOpenChoice
+                    if (results?.length && !isOpenChoice && !results.some((r) => r[1] === choice)) {
                         results.push([0, choice])
                     }
                 })
diff --git a/frontend/src/styles/fonts.scss b/frontend/src/styles/fonts.scss
index 60443636e9b6b..4e367ffed08cb 100644
--- a/frontend/src/styles/fonts.scss
+++ b/frontend/src/styles/fonts.scss
@@ -62,6 +62,6 @@
     font-display: swap;
 
     // src: url('../../public/MatterSQ-Medium.woff2') format('woff2'), url('../../public/MatterSQ-Medium.woff') format('woff');
-    src: url('https://d1sdjtjk6xzm7.cloudfront.net/public/MatterSQ-Medium.woff2') format('woff2'),
-        url('https://d1sdjtjk6xzm7.cloudfront.net/public/MatterSQ-Medium.woff') format('woff');
+    src: url('https://d1sdjtjk6xzm7.cloudfront.net/MatterSQ-Medium.woff2') format('woff2'),
+        url('https://d1sdjtjk6xzm7.cloudfront.net/MatterSQ-Medium.woff') format('woff');
 }
diff --git a/frontend/src/styles/utilities.scss b/frontend/src/styles/utilities.scss
index 0e33b9b17b2c1..d01caa82c1d77 100644
--- a/frontend/src/styles/utilities.scss
+++ b/frontend/src/styles/utilities.scss
@@ -1323,6 +1323,14 @@ $decorations: underline, overline, line-through, no-underline;
     visibility: hidden;
 }
 
+.resize {
+    resize: both;
+}
+
+.resize-x {
+    resize: horizontal;
+}
+
 .resize-y {
     resize: vertical;
 }
diff --git a/frontend/src/styles/vars.scss b/frontend/src/styles/vars.scss
index 661e11f26b1d2..058e0fcf85f4d 100644
--- a/frontend/src/styles/vars.scss
+++ b/frontend/src/styles/vars.scss
@@ -243,7 +243,7 @@ $_lifecycle_dormant: $_danger;
     --font-semibold: 600;
     --font-sans: -apple-system, BlinkMacSystemFont, 'Inter', 'Segoe UI', 'Roboto', 'Helvetica Neue', helvetica, arial,
         sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
-    --font-title: 'MatterSQ', -apple-system, blinkmacsystemfont, 'Inter', 'Segoe UI', 'Roboto', 'Helvetica Neue',
+    --font-title: 'MatterSQ', -apple-system, BlinkMacSystemFont, 'Inter', 'Segoe UI', 'Roboto', 'Helvetica Neue',
         helvetica, arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
     --font-mono: ui-monospace, 'SFMono-Regular', 'SF Mono', 'Menlo', 'Consolas', 'Liberation Mono', monospace;
 
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index bf9bba96c3194..5e027807a2bcf 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -2242,6 +2242,7 @@ export interface RatingSurveyQuestion extends SurveyQuestionBase {
 export interface MultipleSurveyQuestion extends SurveyQuestionBase {
     type: SurveyQuestionType.SingleChoice | SurveyQuestionType.MultipleChoice
     choices: string[]
+    hasOpenChoice?: boolean
 }
 
 export type SurveyQuestion = BasicSurveyQuestion | LinkSurveyQuestion | RatingSurveyQuestion | MultipleSurveyQuestion
diff --git a/package.json b/package.json
index 194e4190efbee..8b089d66db684 100644
--- a/package.json
+++ b/package.json
@@ -136,7 +136,7 @@
         "monaco-editor": "^0.39.0",
         "papaparse": "^5.4.1",
         "pmtiles": "^2.11.0",
-        "posthog-js": "1.92.1",
+        "posthog-js": "1.93.0",
         "posthog-js-lite": "2.0.0-alpha5",
         "prettier": "^2.8.8",
         "prop-types": "^15.7.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a08ecc52451b0..61d44a8e0b5e5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -216,8 +216,8 @@ dependencies:
     specifier: ^2.11.0
     version: 2.11.0
   posthog-js:
-    specifier: 1.92.1
-    version: 1.92.1
+    specifier: 1.93.0
+    version: 1.93.0
   posthog-js-lite:
     specifier: 2.0.0-alpha5
     version: 2.0.0-alpha5
@@ -15805,8 +15805,8 @@ packages:
     resolution: {integrity: sha512-tlkBdypJuvK/s00n4EiQjwYVfuuZv6vt8BF3g1ooIQa2Gz9Vz80p8q3qsPLZ0V5ErGRy6i3Q4fWC9TDzR7GNRQ==}
     dev: false
 
-  /posthog-js@1.92.1:
-    resolution: {integrity: sha512-xtuTfM/acfDauiEfIdKF6d911KUZQ7RLii2COAYEoPWr3cVUFoNUoRQz9QJvgDlV2j22Zwl+mnXacUeua+Yi1A==}
+  /posthog-js@1.93.0:
+    resolution: {integrity: sha512-DKpn+AP8V8GuK0gcaCWbqN4jgs8bXe0LIyT4Jgjh6n486rJfVgzReV0cw6pyfVNWR6LZ+CvAMoqqYgJ0nH0z3g==}
     dependencies:
       fflate: 0.4.8
     dev: false
diff --git a/posthog/api/cohort.py b/posthog/api/cohort.py
index d417246b76d95..90324a48bfda0 100644
--- a/posthog/api/cohort.py
+++ b/posthog/api/cohort.py
@@ -10,6 +10,7 @@
     get_feature_flag_hash_key_overrides,
 )
 from posthog.models.person.person import PersonDistinctId
+from posthog.models.property.property import Property
 from posthog.queries.insight import insight_sync_execute
 import posthoganalytics
 from posthog.metrics import LABEL_TEAM_ID
@@ -556,7 +557,7 @@ def insert_actors_into_cohort_by_query(cohort: Cohort, query: str, params: Dict[
         capture_exception(err)
 
 
-def get_cohort_actors_for_feature_flag(cohort_id: int, flag: str, team_id: int, batchsize: int = 5_000):
+def get_cohort_actors_for_feature_flag(cohort_id: int, flag: str, team_id: int, batchsize: int = 1_000):
     # :TODO: Find a way to incorporate this into the same code path as feature flag evaluation
     try:
         feature_flag = FeatureFlag.objects.get(team_id=team_id, key=flag)
@@ -572,14 +573,16 @@ def get_cohort_actors_for_feature_flag(cohort_id: int, flag: str, team_id: int,
     cohorts_cache = {}
 
     if feature_flag.uses_cohorts:
+        # TODO: Consider disabling flags with cohorts for creating static cohorts
+        # because this is currently a lot more inefficient for flag matching,
+        # as we're required to go to the database for each person.
         cohorts_cache = {cohort.pk: cohort for cohort in Cohort.objects.filter(team_id=team_id, deleted=False)}
 
     default_person_properties = {}
     for condition in feature_flag.conditions:
         property_list = Filter(data=condition).property_groups.flat
         for property in property_list:
-            if property.operator not in ("is_set", "is_not_set") and property.type == "person":
-                default_person_properties[property.key] = ""
+            default_person_properties.update(get_default_person_property(property, cohorts_cache))
 
     try:
         # QuerySet.Iterator() doesn't work with pgbouncer, it will load everything into memory and then stream
@@ -596,7 +599,7 @@ def get_cohort_actors_for_feature_flag(cohort_id: int, flag: str, team_id: int,
             #     "distinct_id", flat=True
             # )[0]
             distinct_id_subquery = Subquery(
-                PersonDistinctId.objects.filter(person_id=OuterRef("person_id")).values_list("id", flat=True)[:1]
+                PersonDistinctId.objects.filter(person_id=OuterRef("person_id")).values_list("id", flat=True)[:3]
             )
             prefetch_related_objects(
                 batch_of_persons,
@@ -612,6 +615,10 @@ def get_cohort_actors_for_feature_flag(cohort_id: int, flag: str, team_id: int,
                 break
 
             for person in all_persons:
+                # ignore almost-deleted persons / persons with no distinct ids
+                if len(person.distinct_ids) == 0:
+                    continue
+
                 distinct_id = person.distinct_ids[0]
                 person_overrides = {}
                 if feature_flag.ensure_experience_continuity:
@@ -660,3 +667,30 @@ def get_cohort_actors_for_feature_flag(cohort_id: int, flag: str, team_id: int,
         if settings.DEBUG or settings.TEST:
             raise err
         capture_exception(err)
+
+
+def get_default_person_property(prop: Property, cohorts_cache: Dict[int, Cohort]):
+    default_person_properties = {}
+
+    if prop.operator not in ("is_set", "is_not_set") and prop.type == "person":
+        default_person_properties[prop.key] = ""
+    elif prop.type == "cohort" and not isinstance(prop.value, list):
+        try:
+            parsed_cohort_id = int(prop.value)
+        except (ValueError, TypeError):
+            return None
+        cohort = cohorts_cache.get(parsed_cohort_id)
+        if cohort:
+            return get_default_person_properties_for_cohort(cohort, cohorts_cache)
+    return default_person_properties
+
+
+def get_default_person_properties_for_cohort(cohort: Cohort, cohorts_cache: Dict[int, Cohort]) -> Dict[str, str]:
+    """
+    Returns a dictionary of default person properties to use when evaluating a feature flag
+    """
+    default_person_properties = {}
+    for property in cohort.properties.flat:
+        default_person_properties.update(get_default_person_property(property, cohorts_cache))
+
+    return default_person_properties
diff --git a/posthog/api/survey.py b/posthog/api/survey.py
index ef3e8c166dac8..70090e575cec3 100644
--- a/posthog/api/survey.py
+++ b/posthog/api/survey.py
@@ -135,6 +135,10 @@ def validate_questions(self, value):
             if description and nh3.is_html(description):
                 cleaned_question["description"] = nh3_clean_with_allow_list(description)
 
+            choices = raw_question.get("choices")
+            if choices and not isinstance(choices, list):
+                raise serializers.ValidationError("Question choices must be a list of strings")
+
             cleaned_questions.append(cleaned_question)
 
         return cleaned_questions
diff --git a/posthog/api/test/__snapshots__/test_feature_flag.ambr b/posthog/api/test/__snapshots__/test_feature_flag.ambr
index c7922b68432eb..ffe583b425eac 100644
--- a/posthog/api/test/__snapshots__/test_feature_flag.ambr
+++ b/posthog/api/test/__snapshots__/test_feature_flag.ambr
@@ -604,7 +604,490 @@
            (SELECT U0."id"
             FROM "posthog_persondistinctid" U0
             WHERE U0."person_id" = "posthog_persondistinctid"."person_id"
-            LIMIT 1)
+            LIMIT 3)
+         AND "posthog_persondistinctid"."person_id" IN (1,
+                                                        2,
+                                                        3,
+                                                        4,
+                                                        5 /* ... */))
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_iterator.4
+  '
+  SELECT "posthog_person"."uuid"
+  FROM "posthog_person"
+  WHERE ("posthog_person"."team_id" = 2
+         AND "posthog_person"."uuid" IN ('00000000-0000-0000-0000-000000000000'::uuid,
+                                         '00000000-0000-0000-0000-000000000001'::uuid /* ... */)
+         AND NOT (EXISTS
+                    (SELECT (1) AS "a"
+                     FROM "posthog_cohortpeople" U1
+                     WHERE (U1."cohort_id" = 2
+                            AND U1."person_id" = "posthog_person"."id")
+                     LIMIT 1)))
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_iterator.5
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."session_recording_network_payload_capture_config",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."plugins_opt_in",
+         "posthog_team"."opt_out_capture",
+         "posthog_team"."event_names",
+         "posthog_team"."event_names_with_usage",
+         "posthog_team"."event_properties",
+         "posthog_team"."event_properties_with_usage",
+         "posthog_team"."event_properties_numerical",
+         "posthog_team"."external_data_workspace_id",
+         "posthog_team"."external_data_workspace_last_synced_at"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_iterator.6
+  '
+  SELECT "posthog_person"."uuid"
+  FROM "posthog_person"
+  WHERE ("posthog_person"."team_id" = 2
+         AND "posthog_person"."uuid" IN ('00000000-0000-0000-0000-000000000000'::uuid,
+                                         '00000000-0000-0000-0000-000000000001'::uuid /* ... */)
+         AND NOT (EXISTS
+                    (SELECT (1) AS "a"
+                     FROM "posthog_cohortpeople" U1
+                     WHERE (U1."cohort_id" = 2
+                            AND U1."person_id" = "posthog_person"."id")
+                     LIMIT 1)))
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_iterator.7
+  '
+  SELECT "posthog_person"."id",
+         "posthog_person"."created_at",
+         "posthog_person"."properties_last_updated_at",
+         "posthog_person"."properties_last_operation",
+         "posthog_person"."team_id",
+         "posthog_person"."properties",
+         "posthog_person"."is_user_id",
+         "posthog_person"."is_identified",
+         "posthog_person"."uuid",
+         "posthog_person"."version"
+  FROM "posthog_person"
+  WHERE "posthog_person"."team_id" = 2
+  ORDER BY "posthog_person"."id" ASC
+  LIMIT 2
+  OFFSET 2
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_iterator.8
+  '
+  SELECT "posthog_persondistinctid"."id",
+         "posthog_persondistinctid"."team_id",
+         "posthog_persondistinctid"."person_id",
+         "posthog_persondistinctid"."distinct_id",
+         "posthog_persondistinctid"."version"
+  FROM "posthog_persondistinctid"
+  WHERE ("posthog_persondistinctid"."id" IN
+           (SELECT U0."id"
+            FROM "posthog_persondistinctid" U0
+            WHERE U0."person_id" = "posthog_persondistinctid"."person_id"
+            LIMIT 3)
+         AND "posthog_persondistinctid"."person_id" IN (1,
+                                                        2,
+                                                        3,
+                                                        4,
+                                                        5 /* ... */))
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_iterator.9
+  '
+  SELECT "posthog_person"."uuid"
+  FROM "posthog_person"
+  WHERE ("posthog_person"."team_id" = 2
+         AND "posthog_person"."uuid" IN ('00000000-0000-0000-0000-000000000000'::uuid,
+                                         '00000000-0000-0000-0000-000000000001'::uuid /* ... */)
+         AND NOT (EXISTS
+                    (SELECT (1) AS "a"
+                     FROM "posthog_cohortpeople" U1
+                     WHERE (U1."cohort_id" = 2
+                            AND U1."person_id" = "posthog_person"."id")
+                     LIMIT 1)))
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too
+  '
+  SELECT "posthog_featureflag"."id",
+         "posthog_featureflag"."key",
+         "posthog_featureflag"."name",
+         "posthog_featureflag"."filters",
+         "posthog_featureflag"."rollout_percentage",
+         "posthog_featureflag"."team_id",
+         "posthog_featureflag"."created_by_id",
+         "posthog_featureflag"."created_at",
+         "posthog_featureflag"."deleted",
+         "posthog_featureflag"."active",
+         "posthog_featureflag"."rollback_conditions",
+         "posthog_featureflag"."performed_rollback",
+         "posthog_featureflag"."ensure_experience_continuity",
+         "posthog_featureflag"."usage_dashboard_id",
+         "posthog_featureflag"."has_enriched_analytics"
+  FROM "posthog_featureflag"
+  WHERE ("posthog_featureflag"."key" = 'some-feature-new'
+         AND "posthog_featureflag"."team_id" = 2)
+  LIMIT 21
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too.1
+  '
+  SELECT "posthog_cohort"."id",
+         "posthog_cohort"."name",
+         "posthog_cohort"."description",
+         "posthog_cohort"."team_id",
+         "posthog_cohort"."deleted",
+         "posthog_cohort"."filters",
+         "posthog_cohort"."version",
+         "posthog_cohort"."pending_version",
+         "posthog_cohort"."count",
+         "posthog_cohort"."created_by_id",
+         "posthog_cohort"."created_at",
+         "posthog_cohort"."is_calculating",
+         "posthog_cohort"."last_calculation",
+         "posthog_cohort"."errors_calculating",
+         "posthog_cohort"."is_static",
+         "posthog_cohort"."groups"
+  FROM "posthog_cohort"
+  WHERE "posthog_cohort"."id" = 2
+  LIMIT 21
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too.10
+  '
+  SELECT "posthog_person"."uuid"
+  FROM "posthog_person"
+  WHERE ("posthog_person"."team_id" = 2
+         AND "posthog_person"."uuid" IN ('00000000-0000-0000-0000-000000000000'::uuid,
+                                         '00000000-0000-0000-0000-000000000001'::uuid /* ... */)
+         AND NOT (EXISTS
+                    (SELECT (1) AS "a"
+                     FROM "posthog_cohortpeople" U1
+                     WHERE (U1."cohort_id" = 2
+                            AND U1."person_id" = "posthog_person"."id")
+                     LIMIT 1)))
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too.11
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."session_recording_network_payload_capture_config",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."plugins_opt_in",
+         "posthog_team"."opt_out_capture",
+         "posthog_team"."event_names",
+         "posthog_team"."event_names_with_usage",
+         "posthog_team"."event_properties",
+         "posthog_team"."event_properties_with_usage",
+         "posthog_team"."event_properties_numerical",
+         "posthog_team"."external_data_workspace_id",
+         "posthog_team"."external_data_workspace_last_synced_at"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too.2
+  '
+  SELECT "posthog_cohort"."id",
+         "posthog_cohort"."name",
+         "posthog_cohort"."description",
+         "posthog_cohort"."team_id",
+         "posthog_cohort"."deleted",
+         "posthog_cohort"."filters",
+         "posthog_cohort"."version",
+         "posthog_cohort"."pending_version",
+         "posthog_cohort"."count",
+         "posthog_cohort"."created_by_id",
+         "posthog_cohort"."created_at",
+         "posthog_cohort"."is_calculating",
+         "posthog_cohort"."last_calculation",
+         "posthog_cohort"."errors_calculating",
+         "posthog_cohort"."is_static",
+         "posthog_cohort"."groups"
+  FROM "posthog_cohort"
+  WHERE (NOT "posthog_cohort"."deleted"
+         AND "posthog_cohort"."team_id" = 2)
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too.3
+  '
+  SELECT "posthog_person"."id",
+         "posthog_person"."created_at",
+         "posthog_person"."properties_last_updated_at",
+         "posthog_person"."properties_last_operation",
+         "posthog_person"."team_id",
+         "posthog_person"."properties",
+         "posthog_person"."is_user_id",
+         "posthog_person"."is_identified",
+         "posthog_person"."uuid",
+         "posthog_person"."version"
+  FROM "posthog_person"
+  WHERE "posthog_person"."team_id" = 2
+  ORDER BY "posthog_person"."id" ASC
+  LIMIT 1000
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too.4
+  '
+  SELECT "posthog_persondistinctid"."id",
+         "posthog_persondistinctid"."team_id",
+         "posthog_persondistinctid"."person_id",
+         "posthog_persondistinctid"."distinct_id",
+         "posthog_persondistinctid"."version"
+  FROM "posthog_persondistinctid"
+  WHERE ("posthog_persondistinctid"."id" IN
+           (SELECT U0."id"
+            FROM "posthog_persondistinctid" U0
+            WHERE U0."person_id" = "posthog_persondistinctid"."person_id"
+            LIMIT 3)
+         AND "posthog_persondistinctid"."person_id" IN (1,
+                                                        2,
+                                                        3,
+                                                        4,
+                                                        5 /* ... */))
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too.5
+  '
+  SELECT ("posthog_person"."id" IS NULL
+          OR "posthog_person"."id" IS NULL
+          OR EXISTS
+            (SELECT (1) AS "a"
+             FROM "posthog_cohortpeople" U0
+             WHERE (U0."cohort_id" = 2
+                    AND U0."cohort_id" = 2
+                    AND U0."person_id" = "posthog_person"."id")
+             LIMIT 1)
+          OR "posthog_person"."id" IS NULL) AS "flag_X_condition_0"
+  FROM "posthog_person"
+  INNER JOIN "posthog_persondistinctid" ON ("posthog_person"."id" = "posthog_persondistinctid"."person_id")
+  WHERE ("posthog_persondistinctid"."distinct_id" = 'person1'
+         AND "posthog_persondistinctid"."team_id" = 2
+         AND "posthog_person"."team_id" = 2)
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too.6
+  '
+  SELECT ("posthog_person"."id" IS NOT NULL
+          OR "posthog_person"."id" IS NULL
+          OR EXISTS
+            (SELECT (1) AS "a"
+             FROM "posthog_cohortpeople" U0
+             WHERE (U0."cohort_id" = 2
+                    AND U0."cohort_id" = 2
+                    AND U0."person_id" = "posthog_person"."id")
+             LIMIT 1)
+          OR "posthog_person"."id" IS NULL) AS "flag_X_condition_0"
+  FROM "posthog_person"
+  INNER JOIN "posthog_persondistinctid" ON ("posthog_person"."id" = "posthog_persondistinctid"."person_id")
+  WHERE ("posthog_persondistinctid"."distinct_id" = 'person2'
+         AND "posthog_persondistinctid"."team_id" = 2
+         AND "posthog_person"."team_id" = 2)
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too.7
+  '
+  SELECT ("posthog_person"."id" IS NULL
+          OR "posthog_person"."id" IS NOT NULL
+          OR EXISTS
+            (SELECT (1) AS "a"
+             FROM "posthog_cohortpeople" U0
+             WHERE (U0."cohort_id" = 2
+                    AND U0."cohort_id" = 2
+                    AND U0."person_id" = "posthog_person"."id")
+             LIMIT 1)
+          OR "posthog_person"."id" IS NULL) AS "flag_X_condition_0"
+  FROM "posthog_person"
+  INNER JOIN "posthog_persondistinctid" ON ("posthog_person"."id" = "posthog_persondistinctid"."person_id")
+  WHERE ("posthog_persondistinctid"."distinct_id" = 'person3'
+         AND "posthog_persondistinctid"."team_id" = 2
+         AND "posthog_person"."team_id" = 2)
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too.8
+  '
+  SELECT ("posthog_person"."id" IS NULL
+          OR "posthog_person"."id" IS NULL
+          OR EXISTS
+            (SELECT (1) AS "a"
+             FROM "posthog_cohortpeople" U0
+             WHERE (U0."cohort_id" = 2
+                    AND U0."cohort_id" = 2
+                    AND U0."person_id" = "posthog_person"."id")
+             LIMIT 1)
+          OR "posthog_person"."id" IS NULL) AS "flag_X_condition_0"
+  FROM "posthog_person"
+  INNER JOIN "posthog_persondistinctid" ON ("posthog_person"."id" = "posthog_persondistinctid"."person_id")
+  WHERE ("posthog_persondistinctid"."distinct_id" = 'person4'
+         AND "posthog_persondistinctid"."team_id" = 2
+         AND "posthog_person"."team_id" = 2)
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too.9
+  '
+  SELECT "posthog_person"."id",
+         "posthog_person"."created_at",
+         "posthog_person"."properties_last_updated_at",
+         "posthog_person"."properties_last_operation",
+         "posthog_person"."team_id",
+         "posthog_person"."properties",
+         "posthog_person"."is_user_id",
+         "posthog_person"."is_identified",
+         "posthog_person"."uuid",
+         "posthog_person"."version"
+  FROM "posthog_person"
+  WHERE "posthog_person"."team_id" = 2
+  ORDER BY "posthog_person"."id" ASC
+  LIMIT 1000
+  OFFSET 1000
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment
+  '
+  SELECT "posthog_featureflag"."id",
+         "posthog_featureflag"."key",
+         "posthog_featureflag"."name",
+         "posthog_featureflag"."filters",
+         "posthog_featureflag"."rollout_percentage",
+         "posthog_featureflag"."team_id",
+         "posthog_featureflag"."created_by_id",
+         "posthog_featureflag"."created_at",
+         "posthog_featureflag"."deleted",
+         "posthog_featureflag"."active",
+         "posthog_featureflag"."rollback_conditions",
+         "posthog_featureflag"."performed_rollback",
+         "posthog_featureflag"."ensure_experience_continuity",
+         "posthog_featureflag"."usage_dashboard_id",
+         "posthog_featureflag"."has_enriched_analytics"
+  FROM "posthog_featureflag"
+  WHERE ("posthog_featureflag"."key" = 'some-feature2'
+         AND "posthog_featureflag"."team_id" = 2)
+  LIMIT 21
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.1
+  '
+  SELECT "posthog_cohort"."id",
+         "posthog_cohort"."name",
+         "posthog_cohort"."description",
+         "posthog_cohort"."team_id",
+         "posthog_cohort"."deleted",
+         "posthog_cohort"."filters",
+         "posthog_cohort"."version",
+         "posthog_cohort"."pending_version",
+         "posthog_cohort"."count",
+         "posthog_cohort"."created_by_id",
+         "posthog_cohort"."created_at",
+         "posthog_cohort"."is_calculating",
+         "posthog_cohort"."last_calculation",
+         "posthog_cohort"."errors_calculating",
+         "posthog_cohort"."is_static",
+         "posthog_cohort"."groups"
+  FROM "posthog_cohort"
+  WHERE "posthog_cohort"."id" = 2
+  LIMIT 21
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.10
+  '
+  SELECT "posthog_persondistinctid"."id",
+         "posthog_persondistinctid"."team_id",
+         "posthog_persondistinctid"."person_id",
+         "posthog_persondistinctid"."distinct_id",
+         "posthog_persondistinctid"."version"
+  FROM "posthog_persondistinctid"
+  WHERE ("posthog_persondistinctid"."id" IN
+           (SELECT U0."id"
+            FROM "posthog_persondistinctid" U0
+            WHERE U0."person_id" = "posthog_persondistinctid"."person_id"
+            LIMIT 3)
          AND "posthog_persondistinctid"."person_id" IN (1,
                                                         2,
                                                         3,
@@ -612,7 +1095,36 @@
                                                         5 /* ... */))
   '
 ---
-# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_iterator.4
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.11
+  '
+  SELECT ("posthog_person"."properties" -> 'key') IS NOT NULL AS "flag_X_condition_0"
+  FROM "posthog_person"
+  INNER JOIN "posthog_persondistinctid" ON ("posthog_person"."id" = "posthog_persondistinctid"."person_id")
+  WHERE ("posthog_persondistinctid"."distinct_id" = 'person3'
+         AND "posthog_persondistinctid"."team_id" = 2
+         AND "posthog_person"."team_id" = 2)
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.12
+  '
+  SELECT "posthog_person"."id",
+         "posthog_person"."created_at",
+         "posthog_person"."properties_last_updated_at",
+         "posthog_person"."properties_last_operation",
+         "posthog_person"."team_id",
+         "posthog_person"."properties",
+         "posthog_person"."is_user_id",
+         "posthog_person"."is_identified",
+         "posthog_person"."uuid",
+         "posthog_person"."version"
+  FROM "posthog_person"
+  WHERE "posthog_person"."team_id" = 2
+  ORDER BY "posthog_person"."id" ASC
+  LIMIT 1000
+  OFFSET 1000
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.13
   '
   SELECT "posthog_person"."uuid"
   FROM "posthog_person"
@@ -627,7 +1139,7 @@
                      LIMIT 1)))
   '
 ---
-# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_iterator.5
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.14
   '
   SELECT "posthog_team"."id",
          "posthog_team"."uuid",
@@ -685,22 +1197,7 @@
   LIMIT 21
   '
 ---
-# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_iterator.6
-  '
-  SELECT "posthog_person"."uuid"
-  FROM "posthog_person"
-  WHERE ("posthog_person"."team_id" = 2
-         AND "posthog_person"."uuid" IN ('00000000-0000-0000-0000-000000000000'::uuid,
-                                         '00000000-0000-0000-0000-000000000001'::uuid /* ... */)
-         AND NOT (EXISTS
-                    (SELECT (1) AS "a"
-                     FROM "posthog_cohortpeople" U1
-                     WHERE (U1."cohort_id" = 2
-                            AND U1."person_id" = "posthog_person"."id")
-                     LIMIT 1)))
-  '
----
-# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_iterator.7
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.2
   '
   SELECT "posthog_person"."id",
          "posthog_person"."created_at",
@@ -715,11 +1212,10 @@
   FROM "posthog_person"
   WHERE "posthog_person"."team_id" = 2
   ORDER BY "posthog_person"."id" ASC
-  LIMIT 2
-  OFFSET 2
+  LIMIT 1000
   '
 ---
-# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_iterator.8
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.3
   '
   SELECT "posthog_persondistinctid"."id",
          "posthog_persondistinctid"."team_id",
@@ -731,7 +1227,7 @@
            (SELECT U0."id"
             FROM "posthog_persondistinctid" U0
             WHERE U0."person_id" = "posthog_persondistinctid"."person_id"
-            LIMIT 1)
+            LIMIT 3)
          AND "posthog_persondistinctid"."person_id" IN (1,
                                                         2,
                                                         3,
@@ -739,7 +1235,26 @@
                                                         5 /* ... */))
   '
 ---
-# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_iterator.9
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.4
+  '
+  SELECT "posthog_person"."id",
+         "posthog_person"."created_at",
+         "posthog_person"."properties_last_updated_at",
+         "posthog_person"."properties_last_operation",
+         "posthog_person"."team_id",
+         "posthog_person"."properties",
+         "posthog_person"."is_user_id",
+         "posthog_person"."is_identified",
+         "posthog_person"."uuid",
+         "posthog_person"."version"
+  FROM "posthog_person"
+  WHERE "posthog_person"."team_id" = 2
+  ORDER BY "posthog_person"."id" ASC
+  LIMIT 1000
+  OFFSET 1000
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.5
   '
   SELECT "posthog_person"."uuid"
   FROM "posthog_person"
@@ -754,6 +1269,128 @@
                      LIMIT 1)))
   '
 ---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.6
+  '
+  SELECT "posthog_team"."id",
+         "posthog_team"."uuid",
+         "posthog_team"."organization_id",
+         "posthog_team"."api_token",
+         "posthog_team"."app_urls",
+         "posthog_team"."name",
+         "posthog_team"."slack_incoming_webhook",
+         "posthog_team"."created_at",
+         "posthog_team"."updated_at",
+         "posthog_team"."anonymize_ips",
+         "posthog_team"."completed_snippet_onboarding",
+         "posthog_team"."has_completed_onboarding_for",
+         "posthog_team"."ingested_event",
+         "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_exceptions_opt_in",
+         "posthog_team"."autocapture_exceptions_errors_to_ignore",
+         "posthog_team"."session_recording_opt_in",
+         "posthog_team"."session_recording_sample_rate",
+         "posthog_team"."session_recording_minimum_duration_milliseconds",
+         "posthog_team"."session_recording_linked_flag",
+         "posthog_team"."session_recording_network_payload_capture_config",
+         "posthog_team"."capture_console_log_opt_in",
+         "posthog_team"."capture_performance_opt_in",
+         "posthog_team"."surveys_opt_in",
+         "posthog_team"."session_recording_version",
+         "posthog_team"."signup_token",
+         "posthog_team"."is_demo",
+         "posthog_team"."access_control",
+         "posthog_team"."week_start_day",
+         "posthog_team"."inject_web_apps",
+         "posthog_team"."test_account_filters",
+         "posthog_team"."test_account_filters_default_checked",
+         "posthog_team"."path_cleaning_filters",
+         "posthog_team"."timezone",
+         "posthog_team"."data_attributes",
+         "posthog_team"."person_display_name_properties",
+         "posthog_team"."live_events_columns",
+         "posthog_team"."recording_domains",
+         "posthog_team"."primary_dashboard_id",
+         "posthog_team"."extra_settings",
+         "posthog_team"."correlation_config",
+         "posthog_team"."session_recording_retention_period_days",
+         "posthog_team"."plugins_opt_in",
+         "posthog_team"."opt_out_capture",
+         "posthog_team"."event_names",
+         "posthog_team"."event_names_with_usage",
+         "posthog_team"."event_properties",
+         "posthog_team"."event_properties_with_usage",
+         "posthog_team"."event_properties_numerical",
+         "posthog_team"."external_data_workspace_id",
+         "posthog_team"."external_data_workspace_last_synced_at"
+  FROM "posthog_team"
+  WHERE "posthog_team"."id" = 2
+  LIMIT 21
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.7
+  '
+  SELECT "posthog_featureflag"."id",
+         "posthog_featureflag"."key",
+         "posthog_featureflag"."name",
+         "posthog_featureflag"."filters",
+         "posthog_featureflag"."rollout_percentage",
+         "posthog_featureflag"."team_id",
+         "posthog_featureflag"."created_by_id",
+         "posthog_featureflag"."created_at",
+         "posthog_featureflag"."deleted",
+         "posthog_featureflag"."active",
+         "posthog_featureflag"."rollback_conditions",
+         "posthog_featureflag"."performed_rollback",
+         "posthog_featureflag"."ensure_experience_continuity",
+         "posthog_featureflag"."usage_dashboard_id",
+         "posthog_featureflag"."has_enriched_analytics"
+  FROM "posthog_featureflag"
+  WHERE ("posthog_featureflag"."key" = 'some-feature-new'
+         AND "posthog_featureflag"."team_id" = 2)
+  LIMIT 21
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.8
+  '
+  SELECT "posthog_cohort"."id",
+         "posthog_cohort"."name",
+         "posthog_cohort"."description",
+         "posthog_cohort"."team_id",
+         "posthog_cohort"."deleted",
+         "posthog_cohort"."filters",
+         "posthog_cohort"."version",
+         "posthog_cohort"."pending_version",
+         "posthog_cohort"."count",
+         "posthog_cohort"."created_by_id",
+         "posthog_cohort"."created_at",
+         "posthog_cohort"."is_calculating",
+         "posthog_cohort"."last_calculation",
+         "posthog_cohort"."errors_calculating",
+         "posthog_cohort"."is_static",
+         "posthog_cohort"."groups"
+  FROM "posthog_cohort"
+  WHERE "posthog_cohort"."id" = 2
+  LIMIT 21
+  '
+---
+# name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_default_person_properties_adjustment.9
+  '
+  SELECT "posthog_person"."id",
+         "posthog_person"."created_at",
+         "posthog_person"."properties_last_updated_at",
+         "posthog_person"."properties_last_operation",
+         "posthog_person"."team_id",
+         "posthog_person"."properties",
+         "posthog_person"."is_user_id",
+         "posthog_person"."is_identified",
+         "posthog_person"."uuid",
+         "posthog_person"."version"
+  FROM "posthog_person"
+  WHERE "posthog_person"."team_id" = 2
+  ORDER BY "posthog_person"."id" ASC
+  LIMIT 1000
+  '
+---
 # name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_deleted_flag
   '
   SELECT "posthog_featureflag"."id",
@@ -1005,7 +1642,7 @@
   FROM "posthog_person"
   WHERE "posthog_person"."team_id" = 2
   ORDER BY "posthog_person"."id" ASC
-  LIMIT 5000
+  LIMIT 1000
   '
 ---
 # name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_experience_continuity_flag.3
@@ -1020,7 +1657,7 @@
            (SELECT U0."id"
             FROM "posthog_persondistinctid" U0
             WHERE U0."person_id" = "posthog_persondistinctid"."person_id"
-            LIMIT 1)
+            LIMIT 3)
          AND "posthog_persondistinctid"."person_id" IN (1,
                                                         2,
                                                         3,
@@ -1085,8 +1722,8 @@
   FROM "posthog_person"
   WHERE "posthog_person"."team_id" = 2
   ORDER BY "posthog_person"."id" ASC
-  LIMIT 5000
-  OFFSET 5000
+  LIMIT 1000
+  OFFSET 1000
   '
 ---
 # name: TestCohortGenerationForFeatureFlag.test_creating_static_cohort_with_experience_continuity_flag.8
@@ -1409,7 +2046,7 @@
            (SELECT U0."id"
             FROM "posthog_persondistinctid" U0
             WHERE U0."person_id" = "posthog_persondistinctid"."person_id"
-            LIMIT 1)
+            LIMIT 3)
          AND "posthog_persondistinctid"."person_id" IN (1,
                                                         2,
                                                         3,
@@ -1432,8 +2069,8 @@
   FROM "posthog_person"
   WHERE "posthog_person"."team_id" = 2
   ORDER BY "posthog_person"."id" ASC
-  LIMIT 5000
-  OFFSET 5000 /*controller='project_feature_flags-create-static-cohort-for-flag',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/feature_flags/%28%3FP%3Cpk%3E%5B%5E/.%5D%2B%29/create_static_cohort_for_flag/%3F%24'*/
+  LIMIT 1000
+  OFFSET 1000 /*controller='project_feature_flags-create-static-cohort-for-flag',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/feature_flags/%28%3FP%3Cpk%3E%5B%5E/.%5D%2B%29/create_static_cohort_for_flag/%3F%24'*/
   '
 ---
 # name: TestFeatureFlag.test_creating_static_cohort.12
@@ -1884,7 +2521,7 @@
   FROM "posthog_person"
   WHERE "posthog_person"."team_id" = 2
   ORDER BY "posthog_person"."id" ASC
-  LIMIT 5000 /*controller='project_feature_flags-create-static-cohort-for-flag',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/feature_flags/%28%3FP%3Cpk%3E%5B%5E/.%5D%2B%29/create_static_cohort_for_flag/%3F%24'*/
+  LIMIT 1000 /*controller='project_feature_flags-create-static-cohort-for-flag',route='api/projects/%28%3FP%3Cparent_lookup_team_id%3E%5B%5E/.%5D%2B%29/feature_flags/%28%3FP%3Cpk%3E%5B%5E/.%5D%2B%29/create_static_cohort_for_flag/%3F%24'*/
   '
 ---
 # name: TestResiliency.test_feature_flags_v3_with_experience_continuity_working_slow_db
diff --git a/posthog/api/test/test_feature_flag.py b/posthog/api/test/test_feature_flag.py
index 06997913184f8..31f46aabff9a0 100644
--- a/posthog/api/test/test_feature_flag.py
+++ b/posthog/api/test/test_feature_flag.py
@@ -3738,6 +3738,38 @@ def test_creating_static_cohort_with_group_flag(self):
         response = self.client.get(f"/api/cohort/{cohort.pk}/persons")
         self.assertEqual(len(response.json()["results"]), 0, response)
 
+    def test_creating_static_cohort_with_no_person_distinct_ids(self):
+        FeatureFlag.objects.create(
+            team=self.team,
+            rollout_percentage=100,
+            filters={
+                "groups": [{"properties": [], "rollout_percentage": 100}],
+                "multivariate": None,
+            },
+            name="some feature",
+            key="some-feature2",
+            created_by=self.user,
+        )
+
+        Person.objects.create(team=self.team)
+
+        cohort = Cohort.objects.create(
+            team=self.team,
+            is_static=True,
+            name="some cohort",
+        )
+
+        with self.assertNumQueries(5):
+            get_cohort_actors_for_feature_flag(cohort.pk, "some-feature2", self.team.pk)
+
+        cohort.refresh_from_db()
+        self.assertEqual(cohort.name, "some cohort")
+        # don't even try inserting anything, because invalid flag, so None instead of 0
+        self.assertEqual(cohort.count, None)
+
+        response = self.client.get(f"/api/cohort/{cohort.pk}/persons")
+        self.assertEqual(len(response.json()["results"]), 0, response)
+
     def test_creating_static_cohort_with_non_existing_flag(self):
         cohort = Cohort.objects.create(
             team=self.team,
@@ -3783,7 +3815,6 @@ def test_creating_static_cohort_with_experience_continuity_flag(self):
             properties={"key": "value"},
         )
         flush_persons_and_events()
-        # TODO: Check right person is added here
 
         FeatureFlagHashKeyOverride.objects.create(
             feature_flag_key="some-feature2",
@@ -3873,6 +3904,177 @@ def test_creating_static_cohort_iterator(self):
         response = self.client.get(f"/api/cohort/{cohort.pk}/persons")
         self.assertEqual(len(response.json()["results"]), 3, response)
 
+    def test_creating_static_cohort_with_default_person_properties_adjustment(self):
+        FeatureFlag.objects.create(
+            team=self.team,
+            filters={
+                "groups": [
+                    {
+                        "properties": [{"key": "key", "value": "value", "type": "person", "operator": "icontains"}],
+                        "rollout_percentage": 100,
+                    }
+                ],
+                "multivariate": None,
+            },
+            name="some feature",
+            key="some-feature2",
+            created_by=self.user,
+            ensure_experience_continuity=False,
+        )
+        FeatureFlag.objects.create(
+            team=self.team,
+            filters={
+                "groups": [
+                    {
+                        "properties": [{"key": "key", "value": "value", "type": "person", "operator": "is_set"}],
+                        "rollout_percentage": 100,
+                    }
+                ],
+                "multivariate": None,
+            },
+            name="some feature",
+            key="some-feature-new",
+            created_by=self.user,
+            ensure_experience_continuity=False,
+        )
+
+        _create_person(team=self.team, distinct_ids=[f"person1"], properties={"key": "value"})
+        _create_person(
+            team=self.team,
+            distinct_ids=[f"person2"],
+            properties={"key": "vaalue"},
+        )
+        _create_person(
+            team=self.team,
+            distinct_ids=[f"person3"],
+            properties={"key22": "value"},
+        )
+        flush_persons_and_events()
+
+        cohort = Cohort.objects.create(
+            team=self.team,
+            is_static=True,
+            name="some cohort",
+        )
+
+        with snapshot_postgres_queries_context(self), self.assertNumQueries(9):
+            # no queries to evaluate flags, because all evaluated using override properties
+            get_cohort_actors_for_feature_flag(cohort.pk, "some-feature2", self.team.pk)
+
+        cohort.refresh_from_db()
+        self.assertEqual(cohort.name, "some cohort")
+        self.assertEqual(cohort.count, 1)
+
+        response = self.client.get(f"/api/cohort/{cohort.pk}/persons")
+        self.assertEqual(len(response.json()["results"]), 1, response)
+
+        cohort2 = Cohort.objects.create(
+            team=self.team,
+            is_static=True,
+            name="some cohort2",
+        )
+
+        with snapshot_postgres_queries_context(self), self.assertNumQueries(13):
+            # need to evaluate flags for person3 using db, because is_set operator can't have defaults added.
+            get_cohort_actors_for_feature_flag(cohort2.pk, "some-feature-new", self.team.pk)
+
+        cohort2.refresh_from_db()
+        self.assertEqual(cohort2.name, "some cohort2")
+        self.assertEqual(cohort2.count, 2)
+
+    def test_creating_static_cohort_with_cohort_flag_adds_cohort_props_as_default_too(self):
+        cohort_nested = Cohort.objects.create(
+            team=self.team,
+            filters={
+                "properties": {
+                    "type": "OR",
+                    "values": [
+                        {
+                            "type": "OR",
+                            "values": [
+                                {"key": "does-not-exist", "value": "none", "type": "person"},
+                            ],
+                        }
+                    ],
+                }
+            },
+        )
+        cohort_static = Cohort.objects.create(
+            team=self.team,
+            is_static=True,
+        )
+        cohort_existing = Cohort.objects.create(
+            team=self.team,
+            filters={
+                "properties": {
+                    "type": "OR",
+                    "values": [
+                        {
+                            "type": "OR",
+                            "values": [
+                                {"key": "group", "value": "none", "type": "person"},
+                                {"key": "group2", "value": [1, 2, 3], "type": "person"},
+                                {"key": "id", "value": cohort_static.pk, "type": "cohort"},
+                                {"key": "id", "value": cohort_nested.pk, "type": "cohort"},
+                            ],
+                        }
+                    ],
+                }
+            },
+            name="cohort1",
+        )
+        FeatureFlag.objects.create(
+            team=self.team,
+            filters={
+                "groups": [
+                    {
+                        "properties": [{"key": "id", "value": cohort_existing.pk, "type": "cohort"}],
+                        "rollout_percentage": 100,
+                    },
+                    {"properties": [{"key": "key", "value": "value", "type": "person"}], "rollout_percentage": 100},
+                ],
+                "multivariate": None,
+            },
+            name="some feature",
+            key="some-feature-new",
+            created_by=self.user,
+            ensure_experience_continuity=False,
+        )
+
+        _create_person(team=self.team, distinct_ids=[f"person1"], properties={"key": "value"})
+        _create_person(
+            team=self.team,
+            distinct_ids=[f"person2"],
+            properties={"group": "none"},
+        )
+        _create_person(
+            team=self.team,
+            distinct_ids=[f"person3"],
+            properties={"key22": "value", "group2": 2},
+        )
+        _create_person(
+            team=self.team,
+            distinct_ids=[f"person4"],
+            properties={},
+        )
+        flush_persons_and_events()
+
+        cohort_static.insert_users_by_list([f"person4"])
+
+        cohort = Cohort.objects.create(
+            team=self.team,
+            is_static=True,
+            name="some cohort",
+        )
+
+        with snapshot_postgres_queries_context(self), self.assertNumQueries(26):
+            # forced to evaluate flags by going to db, because cohorts need db query to evaluate
+            get_cohort_actors_for_feature_flag(cohort.pk, "some-feature-new", self.team.pk)
+
+        cohort.refresh_from_db()
+        self.assertEqual(cohort.name, "some cohort")
+        self.assertEqual(cohort.count, 4)
+
 
 class TestBlastRadius(ClickhouseTestMixin, APIBaseTest):
     @snapshot_clickhouse_queries
diff --git a/posthog/api/test/test_survey.py b/posthog/api/test/test_survey.py
index 75cd3d1c91e5b..e1b5d3163605b 100644
--- a/posthog/api/test/test_survey.py
+++ b/posthog/api/test/test_survey.py
@@ -1144,6 +1144,27 @@ def test_validate_malformed_questions_as_array_of_strings(self):
         assert response.status_code == status.HTTP_400_BAD_REQUEST, response_data
         assert response_data["detail"] == "Questions must be a list of objects"
 
+    def test_validate_malformed_question_choices_as_string(self):
+        response = self.client.post(
+            f"/api/projects/{self.team.id}/surveys/",
+            data={
+                "name": "Notebooks beta release survey",
+                "description": "Get feedback on the new notebooks feature",
+                "type": "popover",
+                "questions": [
+                    {
+                        "question": "this is my question",
+                        "type": "multiple_choice",
+                        "choices": "these are my question choices",
+                    }
+                ],
+            },
+            format="json",
+        )
+        response_data = response.json()
+        assert response.status_code == status.HTTP_400_BAD_REQUEST, response_data
+        assert response_data["detail"] == "Question choices must be a list of strings"
+
 
 class TestSurveysAPIList(BaseTest, QueryMatchingTest):
     def setUp(self):
diff --git a/posthog/clickhouse/client/execute_async.py b/posthog/clickhouse/client/execute_async.py
index 7e42d52d4836c..d44c20b707223 100644
--- a/posthog/clickhouse/client/execute_async.py
+++ b/posthog/clickhouse/client/execute_async.py
@@ -141,16 +141,21 @@ def get_query_status(team_id, query_id):
 
 
 def cancel_query(team_id, query_id):
-    query_status = get_query_status(team_id, query_id)
+    try:
+        query_status = get_query_status(team_id, query_id)
+
+        if query_status.task_id:
+            logger.info("Got task id %s, attempting to revoke", query_status.task_id)
+            celery.app.control.revoke(query_status.task_id, terminate=True)
 
-    if query_status.task_id:
-        logger.info("Got task id %s, attempting to revoke", query_status.task_id)
-        celery.app.control.revoke(query_status.task_id, terminate=True)
+            logger.info("Revoked task id %s", query_status.task_id)
+    except QueryNotFoundError:
+        # Continue, to attempt to cancel the query even if it's not a task
+        pass
 
-        from posthog.clickhouse.cancel import cancel_query_on_cluster
+    from posthog.clickhouse.cancel import cancel_query_on_cluster
 
-        logger.info("Revoked task id %s, attempting to cancel on cluster", query_status.task_id)
-        cancel_query_on_cluster(team_id, query_id)
+    cancel_query_on_cluster(team_id, query_id)
 
     redis_client = redis.get_client()
     key = generate_redis_results_key(query_id, team_id)