diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5564a7248149..e7088d5cc2b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,308 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.3.0] - 2024-10-01
+
+### Bug Fixes
+
+- Update dependency @slack/web-api to v6.12.1 ([#8103](https://github.com/Unleash/unleash/issues/8103))
+
+- Also display strategy variant information on default strategies ([#8115](https://github.com/Unleash/unleash/issues/8115))
+
+- Give project_default_strategy_write the ability to update the default strategy ([#8112](https://github.com/Unleash/unleash/issues/8112))
+
+- Allow you to see default strategies if you have write access ([#8113](https://github.com/Unleash/unleash/issues/8113))
+
+- Allow you to save default strategies with the right permissions ([#8114](https://github.com/Unleash/unleash/issues/8114))
+
+- User projects should exclude archived ones ([#8118](https://github.com/Unleash/unleash/issues/8118))
+
+- Update dependency express-rate-limit to v7.4.0 ([#8127](https://github.com/Unleash/unleash/issues/8127))
+
+- Update dependency unleash-client to v5.6.1 ([#8129](https://github.com/Unleash/unleash/issues/8129))
+
+- Update dependency git-url-parse to v14.1.0 ([#8128](https://github.com/Unleash/unleash/issues/8128))
+
+- Invert logic ([#8135](https://github.com/Unleash/unleash/issues/8135))
+
+- Update dependency express to v4.20.0 [security] ([#8138](https://github.com/Unleash/unleash/issues/8138))
+
+- Docker warnings ([#8148](https://github.com/Unleash/unleash/issues/8148))
+
+- Express upgrade to 4.21 ([#8169](https://github.com/Unleash/unleash/issues/8169))
+
+- Upgrade openapi to drop dompurify and fix path-to-regexp ([#8170](https://github.com/Unleash/unleash/issues/8170))
+
+- Connect sdk description bg color ([#8171](https://github.com/Unleash/unleash/issues/8171))
+
+- Archive project curl ([#8181](https://github.com/Unleash/unleash/issues/8181))
+
+- Update playground SDK to increase the possible random numbers used for stickiness id ([#8182](https://github.com/Unleash/unleash/issues/8182))
+
+- Typo and improved example in latest ADR ([#8063](https://github.com/Unleash/unleash/issues/8063))
+
+- Now onboarding will show up in correct times ([#8214](https://github.com/Unleash/unleash/issues/8214))
+
+- Onboarding img asset path ([#8213](https://github.com/Unleash/unleash/issues/8213))
+
+- Update dependency nodemailer to v6.9.15 ([#8224](https://github.com/Unleash/unleash/issues/8224))
+
+- Trim messages longer than 3000 chars ([#8219](https://github.com/Unleash/unleash/issues/8219))
+
+- SDK snippets import ([#8235](https://github.com/Unleash/unleash/issues/8235))
+
+- Adjust welcome dialog size ([#8244](https://github.com/Unleash/unleash/issues/8244))
+
+- Layout content width on large screens ([#8267](https://github.com/Unleash/unleash/issues/8267))
+
+- Trim role names before validation ([#8277](https://github.com/Unleash/unleash/issues/8277))
+
+- Trim name and description before validation ([#8275](https://github.com/Unleash/unleash/issues/8275))
+
+- Now only one onboarding screen will be shown at time ([#8290](https://github.com/Unleash/unleash/issues/8290))
+
+- Event timeline should unmount when hidden and be closed by default ([#8294](https://github.com/Unleash/unleash/issues/8294))
+
+- Some integrations only counted errors not all results ([#8295](https://github.com/Unleash/unleash/issues/8295))
+
+- Extend feature_toggle_update counter with details about action ([#8202](https://github.com/Unleash/unleash/issues/8202))
+
+- Handle empty strings on permissions gracefully in access service ([#8306](https://github.com/Unleash/unleash/issues/8306))
+
+- Add missing awaits on events ([#8320](https://github.com/Unleash/unleash/issues/8320))
+
+
+### Documentation
+
+- Add in gradual rollout use case doc ([#8172](https://github.com/Unleash/unleash/issues/8172))
+
+- Remove extra diagram ([#8203](https://github.com/Unleash/unleash/issues/8203))
+
+- Demo is pro ([#8270](https://github.com/Unleash/unleash/issues/8270))
+
+- Recommend PG v13 or later ([#8276](https://github.com/Unleash/unleash/issues/8276))
+
+- Feature lifecycle availability ([#8288](https://github.com/Unleash/unleash/issues/8288))
+
+- A/B Testing Use Case Tutorial ([#8257](https://github.com/Unleash/unleash/issues/8257))
+
+
+### Features
+
+- Check flag status snippet ([#8097](https://github.com/Unleash/unleash/issues/8097))
+
+- Change sdk action ([#8098](https://github.com/Unleash/unleash/issues/8098))
+
+- Connection status bubble ([#8099](https://github.com/Unleash/unleash/issues/8099))
+
+- Onboarding stepper ([#8100](https://github.com/Unleash/unleash/issues/8100))
+
+- Onboarding step badges ([#8102](https://github.com/Unleash/unleash/issues/8102))
+
+- New onboarding welcome screen logic ([#8110](https://github.com/Unleash/unleash/issues/8110))
+
+- Make node example more consistent ([#8111](https://github.com/Unleash/unleash/issues/8111))
+
+- Explain complete feature name ([#8120](https://github.com/Unleash/unleash/issues/8120))
+
+- Swift and flutter sdk snippets ([#8149](https://github.com/Unleash/unleash/issues/8149))
+
+- Personal dashboard route ([#8173](https://github.com/Unleash/unleash/issues/8173))
+
+- My projects ui stub ([#8185](https://github.com/Unleash/unleash/issues/8185))
+
+- Personal dashboard project selection ([#8188](https://github.com/Unleash/unleash/issues/8188))
+
+- Personal dashboard connect sdk ([#8190](https://github.com/Unleash/unleash/issues/8190))
+
+- Placeholder flag metrics chart ([#8197](https://github.com/Unleash/unleash/issues/8197))
+
+- Onboarding flow will not break ([#8198](https://github.com/Unleash/unleash/issues/8198))
+
+- Welcome dialog with unleash concepts ([#8199](https://github.com/Unleash/unleash/issues/8199))
+
+- Onboarding can be now closed ([#8215](https://github.com/Unleash/unleash/issues/8215))
+
+- Personal dashboard api ([#8218](https://github.com/Unleash/unleash/issues/8218))
+
+- Personal flags UI component ([#8221](https://github.com/Unleash/unleash/issues/8221))
+
+- Complete java example ([#8227](https://github.com/Unleash/unleash/issues/8227))
+
+- Only show sdk button to specific roles ([#8231](https://github.com/Unleash/unleash/issues/8231))
+
+- Sdk snippets in files ([#8233](https://github.com/Unleash/unleash/issues/8233))
+
+- Personal flag metrics display ([#8232](https://github.com/Unleash/unleash/issues/8232))
+
+- Add your projects (with roles) to personal dashboard api ([#8236](https://github.com/Unleash/unleash/issues/8236))
+
+- Highlighting flags chart ([#8237](https://github.com/Unleash/unleash/issues/8237))
+
+- Add group project roles to project roles ([#8245](https://github.com/Unleash/unleash/issues/8245))
+
+- Flag exposure in personal dashboard ([#8247](https://github.com/Unleash/unleash/issues/8247))
+
+- Rust SDK snippet ([#8239](https://github.com/Unleash/unleash/issues/8239))
+
+- Add project owners to personal dashboard project payload ([#8248](https://github.com/Unleash/unleash/issues/8248))
+
+- Nodejs snippet for production ([#8256](https://github.com/Unleash/unleash/issues/8256))
+
+- Display new completed dialog ([#8255](https://github.com/Unleash/unleash/issues/8255))
+
+- Sdk connected using production snippet ([#8266](https://github.com/Unleash/unleash/issues/8266))
+
+- Get projects by ids ([#8269](https://github.com/Unleash/unleash/issues/8269))
+
+- Show user's roles and project owners ([#8253](https://github.com/Unleash/unleash/issues/8253))
+
+- Project details for personal dashboard ([#8274](https://github.com/Unleash/unleash/issues/8274))
+
+- Vue and Svelte snippets ([#8250](https://github.com/Unleash/unleash/issues/8250))
+
+- Read projects from personal dashboard API ([#8279](https://github.com/Unleash/unleash/issues/8279))
+
+- After onboarding show success box with resources ([#8278](https://github.com/Unleash/unleash/issues/8278))
+
+- Personal dashboard project details API stub ([#8282](https://github.com/Unleash/unleash/issues/8282))
+
+- Now code examples are joined into one ([#8284](https://github.com/Unleash/unleash/issues/8284))
+
+- Create page for when you have no projects ([#8285](https://github.com/Unleash/unleash/issues/8285))
+
+- Add production snippets and resources ([#8286](https://github.com/Unleash/unleash/issues/8286))
+
+- Return latest project events ([#8287](https://github.com/Unleash/unleash/issues/8287))
+
+- Android snippet ([#8281](https://github.com/Unleash/unleash/issues/8281))
+
+- Display basic list of project events ([#8291](https://github.com/Unleash/unleash/issues/8291))
+
+- Adjust search query for personal project ([#8296](https://github.com/Unleash/unleash/issues/8296))
+
+- Add project owners to personal dashboard ([#8293](https://github.com/Unleash/unleash/issues/8293))
+
+- Last project events ui polishing ([#8298](https://github.com/Unleash/unleash/issues/8298))
+
+- Add Unleash admins to API payload ([#8299](https://github.com/Unleash/unleash/issues/8299))
+
+- Open unleash concepts ([#8301](https://github.com/Unleash/unleash/issues/8301))
+
+- Add onboarding status to personal dashboard api ([#8302](https://github.com/Unleash/unleash/issues/8302))
+
+- Use onboarding status to conditionally show badge and message ([#8304](https://github.com/Unleash/unleash/issues/8304))
+
+- Hook up admin / owner data to UI ([#8300](https://github.com/Unleash/unleash/issues/8300))
+
+- Personal dashboard flag created ([#8305](https://github.com/Unleash/unleash/issues/8305))
+
+- Include favorite projects in personal dashboard ([#8309](https://github.com/Unleash/unleash/issues/8309))
+
+- Skeleton loaders for personal dashboard ([#8313](https://github.com/Unleash/unleash/issues/8313))
+
+- Return project owners ([#8312](https://github.com/Unleash/unleash/issues/8312))
+
+- Return project roles ([#8314](https://github.com/Unleash/unleash/issues/8314))
+
+- Add transactional support for access service ([#8311](https://github.com/Unleash/unleash/issues/8311))
+
+- Add links to examples ([#8308](https://github.com/Unleash/unleash/issues/8308))
+
+- Redirect to personal dashboard when no last project ([#8318](https://github.com/Unleash/unleash/issues/8318))
+
+- .NET snippet ([#8307](https://github.com/Unleash/unleash/issues/8307))
+
+
+### Miscellaneous Tasks
+
+- Bump version to 6.2.0
+
+- Remove unused SCIM setting - assumeControlOfExisting ([#8101](https://github.com/Unleash/unleash/issues/8101))
+
+- Adjust language names ([#8117](https://github.com/Unleash/unleash/issues/8117))
+
+- Add logging to new code path ([#8133](https://github.com/Unleash/unleash/issues/8133))
+
+- Add stringified logs ([#8134](https://github.com/Unleash/unleash/issues/8134))
+
+- Bump version to 6.2.1
+
+- Bump version to 6.2.2
+
+- Update go sdk examples ([#8145](https://github.com/Unleash/unleash/issues/8145))
+
+- PHP SDK example fix ([#8146](https://github.com/Unleash/unleash/issues/8146))
+
+- Remove debug logs ([#8147](https://github.com/Unleash/unleash/issues/8147))
+
+- Upgrade unleash-client and mime libraries ([#8158](https://github.com/Unleash/unleash/issues/8158))
+
+- Add eventTimeline feature flag ([#8159](https://github.com/Unleash/unleash/issues/8159))
+
+- Update docker yarnlock ([#8174](https://github.com/Unleash/unleash/issues/8174))
+
+- Bump version to 6.2.3
+
+- Make count column bigint. ([#8183](https://github.com/Unleash/unleash/issues/8183))
+
+- Event timeline ([#8176](https://github.com/Unleash/unleash/issues/8176))
+
+- Finalize python sdk example ([#8186](https://github.com/Unleash/unleash/issues/8186))
+
+- Enables github docker cache ([#8187](https://github.com/Unleash/unleash/issues/8187))
+
+- Update project onboarding UI text ([#8189](https://github.com/Unleash/unleash/issues/8189))
+
+- Orval gen ([#8220](https://github.com/Unleash/unleash/issues/8220))
+
+- Event timeline tooltips ([#8205](https://github.com/Unleash/unleash/issues/8205))
+
+- Full js sdk example ([#8229](https://github.com/Unleash/unleash/issues/8229))
+
+- Feature event formatter md format style ([#8222](https://github.com/Unleash/unleash/issues/8222))
+
+- Send full message without trimming to the addon event ([#8230](https://github.com/Unleash/unleash/issues/8230))
+
+- Event timeline header placement ([#8234](https://github.com/Unleash/unleash/issues/8234))
+
+- Event timeline persistent state ([#8240](https://github.com/Unleash/unleash/issues/8240))
+
+- Update orval for personal dashboards ([#8268](https://github.com/Unleash/unleash/issues/8268))
+
+- Remove manual anonymization of outgoing project owners ([#8252](https://github.com/Unleash/unleash/issues/8252))
+
+- Move onboarding flow and dialog under same location ([#8272](https://github.com/Unleash/unleash/issues/8272))
+
+- Implement event grouping in the event timeline ([#8254](https://github.com/Unleash/unleash/issues/8254))
+
+- Fix search events endpoint description ([#8289](https://github.com/Unleash/unleash/issues/8289))
+
+- Event timeline signals ([#8310](https://github.com/Unleash/unleash/issues/8310))
+
+
+### Refactor
+
+- Move getProjectsByUser to read model ([#8262](https://github.com/Unleash/unleash/issues/8262))
+
+- Composition root for personal dashboard service ([#8280](https://github.com/Unleash/unleash/issues/8280))
+
+- Extract my projects component ([#8317](https://github.com/Unleash/unleash/issues/8317))
+
+
+### Testing
+
+- Onboarding test with existing key ([#8116](https://github.com/Unleash/unleash/issues/8116))
+
+- Improve onboarding test ([#8121](https://github.com/Unleash/unleash/issues/8121))
+
+- Reduce noise from test warnings ([#8251](https://github.com/Unleash/unleash/issues/8251))
+
+- Skip vercel toolbar in e2e tests ([#8273](https://github.com/Unleash/unleash/issues/8273))
+
+- Test the dashboard admins property ([#8303](https://github.com/Unleash/unleash/issues/8303))
+
+
 ## [6.2.3] - 2024-09-18
 
 ### Bug Fixes
diff --git a/frontend/src/component/InitialRedirect.tsx b/frontend/src/component/InitialRedirect.tsx
index 4377385f5261..f65ba0e7186f 100644
--- a/frontend/src/component/InitialRedirect.tsx
+++ b/frontend/src/component/InitialRedirect.tsx
@@ -1,11 +1,13 @@
 import { useCallback, useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
-import useProjects from '../hooks/api/getters/useProjects/useProjects';
-import { useLastViewedProject } from '../hooks/useLastViewedProject';
+import useProjects from 'hooks/api/getters/useProjects/useProjects';
+import { useLastViewedProject } from 'hooks/useLastViewedProject';
 import Loader from './common/Loader/Loader';
-import { getSessionStorageItem, setSessionStorageItem } from '../utils/storage';
+import { getSessionStorageItem, setSessionStorageItem } from 'utils/storage';
+import { useUiFlag } from 'hooks/useUiFlag';
 
 export const InitialRedirect = () => {
+    const personalDashboardUiEnabled = useUiFlag('personalDashboardUI');
     const { lastViewed } = useLastViewedProject();
     const { projects, loading } = useProjects();
     const navigate = useNavigate();
@@ -17,12 +19,16 @@ export const InitialRedirect = () => {
             return `/projects/${lastViewed}`;
         }
 
+        if (personalDashboardUiEnabled) {
+            return '/personal';
+        }
+
         if (projects && !lastViewed && projects.length === 1) {
             return `/projects/${projects[0].id}`;
         }
 
         return '/projects';
-    }, [lastViewed, projects]);
+    }, [lastViewed, projects, personalDashboardUiEnabled]);
 
     const redirect = () => {
         navigate(sessionRedirect ?? getRedirect(), { replace: true });
diff --git a/frontend/src/component/commandBar/CommandBar.tsx b/frontend/src/component/commandBar/CommandBar.tsx
index 9701022191e5..e7434139e370 100644
--- a/frontend/src/component/commandBar/CommandBar.tsx
+++ b/frontend/src/component/commandBar/CommandBar.tsx
@@ -21,7 +21,10 @@ import { CommandPageSuggestions } from './CommandPageSuggestions';
 import { useRoutes } from 'component/layout/MainLayout/NavigationSidebar/useRoutes';
 import { useAsyncDebounce } from 'react-table';
 import useProjects from 'hooks/api/getters/useProjects/useProjects';
-import { CommandSearchFeatures } from './CommandSearchFeatures';
+import {
+    type CommandQueryCounter,
+    CommandSearchFeatures,
+} from './CommandSearchFeatures';
 import { usePlausibleTracker } from 'hooks/usePlausibleTracker';
 import { CommandQuickSuggestions } from './CommandQuickSuggestions';
 import { CommandSearchPages } from './CommandSearchPages';
@@ -105,7 +108,8 @@ export const CommandBar = () => {
     const [searchedPages, setSearchedPages] = useState<
         CommandResultGroupItem[]
     >([]);
-    const [searchedFlagCount, setSearchedFlagCount] = useState(0);
+    const [searchedFlagCount, setSearchedFlagCount] =
+        useState<CommandQueryCounter>({ query: '', count: 0 });
     const [hasNoResults, setHasNoResults] = useState(false);
     const [value, setValue] = useState<string>('');
     const { routes } = useRoutes();
@@ -155,7 +159,8 @@ export const CommandBar = () => {
             query.length !== 0 &&
             mappedProjects.length === 0 &&
             mappedPages.length === 0 &&
-            searchedFlagCount === 0;
+            searchedFlagCount.count === 0 &&
+            searchedFlagCount.query === query;
         if (noResultsFound) {
             trackEvent('command-bar', {
                 props: {
@@ -169,7 +174,7 @@ export const CommandBar = () => {
 
     useEffect(() => {
         debouncedSetSearchState(value);
-    }, [searchedFlagCount]);
+    }, [JSON.stringify(searchedFlagCount)]);
 
     const onSearchChange = (value: string) => {
         debouncedSetSearchState(value);
diff --git a/frontend/src/component/commandBar/CommandSearchFeatures.tsx b/frontend/src/component/commandBar/CommandSearchFeatures.tsx
index cb009fa75585..a75c3e79f7c9 100644
--- a/frontend/src/component/commandBar/CommandSearchFeatures.tsx
+++ b/frontend/src/component/commandBar/CommandSearchFeatures.tsx
@@ -6,9 +6,14 @@ import { useFeatureSearch } from 'hooks/api/getters/useFeatureSearch/useFeatureS
 import { useEffect } from 'react';
 import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
 
+export type CommandQueryCounter = {
+    query: string;
+    count: number;
+};
+
 interface ICommandBar {
     searchString: string;
-    setSearchedFlagCount: (count: number) => void;
+    setSearchedFlagCount: (count: CommandQueryCounter) => void;
     onClick: () => void;
     setSearchLoading: (loading: boolean) => void;
 }
@@ -36,8 +41,8 @@ export const CommandSearchFeatures = ({
     }));
 
     useEffect(() => {
-        setSearchedFlagCount(flags.length);
-    }, [JSON.stringify(flags)]);
+        setSearchedFlagCount({ count: flags.length, query: searchString });
+    }, [loading]);
 
     useEffect(() => {
         setSearchLoading(loading);
diff --git a/frontend/src/component/events/EventTimeline/EventTimeline.tsx b/frontend/src/component/events/EventTimeline/EventTimeline.tsx
index dda221500a41..296f35ff06df 100644
--- a/frontend/src/component/events/EventTimeline/EventTimeline.tsx
+++ b/frontend/src/component/events/EventTimeline/EventTimeline.tsx
@@ -4,11 +4,11 @@ import { startOfDay, sub } from 'date-fns';
 import { useEventSearch } from 'hooks/api/getters/useEventSearch/useEventSearch';
 import { EventTimelineEventGroup } from './EventTimelineEventGroup/EventTimelineEventGroup';
 import { EventTimelineHeader } from './EventTimelineHeader/EventTimelineHeader';
-import { useEventTimeline } from './useEventTimeline';
 import { useMemo } from 'react';
 import { useSignalQuery } from 'hooks/api/getters/useSignalQuery/useSignalQuery';
 import type { ISignalQuerySignal } from 'interfaces/signal';
 import type { IEnvironment } from 'interfaces/environments';
+import { useEventTimelineContext } from './EventTimelineContext';
 
 export type TimelineEventType = 'signal' | EventSchemaType;
 
@@ -30,6 +30,12 @@ const StyledRow = styled('div')({
     justifyContent: 'space-between',
 });
 
+const StyledTimelineBody = styled('div')(({ theme }) => ({
+    display: 'flex',
+    flexDirection: 'column',
+    padding: theme.spacing(1, 0),
+}));
+
 const StyledTimelineContainer = styled('div')(({ theme }) => ({
     position: 'relative',
     height: theme.spacing(1),
@@ -152,9 +158,7 @@ const getTimelineEvent = (
 };
 
 export const EventTimeline = () => {
-    const { timeSpan, environment, setTimeSpan, setEnvironment } =
-        useEventTimeline();
-
+    const { timeSpan, environment } = useEventTimelineContext();
     const endDate = new Date();
     const startDate = sub(endDate, timeSpan.value);
     const endTime = endDate.getTime();
@@ -229,37 +233,33 @@ export const EventTimeline = () => {
     return (
         <>
             <StyledRow>
-                <EventTimelineHeader
-                    totalEvents={events.length}
-                    timeSpan={timeSpan}
-                    setTimeSpan={setTimeSpan}
-                    environment={environment}
-                    setEnvironment={setEnvironment}
-                />
-            </StyledRow>
-            <StyledTimelineContainer>
-                <StyledTimeline />
-                <StyledStart />
-                {groups.map((group) => (
-                    <EventTimelineEventGroup
-                        key={group[0].id}
-                        group={group}
-                        startTime={startTime}
-                        endTime={endTime}
-                    />
-                ))}
-                <StyledEnd />
-            </StyledTimelineContainer>
-            <StyledRow>
-                <StyledMarkerLabel>{timeSpan.markers[0]}</StyledMarkerLabel>
-                {timeSpan.markers.slice(1).map((marker) => (
-                    <StyledMiddleMarkerContainer key={marker}>
-                        <StyledMiddleMarker />
-                        <StyledMarkerLabel>{marker}</StyledMarkerLabel>
-                    </StyledMiddleMarkerContainer>
-                ))}
-                <StyledMarkerLabel>now</StyledMarkerLabel>
+                <EventTimelineHeader totalEvents={events.length} />
             </StyledRow>
+            <StyledTimelineBody>
+                <StyledTimelineContainer>
+                    <StyledTimeline />
+                    <StyledStart />
+                    {groups.map((group) => (
+                        <EventTimelineEventGroup
+                            key={group[0].id}
+                            group={group}
+                            startTime={startTime}
+                            endTime={endTime}
+                        />
+                    ))}
+                    <StyledEnd />
+                </StyledTimelineContainer>
+                <StyledRow>
+                    <StyledMarkerLabel>{timeSpan.markers[0]}</StyledMarkerLabel>
+                    {timeSpan.markers.slice(1).map((marker) => (
+                        <StyledMiddleMarkerContainer key={marker}>
+                            <StyledMiddleMarker />
+                            <StyledMarkerLabel>{marker}</StyledMarkerLabel>
+                        </StyledMiddleMarkerContainer>
+                    ))}
+                    <StyledMarkerLabel>now</StyledMarkerLabel>
+                </StyledRow>
+            </StyledTimelineBody>
         </>
     );
 };
diff --git a/frontend/src/component/events/EventTimeline/EventTimelineContext.tsx b/frontend/src/component/events/EventTimeline/EventTimelineContext.tsx
new file mode 100644
index 000000000000..85e5cd1154e1
--- /dev/null
+++ b/frontend/src/component/events/EventTimeline/EventTimelineContext.tsx
@@ -0,0 +1,18 @@
+import { createContext, useContext } from 'react';
+import type { IEventTimelineContext } from './EventTimelineProvider';
+
+export const EventTimelineContext = createContext<
+    IEventTimelineContext | undefined
+>(undefined);
+
+export const useEventTimelineContext = (): IEventTimelineContext => {
+    const context = useContext(EventTimelineContext);
+
+    if (!context) {
+        throw new Error(
+            'useEventTimelineContext must be used within a EventTimelineProvider',
+        );
+    }
+
+    return context;
+};
diff --git a/frontend/src/component/events/EventTimeline/EventTimelineEventGroup/EventTimelineEventCircle.tsx b/frontend/src/component/events/EventTimeline/EventTimelineEventGroup/EventTimelineEventCircle.tsx
index 5d3969f56d66..0b5e2fd761c5 100644
--- a/frontend/src/component/events/EventTimeline/EventTimelineEventGroup/EventTimelineEventCircle.tsx
+++ b/frontend/src/component/events/EventTimeline/EventTimelineEventGroup/EventTimelineEventCircle.tsx
@@ -47,7 +47,11 @@ const getEventIcon = (type: TimelineEventType) => {
         return <ToggleOffIcon />;
     }
     if (type.startsWith('strategy-') || type.startsWith('feature-strategy-')) {
-        return <ExtensionOutlinedIcon />;
+        return (
+            <ExtensionOutlinedIcon
+                sx={{ marginTop: '-2px', marginRight: '-2px' }}
+            />
+        );
     }
     if (type.startsWith('feature-')) {
         return <FlagOutlinedIcon />;
@@ -77,7 +81,10 @@ export const EventTimelineEventCircle = ({
     group,
     ...props
 }: IEventTimelineEventCircleProps) => {
-    if (group.length === 1) {
+    if (
+        group.length === 1 ||
+        !group.some(({ type }) => type !== group[0].type)
+    ) {
         const event = group[0];
 
         return (
diff --git a/frontend/src/component/events/EventTimeline/EventTimelineEventGroup/EventTimelineEventGroup.tsx b/frontend/src/component/events/EventTimeline/EventTimelineEventGroup/EventTimelineEventGroup.tsx
index 9c458a4cbd69..14e628783710 100644
--- a/frontend/src/component/events/EventTimeline/EventTimelineEventGroup/EventTimelineEventGroup.tsx
+++ b/frontend/src/component/events/EventTimeline/EventTimelineEventGroup/EventTimelineEventGroup.tsx
@@ -36,7 +36,7 @@ export const EventTimelineEventGroup = ({
         <StyledEvent position={position}>
             <HtmlTooltip
                 title={<EventTimelineEventTooltip group={group} />}
-                maxWidth={320}
+                maxWidth={350}
                 arrow
             >
                 <Badge
diff --git a/frontend/src/component/events/EventTimeline/EventTimelineEventGroup/EventTimelineEventTooltip/EventTimelineEventTooltip.tsx b/frontend/src/component/events/EventTimeline/EventTimelineEventGroup/EventTimelineEventTooltip/EventTimelineEventTooltip.tsx
index 29d1ab92700d..45c9846bc428 100644
--- a/frontend/src/component/events/EventTimeline/EventTimelineEventGroup/EventTimelineEventTooltip/EventTimelineEventTooltip.tsx
+++ b/frontend/src/component/events/EventTimeline/EventTimelineEventGroup/EventTimelineEventTooltip/EventTimelineEventTooltip.tsx
@@ -1,5 +1,6 @@
 import { styled } from '@mui/material';
 import { Markdown } from 'component/common/Markdown/Markdown';
+import type { HTMLAttributes } from 'react';
 import { useLocationSettings } from 'hooks/useLocationSettings';
 import {
     formatDateHMS,
@@ -35,20 +36,26 @@ const StyledDate = styled('div')(({ theme }) => ({
     whiteSpace: 'nowrap',
 }));
 
+const StyledTooltipItemList = styled('div')(({ theme }) => ({
+    marginTop: theme.spacing(1),
+    display: 'flex',
+    flexDirection: 'column',
+    gap: theme.spacing(2),
+}));
+
 const StyledTooltipItem = styled('div')(({ theme }) => ({
     display: 'flex',
     gap: theme.spacing(1),
-    marginBottom: theme.spacing(1),
 }));
 
 const StyledEventTimelineEventCircle = styled(EventTimelineEventCircle)(
     ({ theme }) => ({
-        marginTop: theme.spacing(0.5),
+        marginTop: theme.spacing(0.125),
         height: theme.spacing(2.5),
         width: theme.spacing(2.5),
         transition: 'none',
         '& > svg': {
-            height: theme.spacing(2),
+            height: theme.spacing(1.75),
         },
         '&:hover': {
             transform: 'none',
@@ -56,6 +63,8 @@ const StyledEventTimelineEventCircle = styled(EventTimelineEventCircle)(
     }),
 );
 
+const BoldToNormal = ({ children }: HTMLAttributes<HTMLElement>) => children;
+
 interface IEventTimelineEventTooltipProps {
     group: TimelineEventGroup;
 }
@@ -78,7 +87,9 @@ export const EventTimelineEventTooltip = ({
                     <StyledTooltipTitle>{event.label}</StyledTooltipTitle>
                     <StyledDateTime>{eventDateTime}</StyledDateTime>
                 </StyledTooltipHeader>
-                <Markdown>{event.summary}</Markdown>
+                <Markdown components={{ strong: BoldToNormal }}>
+                    {event.summary}
+                </Markdown>
             </>
         );
     }
@@ -97,20 +108,24 @@ export const EventTimelineEventTooltip = ({
                 </StyledTooltipTitle>
                 <StyledDate>{eventDate}</StyledDate>
             </StyledTooltipHeader>
-            {group.map((event) => (
-                <StyledTooltipItem key={event.id}>
-                    <StyledEventTimelineEventCircle group={[event]} />
-                    <div>
-                        <StyledDate>
-                            {formatDateHMS(
-                                event.timestamp,
-                                locationSettings?.locale,
-                            )}
-                        </StyledDate>
-                        <Markdown>{event.summary}</Markdown>
-                    </div>
-                </StyledTooltipItem>
-            ))}
+            <StyledTooltipItemList>
+                {group.map((event) => (
+                    <StyledTooltipItem key={event.id}>
+                        <StyledEventTimelineEventCircle group={[event]} />
+                        <div>
+                            <StyledDate>
+                                {formatDateHMS(
+                                    event.timestamp,
+                                    locationSettings?.locale,
+                                )}
+                            </StyledDate>
+                            <Markdown components={{ strong: BoldToNormal }}>
+                                {event.summary}
+                            </Markdown>
+                        </div>
+                    </StyledTooltipItem>
+                ))}
+            </StyledTooltipItemList>
         </>
     );
 };
diff --git a/frontend/src/component/events/EventTimeline/EventTimelineHeader/EventTimelineHeader.tsx b/frontend/src/component/events/EventTimeline/EventTimelineHeader/EventTimelineHeader.tsx
index d7c29ea76d4b..e8e571fb5370 100644
--- a/frontend/src/component/events/EventTimeline/EventTimelineHeader/EventTimelineHeader.tsx
+++ b/frontend/src/component/events/EventTimeline/EventTimelineHeader/EventTimelineHeader.tsx
@@ -1,9 +1,16 @@
-import { MenuItem, styled, TextField } from '@mui/material';
+import {
+    IconButton,
+    MenuItem,
+    styled,
+    TextField,
+    Tooltip,
+} from '@mui/material';
 import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
 import { useEnvironments } from 'hooks/api/getters/useEnvironments/useEnvironments';
-import type { IEnvironment } from 'interfaces/environments';
 import { useEffect, useMemo } from 'react';
-import { type TimeSpanOption, timeSpanOptions } from '../useEventTimeline';
+import { timeSpanOptions } from '../EventTimelineProvider';
+import CloseIcon from '@mui/icons-material/Close';
+import { useEventTimelineContext } from '../EventTimelineContext';
 
 const StyledCol = styled('div')(({ theme }) => ({
     display: 'flex',
@@ -12,9 +19,9 @@ const StyledCol = styled('div')(({ theme }) => ({
 }));
 
 const StyledFilter = styled(TextField)(({ theme }) => ({
-    color: theme.palette.text.secondary,
     '& > div': {
         background: 'transparent',
+        color: theme.palette.text.secondary,
         '& > .MuiSelect-select': {
             padding: theme.spacing(0.5, 4, 0.5, 1),
             background: 'transparent',
@@ -23,21 +30,19 @@ const StyledFilter = styled(TextField)(({ theme }) => ({
     },
 }));
 
+const StyledTimelineEventsCount = styled('span')(({ theme }) => ({
+    marginTop: theme.spacing(0.25),
+}));
+
 interface IEventTimelineHeaderProps {
     totalEvents: number;
-    timeSpan: TimeSpanOption;
-    setTimeSpan: (timeSpan: TimeSpanOption) => void;
-    environment: IEnvironment | undefined;
-    setEnvironment: (environment: IEnvironment) => void;
 }
 
 export const EventTimelineHeader = ({
     totalEvents,
-    timeSpan,
-    setTimeSpan,
-    environment,
-    setEnvironment,
 }: IEventTimelineHeaderProps) => {
+    const { timeSpan, environment, setOpen, setTimeSpan, setEnvironment } =
+        useEventTimelineContext();
     const { environments } = useEnvironments();
 
     const activeEnvironments = useMemo(
@@ -57,10 +62,10 @@ export const EventTimelineHeader = ({
     return (
         <>
             <StyledCol>
-                <span>
+                <StyledTimelineEventsCount>
                     {totalEvents} event
                     {totalEvents === 1 ? '' : 's'}
-                </span>
+                </StyledTimelineEventsCount>
                 <StyledFilter
                     select
                     size='small'
@@ -106,6 +111,15 @@ export const EventTimelineHeader = ({
                         </StyledFilter>
                     )}
                 />
+                <Tooltip title='Hide timeline' arrow>
+                    <IconButton
+                        aria-label='close'
+                        size='small'
+                        onClick={() => setOpen(false)}
+                    >
+                        <CloseIcon />
+                    </IconButton>
+                </Tooltip>
             </StyledCol>
         </>
     );
diff --git a/frontend/src/component/events/EventTimeline/useEventTimeline.ts b/frontend/src/component/events/EventTimeline/EventTimelineProvider.tsx
similarity index 69%
rename from frontend/src/component/events/EventTimeline/useEventTimeline.ts
rename to frontend/src/component/events/EventTimeline/EventTimelineProvider.tsx
index 66367ea2ab06..680bd7bfed55 100644
--- a/frontend/src/component/events/EventTimeline/useEventTimeline.ts
+++ b/frontend/src/component/events/EventTimeline/EventTimelineProvider.tsx
@@ -1,13 +1,33 @@
+import type { ReactNode } from 'react';
+import { EventTimelineContext } from './EventTimelineContext';
 import { useLocalStorageState } from 'hooks/useLocalStorageState';
 import type { IEnvironment } from 'interfaces/environments';
 
-export type TimeSpanOption = {
+type TimeSpanOption = {
     key: string;
     label: string;
     value: Duration;
     markers: string[];
 };
 
+type EventTimelineState = {
+    open: boolean;
+    timeSpan: TimeSpanOption;
+    environment?: IEnvironment;
+    signalsAlertSeen?: boolean;
+};
+
+type EventTimelineStateSetters = {
+    setOpen: (open: boolean) => void;
+    setTimeSpan: (timeSpan: TimeSpanOption) => void;
+    setEnvironment: (environment: IEnvironment) => void;
+    setSignalsAlertSeen: (seen: boolean) => void;
+};
+
+export interface IEventTimelineContext
+    extends EventTimelineState,
+        EventTimelineStateSetters {}
+
 export const timeSpanOptions: TimeSpanOption[] = [
     {
         key: '30m',
@@ -57,18 +77,18 @@ export const timeSpanOptions: TimeSpanOption[] = [
     },
 ];
 
-type EventTimelineState = {
-    open: boolean;
-    timeSpan: TimeSpanOption;
-    environment?: IEnvironment;
-};
-
 const defaultState: EventTimelineState = {
     open: false,
     timeSpan: timeSpanOptions[0],
 };
 
-export const useEventTimeline = () => {
+interface IEventTimelineProviderProps {
+    children: ReactNode;
+}
+
+export const EventTimelineProvider = ({
+    children,
+}: IEventTimelineProviderProps) => {
     const [state, setState] = useLocalStorageState<EventTimelineState>(
         'event-timeline:v1',
         defaultState,
@@ -81,12 +101,20 @@ export const useEventTimeline = () => {
         setState((prevState) => ({ ...prevState, [key]: value }));
     };
 
-    return {
+    const contextValue: IEventTimelineContext = {
         ...state,
         setOpen: (open: boolean) => setField('open', open),
         setTimeSpan: (timeSpan: TimeSpanOption) =>
             setField('timeSpan', timeSpan),
         setEnvironment: (environment: IEnvironment) =>
             setField('environment', environment),
+        setSignalsAlertSeen: (seen: boolean) =>
+            setField('signalsAlertSeen', seen),
     };
+
+    return (
+        <EventTimelineContext.Provider value={contextValue}>
+            {children}
+        </EventTimelineContext.Provider>
+    );
 };
diff --git a/frontend/src/component/layout/MainLayout/MainLayout.tsx b/frontend/src/component/layout/MainLayout/MainLayout.tsx
index ab8af57676bf..88460c8ebbe3 100644
--- a/frontend/src/component/layout/MainLayout/MainLayout.tsx
+++ b/frontend/src/component/layout/MainLayout/MainLayout.tsx
@@ -17,8 +17,8 @@ import { DraftBanner } from './DraftBanner/DraftBanner';
 import { ThemeMode } from 'component/common/ThemeMode/ThemeMode';
 import { NavigationSidebar } from './NavigationSidebar/NavigationSidebar';
 import { useUiFlag } from 'hooks/useUiFlag';
-import { useEventTimeline } from 'component/events/EventTimeline/useEventTimeline';
 import { MainLayoutEventTimeline } from './MainLayoutEventTimeline';
+import { EventTimelineProvider } from 'component/events/EventTimeline/EventTimelineProvider';
 
 interface IMainLayoutProps {
     children: ReactNode;
@@ -112,14 +112,11 @@ const MainLayoutContentContainer = styled('div')(({ theme }) => ({
 
 export const MainLayout = forwardRef<HTMLDivElement, IMainLayoutProps>(
     ({ children }, ref) => {
-        const { uiConfig, isOss } = useUiConfig();
+        const { uiConfig } = useUiConfig();
         const projectId = useOptionalPathParam('projectId');
         const { isChangeRequestConfiguredInAnyEnv } = useChangeRequestsEnabled(
             projectId || '',
         );
-        const eventTimeline = useUiFlag('eventTimeline') && !isOss();
-        const { open: showTimeline, setOpen: setShowTimeline } =
-            useEventTimeline();
 
         const sidebarNavigationEnabled = useUiFlag('navigationSidebar');
         const StyledMainLayoutContent = sidebarNavigationEnabled
@@ -129,22 +126,12 @@ export const MainLayout = forwardRef<HTMLDivElement, IMainLayoutProps>(
         const isSmallScreen = useMediaQuery(theme.breakpoints.down('lg'));
 
         return (
-            <>
+            <EventTimelineProvider>
                 <SkipNavLink />
                 <ConditionallyRender
                     condition={sidebarNavigationEnabled}
-                    show={
-                        <Header
-                            showTimeline={showTimeline}
-                            setShowTimeline={setShowTimeline}
-                        />
-                    }
-                    elseShow={
-                        <OldHeader
-                            showTimeline={showTimeline}
-                            setShowTimeline={setShowTimeline}
-                        />
-                    }
+                    show={<Header />}
+                    elseShow={<OldHeader />}
                 />
 
                 <SkipNavTarget />
@@ -179,9 +166,7 @@ export const MainLayout = forwardRef<HTMLDivElement, IMainLayoutProps>(
                                     minWidth: 0,
                                 }}
                             >
-                                <MainLayoutEventTimeline
-                                    open={eventTimeline && showTimeline}
-                                />
+                                <MainLayoutEventTimeline />
 
                                 <StyledMainLayoutContent>
                                     <MainLayoutContentContainer ref={ref}>
@@ -211,7 +196,7 @@ export const MainLayout = forwardRef<HTMLDivElement, IMainLayoutProps>(
                     </MainLayoutContentWrapper>
                     <Footer />
                 </MainLayoutContainer>
-            </>
+            </EventTimelineProvider>
         );
     },
 );
diff --git a/frontend/src/component/layout/MainLayout/MainLayoutEventTimeline.tsx b/frontend/src/component/layout/MainLayout/MainLayoutEventTimeline.tsx
index 4272deccfc11..8b39eec23d76 100644
--- a/frontend/src/component/layout/MainLayout/MainLayoutEventTimeline.tsx
+++ b/frontend/src/component/layout/MainLayout/MainLayoutEventTimeline.tsx
@@ -1,29 +1,37 @@
 import { Box, styled } from '@mui/material';
 import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
 import { EventTimeline } from 'component/events/EventTimeline/EventTimeline';
+import { useEventTimelineContext } from 'component/events/EventTimeline/EventTimelineContext';
+import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
+import { useUiFlag } from 'hooks/useUiFlag';
 import { useEffect, useState } from 'react';
 
-interface IMainLayoutEventTimelineProps {
-    open: boolean;
-}
-
-const StyledEventTimelineWrapper = styled(Box)(({ theme }) => ({
+const StyledEventTimelineSlider = styled(Box)(({ theme }) => ({
     backgroundColor: theme.palette.background.paper,
     height: '105px',
     overflow: 'hidden',
+    boxShadow: theme.boxShadows.popup,
+    borderLeft: `1px solid ${theme.palette.divider}`,
+}));
+
+const StyledEventTimelineWrapper = styled(Box)(({ theme }) => ({
+    padding: theme.spacing(1.5, 2),
 }));
 
-export const MainLayoutEventTimeline = ({
-    open,
-}: IMainLayoutEventTimelineProps) => {
+export const MainLayoutEventTimeline = () => {
+    const { isOss } = useUiConfig();
+    const { open: showTimeline } = useEventTimelineContext();
+    const eventTimelineEnabled = useUiFlag('eventTimeline') && !isOss();
     const [isInitialLoad, setIsInitialLoad] = useState(true);
 
+    const open = showTimeline && eventTimelineEnabled;
+
     useEffect(() => {
         setIsInitialLoad(false);
     }, []);
 
     return (
-        <StyledEventTimelineWrapper
+        <StyledEventTimelineSlider
             sx={{
                 transition: isInitialLoad
                     ? 'none'
@@ -31,17 +39,12 @@ export const MainLayoutEventTimeline = ({
                 maxHeight: open ? '105px' : '0',
             }}
         >
-            <Box
-                sx={(theme) => ({
-                    padding: theme.spacing(2),
-                    backgroundColor: theme.palette.background.paper,
-                })}
-            >
+            <StyledEventTimelineWrapper>
                 <ConditionallyRender
                     condition={open}
                     show={<EventTimeline />}
                 />
-            </Box>
-        </StyledEventTimelineWrapper>
+            </StyledEventTimelineWrapper>
+        </StyledEventTimelineSlider>
     );
 };
diff --git a/frontend/src/component/menu/Header/Header.tsx b/frontend/src/component/menu/Header/Header.tsx
index 27bf1ef90316..53cb5e830d07 100644
--- a/frontend/src/component/menu/Header/Header.tsx
+++ b/frontend/src/component/menu/Header/Header.tsx
@@ -33,7 +33,8 @@ import { useAdminRoutes } from 'component/admin/useAdminRoutes';
 import InviteLinkButton from './InviteLink/InviteLinkButton/InviteLinkButton';
 import { useUiFlag } from 'hooks/useUiFlag';
 import { CommandBar } from 'component/commandBar/CommandBar';
-import TimelineIcon from '@mui/icons-material/Timeline';
+import LinearScaleIcon from '@mui/icons-material/LinearScale';
+import { useEventTimelineContext } from 'component/events/EventTimeline/EventTimelineContext';
 
 const HeaderComponent = styled(AppBar)(({ theme }) => ({
     backgroundColor: theme.palette.background.paper,
@@ -97,12 +98,7 @@ const StyledIconButton = styled(IconButton)<{
     },
 }));
 
-interface IHeaderProps {
-    showTimeline: boolean;
-    setShowTimeline: (show: boolean) => void;
-}
-
-const Header = ({ showTimeline, setShowTimeline }: IHeaderProps) => {
+const Header = () => {
     const { onSetThemeMode, themeMode } = useThemeMode();
     const theme = useTheme();
 
@@ -113,6 +109,8 @@ const Header = ({ showTimeline, setShowTimeline }: IHeaderProps) => {
     const toggleDrawer = () => setOpenDrawer((prev) => !prev);
     const celebatoryUnleash = useUiFlag('celebrateUnleash');
     const eventTimeline = useUiFlag('eventTimeline') && !isOss();
+    const { open: showTimeline, setOpen: setShowTimeline } =
+        useEventTimelineContext();
 
     const routes = getRoutes();
     const adminRoutes = useAdminRoutes();
@@ -204,7 +202,7 @@ const Header = ({ showTimeline, setShowTimeline }: IHeaderProps) => {
                                         }
                                         size='large'
                                     >
-                                        <TimelineIcon />
+                                        <LinearScaleIcon />
                                     </StyledIconButton>
                                 </Tooltip>
                             }
diff --git a/frontend/src/component/menu/Header/OldHeader.tsx b/frontend/src/component/menu/Header/OldHeader.tsx
index 40c4f9c5ea78..8ff9d7975112 100644
--- a/frontend/src/component/menu/Header/OldHeader.tsx
+++ b/frontend/src/component/menu/Header/OldHeader.tsx
@@ -36,7 +36,8 @@ import { Notifications } from 'component/common/Notifications/Notifications';
 import { useAdminRoutes } from 'component/admin/useAdminRoutes';
 import InviteLinkButton from './InviteLink/InviteLinkButton/InviteLinkButton';
 import { useUiFlag } from 'hooks/useUiFlag';
-import TimelineIcon from '@mui/icons-material/Timeline';
+import LinearScaleIcon from '@mui/icons-material/LinearScale';
+import { useEventTimelineContext } from 'component/events/EventTimeline/EventTimelineContext';
 
 const HeaderComponent = styled(AppBar)(({ theme }) => ({
     backgroundColor: theme.palette.background.paper,
@@ -131,12 +132,7 @@ const StyledIconButton = styled(IconButton)<{
     },
 }));
 
-interface IOldHeaderProps {
-    showTimeline: boolean;
-    setShowTimeline: (show: boolean) => void;
-}
-
-const OldHeader = ({ showTimeline, setShowTimeline }: IOldHeaderProps) => {
+const OldHeader = () => {
     const { onSetThemeMode, themeMode } = useThemeMode();
     const theme = useTheme();
     const adminId = useId();
@@ -153,6 +149,8 @@ const OldHeader = ({ showTimeline, setShowTimeline }: IOldHeaderProps) => {
     const onConfigureClose = () => setConfigRef(null);
     const celebatoryUnleash = useUiFlag('celebrateUnleash');
     const eventTimeline = useUiFlag('eventTimeline') && !isOss();
+    const { open: showTimeline, setOpen: setShowTimeline } =
+        useEventTimelineContext();
 
     const routes = getRoutes();
     const adminRoutes = useAdminRoutes();
@@ -269,7 +267,7 @@ const OldHeader = ({ showTimeline, setShowTimeline }: IOldHeaderProps) => {
                                         }
                                         size='large'
                                     >
-                                        <TimelineIcon />
+                                        <LinearScaleIcon />
                                     </StyledIconButton>
                                 </Tooltip>
                             }
diff --git a/frontend/src/component/onboarding/dialog/SdkConnected.tsx b/frontend/src/component/onboarding/dialog/SdkConnected.tsx
index 498ab26a4df1..fd73d636b8e4 100644
--- a/frontend/src/component/onboarding/dialog/SdkConnected.tsx
+++ b/frontend/src/component/onboarding/dialog/SdkConnected.tsx
@@ -45,9 +45,10 @@ export const SdkConnected: FC<ISdkConnectedProps> = ({ sdk }) => {
                 <Box sx={{ mt: 2 }}>
                     <SectionHeader>Production settings</SectionHeader>
                     <Typography variant='body2'>
-                        In order to validate the connection, we changed some
-                        settings that you might want to revert. We recommend the
-                        following default settings.
+                        You have successfully connected your SDK. In the
+                        previous code example, the settings were optimized for
+                        development. We recommend the following setup for
+                        production.
                     </Typography>
                     <Markdown components={{ code: CodeRenderer }}>
                         {productionSnippet}
diff --git a/frontend/src/component/onboarding/dialog/snippets/dotnet.md b/frontend/src/component/onboarding/dialog/snippets/dotnet.md
index 9f965ba725e6..c0827a26efb0 100644
--- a/frontend/src/component/onboarding/dialog/snippets/dotnet.md
+++ b/frontend/src/component/onboarding/dialog/snippets/dotnet.md
@@ -8,13 +8,47 @@ dotnet add package Newtonsoft.Json
 2\. Initialize Unleash
 ```csharp
 using Unleash;
+using Unleash.ClientFactory;
+
+public class Program
+{
+    public static async Task Main()
+    {
+        var settings = new UnleashSettings()
+        {
+            AppName = "unleash-onboarding-dotnet",
+            UnleashApi = new Uri("<YOUR_API_URL>"),
+            SendMetricsInterval = TimeSpan.FromSeconds(5),
+            CustomHttpHeaders = new Dictionary<string, string>()
+            {
+                {"Authorization","<YOUR_API_TOKEN>"}
+            }
+        };
+
+        var unleash =  new DefaultUnleash(settings);
+
+        while (true) {
+            Console.WriteLine($"Flag is enabled: {unleash.IsEnabled("<YOUR_FLAG>")}");
+            await Task.Delay(1000);
+        }
+    }
+}
+
+```
+
+---
+```csharp
 var settings = new UnleashSettings()
 {
     AppName = "unleash-onboarding-dotnet",
     UnleashApi = new Uri("<YOUR_API_URL>"),
     CustomHttpHeaders = new Dictionary<string, string>()
     {
-      {"Authorization","<YOUR_API_TOKEN>" }
+        {"Authorization",Environment.GetEnvironmentVariable("UNLEASH_API_KEY")}
     }
 };
 ```
+
+---
+- [SDK repository with documentation](https://github.com/Unleash/unleash-client-dotnet)
+- [.NET/C# SDK example with CodeSandbox](https://github.com/Unleash/unleash-sdk-examples/tree/main/Csharp)
diff --git a/frontend/src/component/onboarding/dialog/snippets/nodejs.md b/frontend/src/component/onboarding/dialog/snippets/nodejs.md
index c884b082ea72..2580de4e5342 100644
--- a/frontend/src/component/onboarding/dialog/snippets/nodejs.md
+++ b/frontend/src/component/onboarding/dialog/snippets/nodejs.md
@@ -20,10 +20,6 @@ setInterval(() => {
 ```
 
 ---
-### Production settings
-
-In order to validate the connection, we changed some settings that you might want to revert. We recommend the following default settings.
-
 ```js
 const { initialize } = require('unleash-client');
 
@@ -35,10 +31,6 @@ const unleash = initialize({
 ```
 
 ---
-### Additional resources
-
-Now that we’ve validated the connection, you might want to look into more advanced use cases and examples:
-
 - [SDK repository with documentation](https://github.com/Unleash/unleash-client-node)
 - [Node.js SDK example with CodeSandbox](https://github.com/Unleash/unleash-sdk-examples/tree/main/NodeJS)
 - [Node.js SDK tutorial](https://dev.to/reeshee/how-to-implement-feature-flags-in-nodejs-using-unleash-3907)
diff --git a/frontend/src/component/onboarding/flow/ProjectOnboarding.test.tsx b/frontend/src/component/onboarding/flow/ProjectOnboarding.test.tsx
index 7cb2a6317913..1508eeb11705 100644
--- a/frontend/src/component/onboarding/flow/ProjectOnboarding.test.tsx
+++ b/frontend/src/component/onboarding/flow/ProjectOnboarding.test.tsx
@@ -22,6 +22,7 @@ test('Project can start onboarding', async () => {
                         projectId={projectId}
                         setConnectSdkOpen={() => {}}
                         setOnboardingFlow={() => {}}
+                        refetchFeatures={() => {}}
                     />
                 }
             />
@@ -50,6 +51,7 @@ test('Project can connect SDK', async () => {
                         projectId={projectId}
                         setConnectSdkOpen={() => {}}
                         setOnboardingFlow={() => {}}
+                        refetchFeatures={() => {}}
                     />
                 }
             />
diff --git a/frontend/src/component/onboarding/flow/ProjectOnboarding.tsx b/frontend/src/component/onboarding/flow/ProjectOnboarding.tsx
index 0396373c1c0d..473fb65747c8 100644
--- a/frontend/src/component/onboarding/flow/ProjectOnboarding.tsx
+++ b/frontend/src/component/onboarding/flow/ProjectOnboarding.tsx
@@ -14,10 +14,12 @@ interface IProjectOnboardingProps {
     projectId: string;
     setConnectSdkOpen: (open: boolean) => void;
     setOnboardingFlow: (status: 'visible' | 'closed') => void;
+    refetchFeatures: () => void;
 }
 
 interface ICreateFlagProps {
     projectId: string;
+    refetchFeatures: () => void;
 }
 
 const Container = styled('div')(({ theme }) => ({
@@ -101,6 +103,7 @@ export const ProjectOnboarding = ({
     projectId,
     setConnectSdkOpen,
     setOnboardingFlow,
+    refetchFeatures,
 }: IProjectOnboardingProps) => {
     const { project } = useProjectOverview(projectId);
     const isFirstFlagCreated =
@@ -133,7 +136,10 @@ export const ProjectOnboarding = ({
                     'first-flag-created' ? (
                         <ExistingFlag />
                     ) : (
-                        <CreateFlag projectId={projectId} />
+                        <CreateFlag
+                            projectId={projectId}
+                            refetchFeatures={refetchFeatures}
+                        />
                     )}
                 </ActionBox>
                 <ActionBox>
@@ -166,7 +172,7 @@ export const ProjectOnboarding = ({
     );
 };
 
-const CreateFlag = ({ projectId }: ICreateFlagProps) => {
+const CreateFlag = ({ projectId, refetchFeatures }: ICreateFlagProps) => {
     const { refetch } = useProjectOverview(projectId);
     return (
         <>
@@ -181,7 +187,10 @@ const CreateFlag = ({ projectId }: ICreateFlagProps) => {
             <FlagCreationButton
                 text='Create flag'
                 skipNavigationOnComplete={true}
-                onSuccess={refetch}
+                onSuccess={() => {
+                    refetch();
+                    refetchFeatures();
+                }}
             />
         </>
     );
diff --git a/frontend/src/component/onboarding/flow/SdkExample.tsx b/frontend/src/component/onboarding/flow/SdkExample.tsx
index 04c667400ee4..a22ae60afc4f 100644
--- a/frontend/src/component/onboarding/flow/SdkExample.tsx
+++ b/frontend/src/component/onboarding/flow/SdkExample.tsx
@@ -1,8 +1,8 @@
 import { type SelectChangeEvent, styled, Typography } from '@mui/material';
 import { Link } from 'react-router-dom';
-import Select from '../../common/select';
-import { useState } from 'react';
-import { allSdks } from '../dialog/sharedTypes';
+import { useLocalStorageState } from 'hooks/useLocalStorageState';
+import Select from 'component/common/select';
+import { allSdks, type SdkName } from '../dialog/sharedTypes';
 
 const TitleContainer = styled('div')(({ theme }) => ({
     display: 'flex',
@@ -18,17 +18,40 @@ const StyledLink = styled(Link)({
     textDecoration: 'none',
 });
 
+const repositoryUrl =
+    'https://github.com/Unleash/unleash-sdk-examples/tree/main';
+
+type exampleDirectories =
+    | 'Android'
+    | '.NET'
+    | 'Flutter'
+    | 'Go'
+    | 'Java'
+    | 'JavaScript'
+    | 'Node.js'
+    | 'PHP'
+    | 'Python'
+    | 'React'
+    | 'Ruby'
+    | 'Rust'
+    | 'Svelte'
+    | 'Swift'
+    | 'Vue';
+
 export const SdkExample = () => {
     const sdkOptions = allSdks.map((sdk) => ({
         key: sdk.name,
         label: sdk.name,
     }));
-
-    const [selectedSdk, setSelectedSdk] = useState<string>(sdkOptions[0].key);
-
+    const [selectedSdk, setSelectedSdk] =
+        useLocalStorageState<exampleDirectories>(
+            'onboarding-sdk-example',
+            sdkOptions[0].key,
+        );
     const onChange = (event: SelectChangeEvent) => {
-        setSelectedSdk(event.target.value);
+        setSelectedSdk(event.target.value as SdkName);
     };
+
     return (
         <>
             <TitleContainer>View SDK Example</TitleContainer>
@@ -45,7 +68,9 @@ export const SdkExample = () => {
                     width: '60%',
                 }}
             />
-            <StyledLink to={``}>Go to example</StyledLink>
+            <StyledLink to={`${repositoryUrl}/${selectedSdk}`} target='_blank'>
+                Go to example
+            </StyledLink>
         </>
     );
 };
diff --git a/frontend/src/component/personalDashboard/Grid.tsx b/frontend/src/component/personalDashboard/Grid.tsx
new file mode 100644
index 000000000000..de1ce152ecc9
--- /dev/null
+++ b/frontend/src/component/personalDashboard/Grid.tsx
@@ -0,0 +1,31 @@
+import { Box, Grid, styled } from '@mui/material';
+import type { Theme } from '@mui/material/styles/createTheme';
+
+export const ContentGrid = styled(Grid)(({ theme }) => ({
+    backgroundColor: theme.palette.background.paper,
+    borderRadius: `${theme.shape.borderRadiusLarge}px`,
+}));
+
+export const SpacedGridItem = styled(Grid)(({ theme }) => ({
+    padding: theme.spacing(4),
+    border: `0.5px solid ${theme.palette.divider}`,
+}));
+
+export const ListItemBox = styled(Box)(({ theme }) => ({
+    display: 'flex',
+    gap: theme.spacing(2),
+    alignItems: 'center',
+    width: '100%',
+}));
+
+export const listItemStyle = (theme: Theme) => ({
+    borderRadius: theme.spacing(0.5),
+    borderLeft: `${theme.spacing(0.5)} solid transparent`,
+    '&.Mui-selected': {
+        borderLeft: `${theme.spacing(0.5)} solid ${theme.palette.primary.main}`,
+    },
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'flex-start',
+    gap: theme.spacing(1),
+});
diff --git a/frontend/src/component/personalDashboard/MyProjects.tsx b/frontend/src/component/personalDashboard/MyProjects.tsx
new file mode 100644
index 000000000000..090b64d5c396
--- /dev/null
+++ b/frontend/src/component/personalDashboard/MyProjects.tsx
@@ -0,0 +1,177 @@
+import {
+    Box,
+    IconButton,
+    Link,
+    List,
+    ListItem,
+    ListItemButton,
+    Typography,
+} from '@mui/material';
+import { Badge } from '../common/Badge/Badge';
+import { ProjectIcon } from '../common/ProjectIcon/ProjectIcon';
+import LinkIcon from '@mui/icons-material/Link';
+import { ProjectSetupComplete } from './ProjectSetupComplete';
+import { ConnectSDK, CreateFlag, ExistingFlag } from './ConnectSDK';
+import { LatestProjectEvents } from './LatestProjectEvents';
+import { RoleAndOwnerInfo } from './RoleAndOwnerInfo';
+import type { FC } from 'react';
+import { StyledCardTitle } from './PersonalDashboard';
+import type {
+    PersonalDashboardProjectDetailsSchema,
+    PersonalDashboardSchemaProjectsItem,
+} from '../../openapi';
+import {
+    ContentGrid,
+    ListItemBox,
+    listItemStyle,
+    SpacedGridItem,
+} from './Grid';
+
+const ActiveProjectDetails: FC<{
+    project: PersonalDashboardSchemaProjectsItem;
+}> = ({ project }) => {
+    return (
+        <Box sx={{ display: 'flex', gap: 2 }}>
+            <Box sx={{ display: 'flex', flexDirection: 'column' }}>
+                <Typography variant='subtitle2' color='primary'>
+                    {project.featureCount}
+                </Typography>
+                <Typography variant='caption' color='text.secondary'>
+                    flags
+                </Typography>
+            </Box>
+            <Box sx={{ display: 'flex', flexDirection: 'column' }}>
+                <Typography variant='subtitle2' color='primary'>
+                    {project.memberCount}
+                </Typography>
+                <Typography variant='caption' color='text.secondary'>
+                    members
+                </Typography>
+            </Box>
+            <Box sx={{ display: 'flex', flexDirection: 'column' }}>
+                <Typography variant='subtitle2' color='primary'>
+                    {project.health}%
+                </Typography>
+                <Typography variant='caption' color='text.secondary'>
+                    health
+                </Typography>
+            </Box>
+        </Box>
+    );
+};
+
+export const MyProjects: FC<{
+    projects: PersonalDashboardSchemaProjectsItem[];
+    personalDashboardProjectDetails?: PersonalDashboardProjectDetailsSchema;
+    activeProject: string;
+    setActiveProject: (project: string) => void;
+}> = ({
+    projects,
+    personalDashboardProjectDetails,
+    setActiveProject,
+    activeProject,
+}) => {
+    const activeProjectStage =
+        personalDashboardProjectDetails?.onboardingStatus.status ?? 'loading';
+    const setupIncomplete =
+        activeProjectStage === 'onboarding-started' ||
+        activeProjectStage === 'first-flag-created';
+
+    return (
+        <ContentGrid container columns={{ lg: 12, md: 1 }}>
+            <SpacedGridItem item lg={4} md={1}>
+                <Typography variant='h3'>My projects</Typography>
+            </SpacedGridItem>
+            <SpacedGridItem
+                item
+                lg={8}
+                md={1}
+                sx={{ display: 'flex', justifyContent: 'flex-end' }}
+            >
+                {setupIncomplete ? (
+                    <Badge color='warning'>Setup incomplete</Badge>
+                ) : null}
+            </SpacedGridItem>
+            <SpacedGridItem item lg={4} md={1}>
+                <List
+                    disablePadding={true}
+                    sx={{ maxHeight: '400px', overflow: 'auto' }}
+                >
+                    {projects.map((project) => {
+                        return (
+                            <ListItem
+                                key={project.id}
+                                disablePadding={true}
+                                sx={{ mb: 1 }}
+                            >
+                                <ListItemButton
+                                    sx={listItemStyle}
+                                    selected={project.id === activeProject}
+                                    onClick={() => setActiveProject(project.id)}
+                                >
+                                    <ListItemBox>
+                                        <ProjectIcon color='primary' />
+                                        <StyledCardTitle>
+                                            {project.name}
+                                        </StyledCardTitle>
+                                        <IconButton
+                                            component={Link}
+                                            href={`projects/${project.id}`}
+                                            size='small'
+                                            sx={{ ml: 'auto' }}
+                                        >
+                                            <LinkIcon
+                                                titleAccess={`projects/${project.id}`}
+                                            />
+                                        </IconButton>
+                                    </ListItemBox>
+                                    {project.id === activeProject ? (
+                                        <ActiveProjectDetails
+                                            project={project}
+                                        />
+                                    ) : null}
+                                </ListItemButton>
+                            </ListItem>
+                        );
+                    })}
+                </List>
+            </SpacedGridItem>
+            <SpacedGridItem item lg={4} md={1}>
+                {activeProjectStage === 'onboarded' ? (
+                    <ProjectSetupComplete project={activeProject} />
+                ) : null}
+                {activeProjectStage === 'onboarding-started' ||
+                activeProjectStage === 'loading' ? (
+                    <CreateFlag project={activeProject} />
+                ) : null}
+                {activeProjectStage === 'first-flag-created' ? (
+                    <ExistingFlag project={activeProject} />
+                ) : null}
+            </SpacedGridItem>
+            <SpacedGridItem item lg={4} md={1}>
+                {activeProjectStage === 'onboarded' &&
+                personalDashboardProjectDetails ? (
+                    <LatestProjectEvents
+                        latestEvents={
+                            personalDashboardProjectDetails.latestEvents
+                        }
+                    />
+                ) : null}
+                {setupIncomplete || activeProjectStage === 'loading' ? (
+                    <ConnectSDK project={activeProject} />
+                ) : null}
+            </SpacedGridItem>
+            <SpacedGridItem item lg={4} md={1} />
+            <SpacedGridItem item lg={8} md={1}>
+                {personalDashboardProjectDetails ? (
+                    <RoleAndOwnerInfo
+                        roles={personalDashboardProjectDetails.roles.map(
+                            (role) => role.name,
+                        )}
+                        owners={personalDashboardProjectDetails.owners}
+                    />
+                ) : null}
+            </SpacedGridItem>
+        </ContentGrid>
+    );
+};
diff --git a/frontend/src/component/personalDashboard/PersonalDashboard.tsx b/frontend/src/component/personalDashboard/PersonalDashboard.tsx
index 2989672b22a3..f3d8416a52fd 100644
--- a/frontend/src/component/personalDashboard/PersonalDashboard.tsx
+++ b/frontend/src/component/personalDashboard/PersonalDashboard.tsx
@@ -1,7 +1,5 @@
 import { useAuthUser } from 'hooks/api/getters/useAuth/useAuthUser';
 import {
-    Box,
-    Grid,
     IconButton,
     Link,
     List,
@@ -10,15 +8,10 @@ import {
     styled,
     Typography,
 } from '@mui/material';
-import type { Theme } from '@mui/material/styles/createTheme';
-import { ProjectIcon } from 'component/common/ProjectIcon/ProjectIcon';
 import React, { type FC, useEffect, useState } from 'react';
 import LinkIcon from '@mui/icons-material/Link';
-import { Badge } from '../common/Badge/Badge';
-import { ConnectSDK, CreateFlag, ExistingFlag } from './ConnectSDK';
 import { WelcomeDialog } from './WelcomeDialog';
 import { useLocalStorageState } from 'hooks/useLocalStorageState';
-import { ProjectSetupComplete } from './ProjectSetupComplete';
 import { usePersonalDashboard } from 'hooks/api/getters/usePersonalDashboard/usePersonalDashboard';
 import { getFeatureTypeIcons } from 'utils/getFeatureTypeIcons';
 import type {
@@ -26,12 +19,17 @@ import type {
     PersonalDashboardSchemaProjectsItem,
 } from '../../openapi';
 import { FlagExposure } from 'component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FlagExposure';
-import { RoleAndOwnerInfo } from './RoleAndOwnerInfo';
-import { ContentGridNoProjects } from './ContentGridNoProjects';
-import { LatestProjectEvents } from './LatestProjectEvents';
 import { usePersonalDashboardProjectDetails } from 'hooks/api/getters/usePersonalDashboard/usePersonalDashboardProjectDetails';
 import HelpOutline from '@mui/icons-material/HelpOutline';
 import useLoading from '../../hooks/useLoading';
+import { MyProjects } from './MyProjects';
+import {
+    ContentGrid,
+    ListItemBox,
+    listItemStyle,
+    SpacedGridItem,
+} from './Grid';
+import { ContentGridNoProjects } from './ContentGridNoProjects';
 
 const ScreenExplanation = styled('div')(({ theme }) => ({
     marginBottom: theme.spacing(4),
@@ -39,30 +37,6 @@ const ScreenExplanation = styled('div')(({ theme }) => ({
     alignItems: 'center',
 }));
 
-const ContentGrid = styled(Grid)(({ theme }) => ({
-    backgroundColor: theme.palette.background.paper,
-    borderRadius: `${theme.shape.borderRadiusLarge}px`,
-}));
-
-const ProjectBox = styled(Box)(({ theme }) => ({
-    display: 'flex',
-    gap: theme.spacing(2),
-    alignItems: 'center',
-    width: '100%',
-}));
-
-const projectStyle = (theme: Theme) => ({
-    borderRadius: theme.spacing(0.5),
-    borderLeft: `${theme.spacing(0.5)} solid transparent`,
-    '&.Mui-selected': {
-        borderLeft: `${theme.spacing(0.5)} solid ${theme.palette.primary.main}`,
-    },
-    display: 'flex',
-    flexDirection: 'column',
-    alignItems: 'flex-start',
-    gap: theme.spacing(1),
-});
-
 export const StyledCardTitle = styled('div')<{ lines?: number }>(
     ({ theme, lines = 2 }) => ({
         fontWeight: theme.typography.fontWeightRegular,
@@ -80,56 +54,6 @@ export const StyledCardTitle = styled('div')<{ lines?: number }>(
     }),
 );
 
-const ActiveProjectDetails: FC<{
-    project: PersonalDashboardSchemaProjectsItem;
-}> = ({ project }) => {
-    return (
-        <Box sx={{ display: 'flex', gap: 2 }}>
-            <Box sx={{ display: 'flex', flexDirection: 'column' }}>
-                <Typography variant='subtitle2' color='primary'>
-                    {project.featureCount}
-                </Typography>
-                <Typography variant='caption' color='text.secondary'>
-                    flags
-                </Typography>
-            </Box>
-            <Box sx={{ display: 'flex', flexDirection: 'column' }}>
-                <Typography variant='subtitle2' color='primary'>
-                    {project.memberCount}
-                </Typography>
-                <Typography variant='caption' color='text.secondary'>
-                    members
-                </Typography>
-            </Box>
-            <Box sx={{ display: 'flex', flexDirection: 'column' }}>
-                <Typography variant='subtitle2' color='primary'>
-                    {project.health}%
-                </Typography>
-                <Typography variant='caption' color='text.secondary'>
-                    health
-                </Typography>
-            </Box>
-        </Box>
-    );
-};
-
-const SpacedGridItem = styled(Grid)(({ theme }) => ({
-    padding: theme.spacing(4),
-    border: `0.5px solid ${theme.palette.divider}`,
-}));
-
-const useProjects = (projects: PersonalDashboardSchemaProjectsItem[]) => {
-    const [activeProject, setActiveProject] = useState(projects[0]?.id);
-
-    useEffect(() => {
-        if (!activeProject && projects.length > 0) {
-            setActiveProject(projects[0].id);
-        }
-    }, [JSON.stringify(projects)]);
-
-    return { projects, activeProject, setActiveProject };
-};
-
 const FlagListItem: FC<{
     flag: { name: string; project: string; type: string };
     selected: boolean;
@@ -139,11 +63,11 @@ const FlagListItem: FC<{
     return (
         <ListItem key={flag.name} disablePadding={true} sx={{ mb: 1 }}>
             <ListItemButton
-                sx={projectStyle}
+                sx={listItemStyle}
                 selected={selected}
                 onClick={onClick}
             >
-                <ProjectBox>
+                <ListItemBox>
                     <IconComponent color='primary' />
                     <StyledCardTitle>{flag.name}</StyledCardTitle>
                     <IconButton
@@ -156,12 +80,24 @@ const FlagListItem: FC<{
                             titleAccess={`projects/${flag.project}/features/${flag.name}`}
                         />
                     </IconButton>
-                </ProjectBox>
+                </ListItemBox>
             </ListItemButton>
         </ListItem>
     );
 };
 
+const useActiveProject = (projects: PersonalDashboardSchemaProjectsItem[]) => {
+    const [activeProject, setActiveProject] = useState(projects[0]?.id);
+
+    useEffect(() => {
+        if (!activeProject && projects.length > 0) {
+            setActiveProject(projects[0].id);
+        }
+    }, [JSON.stringify(projects)]);
+
+    return [activeProject, setActiveProject] as const;
+};
+
 export const PersonalDashboard = () => {
     const { user } = useAuthUser();
 
@@ -181,32 +117,25 @@ export const PersonalDashboard = () => {
         }
     }, [JSON.stringify(personalDashboard?.flags)]);
 
-    const { projects, activeProject, setActiveProject } = useProjects(
-        personalDashboard?.projects || [],
-    );
+    const [welcomeDialog, setWelcomeDialog] = useLocalStorageState<
+        'open' | 'closed'
+    >('welcome-dialog:v1', 'open');
+
+    const projects = personalDashboard?.projects || [];
+    const [activeProject, setActiveProject] = useActiveProject(projects);
 
     const { personalDashboardProjectDetails, loading: loadingDetails } =
         usePersonalDashboardProjectDetails(activeProject);
 
-    const stage =
+    const activeProjectStage =
         personalDashboardProjectDetails?.onboardingStatus.status ?? 'loading';
-
-    const [welcomeDialog, setWelcomeDialog] = useLocalStorageState<
-        'open' | 'closed'
-    >('welcome-dialog:v1', 'open');
+    const setupIncomplete =
+        activeProjectStage === 'onboarding-started' ||
+        activeProjectStage === 'first-flag-created';
 
     const noProjects = projects.length === 0;
 
-    const setupIncomplete =
-        personalDashboardProjectDetails?.onboardingStatus.status ===
-            'onboarding-started' ||
-        personalDashboardProjectDetails?.onboardingStatus.status ===
-            'first-flag-created';
-    const onboarded =
-        personalDashboardProjectDetails?.onboardingStatus.status ===
-        'onboarded';
-
-    const projectStageRef = useLoading(stage === 'loading');
+    const projectStageRef = useLoading(activeProjectStage === 'loading');
 
     return (
         <div ref={projectStageRef}>
@@ -215,13 +144,13 @@ export const PersonalDashboard = () => {
             </Typography>
             <ScreenExplanation>
                 <p data-loading>
-                    {onboarded
+                    {activeProjectStage === 'onboarded'
                         ? 'We have gathered projects and flags you have favorited or owned'
                         : null}
                     {setupIncomplete
                         ? 'Here are some tasks we think would be useful in order to get the most out of Unleash'
                         : null}
-                    {stage === 'loading'
+                    {activeProjectStage === 'loading'
                         ? 'We have gathered projects and flags you have favorited or owned'
                         : null}
                 </p>
@@ -241,104 +170,16 @@ export const PersonalDashboard = () => {
                     admins={personalDashboard.admins}
                 />
             ) : (
-                <ContentGrid container columns={{ lg: 12, md: 1 }}>
-                    <SpacedGridItem item lg={4} md={1}>
-                        <Typography variant='h3'>My projects</Typography>
-                    </SpacedGridItem>
-                    <SpacedGridItem
-                        item
-                        lg={8}
-                        md={1}
-                        sx={{ display: 'flex', justifyContent: 'flex-end' }}
-                    >
-                        {setupIncomplete ? (
-                            <Badge color='warning'>Setup incomplete</Badge>
-                        ) : null}
-                    </SpacedGridItem>
-                    <SpacedGridItem item lg={4} md={1}>
-                        <List
-                            disablePadding={true}
-                            sx={{ maxHeight: '400px', overflow: 'auto' }}
-                        >
-                            {projects.map((project) => {
-                                return (
-                                    <ListItem
-                                        key={project.id}
-                                        disablePadding={true}
-                                        sx={{ mb: 1 }}
-                                    >
-                                        <ListItemButton
-                                            sx={projectStyle}
-                                            selected={
-                                                project.id === activeProject
-                                            }
-                                            onClick={() =>
-                                                setActiveProject(project.id)
-                                            }
-                                        >
-                                            <ProjectBox>
-                                                <ProjectIcon color='primary' />
-                                                <StyledCardTitle>
-                                                    {project.name}
-                                                </StyledCardTitle>
-                                                <IconButton
-                                                    component={Link}
-                                                    href={`projects/${project.id}`}
-                                                    size='small'
-                                                    sx={{ ml: 'auto' }}
-                                                >
-                                                    <LinkIcon
-                                                        titleAccess={`projects/${project.id}`}
-                                                    />
-                                                </IconButton>
-                                            </ProjectBox>
-                                            {project.id === activeProject ? (
-                                                <ActiveProjectDetails
-                                                    project={project}
-                                                />
-                                            ) : null}
-                                        </ListItemButton>
-                                    </ListItem>
-                                );
-                            })}
-                        </List>
-                    </SpacedGridItem>
-                    <SpacedGridItem item lg={4} md={1}>
-                        {stage === 'onboarded' ? (
-                            <ProjectSetupComplete project={activeProject} />
-                        ) : null}
-                        {stage === 'onboarding-started' ||
-                        stage === 'loading' ? (
-                            <CreateFlag project={activeProject} />
-                        ) : null}
-                        {stage === 'first-flag-created' ? (
-                            <ExistingFlag project={activeProject} />
-                        ) : null}
-                    </SpacedGridItem>
-                    <SpacedGridItem item lg={4} md={1}>
-                        {stage === 'onboarded' &&
-                        personalDashboardProjectDetails ? (
-                            <LatestProjectEvents
-                                latestEvents={
-                                    personalDashboardProjectDetails.latestEvents
-                                }
-                            />
-                        ) : null}
-                        {setupIncomplete || stage === 'loading' ? (
-                            <ConnectSDK project={activeProject} />
-                        ) : null}
-                    </SpacedGridItem>
-                    <SpacedGridItem item lg={4} md={1} />
-                    <SpacedGridItem item lg={8} md={1}>
-                        {activeProject ? (
-                            <RoleAndOwnerInfo
-                                roles={['owner', 'custom']}
-                                owners={[{ ownerType: 'system' }]}
-                            />
-                        ) : null}
-                    </SpacedGridItem>
-                </ContentGrid>
+                <MyProjects
+                    projects={projects}
+                    activeProject={activeProject}
+                    setActiveProject={setActiveProject}
+                    personalDashboardProjectDetails={
+                        personalDashboardProjectDetails
+                    }
+                />
             )}
+
             <ContentGrid container columns={{ lg: 12, md: 1 }} sx={{ mt: 2 }}>
                 <SpacedGridItem item lg={4} md={1}>
                     <Typography variant='h3'>My feature flags</Typography>
diff --git a/frontend/src/component/personalDashboard/RoleAndOwnerInfo.tsx b/frontend/src/component/personalDashboard/RoleAndOwnerInfo.tsx
index f9d112cdc82e..645b04e4e1cd 100644
--- a/frontend/src/component/personalDashboard/RoleAndOwnerInfo.tsx
+++ b/frontend/src/component/personalDashboard/RoleAndOwnerInfo.tsx
@@ -25,12 +25,18 @@ export const RoleAndOwnerInfo = ({ roles, owners }: Props) => {
     return (
         <Wrapper>
             <InfoSection>
-                <span>Your roles in this project:</span>
-                {roles.map((role) => (
-                    <Badge key={role} color='secondary'>
-                        {role}
-                    </Badge>
-                ))}
+                {roles.length > 0 ? (
+                    <>
+                        <span>Your roles in this project:</span>
+                        {roles.map((role) => (
+                            <Badge key={role} color='secondary'>
+                                {role}
+                            </Badge>
+                        ))}
+                    </>
+                ) : (
+                    <span>You have no project roles in this project.</span>
+                )}
             </InfoSection>
             <InfoSection>
                 <span>Project owner{owners.length > 1 ? 's' : ''}</span>
diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx
index c8f427ab17c0..a81e782efc76 100644
--- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx
+++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx
@@ -426,6 +426,7 @@ export const ProjectFeatureToggles = ({
                         projectId={projectId}
                         setConnectSdkOpen={setConnectSdkOpen}
                         setOnboardingFlow={setOnboardingFlow}
+                        refetchFeatures={refetch}
                     />
                 }
             />
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 999c1e1c8fc8..8a36b38bbf36 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1935,114 +1935,114 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm-eabi@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-android-arm-eabi@npm:4.21.2"
+"@rollup/rollup-android-arm-eabi@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.22.4"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm64@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-android-arm64@npm:4.21.2"
+"@rollup/rollup-android-arm64@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-android-arm64@npm:4.22.4"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-arm64@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-darwin-arm64@npm:4.21.2"
+"@rollup/rollup-darwin-arm64@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.22.4"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-x64@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-darwin-x64@npm:4.21.2"
+"@rollup/rollup-darwin-x64@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-darwin-x64@npm:4.22.4"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-gnueabihf@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.21.2"
+"@rollup/rollup-linux-arm-gnueabihf@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.22.4"
   conditions: os=linux & cpu=arm & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-musleabihf@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.21.2"
+"@rollup/rollup-linux-arm-musleabihf@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.22.4"
   conditions: os=linux & cpu=arm & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-gnu@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.21.2"
+"@rollup/rollup-linux-arm64-gnu@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.22.4"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-musl@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.21.2"
+"@rollup/rollup-linux-arm64-musl@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.22.4"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-powerpc64le-gnu@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.21.2"
+"@rollup/rollup-linux-powerpc64le-gnu@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.22.4"
   conditions: os=linux & cpu=ppc64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-riscv64-gnu@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.21.2"
+"@rollup/rollup-linux-riscv64-gnu@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.22.4"
   conditions: os=linux & cpu=riscv64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-s390x-gnu@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.21.2"
+"@rollup/rollup-linux-s390x-gnu@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.22.4"
   conditions: os=linux & cpu=s390x & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-gnu@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.21.2"
+"@rollup/rollup-linux-x64-gnu@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.22.4"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-musl@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-linux-x64-musl@npm:4.21.2"
+"@rollup/rollup-linux-x64-musl@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.22.4"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-arm64-msvc@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.21.2"
+"@rollup/rollup-win32-arm64-msvc@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.22.4"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-ia32-msvc@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.21.2"
+"@rollup/rollup-win32-ia32-msvc@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.22.4"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-x64-msvc@npm:4.21.2":
-  version: 4.21.2
-  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.21.2"
+"@rollup/rollup-win32-x64-msvc@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.22.4"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -8513,25 +8513,25 @@ __metadata:
   linkType: hard
 
 "rollup@npm:^4.20.0":
-  version: 4.21.2
-  resolution: "rollup@npm:4.21.2"
-  dependencies:
-    "@rollup/rollup-android-arm-eabi": "npm:4.21.2"
-    "@rollup/rollup-android-arm64": "npm:4.21.2"
-    "@rollup/rollup-darwin-arm64": "npm:4.21.2"
-    "@rollup/rollup-darwin-x64": "npm:4.21.2"
-    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.21.2"
-    "@rollup/rollup-linux-arm-musleabihf": "npm:4.21.2"
-    "@rollup/rollup-linux-arm64-gnu": "npm:4.21.2"
-    "@rollup/rollup-linux-arm64-musl": "npm:4.21.2"
-    "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.21.2"
-    "@rollup/rollup-linux-riscv64-gnu": "npm:4.21.2"
-    "@rollup/rollup-linux-s390x-gnu": "npm:4.21.2"
-    "@rollup/rollup-linux-x64-gnu": "npm:4.21.2"
-    "@rollup/rollup-linux-x64-musl": "npm:4.21.2"
-    "@rollup/rollup-win32-arm64-msvc": "npm:4.21.2"
-    "@rollup/rollup-win32-ia32-msvc": "npm:4.21.2"
-    "@rollup/rollup-win32-x64-msvc": "npm:4.21.2"
+  version: 4.22.4
+  resolution: "rollup@npm:4.22.4"
+  dependencies:
+    "@rollup/rollup-android-arm-eabi": "npm:4.22.4"
+    "@rollup/rollup-android-arm64": "npm:4.22.4"
+    "@rollup/rollup-darwin-arm64": "npm:4.22.4"
+    "@rollup/rollup-darwin-x64": "npm:4.22.4"
+    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.22.4"
+    "@rollup/rollup-linux-arm-musleabihf": "npm:4.22.4"
+    "@rollup/rollup-linux-arm64-gnu": "npm:4.22.4"
+    "@rollup/rollup-linux-arm64-musl": "npm:4.22.4"
+    "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.22.4"
+    "@rollup/rollup-linux-riscv64-gnu": "npm:4.22.4"
+    "@rollup/rollup-linux-s390x-gnu": "npm:4.22.4"
+    "@rollup/rollup-linux-x64-gnu": "npm:4.22.4"
+    "@rollup/rollup-linux-x64-musl": "npm:4.22.4"
+    "@rollup/rollup-win32-arm64-msvc": "npm:4.22.4"
+    "@rollup/rollup-win32-ia32-msvc": "npm:4.22.4"
+    "@rollup/rollup-win32-x64-msvc": "npm:4.22.4"
     "@types/estree": "npm:1.0.5"
     fsevents: "npm:~2.3.2"
   dependenciesMeta:
@@ -8571,7 +8571,7 @@ __metadata:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: 10c0/c9d97f7a21cde110371b2e890a31a996fee09b81e639e79372b962a9638ae653d2d24186b94632fc5dfab8a0582e1d0639dfe34b8b75051facd86915a9585a5f
+  checksum: 10c0/4c96b6e2e0c5dbe73b4ba899cea894a05115ab8c65ccff631fbbb944e2b3a9f2eb3b99c2dce3dd91b179647df1892ffc44ecee29381ccf155ba8000b22712a32
   languageName: node
   linkType: hard
 
diff --git a/package.json b/package.json
index 8e3ce5a915dd..b4478faa9b72 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "unleash-server",
   "description": "Unleash is an enterprise ready feature toggles service. It provides different strategies for handling feature toggles.",
-  "version": "6.2.3",
+  "version": "6.3.0",
   "keywords": [
     "unleash",
     "feature toggle",
diff --git a/src/lib/features/personal-dashboard/fake-personal-dashboard-read-model.ts b/src/lib/features/personal-dashboard/fake-personal-dashboard-read-model.ts
index 36578f399b28..abaffd772942 100644
--- a/src/lib/features/personal-dashboard/fake-personal-dashboard-read-model.ts
+++ b/src/lib/features/personal-dashboard/fake-personal-dashboard-read-model.ts
@@ -8,6 +8,13 @@ import type {
 export class FakePersonalDashboardReadModel
     implements IPersonalDashboardReadModel
 {
+    async getLatestHealthScores(
+        project: string,
+        count: number,
+    ): Promise<number[]> {
+        return [];
+    }
+
     async getPersonalFeatures(userId: number): Promise<PersonalFeature[]> {
         return [];
     }
diff --git a/src/lib/features/personal-dashboard/personal-dashboard-controller.e2e.test.ts b/src/lib/features/personal-dashboard/personal-dashboard-controller.e2e.test.ts
index acc6214afa58..55d5b8f89281 100644
--- a/src/lib/features/personal-dashboard/personal-dashboard-controller.e2e.test.ts
+++ b/src/lib/features/personal-dashboard/personal-dashboard-controller.e2e.test.ts
@@ -227,6 +227,10 @@ test('should return personal dashboard project details', async () => {
     );
 
     expect(body).toMatchObject({
+        insights: {
+            avgHealthCurrentWindow: null,
+            avgHealthPastWindow: null,
+        },
         owners: [{}],
         roles: [{}],
         onboardingStatus: {
@@ -260,6 +264,41 @@ test('should return personal dashboard project details', async () => {
             },
         ],
     });
+
+    const insertHealthScore = (id: string, health: number) => {
+        const irrelevantFlagTrendDetails = {
+            total_flags: 10,
+            stale_flags: 10,
+            potentially_stale_flags: 10,
+        };
+        return db.rawDatabase('flag_trends').insert({
+            ...irrelevantFlagTrendDetails,
+            id,
+            project: project.id,
+            health,
+        });
+    };
+
+    await insertHealthScore('2024-01', 80);
+    await insertHealthScore('2024-02', 80);
+    await insertHealthScore('2024-03', 80);
+    await insertHealthScore('2024-04', 81);
+
+    await insertHealthScore('2024-05', 90);
+    await insertHealthScore('2024-06', 91);
+    await insertHealthScore('2024-07', 91);
+    await insertHealthScore('2024-08', 91);
+
+    const { body: bodyWithHealthScores } = await app.request.get(
+        `/api/admin/personal-dashboard/${project.id}`,
+    );
+
+    expect(bodyWithHealthScores).toMatchObject({
+        insights: {
+            avgHealthPastWindow: 80,
+            avgHealthCurrentWindow: 91,
+        },
+    });
 });
 
 test('should return Unleash admins', async () => {
diff --git a/src/lib/features/personal-dashboard/personal-dashboard-read-model-type.ts b/src/lib/features/personal-dashboard/personal-dashboard-read-model-type.ts
index 6926957bcb40..5fbbad90a0dc 100644
--- a/src/lib/features/personal-dashboard/personal-dashboard-read-model-type.ts
+++ b/src/lib/features/personal-dashboard/personal-dashboard-read-model-type.ts
@@ -21,4 +21,5 @@ export type PersonalProject = BasePersonalProject & {
 export interface IPersonalDashboardReadModel {
     getPersonalFeatures(userId: number): Promise<PersonalFeature[]>;
     getPersonalProjects(userId: number): Promise<BasePersonalProject[]>;
+    getLatestHealthScores(project: string, count: number): Promise<number[]>;
 }
diff --git a/src/lib/features/personal-dashboard/personal-dashboard-read-model.ts b/src/lib/features/personal-dashboard/personal-dashboard-read-model.ts
index 87e4df16d9a7..1dec47bca84e 100644
--- a/src/lib/features/personal-dashboard/personal-dashboard-read-model.ts
+++ b/src/lib/features/personal-dashboard/personal-dashboard-read-model.ts
@@ -19,6 +19,19 @@ export class PersonalDashboardReadModel implements IPersonalDashboardReadModel {
         this.db = db;
     }
 
+    async getLatestHealthScores(
+        project: string,
+        count: number,
+    ): Promise<number[]> {
+        const results = await this.db<{ health: number }>('flag_trends')
+            .select('health')
+            .orderBy('created_at', 'desc')
+            .where('project', project)
+            .limit(count);
+
+        return results.map((row) => Number(row.health));
+    }
+
     async getPersonalProjects(userId: number): Promise<BasePersonalProject[]> {
         const result = await this.db<{
             name: string;
diff --git a/src/lib/features/personal-dashboard/personal-dashboard-service.ts b/src/lib/features/personal-dashboard/personal-dashboard-service.ts
index 048ac7d19a02..3ea0b672e77d 100644
--- a/src/lib/features/personal-dashboard/personal-dashboard-service.ts
+++ b/src/lib/features/personal-dashboard/personal-dashboard-service.ts
@@ -122,7 +122,7 @@ export class PersonalDashboardService {
                     type: role.type as PersonalDashboardProjectDetailsSchema['roles'][number]['type'],
                 }));
 
-        const [latestEvents, onboardingStatus, owners, roles] =
+        const [latestEvents, onboardingStatus, owners, roles, healthScores] =
             await Promise.all([
                 this.eventStore
                     .searchEvents({ limit: 4, offset: 0 }, [
@@ -140,13 +140,40 @@ export class PersonalDashboardService {
                 this.accessStore
                     .getAllProjectRolesForUser(userId, projectId)
                     .then(filterRoles),
+                this.personalDashboardReadModel.getLatestHealthScores(
+                    projectId,
+                    8,
+                ),
             ]);
 
+        let avgHealthCurrentWindow: number | null = null;
+        let avgHealthPastWindow: number | null = null;
+
+        if (healthScores.length >= 4) {
+            avgHealthCurrentWindow = Math.round(
+                healthScores
+                    .slice(0, 4)
+                    .reduce((acc, score) => acc + score, 0) / 4,
+            );
+        }
+
+        if (healthScores.length >= 8) {
+            avgHealthPastWindow = Math.round(
+                healthScores
+                    .slice(4, 8)
+                    .reduce((acc, score) => acc + score, 0) / 4,
+            );
+        }
+
         return {
             latestEvents,
             onboardingStatus,
             owners,
             roles,
+            insights: {
+                avgHealthCurrentWindow,
+                avgHealthPastWindow,
+            },
         };
     }
 
diff --git a/src/lib/openapi/spec/personal-dashboard-project-details-schema.ts b/src/lib/openapi/spec/personal-dashboard-project-details-schema.ts
index f580b6e21e58..b2cba57d5d56 100644
--- a/src/lib/openapi/spec/personal-dashboard-project-details-schema.ts
+++ b/src/lib/openapi/spec/personal-dashboard-project-details-schema.ts
@@ -7,8 +7,36 @@ export const personalDashboardProjectDetailsSchema = {
     type: 'object',
     description: 'Project details in personal dashboard',
     additionalProperties: false,
-    required: ['owners', 'roles', 'latestEvents', 'onboardingStatus'],
+    required: [
+        'owners',
+        'roles',
+        'latestEvents',
+        'onboardingStatus',
+        'insights',
+    ],
     properties: {
+        insights: {
+            type: 'object',
+            description: 'Insights for the project',
+            additionalProperties: false,
+            required: ['avgHealthCurrentWindow', 'avgHealthPastWindow'],
+            properties: {
+                avgHealthCurrentWindow: {
+                    type: 'number',
+                    description:
+                        'The average health score in the current window of the last 4 weeks',
+                    example: 80,
+                    nullable: true,
+                },
+                avgHealthPastWindow: {
+                    type: 'number',
+                    description:
+                        'The average health score in the previous 4 weeks before the current window',
+                    example: 70,
+                    nullable: true,
+                },
+            },
+        },
         onboardingStatus: projectOverviewSchema.properties.onboardingStatus,
         latestEvents: {
             type: 'array',
diff --git a/src/lib/services/access-service.ts b/src/lib/services/access-service.ts
index 12023cdba67d..af05b9a7729f 100644
--- a/src/lib/services/access-service.ts
+++ b/src/lib/services/access-service.ts
@@ -752,7 +752,7 @@ export class AccessService {
         const addedPermissions = await this.store.getPermissionsForRole(
             newRole.id,
         );
-        this.eventService.storeEvent(
+        await this.eventService.storeEvent(
             new RoleCreatedEvent({
                 data: {
                     ...newRole,
@@ -803,7 +803,7 @@ export class AccessService {
         const updatedPermissions = await this.store.getPermissionsForRole(
             role.id,
         );
-        this.eventService.storeEvent(
+        await this.eventService.storeEvent(
             new RoleUpdatedEvent({
                 data: {
                     ...updatedRole,
@@ -846,7 +846,7 @@ export class AccessService {
         const existingRole = await this.roleStore.get(id);
         const existingPermissions = await this.store.getPermissionsForRole(id);
         await this.roleStore.delete(id);
-        this.eventService.storeEvent(
+        await this.eventService.storeEvent(
             new RoleDeletedEvent({
                 preData: {
                     ...existingRole,
diff --git a/src/lib/services/index.ts b/src/lib/services/index.ts
index 9c6ef7845e72..c0c6fa78a944 100644
--- a/src/lib/services/index.ts
+++ b/src/lib/services/index.ts
@@ -63,8 +63,10 @@ import {
 } from '../features/change-request-segment-usage-service/createChangeRequestSegmentUsageReadModel';
 import ConfigurationRevisionService from '../features/feature-toggle/configuration-revision-service';
 import {
+    createAccessService,
     createEnvironmentService,
     createEventsService,
+    createFakeAccessService,
     createFakeEnvironmentService,
     createFakeEventsService,
     createFakeProjectService,
@@ -165,6 +167,11 @@ export const createServices = (
         ? createEventsService(db, config)
         : createFakeEventsService(config, stores);
     const groupService = new GroupService(stores, config, eventService);
+
+    const transactionalAccessService = db
+        ? withTransactional((db) => createAccessService(db, config), db)
+        : withFakeTransactional(createFakeAccessService(config).accessService);
+
     const accessService = new AccessService(
         stores,
         config,
@@ -411,6 +418,7 @@ export const createServices = (
         : createFakePersonalDashboardService(config);
 
     return {
+        transactionalAccessService,
         accessService,
         accountService,
         addonService,
diff --git a/src/lib/types/services.ts b/src/lib/types/services.ts
index f84ca20e8f1b..626553f6c1ce 100644
--- a/src/lib/types/services.ts
+++ b/src/lib/types/services.ts
@@ -59,6 +59,7 @@ import type { OnboardingService } from '../features/onboarding/onboarding-servic
 import type { PersonalDashboardService } from '../features/personal-dashboard/personal-dashboard-service';
 
 export interface IUnleashServices {
+    transactionalAccessService: WithTransactional<AccessService>;
     accessService: AccessService;
     accountService: AccountService;
     addonService: AddonService;
diff --git a/website/docs/how-to/how-to-add-strategy-constraints.md b/website/docs/how-to/how-to-add-strategy-constraints.md
index 4ed2cf5150fe..3a50a0172abe 100644
--- a/website/docs/how-to/how-to-add-strategy-constraints.md
+++ b/website/docs/how-to/how-to-add-strategy-constraints.md
@@ -8,7 +8,7 @@ Before Unleash 4.16, strategy constraints were only available to Unleash Pro and
 
 :::
 
-This guide shows you how to add [strategy constraints](../reference/strategy-constraints.md) to your feature flags via the admin UI. For information on how to interact with strategy constraints from an [Unleash client SDK](../reference/sdks/index.md), visit the specific SDKs documentation or see [the relevant section in the strategy constraints documentation](../reference/strategy-constraints.md#sdks 'strategy constraints documentation, section on interacting with constraints from client SDKs').
+This guide shows you how to add [strategy constraints](../reference/strategy-constraints.md) to your feature flags using the Admin UI. For information on how to interact with strategy constraints from an [Unleash client SDK](../reference/sdks/index.md), visit the specific SDK's documentation or see [the relevant section in the strategy constraints documentation](../reference/strategy-constraints.md#sdks 'strategy constraints documentation, section on interacting with constraints from client SDKs').
 
 ## Prerequisites
 
diff --git a/website/docs/how-to/how-to-create-api-tokens.mdx b/website/docs/how-to/how-to-create-api-tokens.mdx
index a31699bcbbec..fc44549f490d 100644
--- a/website/docs/how-to/how-to-create-api-tokens.mdx
+++ b/website/docs/how-to/how-to-create-api-tokens.mdx
@@ -12,7 +12,7 @@ All users can see tokens with `CLIENT` level access, but only instance admins ca
 
 :::
 
-Unleash SDKs use API tokens to authenticate to the Unleash API. Unleash supports different types of API tokens, each with different levels of access and privileges. Refer to the [API tokens and client keys](../reference/api-tokens-and-client-keys.mdx) article for complete overview of the different token types.
+Unleash SDKs use API tokens to authenticate to the Unleash API. Unleash supports different types of API tokens, each with different levels of access and privileges. Refer to the [API tokens and client keys documentation](../reference/api-tokens-and-client-keys.mdx) for a complete overview of the different token types.
 
 ## Step 1: Navigate to the API token creation form {#step-1}
 
diff --git a/website/docs/how-to/how-to-create-project-api-tokens.mdx b/website/docs/how-to/how-to-create-project-api-tokens.mdx
index 84acd5a24c91..11f16f7fb5d6 100644
--- a/website/docs/how-to/how-to-create-project-api-tokens.mdx
+++ b/website/docs/how-to/how-to-create-project-api-tokens.mdx
@@ -8,7 +8,7 @@ Creating Project API tokens requires you to have the `CREATE_PROJECT_API_TOKEN`
 
 :::
 
-Unleash SDKs use API tokens to authenticate to the Unleash API. Unleash supports different types of API tokens, each with different levels of access and privileges. Refer to the [API tokens and client keys](../reference/api-tokens-and-client-keys.mdx) article for complete overview of the different token types.
+Unleash SDKs use API tokens to authenticate to the Unleash API. Unleash supports different types of API tokens, each with different levels of access and privileges. Refer to the [API tokens and client keys documentation](../reference/api-tokens-and-client-keys.mdx) for a complete overview of the different token types.
 
 ## Step 1: Navigate to the API token creation form {#step-1}
 
diff --git a/website/docs/how-to/how-to-create-service-accounts.mdx b/website/docs/how-to/how-to-create-service-accounts.mdx
index 303678366cad..c8a2dbedeaa3 100644
--- a/website/docs/how-to/how-to-create-service-accounts.mdx
+++ b/website/docs/how-to/how-to-create-service-accounts.mdx
@@ -8,7 +8,7 @@ Service accounts is an enterprise feature available from Unleash 4.21 onwards.
 
 :::
 
-[Service accounts](../reference/service-accounts.md) enable Unleash admins to create accounts that act as users and respect the same set of permissions, however they do not have a password and cannot log in to the Unleash UI. Instead, they are intended to be used to access the Unleash API programatically.
+[Service accounts](../reference/service-accounts.md) enable Unleash admins to create accounts that act as users and adhere to the same set of permissions. However, these accounts do not have a password and cannot log in to the Unleash Admin UI. Instead, they are intended to be used to access the Unleash API programmatically.
 
 ## Step 1: Navigate to the service accounts page {#step-1}
 
@@ -30,7 +30,7 @@ Select a [root role](https://docs.getunleash.io/reference/rbac#predefined-roles)
 
 ![The service account form filled with some example data, and the "add service account" button highlighted at the bottom.](/img/service-account-3.png)
 
-You can optionally generate a token for the new service account right away. Give your token a description and optionally set an expiry date. By default the expiry date is set to 30 days. The token will be generated when you submit the form.
+You can optionally generate a token for the new service account right away. Give your token a description and optionally set an expiry date. By default, the expiry date is set to 30 days. The token will be generated when you submit the form.
 
 ![The service account form with the token section highlighted and the "generate a token now" option selected](/img/service-account-4.png)
 
diff --git a/website/docs/how-to/how-to-enable-openapi.mdx b/website/docs/how-to/how-to-enable-openapi.mdx
index 7a6851aab8e4..45fd8d013662 100644
--- a/website/docs/how-to/how-to-enable-openapi.mdx
+++ b/website/docs/how-to/how-to-enable-openapi.mdx
@@ -13,7 +13,7 @@ Since v5.2.0 Unleash has OpenAPI enabled by default.
 
 :::
 
-Both Unleash and the Unleash proxy have included OpenAPI schemas and Swagger UIs for their APIs. The schemas can be used to get an overview over all API operations and to generate API clients using OpenAPI client generators. The Swagger UI lets you see and try out all the available API operations directly in your browser.
+Both Unleash and the Unleash proxy have included OpenAPI schemas and Swagger UIs for their APIs. The schemas can be used to get an overview of all API operations and to generate API clients using OpenAPI client generators. The Swagger UI lets you see and try out all the available API operations directly in your browser.
 
 To enable the OpenAPI documentation and the Swagger UI, you must start Unleash or the proxy with the correct configuration option. The following section shows you how. The methods are the same for both Unleash and the Unleash proxy, so the steps described in the next section will work for either.
 
@@ -79,7 +79,7 @@ docker run \
 
 The configuration option for enabling OpenAPI and the swagger UI is `enableOAS`. Set this option to `true`.
 
-The following examples have been shortened to show the only the relevant configuration options. For more detailed instructions on how to run Unleash or the proxy, refer to [how to run the Unleash proxy](how-to-run-the-unleash-proxy.mdx) or the [section on running Unleash via Node.js from the deployment section](/using-unleash/deploy/getting-started.md#option-three---from-nodejs) of the documentation.
+The following examples have been shortened to show only the relevant configuration options. For more detailed instructions on how to run Unleash or the proxy, refer to [how to run the Unleash proxy](how-to-run-the-unleash-proxy.mdx) or the [section on running Unleash via Node.js from the deployment section](/using-unleash/deploy/getting-started.md#option-three---from-nodejs) of the documentation.
 
 <Tabs groupId="openapi-configuration">
 
@@ -90,7 +90,7 @@ const unleash = require('unleash-server');
 
 unleash
     .start({
-        // ... Other options elided for brevity
+        // ... Other options emitted for brevity
         // highlight-next-line
         enableOAS: true,
     })
diff --git a/website/docs/how-to/how-to-use-the-admin-api.md b/website/docs/how-to/how-to-use-the-admin-api.md
index 6302e149e60d..41da452914d0 100644
--- a/website/docs/how-to/how-to-use-the-admin-api.md
+++ b/website/docs/how-to/how-to-use-the-admin-api.md
@@ -2,7 +2,7 @@
 title: How to use the Admin API
 ---
 
-It is possible to integrate directly with the Admin API. In this guide we will explain all the steps to set it up.
+This guide explains the steps required to getting access to and using the Admin API.
 
 ## Step 1: Create API token {#step-1-create-api-token}
 
diff --git a/website/docs/quickstart.md b/website/docs/quickstart.md
index 75657a945847..206c15a59c32 100644
--- a/website/docs/quickstart.md
+++ b/website/docs/quickstart.md
@@ -6,7 +6,7 @@ There are lots of options to get started with Unleash. If you're comfortable wit
 
 ## 1. Set up Unleash with Docker {#setup-unleash-docker}
 
-The easiest way to run unleash locally is using git and [docker](https://www.docker.com/).
+The easiest way to run Unleash locally is using Git and [Docker](https://www.docker.com/).
 
 ```sh
 git clone git@github.com:Unleash/unleash.git
@@ -87,7 +87,7 @@ unleash.on("synchronized", () => {
 
 ### Unleash Demo Instance {#unleash-demo-instance}
 
-For testing purposes we have set up a demo instance that you can use in order to test out different use-cases before setting up your own instance. You can find the demo instance here: https://app.unleash-hosted.com/demo/
+For testing purposes, we have set up a demo instance that you can use to test out different use cases before setting up your own instance. You can find the demo instance here: https://app.unleash-hosted.com/demo/
 
 NOTE: This is a demo instance set up with the Pro version. [More information on our different versions](https://www.getunleash.io/pricing).
 
diff --git a/website/docs/reference/api-tokens-and-client-keys.mdx b/website/docs/reference/api-tokens-and-client-keys.mdx
index e9fc5a4940d3..3b438c2a9204 100644
--- a/website/docs/reference/api-tokens-and-client-keys.mdx
+++ b/website/docs/reference/api-tokens-and-client-keys.mdx
@@ -128,7 +128,7 @@ Do **not** use client tokens in:
 
 **Front-end tokens** are used with [front-end SDKs](../reference/sdks/index.md#front-end-sdks) when used with the [Unleash front-end API](./front-end-api.md). They grant the user permission to:
 
--   Read the enabled flagd for a given context
+-   Read the enabled flags for a given context
 -   Register applications with the Unleash server
 -   Send usage metrics
 
diff --git a/website/docs/reference/sdks/index.md b/website/docs/reference/sdks/index.md
index f66e8f821af7..47ae1522fc2a 100644
--- a/website/docs/reference/sdks/index.md
+++ b/website/docs/reference/sdks/index.md
@@ -4,9 +4,9 @@ title: SDK overview
 
 import VideoContent from '@site/src/components/VideoContent.jsx'
 
-In order to connect your application to Unleash you will need a client SDK (software developer kit) for your programming language and an [API token](../how-to/how-to-create-api-tokens). The SDK will handle connecting to the Unleash server instance and retrieving feature flags based on your configuration. All versions of Unleash (OSS, Pro, and Enterprise) use the same client SDKs.
+To connect your application to Unleash you need a [client SDK](#official-sdks) for your programming language and an [API token](../how-to/how-to-create-api-tokens). The SDK handles connecting to the Unleash server instance and retrieving feature flags based on your configuration. All versions of Unleash (OSS, Pro, and Enterprise) use the same client SDKs.
 
-Unleash provides official client SDKs for a number of programming language. Additionally, our community have developed and contributed SDKs for other languages. So if you can't find your favorite language in the list of official SDKs, check out the [list of clients written by our fantastic community](#community-sdks).
+Unleash provides official client SDKs for a number of programming languages. Additionally, our community has developed and contributed SDKs for other languages. So if you can't find your favorite language in the list of official SDKs, check out the [list of clients written by our fantastic community](#community-sdks).
 
 ## Official SDKs
 
@@ -32,7 +32,8 @@ Client-side SDKs can connect to [Unleash Edge](/reference/unleash-edge) or to th
 -   [Android SDK](/docs/generated/sdks/client-side/android-proxy.md)
 -   [Flutter Proxy SDK](/docs/generated/sdks/client-side/flutter.md)
 -   [iOS Proxy SDK](/docs/generated/sdks/client-side/ios-proxy.md)
--   [Javascript SDK](/docs/generated/sdks/client-side/javascript-browser.md)
+-   [JavaScript SDK](/docs/generated/sdks/client-side/javascript-browser.md)
+-   [Next.js](/docs/generated/sdks/client-side/next-js.md)
 -   [React Proxy SDK](/docs/generated/sdks/client-side/react.md)
 -   [Svelte Proxy SDK](/docs/generated/sdks/client-side/svelte.md)
 -   [Vue Proxy SDK](/docs/generated/sdks/client-side/vue.md)
@@ -83,7 +84,7 @@ If you see an item marked with a ❌ that you would find useful, feel free to re
 | Basic support | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
 | <span id="strategy-constraints">**Category: [Strategy constraints](../strategy-constraints.md)**</span> |  |  |  |  |  |  |  |  |
 | Basic support (`IN`, `NOT_IN` operators) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-| <span id="strategy-constraints-advanced-support">Advanced support (Semver, date, numeric and extended string operators)</span> (introduced in) | ✅ (5.1) | ✅ (3.12) | ✅ (3.3) | ✅ (5.1) | ✅ (4.2) | ✅ (2.1) | ✅ (1.3.1) | ⭕ |
+| <span id="strategy-constraints-advanced-support">Advanced support (Semver, date, numeric, and extended string operators)</span> (introduced in) | ✅ (5.1) | ✅ (3.12) | ✅ (3.3) | ✅ (5.1) | ✅ (4.2) | ✅ (2.1) | ✅ (1.3.1) | ⭕ |
 | **Category: [Unleash Context](../reference/unleash-context)** |  |  |  |  |  |  |  |  |
 | Static fields (`environment`, `appName`) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
 | Defined fields | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
@@ -99,7 +100,7 @@ If you see an item marked with a ❌ that you would find useful, feel free to re
 | [Custom stickiness](../stickiness.md#custom-stickiness-beta) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ⭕ |
 | [Strategy Variants](./strategy-variants)| ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ⭕ |
 | **Category: Local backup** |  |  |  |  |  |  |  |  |
-| File based backup | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ⭕ |
+| File-based backup | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ⭕ |
 | **Category: Usage metrics** |  |  |  |  |  |  |  |  |
 | Can disable metrics | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
 | Client registration | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
@@ -134,7 +135,7 @@ Here's some of the fantastic work our community has done to make Unleash work in
 
 ### Implement your own SDK {#implement-your-own-sdk}
 
-If you can't find an SDK that fits your need, you can also develop your own SDK. To make implementation easier, check out these resources:
+If you can't find an SDK that fits your requirements, you can also develop your own SDK. To make implementation easier, check out these resources:
 
 -   [Unleash Client Specifications](https://github.com/Unleash/client-specification) - Used by all official SDKs to make sure they behave correctly across different language implementations. This lets us verify that a gradual rollout to 10% of the users would affect the same users regardless of which SDK you're using.
 -   [Client SDK overview](../client-specification) - A brief, overall guide of the _Unleash Architecture_ and important aspects of the SDK role in it all.
@@ -143,7 +144,7 @@ If you can't find an SDK that fits your need, you can also develop your own SDK.
 
 The following section details the behavior of frontend / client-side SDKs when initializing and fetching flags with respect to network connectivity.
 
-When the SDK is initialized in the application, an in memory repository is setup and synchronized against the frontend API using the configured token and context. Note that the frontend API is hosted by either the Unleash Proxy/Edge or the upstream Unleash instance directly.
+When the SDK is initialized in the application, an in-memory repository is set up and synchronized against the frontend API using the configured token and context. Note that the frontend API is hosted by either the Unleash Proxy/Edge or the upstream Unleash instance directly.
 
 1. All feature flag evaluation is performed by the Proxy/Edge or Unleash instance. A payload of all enabled flags and their variants (if applicable) is returned as a single request. Disabled flags are not included.
 
@@ -165,7 +166,7 @@ By default, all SDKs reach out to the Unleash Server at startup to fetch their f
 Bootstrapping is also supported by the following front-end client SDKs:
 
 -   [Android SDK](/docs/generated/sdks/client-side/android-proxy.md)
--   [Javascript SDK](/docs/generated/sdks/client-side/javascript-browser.md)
+-   [JavaScript SDK](/docs/generated/sdks/client-side/javascript-browser.md)
 -   [React Proxy SDK](/docs/generated/sdks/client-side/react.md)
 -   [Svelte Proxy SDK](/docs/generated/sdks/client-side/svelte.md)
 -   [Vue Proxy SDK](/docs/generated/sdks/client-side/vue.md)
diff --git a/website/docs/understanding-unleash/data-collection.md b/website/docs/understanding-unleash/data-collection.md
index 1b432f2abd08..0efef58ea3f3 100644
--- a/website/docs/understanding-unleash/data-collection.md
+++ b/website/docs/understanding-unleash/data-collection.md
@@ -1,13 +1,9 @@
 ---
 title: Data collection
 ---
-:::info
-
 At Unleash, we prioritize the privacy and security of our users' data. This document provides an overview of the data collected when running Unleash. We explain the purpose of data collection and provide instructions on managing data collection settings.
 
-:::
-
-## What data is collected {#what-data-is-collected}
+## What data is collected
 When running Unleash, we collect the following data:
 
 **Version and Instance ID**: A unique identifier and version for your Unleash instance. This ID allows us to track usage statistics and measure the adoption of Unleash across different installations and helps us ensure that you're using the latest version with the most up-to-date features and security enhancements.
@@ -26,16 +22,20 @@ This includes the following data points:
 - The number of custom strategies defined and in use
 - The number of feature exports/imports made
 
-Please note that all collected data is anonymous, and we only collect usage counts. This data helps us understand how features are used in Unleash, enabling us to prioritize important features and make informed decisions about deprecating features that are no longer relevant to our users.
+All collected data is anonymous, and we only collect usage counts. This data helps us understand how features are used in Unleash, enabling us to prioritize important features and make informed decisions about deprecating features that are no longer relevant to our users.
 
-Please note that we do not collect personally identifiable information (PII) through Unleash.
+:::info
+
+Unleash does not collect personally identifiable information (PII).
+
+:::
 
-## Managing data collection settings {#managing-data-collection-settings}
+## Managing data collection settings
 We understand that privacy preferences may vary among our users. While the data collected by Unleash is limited and anonymous, we provide options to manage data collection settings:
 
-**Disabling All Telemetry**: If you have previously disabled the version telemetry by setting the environment variable `CHECK_VERSION` to anything other than "true", "t" or "1" both the version telemetry and the feature telemetry will be disabled. This respects your choice to opt out of all telemetry data if you had previously disabled it.
+**Disabling All Telemetry**: If you have previously disabled the version telemetry by setting the environment variable `CHECK_VERSION` to anything other than `true`, `t`, or `1`, then both the version telemetry and the feature telemetry will be disabled. This respects your choice to opt out of all telemetry data if you had previously disabled it.
 
-**Turning Off Feature Telemetry**: To disable the collection of the new telemetry data while still allowing the version telemetry, set the environment variable `SEND_TELEMETRY` to anything other than "true", "t" or "1" before starting Unleash. This will ensure that the new telemetry data is not sent, but the version information is still sent.
+**Turning Off Feature Telemetry**: To disable the collection of the new telemetry data while still allowing the version telemetry, set the environment variable `SEND_TELEMETRY` to anything other than  `true`, `t`, or `1` before starting Unleash. This will ensure that the new telemetry data is not sent, but the version information is still sent.
 
 We respect your privacy choices, and we will continue to honor your decision regarding telemetry. If you have any questions or concerns about managing data collection settings or privacy, please reach out to our support team for assistance.
 
diff --git a/website/docs/understanding-unleash/managing-constraints.mdx b/website/docs/understanding-unleash/managing-constraints.mdx
index 6cb91578bb5d..f1a97a2dd4e8 100644
--- a/website/docs/understanding-unleash/managing-constraints.mdx
+++ b/website/docs/understanding-unleash/managing-constraints.mdx
@@ -8,7 +8,7 @@ In this explanatory guide, we will discuss how best to deal with large and compl
 
 :::
 
-Unleash offers several ways to limit feature exposure to a specified audience, such as the [User IDs strategy](../reference/activation-strategies.md#userids), [strategy constraints](../reference/strategy-constraints.md), and [segments](../reference/segments.mdx). Each of these options make it easy to add some sort of user identifier to the list of users who should get access to a feature.
+Unleash offers several ways to limit feature exposure to a specified audience, such as the [User IDs strategy](../reference/activation-strategies.md#userids), [strategy constraints](../reference/strategy-constraints.md), and [segments](../reference/segments.mdx). Each of these options makes it easy to add some sort of user identifier to the list of users who should get access to a feature.
 
 Because of their availability and ease of use with smaller lists, it can be tempting to just keep adding identifiers to those lists. However, once you start approaching a hundred elements, we recommend that you find another way to manage these IDs. In fact, it's probably better to stop well before you get that far.
 
@@ -22,9 +22,9 @@ First, let's talk a bit about Unleash's architecture: **Your Unleash instance**
 
 For the SDKs (Edge/proxy included) to evaluate a feature, it needs to know everything about that feature in a specific environment. This includes all strategies and their constraints. This means that the Unleash instance must transmit all information about this feature (and all other features) as a response to an API call.
 
-As the number of elements in a constraint list (such as number of unique user IDs) grows, so does the size of the HTTP response from the Unleash instance. More data to transmit, means more bandwidth used and longer response times. More data to parse (on the SDK side) means more time spent processing and more data to store and look up on the client.
+As the number of elements in a constraint list (such as the number of unique user IDs) grows, so does the size of the HTTP response from the Unleash instance. More data to transmit means more bandwidth used and longer response times. More data to parse (on the SDK side) means more time spent processing and more data to store and look up on the client.
 
-To fetch feature configuration, Unleash SDKs run a polling loop in the background. With normal-sized configurations this isn't an issue, but as you add more and more complex constraints, this can eventually overload your network and slow down your SDK. And the more SDKs that connect to your Unleash instance, the worse the problem gets.
+To fetch feature configuration, Unleash SDKs run a polling loop in the background. While this works well with normal-sized configurations, as you add more complex constraints, it can eventually overload your network and slow down your SDK. Additionally, as the number of SDKs connecting to your Unleash instance increases, the problem can become more pronounced, potentially impacting performance.
 
 In other words: it's not good.
 
@@ -32,7 +32,7 @@ In other words: it's not good.
 
 Okay, so putting all these IDs in Unleash isn't good. But how **do** you manage features for these 124 special cases you have?
 
-The first thing to think about would be whether you can group these special cases in some way. Maybe you already have an [Unleash context](../reference/unleash-context.md) field that covers the same amount of users. In that case, you can constrain on that instead. If you don't have a context field that matches these users, then you might need to create one.
+The first thing to think about would be whether you can group these special cases in some way. Maybe you already have an [Unleash context](../reference/unleash-context.md) field that covers the same amount of users. In that case, you can constrain that instead. If you don't have a context field that matches these users, then you might need to create one.
 
 Further, if you have a lot of special cases and require complex constraint logic to model it correctly, this probably reflects some logic that is specific to your domain. It's also likely that this same logic is used elsewhere in your system external to Unleash. Modeling this logic in multiple places can quickly lead to breakage, and we recommend having a single source of truth for cases like this.
 
diff --git a/website/docs/understanding-unleash/proxy-hosting.mdx b/website/docs/understanding-unleash/proxy-hosting.mdx
index d7a71c850e32..6dc29c008f3f 100644
--- a/website/docs/understanding-unleash/proxy-hosting.mdx
+++ b/website/docs/understanding-unleash/proxy-hosting.mdx
@@ -1,5 +1,5 @@
 ---
-title: Edge & Proxy hosting strategies
+title: Edge and Proxy hosting strategies
 ---
 
 import VideoContent from '@site/src/components/VideoContent.jsx'
@@ -27,13 +27,13 @@ If you want Unleash to host the Frontend API for you, you should be aware of the
 -   We allow short spikes in traffic and our adaptive infrastructure will automatically scale to your needs.
 -   Please check the [Fair Use Policy](https://www.getunleash.io/fair-use-policy) to see the limits of the Unleash-hosted Frontend API.
 -   There's no guarantee that it'll be geographically close to your end users, this means your end users might be getting slower response times on feature flag evaluations.
--   When we host the frontend API, we will also receive whatever end user data you put in the [Unleash context](../reference/unleash-context.md). This may or may not be an issue depending on your business requirements.
+-   When we host the frontend API, we will also receive whatever end-user data you put in the [Unleash context](../reference/unleash-context.md). This may or may not be an issue depending on your business requirements.
 
-Hosting Edge requires a little more setup the Unleash-hosted Frontend API does, but it offers a number of benefits over both the frontend API and Proxy:
+Hosting Edge requires a little more setup than the Unleash-hosted Frontend API does, but it offers a number of benefits over both the frontend API and Proxy:
 
 -   You can scale Edge instances horizontally and automatically.
 -   There's no request cap or extra charges.
--   Edge can handle multiple sets of API tokens and sync these automatically. Compared to the legacy proxy, it is not necessary to setup single instances per token.
+-   Edge can handle multiple sets of API tokens and sync these automatically. Compared to the legacy proxy, it is not necessary to set up single instances per token.
 -   A key benefit of Edge is its ability to dynamically update new tokens while running. This greatly simplifies scaling up additional application workloads that leverage new tokens without the need to restart the instance or make large changes to infra, as was the prior requirement with the proxy.
 -   You can arrange for Edge to be close to your applications, minimizing response times.
 -   You have full control of all your user data. None of the data that Edge receives is ever sent to the Unleash API. This keeps _your_ data in _your_ hands.
@@ -52,9 +52,9 @@ This setup is only available to Pro and Enterprise customers.
 
 Unleash no longer hosts instances of the proxy, but makes the [Frontend API](../reference/front-end-api) available to all Pro and Enterprise customers. The API is backed by an Amazon RDS database. Your applications can connect to the frontend API from your own cloud or from other hosting solutions.
 
-In order to access the frontend API you'll need
-- to create a [Frontend API key](../reference/api-tokens-and-client-keys#front-end-tokens) for the environment you'd like to use.
-- The Frontend API URL. This will be the your Unleash instance's URL followed by "/api/frontend".
+In order to access the frontend API you'll need:
+- A [Frontend API key](../reference/api-tokens-and-client-keys#front-end-tokens) for the environment you'd like to use.
+- The Frontend API URL. This will be your Unleash instance's URL followed by `/api/frontend`.
 
 This is the simplest, but also most limited (by far) way to use Unleash client SDKs. In this setup, Unleash hosts both the Unleash API and the Unleash frontend API. With Unleash hosting, you'll only need to worry about the Frontend API keys and the URL to access the endpoint.
 
@@ -74,30 +74,33 @@ This setup is only available to Pro and Enterprise customers.
 
 
 
-You host Edge yourself. It runs in a standalone container alongside your other applications in your cloud or hosting setup. Unleash manages the Unleash API, the admin UI, and the backing database in our AWS setup: the API and the UI run together in a Kubernetes deployment and connect to an Amazon RDS database.
+You host Edge yourself. It runs in a standalone container alongside your other applications in your cloud or hosting setup. Unleash manages the Unleash API, the admin UI, and the backing database in our AWS setup; the API and the UI run together in a Kubernetes deployment and connect to an Amazon RDS database.
 
 You'll need to configure Edge and the SDKs.
 
 ### On Unleash
 
-- Create one or multiple [client API tokens](https://docs.getunleash.io/reference/api-tokens-and-client-keys#client-tokens) scoped to the projects/environments you wish to leverage the Edge instance for. (Refer to [how to create API tokens](https://docs.getunleash.io/how-to/how-to-create-api-tokens) for the steps to create one)
-- Create frontend tokens for the frontend apps that will retrieve feature flags from Edge
+- Create one or more [client API tokens](https://docs.getunleash.io/reference/api-tokens-and-client-keys#client-tokens) scoped to the projects/environments you wish to use the Edge instance for. Refer to [how to create API tokens](https://docs.getunleash.io/how-to/how-to-create-api-tokens) for the steps to create one.
+- Create frontend tokens for the frontend apps that will retrieve feature flags from Edge.
 
 ### On Edge
 
 Edge will fetch feature flags from the specified upstream Unleash instance for every client API key it has been made aware of, either during startup (recommended) or separate endpoint requests. It will then periodically sync features with upstream.
 
-It will then accept frontend / backend tokens from application SDKs.
+It will then accept frontend or backend tokens from application SDKs.
 
 :::info Warning
 
-Make sure to use the correct token type for the use case:
-Frontend API: Frontend facing apps only, Edge returns app specific context
-Client API: For backend SDKs, Edge returns entire flag payload for scope of token (project/environment)
+Make sure to use the correct token type for your use case:
+
+- Frontend API: Use for frontend-facing apps; Edge returns application-specific context.
+- Client API: Use for backend SDKs; Edge returns the entire flag payload for the scope of the token (project/environment).
 
 :::
-**Start Edge & populate flag cache**
-- This initial command will populate flag cache on startup using the client token specified in the environment variable:
+
+#### Start Edge and populate flag cache
+
+This initial command will populate the flag cache on startup using the client token specified in the environment variable:
 
 ```docker run -p 3063:3063 -e TOKENS='CLIENT_API_TOKEN' -e UPSTREAM_URL='UPSTREAM_URL' unleashorg/unleash-edge:v8.1 edge```
 
@@ -107,9 +110,9 @@ The following can be used to pass new tokens to Edge for different project/envir
 
 ### On SDKs
 
-- Point frontend/client SDKs to Edge endpoints
-    - **Backend SDKs:** /api/client
-    - **Frontend SDKs:** /api/frontend, /api/proxy
+- Point frontend/client SDKs to Edge endpoints:
+    - **Backend SDKs**: `/api/client`.
+    - **Frontend SDKs**: `/api/frontend`, `/api/proxy`.
 
 
 ## You host everything
@@ -126,7 +129,7 @@ You host everything yourself. Everything runs where and how you configure it to.
 
 **To configure Edge and the SDKs, follow steps in the [previous section on Unleash hosts the API, you host Edge](#unleash-hosts-the-api-you-host-edge)**
 
-As you might expect, doing everything yourself _is_ going to give you the most flexibility, but it's also going to be the most work. If you're already hosting Unleash yourself, though, this shouldn't be any more difficult than the previous section.
+As you might expect, doing everything yourself gives you the most flexibility, but also requires the most effort. However, if you're already hosting Unleash yourself, this shouldn't be any more difficult than the previous section.
 
 As described in the [section on tradeoffs between self-hosted and Unleash-hosted setups](#unleash-hosted-or-self-hosted), running Edge yourself gives you a number of benefits.
 
@@ -162,13 +165,13 @@ You'll need to configure the proxy and the proxy client SDKs.
 
 For the proxy, configure:
 
--   The Unleash API url. This is your Unleash instance URL followed by "/api".
--   A [client API token](../reference/api-tokens-and-client-keys.mdx#client-tokens). (Refer to [how to create API tokens](../how-to/how-to-create-api-tokens.mdx) for the steps to create one.)
+-   The Unleash API url. This is your Unleash instance URL followed by `/api`.
+-   A [client API token](../reference/api-tokens-and-client-keys.mdx#client-tokens). Refer to [how to create API tokens](../how-to/how-to-create-api-tokens.mdx) for the steps to create one.
 -   One or more [proxy client keys](../reference/api-tokens-and-client-keys.mdx#proxy-client-keys). Refer to the [configuration section of the proxy document](../reference/unleash-proxy#configuration) for more details.
 
 For the proxy client SDK, configure:
 
 -   One of the proxy client keys that you configured for the proxy.
--   The proxy's endpoint. This will depend on where and how you're hosting the proxy, but will typically end in "/proxy"
+-   The proxy's endpoint. This will depend on where and how you're hosting the proxy, but will typically end in `/proxy`.
 
 This setup requires a little more setup on your part than the Unleash-hosted proxy does, but it offers all the benefits described in the [section on tradeoffs between self-hosted and Unleash-hosted setups](#unleash-hosted-or-self-hosted).
diff --git a/website/docs/understanding-unleash/the-anatomy-of-unleash.mdx b/website/docs/understanding-unleash/the-anatomy-of-unleash.mdx
index 6557fd59a552..37ad6e4405ac 100644
--- a/website/docs/understanding-unleash/the-anatomy-of-unleash.mdx
+++ b/website/docs/understanding-unleash/the-anatomy-of-unleash.mdx
@@ -3,7 +3,7 @@ title: The Anatomy of Unleash
 ---
 import Figure from '@site/src/components/Figure/Figure.tsx'
 
-This guide's purpose is to give you a conceptual overview of how Unleash works. It covers the various components that exist within an Unleash system and how they interact with each other and with external applications. The diagrams are intended to help you understand the fundamental building blocks, such as [projects](../reference/projects.md), [environments](../reference/environments.md), [variants](../reference/feature-toggle-variants.md) and, of course, [feature flags](../reference/feature-toggles.mdx).
+This guide's purpose is to give you a conceptual overview of how Unleash works. It covers the various components that exist within our system and how they interact with each other and with external applications. The diagrams help you understand the fundamental building blocks, such as [projects](../reference/projects.md), [environments](../reference/environments.md), [variants](../reference/feature-toggle-variants.md) and of course, [feature flags](../reference/feature-toggles.mdx).
 
 The end of this guide presents a [short use case, explaining how you might configure Unleash](#use-case) to start working with feature flags.
 
@@ -18,7 +18,7 @@ Some things in Unleash are configured and defined on the root level. These optio
 - [Strategy types](../reference/activation-strategies.md) (including [custom activation strategy types](../reference/custom-activation-strategies.md))
 - [Tag types](../reference/tags.md)
 - [Unleash context](../reference/unleash-context.md) fields (including [custom context fields](../reference/unleash-context.md#custom-context-fields))
-- Users, [user groups](../reference/rbac.md#user-groups) and [roles](../reference/rbac.md)
+- Users, [user groups](../reference/rbac.md#user-groups), and [roles](../reference/rbac.md)
 
 
 ## Projects
@@ -33,7 +33,7 @@ Pro and Enterprise customers can create, rename, and delete projects as they wis
 
 ## Environments and project environments
 
-<Figure img="/img/anatomy-of-unleash-customer-tiers.png" caption="Feature flags can be activated or deactivated independently in different environments. For instance, a feature flag can be active in the development environment, and deactivated in the production environment. Even if their configuration is otherwise identical, deactivated feature flags will never be considered enabled."/>
+<Figure img="/img/anatomy-of-unleash-customer-tiers.png" caption="Feature flags can be activated or deactivated independently in different environments. For instance, a feature flag can be active in the development environment and deactivated in the production environment. Even if their configuration is otherwise identical, deactivated feature flags will never be considered enabled."/>
 
 [**Environments**](../reference/environments.md) in Unleash let you change how a feature flag works in your application’s different environments. For instance, while you are developing a feature, it’s likely that you’ll want it to be available in your development environment, but not in your production environment: environments let you do that. You might also want to enable a feature for only some users in your development environment, but no users in your production environment: environments let you do that.
 
@@ -70,11 +70,11 @@ When creating a feature flag, you must assign a unique (across your Unleash inst
 
 When you check a [feature flag](../reference/feature-toggles.mdx) in an application, the following decides the result:
 1. Is the flag active in the current environment? If not, it will be disabled.
-2. If the flag **is** active in the current environment, the flag’s strategies decide the result. As long as **at least one** of a flag’s strategies resolve to true for the current context (user or application), then the flag will be considered enabled. In other words, if you have a hundred strategies and ninety-nine of them resolve to false, but one of them resolves to true, then the flag is enabled.
+2. If the flag **is** active in the current environment, the flag’s strategies decide the result. As long as **at least one** of a flag’s strategies resolves to `true` for the current context (user or application), then the flag will be considered enabled. In other words, if you have a hundred strategies and ninety-nine of them resolve to false, but one of them resolves to true, then the flag is enabled.
 
-Activation strategies tie feature flags and [environments](../reference/environments.md) together. When you assign an activation strategy to a feature flag, you do so in one environment at a time. You can assign the same strategy to the same flag in different environments, but they will be different instances of the same strategy, and do not stay in sync. Unleash also lets you copy strategies from one environment to another.
+Activation strategies tie feature flags and [environments](../reference/environments.md) together. When you assign an activation strategy to a feature flag, you do so in one environment at a time. You can assign the same strategy to the same flag in different environments, but they will be different instances of the same strategy and do not stay in sync. Unleash also lets you copy strategies from one environment to another.
 
-Unleash comes with a number of strategies built in (refer the [activation strategies documentation](../reference/activation-strategies.md) for more information on those). You can also create your own [custom activation strategies](../reference/custom-activation-strategies.md) if you need them. All strategies can be further augmented by [**strategy constraints**](../reference/strategy-constraints.md).
+Unleash comes with a number of [built-in strategies](../reference/activation-strategies.md). You can also create your own [custom activation strategies](../reference/custom-activation-strategies.md). All strategies can be further augmented by [**strategy constraints**](../reference/strategy-constraints.md).
 
 
 <Figure img="/img/anatomy-of-unleash-environments-strategies.png" caption="Feature flags exist across environments and can have different activation strategies in each environment."/>
@@ -93,7 +93,7 @@ An activation strategy can have as many constraints as you want. When an activat
 
 :::tip Strategies and constraints
 
-Feature flag strategies are **permissive**: As long as **one** strategy resolves to true, the feature is considered enabled. On the other hand, constrains are **restrictive**: for a given strategy, **all** constraints must be met for it to resolve to true.
+Feature flag strategies are **permissive**: As long as **one** strategy resolves to true, the feature is considered enabled. On the other hand, constraints are **restrictive**: for a given strategy, **all** constraints must be met for it to resolve to true.
 
 We can exemplify this difference with the logical operators AND and OR:
 - For a feature flag, if Strategy1 OR Strategy2 OR .. OR StrategyN is true, **then the feature is enabled**.
@@ -140,7 +140,7 @@ Prior to 4.21, variants were independent of [environments](../reference/environm
 
 <Figure img="/img/anatomy-of-unleash-variants.png" caption="Before Unleash 4.21, feature flag variants were the same for all environments."/>
 
-As of version 4.21, a feature can have different variants in different environments. For instance, a development environment might have no variants, while a production environment has 2 variants. Payloads, weightings and anything else can also differ between environments.
+As of version 4.21, a feature can have different variants in different environments. For instance, a development environment might have no variants, while a production environment has 2 variants. Payloads, weightings, and anything else can also differ between environments.
 
 <Figure img="/img/anatomy-of-unleash-variants-environment.png" caption="From Unleash 4.21 on, a feature flag can have different variants in each environment."/>
 
@@ -169,9 +169,9 @@ In pseudocode (loosely based on the [Node.js SDK](/docs/generated/sdks/server-si
 
 ```js
 if (unleash.isEnabled(“new-color-scheme”)) {
-  // load stylesheet with new color scheme
+  // load stylesheet with the new color scheme
 } else {
-  // load stylesheet with old color scheme
+  // load stylesheet with the old color scheme
 }
 ```
 
@@ -180,7 +180,7 @@ And with that, the new color scheme is now live in your development environment.
 
 ### Rolling out the feature to users
 
-When you’re happy with the new color scheme, you decide to start rolling it out to users. But you want it to go out to only a small number of users at first, so that you can get some feedback while rolling out.
+When you’re happy with the new color scheme, you decide to start rolling it out to users. But you want it to go out to only a small number of users at first so that you can get some feedback while rolling out.
 
 You decide to add a _gradual rollout_ strategy to the new-color-scheme feature in the production environment. Because you want to start small, you set the rollout percentage to 5%.
 
diff --git a/website/docs/understanding-unleash/unleash-overview.md b/website/docs/understanding-unleash/unleash-overview.md
index 23cf27d2e8f5..a73234e2e818 100644
--- a/website/docs/understanding-unleash/unleash-overview.md
+++ b/website/docs/understanding-unleash/unleash-overview.md
@@ -2,7 +2,7 @@
 title: Unleash introductory overview
 ---
 
-One of the most important aspects of the architecture to understand is that feature flags are evaluated in client SDKs which runs as part of your application. This makes flag evaluations super-fast (_we're talking nano-seconds_), scalable and resilient against network disturbances. In order to achieve this Unleash incurs a small update-delay when you change your flag configurations until it is fully propagated to your application (in terms of seconds and is configurable).
+One of the most important aspects of the Unleash architecture is that feature flags are evaluated directly in the client SDKs that run as part of your application. This makes flag evaluations incredibly fast (we're talking nano-seconds), scalable, and resilient against network disturbances. To achieve this, Unleash incurs a small update-delay when you change your flag configurations until it is fully propagated to your application. This delay is typically a few seconds and is configurable.
 
 If you want more details you can read about [our unique architecture](https://www.getunleash.io/blog/our-unique-architecture).
 
@@ -22,9 +22,9 @@ Before you can connect your application to Unleash you need a Unleash server. Yo
 
 ![A visual overview of an Unleash system as described in the following paragraph.](/img/unleash-architecture-edge.png 'System Overview')
 
-- [**The Unleash API**](/reference/api/unleash) - The Unleash instance. This is where you create feature flags, configure activation strategies, and parameters, etc. The service holding all feature flags and their configurations. Configurations declare which activation strategies to use and which parameters they should get.
-- **The Unleash admin UI** - The bundled web interface for interacting with the Unleash instance. Manage flags, define strategies, look at metrics, and much more. Use the UI to [create feature flags](how-to/how-to-create-feature-toggles.md), [manage project access roles](../how-to/how-to-create-and-assign-custom-project-roles.md), [create API tokens](how-to/how-to-create-api-tokens.mdx), and more.
+- [**Unleash API**](/reference/api/unleash) - The Unleash instance. This is where you create feature flags, configure activation strategies, and parameters, etc. The service that contains all feature flags and their configurations. Configurations declare which activation strategies to use and which parameters they should get.
+- **Unleash Admin UI** - The bundled web interface for interacting with the Unleash instance. Manage flags, define strategies, look at metrics, and much more. Use the UI to [create feature flags](how-to/how-to-create-feature-toggles.md), [manage project access roles](../how-to/how-to-create-and-assign-custom-project-roles.md), [create API tokens](how-to/how-to-create-api-tokens.mdx), and more.
 - [**Unleash SDKs**](../reference/sdks/index.md) - Unleash SDKs integrate into your applications and get feature configurations from the Unleash API. Use them to check whether features are enabled or disabled and to send metrics to the Unleash API. [See all our SDKs](../reference/sdks/index.md)
-- [**The Unleash Edge**](../generated/unleash-edge.md) - The Unleash Edge sits between front-end and native applications and the Unleash API, it can also sit between server-side SDKs and the Unleash API as well. You can scale it independently of the Unleash API to handle large request rates without causing issues for the Unleash API. Edge has all endpoints for the client API, frontend API, and proxy API. 
+- [**Unleash Edge**](../generated/unleash-edge.md) - The Unleash Edge sits between front-end and native applications on one side and the Unleash API on the other. It can also sit between server-side SDKs and the Unleash API as well. You can scale it independently of the Unleash API to handle large request rates without causing issues for the Unleash API. Edge has all endpoints for the client API, frontend API, and proxy API. 
 
 To be super fast (_we're talking nano-seconds_), the [client SDK](../reference/sdks/index.md) caches all feature flags and their current configuration in memory. The activation strategies are also implemented in the SDK. This makes it really fast to check if a flag is on or off because it is just a simple function operating on local state, without the need to poll data from the database.