diff --git a/CHANGELOG.md b/CHANGELOG.md
index cae30204a3b..c2c320d8268 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,19 @@
 
 - Add required reason API (#3206)
 
+## 8.9.6
+
+### Fixed
+
+- WatchOS build for Xcode 15 (#3204)
+- Fix CPU usage collection for upcoming visualization in profiling flamecharts (#3214)
+
+## 8.9.5
+
+### Hybrid SDK support
+
+- Allow profiling from hybrid SDKs (([#3194]https://github.com/getsentry/sentry-cocoa/pull/3194))
+
 ## 8.9.4
 
 ### Fixes
diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
index 295ad58822a..98f8ad95151 100644
--- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
+++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
@@ -1196,7 +1196,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 8.9.4;
+				MARKETING_VERSION = 8.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift";
@@ -1225,7 +1225,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 8.9.4;
+				MARKETING_VERSION = 8.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift";
@@ -1870,7 +1870,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 8.9.4;
+				MARKETING_VERSION = 8.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip";
@@ -1905,7 +1905,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 8.9.4;
+				MARKETING_VERSION = 8.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift.Clip";
diff --git a/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard b/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard
index 4ab62f660b2..9ad3c1642ac 100644
--- a/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard
+++ b/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard
@@ -19,27 +19,41 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="Cod-iq-tSj">
-                                <rect key="frame" x="89" y="137.5" width="142" height="308"/>
+                                <rect key="frame" x="30.5" y="137.5" width="259" height="308"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cdR-H3-8fr">
-                                        <rect key="frame" x="0.0" y="0.0" width="142" height="28"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="259" height="28"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Capture Transaction"/>
                                         <connections>
                                             <action selector="captureTransaction:" destination="BYZ-38-t0r" eventType="touchUpInside" id="kff-pT-Uf4"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="60A-0I-s24">
-                                        <rect key="frame" x="0.0" y="28" width="142" height="28"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                        <state key="normal" title="Start transaction"/>
-                                        <connections>
-                                            <action selector="startTransaction:" destination="BYZ-38-t0r" eventType="touchUpInside" id="QEI-9L-E5C"/>
-                                        </connections>
-                                    </button>
+                                    <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="I38-4R-JYf">
+                                        <rect key="frame" x="0.0" y="28" width="259" height="28"/>
+                                        <subviews>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="60A-0I-s24">
+                                                <rect key="frame" x="0.0" y="0.0" width="187" height="28"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                                <state key="normal" title="Start transaction (main thread)"/>
+                                                <connections>
+                                                    <action selector="startTransaction:" destination="BYZ-38-t0r" eventType="touchUpInside" id="QEI-9L-E5C"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="80k-Lr-YpF">
+                                                <rect key="frame" x="187" y="0.0" width="72" height="28"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                                <state key="normal" title=" (bg thread)"/>
+                                                <connections>
+                                                    <action selector="startTransactionFromOtherThread:" destination="BYZ-38-t0r" eventType="touchUpInside" id="ZEH-BE-vTP"/>
+                                                </connections>
+                                            </button>
+                                        </subviews>
+                                    </stackView>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="M4W-xc-mEo">
-                                        <rect key="frame" x="0.0" y="56" width="142" height="28"/>
+                                        <rect key="frame" x="0.0" y="56" width="259" height="28"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                         <state key="normal" title="Stop transaction"/>
@@ -48,7 +62,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LvU-yx-01i">
-                                        <rect key="frame" x="0.0" y="84" width="142" height="28"/>
+                                        <rect key="frame" x="0.0" y="84" width="259" height="28"/>
                                         <accessibility key="accessibilityConfiguration" identifier="showNibButton"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Nib Controller"/>
@@ -57,7 +71,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RjO-LN-eHj">
-                                        <rect key="frame" x="0.0" y="112" width="142" height="28"/>
+                                        <rect key="frame" x="0.0" y="112" width="259" height="28"/>
                                         <accessibility key="accessibilityConfiguration" identifier="showTableViewButton"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Table Controller"/>
@@ -66,7 +80,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ok0-hq-2kK">
-                                        <rect key="frame" x="0.0" y="140" width="142" height="28"/>
+                                        <rect key="frame" x="0.0" y="140" width="259" height="28"/>
                                         <accessibility key="accessibilityConfiguration" identifier="showSplitViewButton"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Split Controller"/>
@@ -75,7 +89,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jwi-v3-e8T">
-                                        <rect key="frame" x="0.0" y="168" width="142" height="28"/>
+                                        <rect key="frame" x="0.0" y="168" width="259" height="28"/>
                                         <accessibility key="accessibilityConfiguration" identifier="loremIpsumButton"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Lorem Ipsum Controller"/>
@@ -84,7 +98,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cTC-V8-T1j">
-                                        <rect key="frame" x="0.0" y="196" width="142" height="28"/>
+                                        <rect key="frame" x="0.0" y="196" width="259" height="28"/>
                                         <accessibility key="accessibilityConfiguration" identifier="useCoreData"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Core Data Tests "/>
@@ -93,7 +107,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ld2-mz-wQD">
-                                        <rect key="frame" x="0.0" y="224" width="142" height="28"/>
+                                        <rect key="frame" x="0.0" y="224" width="259" height="28"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                         <state key="normal" title="Performance scenarios"/>
@@ -102,7 +116,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8CV-WC-ffq">
-                                        <rect key="frame" x="0.0" y="252" width="142" height="28"/>
+                                        <rect key="frame" x="0.0" y="252" width="259" height="28"/>
                                         <accessibility key="accessibilityConfiguration" identifier="testNavigationTransactionButton"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="Load Image Controller"/>
@@ -111,7 +125,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mjD-vZ-Wtp" userLabel="UIClick Transaction">
-                                        <rect key="frame" x="0.0" y="280" width="142" height="28"/>
+                                        <rect key="frame" x="0.0" y="280" width="259" height="28"/>
                                         <accessibility key="accessibilityConfiguration" identifier="uiClickTransactionButton"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <state key="normal" title="UIClick Transaction"/>
@@ -498,10 +512,10 @@
                                 <rect key="frame" x="8" y="80" width="304" height="455"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="Yzg-QH-aPg">
-                                        <rect key="frame" x="0.0" y="0.0" width="304" height="196"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="304" height="224"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="FaL-DP-Rl6">
-                                                <rect key="frame" x="0.0" y="0.0" width="152" height="196"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="152" height="224"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oag-iN-lAn">
                                                         <rect key="frame" x="0.0" y="0.0" width="152" height="28"/>
@@ -561,10 +575,19 @@
                                                             <action selector="flush:" destination="VqS-l1-kwe" eventType="touchUpInside" id="Noh-VX-qnf"/>
                                                         </connections>
                                                     </button>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="M3X-e9-STj">
+                                                        <rect key="frame" x="0.0" y="196" width="152" height="28"/>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                                        <state key="normal" title="Cause frozen frames"/>
+                                                        <connections>
+                                                            <action selector="causeFrozenFrames:" destination="VqS-l1-kwe" eventType="touchUpInside" id="B96-yJ-Yof"/>
+                                                        </connections>
+                                                    </button>
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="ULj-Tl-kYs">
-                                                <rect key="frame" x="152" y="0.0" width="152" height="196"/>
+                                                <rect key="frame" x="152" y="0.0" width="152" height="224"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="weS-d7-IY1">
                                                         <rect key="frame" x="0.0" y="0.0" width="152" height="28"/>
@@ -575,7 +598,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ckT-1E-GWZ">
-                                                        <rect key="frame" x="0.0" y="33.5" width="152" height="28"/>
+                                                        <rect key="frame" x="0.0" y="39" width="152" height="28"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <state key="normal" title="Close SDK"/>
                                                         <connections>
@@ -583,7 +606,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rpD-Rf-xbz">
-                                                        <rect key="frame" x="0.0" y="67" width="152" height="28"/>
+                                                        <rect key="frame" x="0.0" y="78.5" width="152" height="28"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <state key="normal" title="ANR fully blocking"/>
                                                         <connections>
@@ -591,7 +614,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2e4-48-rLl">
-                                                        <rect key="frame" x="0.0" y="101" width="152" height="28"/>
+                                                        <rect key="frame" x="0.0" y="117.5" width="152" height="28"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <state key="normal" title="ANR filling run loop"/>
                                                         <connections>
@@ -599,7 +622,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="F0l-xf-cQd">
-                                                        <rect key="frame" x="0.0" y="134.5" width="152" height="28"/>
+                                                        <rect key="frame" x="0.0" y="157" width="152" height="28"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                         <state key="normal" title="Start 100 threads"/>
@@ -608,7 +631,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Evt-B9-zEC">
-                                                        <rect key="frame" x="0.0" y="168" width="152" height="28"/>
+                                                        <rect key="frame" x="0.0" y="196" width="152" height="28"/>
                                                         <accessibility key="accessibilityConfiguration" identifier="breadcrumbInfoButton"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
@@ -622,22 +645,22 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="omd-Rj-xhq">
-                                        <rect key="frame" x="0.0" y="196" width="304" height="259"/>
+                                        <rect key="frame" x="0.0" y="224" width="304" height="231"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eMF-4u-JGE">
-                                                <rect key="frame" x="8" y="32" width="288" height="34"/>
+                                                <rect key="frame" x="8" y="32" width="288" height="29"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="DSN  " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FXp-oI-RdR">
-                                                <rect key="frame" x="8" y="66" width="288" height="33.5"/>
+                                                <rect key="frame" x="8" y="61" width="288" height="29.5"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="wzO-lb-yFR">
-                                                <rect key="frame" x="8" y="99.5" width="288" height="34"/>
+                                                <rect key="frame" x="8" y="90.5" width="288" height="29"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                                 <connections>
@@ -645,21 +668,21 @@
                                                 </connections>
                                             </textField>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="te3-IR-L1y">
-                                                <rect key="frame" x="8" y="133.5" width="288" height="34"/>
+                                                <rect key="frame" x="8" y="119.5" width="288" height="29"/>
                                                 <state key="normal" title="Reset DSN"/>
                                                 <connections>
                                                     <action selector="resetDSN:" destination="VqS-l1-kwe" eventType="touchUpInside" id="3LJ-al-JGc"/>
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Frames" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xua-qE-dXN" userLabel="frames">
-                                                <rect key="frame" x="8" y="167.5" width="288" height="33.5"/>
+                                                <rect key="frame" x="8" y="148.5" width="288" height="29.5"/>
                                                 <accessibility key="accessibilityConfiguration" identifier="framesStatsLabel"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last breadcrumb" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4M5-qM-BM9" userLabel="breadcrumb">
-                                                <rect key="frame" x="8" y="201" width="288" height="34"/>
+                                                <rect key="frame" x="8" y="178" width="288" height="29"/>
                                                 <accessibility key="accessibilityConfiguration" identifier="breadcrumbLabel"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
diff --git a/Samples/iOS-Swift/iOS-Swift/ExtraViewController.swift b/Samples/iOS-Swift/iOS-Swift/ExtraViewController.swift
index 727ef81fd79..c9263a6bb45 100644
--- a/Samples/iOS-Swift/iOS-Swift/ExtraViewController.swift
+++ b/Samples/iOS-Swift/iOS-Swift/ExtraViewController.swift
@@ -206,6 +206,13 @@ class ExtraViewController: UIViewController {
         AppDelegate.startSentry()
     }
 
+    @IBAction func causeFrozenFrames(_ sender: Any) {
+        var a = String()
+        for i in 0..<100_000_000 {
+            a.append(String(i))
+        }
+    }
+
     private func calcPi() -> Double {
         var denominator = 1.0
         var pi = 0.0
diff --git a/Samples/iOS-Swift/iOS-Swift/ViewController.swift b/Samples/iOS-Swift/iOS-Swift/ViewController.swift
index 11290c1767f..fc5485d7871 100644
--- a/Samples/iOS-Swift/iOS-Swift/ViewController.swift
+++ b/Samples/iOS-Swift/iOS-Swift/ViewController.swift
@@ -26,13 +26,16 @@ class ViewController: UIViewController {
         dataTask.resume()
     }
 
-    var span: Span?
+    var spans = [Span]()
     let profilerNotification = NSNotification.Name("SentryProfileCompleteNotification")
-    
+
     @IBAction func startTransaction(_ sender: UIButton) {
         highlightButton(sender)
-        guard span == nil else { return }
-        span = SentrySDK.startTransaction(name: "Manual Transaction", operation: "Manual Operation")
+        startNewTransaction()
+    }
+
+    fileprivate func startNewTransaction() {
+        spans.append(SentrySDK.startTransaction(name: "Manual Transaction", operation: "Manual Operation"))
 
         NotificationCenter.default.addObserver(forName: profilerNotification, object: nil, queue: nil) { note in
             DispatchQueue.main.async {
@@ -49,12 +52,64 @@ class ViewController: UIViewController {
         }
     }
 
+    @IBAction func startTransactionFromOtherThread(_ sender: UIButton) {
+        highlightButton(sender)
+
+        Thread.detachNewThread {
+            self.startNewTransaction()
+        }
+    }
+
     @IBAction func stopTransaction(_ sender: UIButton) {
         highlightButton(sender)
-        span?.finish()
-        span = nil
 
-        NotificationCenter.default.removeObserver(self, name: profilerNotification, object: nil)
+        defer {
+            if spans.isEmpty {
+                NotificationCenter.default.removeObserver(self, name: profilerNotification, object: nil)
+            }
+        }
+
+        func showConfirmation(span: Span) {
+            DispatchQueue.main.async {
+                let confirmation = UIAlertController(title: "Finished span \(span.spanId.sentrySpanIdString)", message: nil, preferredStyle: .alert)
+                confirmation.addAction(UIAlertAction(title: "OK", style: .default))
+                self.present(confirmation, animated: true)
+            }
+        }
+
+        func finishSpan(span: Span) {
+            span.finish()
+            self.spans.remove(at: self.spans.firstIndex(where: { testSpan in
+                testSpan.spanId == span.spanId
+            })!)
+            showConfirmation(span: span)
+        }
+
+        if spans.count == 1 {
+            finishSpan(span: spans[0])
+            return
+        }
+
+        let alert = UIAlertController(title: "Choose span to stop", message: nil, preferredStyle: .actionSheet)
+        spans.forEach { span in
+            alert.addAction(UIAlertAction(title: span.spanId.sentrySpanIdString, style: .default, handler: { _ in
+                let threadPicker = UIAlertController(title: "From thread:", message: nil, preferredStyle: .actionSheet)
+                threadPicker.addAction(UIAlertAction(title: "Main thread", style: .default, handler: { _ in
+                    DispatchQueue.main.async {
+                        finishSpan(span: span)
+                    }
+                }))
+                threadPicker.addAction(UIAlertAction(title: "BG thread", style: .default, handler: { _ in
+                    Thread.detachNewThread {
+                        finishSpan(span: span)
+                    }
+                }))
+                threadPicker.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+                self.present(threadPicker, animated: true)
+            }))
+        }
+        alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+        present(alert, animated: true)
     }
 
     @IBAction func captureTransaction(_ sender: UIButton) {
diff --git a/Samples/iOS-Swift/iOS-SwiftUITests/ProfilingUITests.swift b/Samples/iOS-Swift/iOS-SwiftUITests/ProfilingUITests.swift
index 46f2c6869be..f18edf5a6ca 100644
--- a/Samples/iOS-Swift/iOS-SwiftUITests/ProfilingUITests.swift
+++ b/Samples/iOS-Swift/iOS-SwiftUITests/ProfilingUITests.swift
@@ -22,7 +22,7 @@ final class ProfilingUITests: XCTestCase {
 
         XCUIApplication().tabBars["Tab Bar"].buttons["Extra"].tap()
         XCUIApplication().tabBars["Tab Bar"].buttons["Transactions"].tap()
-        app.buttons["Start transaction"].afterWaitingForExistence("Couldn't find button to start transaction").tap()
+        app.buttons["Start transaction (main thread)"].afterWaitingForExistence("Couldn't find button to start transaction").tap()
         XCUIApplication().tabBars["Tab Bar"].buttons["Extra"].tap()
         app.buttons["ANR filling run loop"].afterWaitingForExistence("Couldn't find button to ANR").tap()
         XCUIApplication().tabBars["Tab Bar"].buttons["Transactions"].tap()
diff --git a/Samples/watchOS-Swift/watchOS-Swift WatchKit Extension/ContentView.swift b/Samples/watchOS-Swift/watchOS-Swift WatchKit Extension/ContentView.swift
index 9bf6452a48c..257771090f9 100644
--- a/Samples/watchOS-Swift/watchOS-Swift WatchKit Extension/ContentView.swift	
+++ b/Samples/watchOS-Swift/watchOS-Swift WatchKit Extension/ContentView.swift	
@@ -1,6 +1,7 @@
 import Sentry
 import SwiftUI
 
+@available(watchOSApplicationExtension 7.0, *)
 struct ContentView: View {
     
     @StateObject var viewModel = ContentViewModel()
@@ -89,6 +90,7 @@ class ContentViewModel: ObservableObject {
     }
 }
 
+@available(watchOSApplicationExtension 7.0, *)
 struct ContentView_Previews: PreviewProvider {
     static var previews: some View {
         ContentView()
diff --git a/Samples/watchOS-Swift/watchOS-Swift WatchKit Extension/HostingController.swift b/Samples/watchOS-Swift/watchOS-Swift WatchKit Extension/HostingController.swift
index d7a2e86ae8b..f908dd5b09f 100644
--- a/Samples/watchOS-Swift/watchOS-Swift WatchKit Extension/HostingController.swift	
+++ b/Samples/watchOS-Swift/watchOS-Swift WatchKit Extension/HostingController.swift	
@@ -2,6 +2,7 @@ import Foundation
 import SwiftUI
 import WatchKit
 
+@available(watchOSApplicationExtension 7.0, *)
 class HostingController: WKHostingController<ContentView> {
     override var body: ContentView {
         return ContentView()
diff --git a/Samples/watchOS-Swift/watchOS-Swift.xcodeproj/project.pbxproj b/Samples/watchOS-Swift/watchOS-Swift.xcodeproj/project.pbxproj
index 06fa6f06b1d..e6d5210826f 100644
--- a/Samples/watchOS-Swift/watchOS-Swift.xcodeproj/project.pbxproj
+++ b/Samples/watchOS-Swift/watchOS-Swift.xcodeproj/project.pbxproj
@@ -377,6 +377,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = 97JCY7859U;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -437,6 +438,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = 97JCY7859U;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -460,9 +462,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
-				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_ASSET_PATHS = "\"watchOS-Swift WatchKit Extension/Preview Content\"";
-				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = "watchOS-Swift WatchKit Extension/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -472,6 +472,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.watchOS-Swift.watchkitapp.watchkitextension";
 				PRODUCT_NAME = "${TARGET_NAME}";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=watchos*]" = "match Development io.sentry.*";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
@@ -484,9 +486,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
-				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_ASSET_PATHS = "\"watchOS-Swift WatchKit Extension/Preview Content\"";
-				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = "watchOS-Swift WatchKit Extension/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -496,6 +496,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.watchOS-Swift.watchkitapp.watchkitextension";
 				PRODUCT_NAME = "${TARGET_NAME}";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=watchos*]" = "match Development io.sentry.*";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
@@ -509,12 +511,12 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 97JCY7859U;
 				IBSC_MODULE = watchOS_Swift_WatchKit_Extension;
 				INFOPLIST_FILE = "watchOS-Swift WatchKit App/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.watchOS-Swift.watchkitapp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=watchos*]" = "match Development io.sentry.*";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
@@ -528,12 +530,12 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 97JCY7859U;
 				IBSC_MODULE = watchOS_Swift_WatchKit_Extension;
 				INFOPLIST_FILE = "watchOS-Swift WatchKit App/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.watchOS-Swift.watchkitapp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=watchos*]" = "match Development io.sentry.*";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
@@ -545,12 +547,12 @@
 		7B82C4B324C98A96002CA6D1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 97JCY7859U;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.watchOS-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.*";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
@@ -558,12 +560,12 @@
 		7B82C4B424C98A96002CA6D1 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 97JCY7859U;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.watchOS-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.*";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
diff --git a/Sentry.podspec b/Sentry.podspec
index 44b4489f220..94373966198 100644
--- a/Sentry.podspec
+++ b/Sentry.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Sentry"
-  s.version      = "8.9.4"
+  s.version      = "8.9.6"
   s.summary      = "Sentry client for cocoa"
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   }
 
   s.default_subspecs = ['Core']
-  s.dependency "SentryPrivate", "8.9.4"
+  s.dependency "SentryPrivate", "8.9.6"
 
   s.subspec 'Core' do |sp|
       sp.source_files = "Sources/Sentry/**/*.{h,hpp,m,mm,c,cpp}",
diff --git a/SentryPrivate.podspec b/SentryPrivate.podspec
index ed8ecaf845b..b2f14fa2a09 100644
--- a/SentryPrivate.podspec
+++ b/SentryPrivate.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SentryPrivate"
-  s.version      = "8.9.4"
+  s.version      = "8.9.6"
   s.summary      = "Sentry Private Library."
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"
diff --git a/SentrySwiftUI.podspec b/SentrySwiftUI.podspec
index 0dce39ce7a6..df9bc5eec1a 100644
--- a/SentrySwiftUI.podspec
+++ b/SentrySwiftUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SentrySwiftUI"
-  s.version      = "8.9.4"
+  s.version      = "8.9.6"
   s.summary      = "Sentry client for SwiftUI"
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"
@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
   s.watchos.framework = 'WatchKit'
 
   s.source_files = "Sources/SentrySwiftUI/**/*.{swift,h,m}"
-  s.dependency 'Sentry', "8.9.4"
+  s.dependency 'Sentry', "8.9.6"
 end
diff --git a/SentryTestUtils/TestSentrySystemWrapper.swift b/SentryTestUtils/TestSentrySystemWrapper.swift
index 5e9bdd7bfc6..9060020b0c2 100644
--- a/SentryTestUtils/TestSentrySystemWrapper.swift
+++ b/SentryTestUtils/TestSentrySystemWrapper.swift
@@ -6,7 +6,7 @@ public class TestSentrySystemWrapper: SentrySystemWrapper {
         public var memoryFootprintBytes: SentryRAMBytes?
 
         public var cpuUsageError: NSError?
-        public var cpuUsagePerCore: [NSNumber]?
+        public var cpuUsage: NSNumber?
     }
 
     public var overrides = Override()
@@ -19,10 +19,10 @@ public class TestSentrySystemWrapper: SentrySystemWrapper {
         return overrides.memoryFootprintBytes ?? super.memoryFootprintBytes(error)
     }
 
-    public override func cpuUsagePerCore() throws -> [NSNumber] {
+    public override func cpuUsage() throws -> NSNumber {
         if let errorOverride = overrides.cpuUsageError {
             throw errorOverride
         }
-        return try overrides.cpuUsagePerCore ?? super.cpuUsagePerCore()
+        return try overrides.cpuUsage ?? super.cpuUsage()
     }
 }
diff --git a/Sources/Configuration/Sentry.xcconfig b/Sources/Configuration/Sentry.xcconfig
index 85892e4f899..19d71ec68cf 100644
--- a/Sources/Configuration/Sentry.xcconfig
+++ b/Sources/Configuration/Sentry.xcconfig
@@ -2,6 +2,6 @@ PRODUCT_NAME = Sentry
 INFOPLIST_FILE = Sources/Sentry/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry
 
-CURRENT_PROJECT_VERSION = 8.9.4
+CURRENT_PROJECT_VERSION = 8.9.6
 
 MODULEMAP_FILE = $(SRCROOT)/Sources/Sentry/Sentry.modulemap
diff --git a/Sources/Configuration/SentryPrivate.xcconfig b/Sources/Configuration/SentryPrivate.xcconfig
index f61852557ca..1a576b8ef51 100644
--- a/Sources/Configuration/SentryPrivate.xcconfig
+++ b/Sources/Configuration/SentryPrivate.xcconfig
@@ -1,3 +1,3 @@
 PRODUCT_NAME = SentryPrivate
 MACH_O_TYPE = staticlib
-CURRENT_PROJECT_VERSION = 8.9.4
+CURRENT_PROJECT_VERSION = 8.9.6
diff --git a/Sources/Sentry/PrivateSentrySDKOnly.m b/Sources/Sentry/PrivateSentrySDKOnly.m
index e2ee8bdb121..7ac4444b56c 100644
--- a/Sources/Sentry/PrivateSentrySDKOnly.m
+++ b/Sources/Sentry/PrivateSentrySDKOnly.m
@@ -1,11 +1,14 @@
 #import "PrivateSentrySDKOnly.h"
 #import "SentryBreadcrumb+Private.h"
 #import "SentryClient.h"
+#import "SentryCurrentDateProvider.h"
 #import "SentryDebugImageProvider.h"
 #import "SentryExtraContextProvider.h"
 #import "SentryHub+Private.h"
 #import "SentryInstallation.h"
+#import "SentryInternalDefines.h"
 #import "SentryMeta.h"
+#import "SentryProfiler.h"
 #import "SentrySDK+Private.h"
 #import "SentrySerialization.h"
 #import "SentryUser+Private.h"
@@ -117,6 +120,30 @@ + (NSDictionary *)getExtraContext
     return [[SentryExtraContextProvider sharedInstance] getExtraContext];
 }
 
+#if SENTRY_TARGET_PROFILING_SUPPORTED
++ (uint64_t)startProfilingForTrace:(SentryId *)traceId;
+{
+    [SentryProfiler startWithTracer:traceId];
+    return SentryDependencyContainer.sharedInstance.dateProvider.systemTime;
+}
+
++ (nullable NSDictionary<NSString *, id> *)collectProfileForTrace:(SentryId *)traceId
+                                                            since:(uint64_t)startSystemTime;
+{
+    NSMutableDictionary<NSString *, id> *payload = [SentryProfiler
+        collectProfileBetween:startSystemTime
+                          and:SentryDependencyContainer.sharedInstance.dateProvider.systemTime
+                     forTrace:traceId
+                        onHub:[SentrySDK currentHub]];
+
+    if (payload != nil) {
+        payload[@"platform"] = SentryPlatformName;
+    }
+
+    return payload;
+}
+#endif // SENTRY_TARGET_PROFILING_SUPPORTED
+
 #if SENTRY_HAS_UIKIT
 
 + (BOOL)framesTrackingMeasurementHybridSDKMode
diff --git a/Sources/Sentry/Profiling/SentryProfiledTracerConcurrency.mm b/Sources/Sentry/Profiling/SentryProfiledTracerConcurrency.mm
index 14b3f4d4daf..ed306b773ed 100644
--- a/Sources/Sentry/Profiling/SentryProfiledTracerConcurrency.mm
+++ b/Sources/Sentry/Profiling/SentryProfiledTracerConcurrency.mm
@@ -6,7 +6,6 @@
 #    import "SentryInternalDefines.h"
 #    import "SentryLog.h"
 #    import "SentryProfiler+Private.h"
-#    import "SentryTracer.h"
 #    include <mutex>
 
 #    if SENTRY_HAS_UIKIT
@@ -55,12 +54,12 @@
 std::mutex _gStateLock;
 
 void
-trackProfilerForTracer(SentryProfiler *profiler, SentryTracer *tracer)
+trackProfilerForTracer(SentryProfiler *profiler, SentryId *traceId)
 {
     std::lock_guard<std::mutex> l(_gStateLock);
 
     const auto profilerKey = profiler.profileId.sentryIdString;
-    const auto tracerKey = tracer.traceId.sentryIdString;
+    const auto tracerKey = traceId.sentryIdString;
 
     SENTRY_LOG_DEBUG(
         @"Tracking relationship between profiler id %@ and tracer id %@", profilerKey, tracerKey);
@@ -83,14 +82,14 @@
 }
 
 void
-discardProfilerForTracer(SentryTracer *tracer)
+discardProfilerForTracer(SentryId *traceId)
 {
     std::lock_guard<std::mutex> l(_gStateLock);
 
     SENTRY_CASSERT(_gTracersToProfilers != nil && _gProfilersToTracers != nil,
         @"Structures should have already been initialized by the time they are being queried");
 
-    const auto tracerKey = tracer.traceId.sentryIdString;
+    const auto tracerKey = traceId.sentryIdString;
     const auto profiler = _gTracersToProfilers[tracerKey];
 
     if (profiler == nil) {
@@ -106,14 +105,14 @@
 #    endif // SENTRY_HAS_UIKIT
 }
 
-SentryProfiler *_Nullable profilerForFinishedTracer(SentryTracer *tracer)
+SentryProfiler *_Nullable profilerForFinishedTracer(SentryId *traceId)
 {
     std::lock_guard<std::mutex> l(_gStateLock);
 
     SENTRY_CASSERT(_gTracersToProfilers != nil && _gProfilersToTracers != nil,
         @"Structures should have already been initialized by the time they are being queried");
 
-    const auto tracerKey = tracer.traceId.sentryIdString;
+    const auto tracerKey = traceId.sentryIdString;
     const auto profiler = _gTracersToProfilers[tracerKey];
 
     if (!SENTRY_CASSERT_RETURN(profiler != nil,
diff --git a/Sources/Sentry/SentryDevice.mm b/Sources/Sentry/SentryDevice.mm
index f27cf1c56de..86dcb14b35b 100644
--- a/Sources/Sentry/SentryDevice.mm
+++ b/Sources/Sentry/SentryDevice.mm
@@ -18,8 +18,6 @@
 #import <sys/sysctl.h>
 #if SENTRY_HAS_UIKIT
 #    import <UIKit/UIKit.h>
-#elif TARGET_OS_WATCH
-#    import <WatchKit/WatchKit.h>
 #endif
 
 namespace {
@@ -180,7 +178,8 @@
 sentry_getOSVersion(void)
 {
 #if TARGET_OS_WATCH
-    return WKInterfaceDevice.currentDevice.systemVersion;
+    // This function is only used for profiling, and profiling don't run for watchOS
+    return @"";
 #elif SENTRY_HAS_UIKIT
     return UIDevice.currentDevice.systemVersion;
 #else
diff --git a/Sources/Sentry/SentryEvent.m b/Sources/Sentry/SentryEvent.m
index 7154a6f50c6..95c8828888b 100644
--- a/Sources/Sentry/SentryEvent.m
+++ b/Sources/Sentry/SentryEvent.m
@@ -8,6 +8,7 @@
 #import "SentryEvent+Private.h"
 #import "SentryException.h"
 #import "SentryId.h"
+#import "SentryInternalDefines.h"
 #import "SentryLevelMapper.h"
 #import "SentryMessage.h"
 #import "SentryMeta.h"
@@ -31,7 +32,7 @@ - (instancetype)initWithLevel:(enum SentryLevel)level
     if (self) {
         self.eventId = [[SentryId alloc] init];
         self.level = level;
-        self.platform = @"cocoa";
+        self.platform = SentryPlatformName;
         self.timestamp = [SentryDependencyContainer.sharedInstance.dateProvider date];
     }
     return self;
@@ -53,7 +54,7 @@ - (instancetype)initWithError:(NSError *)error
     NSMutableDictionary *serializedData = @{
         @"event_id" : self.eventId.sentryIdString,
         @"timestamp" : @(self.timestamp.timeIntervalSince1970),
-        @"platform" : @"cocoa",
+        @"platform" : SentryPlatformName,
     }
                                               .mutableCopy;
 
diff --git a/Sources/Sentry/SentryMeta.m b/Sources/Sentry/SentryMeta.m
index 4c283d65c7f..8371c20b50a 100644
--- a/Sources/Sentry/SentryMeta.m
+++ b/Sources/Sentry/SentryMeta.m
@@ -5,7 +5,7 @@ @implementation SentryMeta
 // Don't remove the static keyword. If you do the compiler adds the constant name to the global
 // symbol table and it might clash with other constants. When keeping the static keyword the
 // compiler replaces all occurrences with the value.
-static NSString *versionString = @"8.9.4";
+static NSString *versionString = @"8.9.6";
 static NSString *sdkName = @"sentry.cocoa";
 
 + (NSString *)versionString
diff --git a/Sources/Sentry/SentryMetricProfiler.mm b/Sources/Sentry/SentryMetricProfiler.mm
index 0b7d9cf87f5..292866a9e61 100644
--- a/Sources/Sentry/SentryMetricProfiler.mm
+++ b/Sources/Sentry/SentryMetricProfiler.mm
@@ -10,7 +10,6 @@
 #    import "SentryEvent+Private.h"
 #    import "SentryFormatter.h"
 #    import "SentryLog.h"
-#    import "SentryNSProcessInfoWrapper.h"
 #    import "SentryNSTimerFactory.h"
 #    import "SentrySystemWrapper.h"
 #    import "SentryTime.h"
@@ -28,7 +27,7 @@ @implementation SentryMetricReading
 @end
 
 NSString *const kSentryMetricProfilerSerializationKeyMemoryFootprint = @"memory_footprint";
-NSString *const kSentryMetricProfilerSerializationKeyCPUUsageFormat = @"cpu_usage_%d";
+NSString *const kSentryMetricProfilerSerializationKeyCPUUsage = @"cpu_usage";
 
 NSString *const kSentryMetricProfilerSerializationUnitBytes = @"byte";
 NSString *const kSentryMetricProfilerSerializationUnitPercentage = @"percent";
@@ -46,23 +45,22 @@ @implementation SentryMetricReading
  */
 SentrySerializedMetricEntry *_Nullable serializeValuesWithNormalizedTime(
     NSArray<SentryMetricReading *> *absoluteTimestampValues, NSString *unit,
-    SentryTransaction *transaction)
+    uint64_t startSystemTime, uint64_t endSystemTime)
 {
     const auto *timestampNormalizedValues = [NSMutableArray<SentrySerializedMetricReading *> array];
     [absoluteTimestampValues enumerateObjectsUsingBlock:^(
         SentryMetricReading *_Nonnull reading, NSUInteger idx, BOOL *_Nonnull stop) {
         // if the metric reading wasn't recorded until the transaction ended, don't include it
-        if (!orderedChronologically(reading.absoluteTimestamp, transaction.endSystemTime)) {
+        if (!orderedChronologically(reading.absoluteTimestamp, endSystemTime)) {
             return;
         }
 
         // if the metric reading was taken before the transaction started, don't include it
-        if (!orderedChronologically(transaction.startSystemTime, reading.absoluteTimestamp)) {
+        if (!orderedChronologically(startSystemTime, reading.absoluteTimestamp)) {
             return;
         }
 
-        const auto relativeTimestamp
-            = getDurationNs(transaction.startSystemTime, reading.absoluteTimestamp);
+        const auto relativeTimestamp = getDurationNs(startSystemTime, reading.absoluteTimestamp);
 
         [timestampNormalizedValues addObject:@ {
             @"elapsed_since_start_ns" : sentry_stringForUInt64(relativeTimestamp),
@@ -79,25 +77,14 @@ @implementation SentryMetricReading
 @implementation SentryMetricProfiler {
     SentryDispatchSourceWrapper *_dispatchSource;
 
-    /// arrays of readings keyed on NSNumbers representing the core number for the set of readings
-    NSMutableDictionary<NSNumber *, NSMutableArray<SentryMetricReading *> *> *_cpuUsage;
-
+    NSMutableArray<SentryMetricReading *> *_cpuUsage;
     NSMutableArray<SentryMetricReading *> *_memoryFootprint;
 }
 
 - (instancetype)init
 {
     if (self = [super init]) {
-        _cpuUsage =
-            [NSMutableDictionary<NSNumber *, NSMutableArray<SentryMetricReading *> *> dictionary];
-        const auto processorCount
-            = SentryDependencyContainer.sharedInstance.processInfoWrapper.processorCount;
-        SENTRY_LOG_DEBUG(
-            @"Preparing %lu arrays for CPU core usage readings", (long unsigned)processorCount);
-        for (NSUInteger core = 0; core < processorCount; core++) {
-            _cpuUsage[@(core)] = [NSMutableArray<SentryMetricReading *> array];
-        }
-
+        _cpuUsage = [NSMutableArray<SentryMetricReading *> array];
         _memoryFootprint = [NSMutableArray<SentryMetricReading *> array];
     }
     return self;
@@ -120,32 +107,28 @@ - (void)stop
     [_dispatchSource cancel];
 }
 
-- (NSMutableDictionary<NSString *, id> *)serializeForTransaction:(SentryTransaction *)transaction
+- (NSMutableDictionary<NSString *, id> *)serializeBetween:(uint64_t)startSystemTime
+                                                      and:(uint64_t)endSystemTime;
 {
     NSArray<SentryMetricReading *> *memoryFootprint;
-    NSDictionary<NSNumber *, NSArray<SentryMetricReading *> *> *cpuUsage;
+    NSArray<SentryMetricReading *> *cpuUsage;
     @synchronized(self) {
         memoryFootprint = [NSArray<SentryMetricReading *> arrayWithArray:_memoryFootprint];
-        cpuUsage = [NSDictionary<NSNumber *, NSArray<SentryMetricReading *> *>
-            dictionaryWithDictionary:_cpuUsage];
+        cpuUsage = [NSArray<SentryMetricReading *> arrayWithArray:_cpuUsage];
     }
 
     const auto dict = [NSMutableDictionary<NSString *, id> dictionary];
     if (memoryFootprint.count > 0) {
         dict[kSentryMetricProfilerSerializationKeyMemoryFootprint]
-            = serializeValuesWithNormalizedTime(
-                memoryFootprint, kSentryMetricProfilerSerializationUnitBytes, transaction);
+            = serializeValuesWithNormalizedTime(memoryFootprint,
+                kSentryMetricProfilerSerializationUnitBytes, startSystemTime, endSystemTime);
     }
 
-    [cpuUsage enumerateKeysAndObjectsUsingBlock:^(NSNumber *_Nonnull core,
-        NSArray<SentryMetricReading *> *_Nonnull readings, BOOL *_Nonnull stop) {
-        if (readings.count > 0) {
-            dict[[NSString stringWithFormat:kSentryMetricProfilerSerializationKeyCPUUsageFormat,
-                           core.intValue]]
-                = serializeValuesWithNormalizedTime(
-                    readings, kSentryMetricProfilerSerializationUnitPercentage, transaction);
-        }
-    }];
+    if (cpuUsage.count > 0) {
+        dict[kSentryMetricProfilerSerializationKeyCPUUsage]
+            = serializeValuesWithNormalizedTime(cpuUsage,
+                kSentryMetricProfilerSerializationUnitPercentage, startSystemTime, endSystemTime);
+    }
 
     return dict;
 }
@@ -164,7 +147,7 @@ - (void)registerSampler
                 attributes:dispatch_queue_attr_make_with_qos_class(
                                DISPATCH_QUEUE_CONCURRENT, QOS_CLASS_UTILITY, 0)
               eventHandler:^{
-                  [weakSelf recordCPUPercentagePerCore];
+                  [weakSelf recordCPUsage];
                   [weakSelf recordMemoryFootprint];
               }];
 }
@@ -185,22 +168,23 @@ - (void)recordMemoryFootprint
     }
 }
 
-- (void)recordCPUPercentagePerCore
+- (void)recordCPUsage
 {
     NSError *error;
     const auto result =
-        [SentryDependencyContainer.sharedInstance.systemWrapper cpuUsagePerCore:&error];
+        [SentryDependencyContainer.sharedInstance.systemWrapper cpuUsageWithError:&error];
 
     if (error) {
         SENTRY_LOG_ERROR(@"Failed to read CPU usages: %@", error);
         return;
     }
 
+    if (result == nil) {
+        return;
+    }
+
     @synchronized(self) {
-        [result enumerateObjectsUsingBlock:^(
-            NSNumber *_Nonnull usage, NSUInteger core, BOOL *_Nonnull stop) {
-            [_cpuUsage[@(core)] addObject:[self metricReadingForValue:usage]];
-        }];
+        [_cpuUsage addObject:[self metricReadingForValue:result]];
     }
 }
 
diff --git a/Sources/Sentry/SentryProfileTimeseries.mm b/Sources/Sentry/SentryProfileTimeseries.mm
index 23c8dffa6ac..0a9ec459e15 100644
--- a/Sources/Sentry/SentryProfileTimeseries.mm
+++ b/Sources/Sentry/SentryProfileTimeseries.mm
@@ -16,7 +16,7 @@
  */
 void
 logSlicingFailureWithArray(
-    NSArray<SentrySample *> *array, SentryTransaction *transaction, BOOL start)
+    NSArray<SentrySample *> *array, uint64_t startSystemTime, uint64_t endSystemTime, BOOL start)
 {
     if (!SENTRY_CASSERT_RETURN(
             array.count > 0, @"Should not have attempted to slice an empty array.")) {
@@ -29,52 +29,48 @@
 
     const auto firstSampleAbsoluteTime = array.firstObject.absoluteTimestamp;
     const auto lastSampleAbsoluteTime = array.lastObject.absoluteTimestamp;
-    const auto firstSampleRelativeToTransactionStart
-        = firstSampleAbsoluteTime - transaction.startSystemTime;
-    const auto lastSampleRelativeToTransactionStart
-        = lastSampleAbsoluteTime - transaction.startSystemTime;
+    const auto firstSampleRelativeToTransactionStart = firstSampleAbsoluteTime - startSystemTime;
+    const auto lastSampleRelativeToTransactionStart = lastSampleAbsoluteTime - startSystemTime;
     SENTRY_LOG_DEBUG(@"[slice %@] Could not find any%@ sample taken during the transaction "
                      @"(first sample taken at: %llu; last: %llu; transaction start: %llu; end: "
                      @"%llu; first sample relative to transaction start: %lld; last: %lld).",
         start ? @"start" : @"end", start ? @"" : @" other", firstSampleAbsoluteTime,
-        lastSampleAbsoluteTime, transaction.startSystemTime, transaction.endSystemTime,
+        lastSampleAbsoluteTime, startSystemTime, endSystemTime,
         firstSampleRelativeToTransactionStart, lastSampleRelativeToTransactionStart);
 }
 
 NSArray<SentrySample *> *_Nullable slicedProfileSamples(
-    NSArray<SentrySample *> *samples, SentryTransaction *transaction)
+    NSArray<SentrySample *> *samples, uint64_t startSystemTime, uint64_t endSystemTime)
 {
     if (samples.count == 0) {
         return nil;
     }
 
-    const auto transactionStart = transaction.startSystemTime;
     const auto firstIndex =
         [samples indexOfObjectWithOptions:NSEnumerationConcurrent
                               passingTest:^BOOL(SentrySample *_Nonnull sample, NSUInteger idx,
                                   BOOL *_Nonnull stop) {
-                                  *stop = sample.absoluteTimestamp >= transactionStart;
+                                  *stop = sample.absoluteTimestamp >= startSystemTime;
                                   return *stop;
                               }];
 
     if (firstIndex == NSNotFound) {
-        logSlicingFailureWithArray(samples, transaction, /*start*/ YES);
+        logSlicingFailureWithArray(samples, startSystemTime, endSystemTime, /*start*/ YES);
         return nil;
     } else {
         SENTRY_LOG_DEBUG(@"Found first slice sample at index %lu", firstIndex);
     }
 
-    const auto transactionEnd = transaction.endSystemTime;
     const auto lastIndex =
         [samples indexOfObjectWithOptions:NSEnumerationConcurrent | NSEnumerationReverse
                               passingTest:^BOOL(SentrySample *_Nonnull sample, NSUInteger idx,
                                   BOOL *_Nonnull stop) {
-                                  *stop = sample.absoluteTimestamp <= transactionEnd;
+                                  *stop = sample.absoluteTimestamp <= endSystemTime;
                                   return *stop;
                               }];
 
     if (lastIndex == NSNotFound) {
-        logSlicingFailureWithArray(samples, transaction, /*start*/ NO);
+        logSlicingFailureWithArray(samples, startSystemTime, endSystemTime, /*start*/ NO);
         return nil;
     } else {
         SENTRY_LOG_DEBUG(@"Found last slice sample at index %lu", lastIndex);
diff --git a/Sources/Sentry/SentryProfiler.mm b/Sources/Sentry/SentryProfiler.mm
index c7fb2222f1b..8a8bc2ec444 100644
--- a/Sources/Sentry/SentryProfiler.mm
+++ b/Sources/Sentry/SentryProfiler.mm
@@ -85,7 +85,7 @@
  * for it.
  */
 NSArray<SentrySerializedMetricReading *> *
-sliceGPUData(SentryFrameInfoTimeSeries *frameInfo, SentryTransaction *transaction,
+sliceGPUData(SentryFrameInfoTimeSeries *frameInfo, uint64_t startSystemTime, uint64_t endSystemTime,
     BOOL useMostRecentRecording)
 {
     auto slicedGPUEntries = [NSMutableArray<SentrySerializedMetricEntry *> array];
@@ -94,19 +94,19 @@
         NSDictionary<NSString *, NSNumber *> *_Nonnull obj, NSUInteger idx, BOOL *_Nonnull stop) {
         const auto timestamp = obj[@"timestamp"].unsignedLongLongValue;
 
-        if (!orderedChronologically(transaction.startSystemTime, timestamp)) {
+        if (!orderedChronologically(startSystemTime, timestamp)) {
             SENTRY_LOG_DEBUG(@"GPU info recorded (%llu) before transaction start (%llu), "
                              @"will not report it.",
-                timestamp, transaction.startSystemTime);
+                timestamp, startSystemTime);
             nearestPredecessorValue = obj[@"value"];
             return;
         }
 
-        if (!orderedChronologically(timestamp, transaction.endSystemTime)) {
+        if (!orderedChronologically(timestamp, endSystemTime)) {
             SENTRY_LOG_DEBUG(@"GPU info recorded after transaction finished, won't record.");
             return;
         }
-        const auto relativeTimestamp = getDurationNs(transaction.startSystemTime, timestamp);
+        const auto relativeTimestamp = getDurationNs(startSystemTime, timestamp);
 
         [slicedGPUEntries addObject:@ {
             @"elapsed_since_start_ns" : sentry_stringForUInt64(relativeTimestamp),
@@ -126,21 +126,20 @@
 /** Given an array of samples with absolute timestamps, return the serialized JSON mapping with
  * their data, with timestamps normalized relative to the provided transaction's start time. */
 NSArray<NSDictionary *> *
-serializedSamplesWithRelativeTimestamps(
-    NSArray<SentrySample *> *samples, SentryTransaction *transaction)
+serializedSamplesWithRelativeTimestamps(NSArray<SentrySample *> *samples, uint64_t startSystemTime)
 {
     const auto result = [NSMutableArray<NSDictionary *> array];
     [samples enumerateObjectsUsingBlock:^(
         SentrySample *_Nonnull sample, NSUInteger idx, BOOL *_Nonnull stop) {
         // This shouldn't happen as we would've filtered out any such samples, but we should still
         // guard against it before calling getDurationNs as a defensive measure
-        if (!orderedChronologically(transaction.startSystemTime, sample.absoluteTimestamp)) {
+        if (!orderedChronologically(startSystemTime, sample.absoluteTimestamp)) {
             SENTRY_LOG_WARN(@"Filtered sample not chronological with transaction.");
             return;
         }
         const auto dict = [NSMutableDictionary dictionaryWithDictionary:@ {
-            @"elapsed_since_start_ns" : sentry_stringForUInt64(
-                getDurationNs(transaction.startSystemTime, sample.absoluteTimestamp)),
+            @"elapsed_since_start_ns" :
+                sentry_stringForUInt64(getDurationNs(startSystemTime, sample.absoluteTimestamp)),
             @"thread_id" : sentry_stringForUInt64(sample.threadID),
             @"stack_id" : sample.stackIndex,
         }];
@@ -153,11 +152,11 @@
     return result;
 }
 
-NSDictionary<NSString *, id> *
-serializedProfileData(
-    NSDictionary<NSString *, id> *profileData, SentryTransaction *transaction, SentryId *profileID,
-    NSString *truncationReason, NSDictionary<NSString *, id> *serializedMetrics,
-    NSArray<SentryDebugMeta *> *debugMeta, SentryHub *hub
+NSMutableDictionary<NSString *, id> *
+serializedProfileData(NSDictionary<NSString *, id> *profileData, uint64_t startSystemTime,
+    uint64_t endSystemTime, SentryId *profileID, NSString *truncationReason,
+    NSDictionary<NSString *, id> *serializedMetrics, NSArray<SentryDebugMeta *> *debugMeta,
+    SentryHub *hub
 #    if SENTRY_HAS_UIKIT
     ,
     SentryScreenFrames *gpuData
@@ -176,7 +175,7 @@
     }
 
     // slice the profile data to only include the samples/metrics within the transaction
-    const auto slicedSamples = slicedProfileSamples(samples, transaction);
+    const auto slicedSamples = slicedProfileSamples(samples, startSystemTime, endSystemTime);
     if (slicedSamples.count < 2) {
         SENTRY_LOG_DEBUG(@"Not enough samples in profile during the transaction");
         [hub.getClient recordLostEvent:kSentryDataCategoryProfile
@@ -185,7 +184,7 @@
     }
     const auto payload = [NSMutableDictionary<NSString *, id> dictionary];
     NSMutableDictionary<NSString *, id> *const profile = [profileData[@"profile"] mutableCopy];
-    profile[@"samples"] = serializedSamplesWithRelativeTimestamps(slicedSamples, transaction);
+    profile[@"samples"] = serializedSamplesWithRelativeTimestamps(slicedSamples, startSystemTime);
     payload[@"profile"] = profile;
 
     payload[@"version"] = @"1";
@@ -214,26 +213,8 @@
 
     payload[@"profile_id"] = profileID.sentryIdString;
     payload[@"truncation_reason"] = truncationReason;
-    payload[@"platform"] = transaction.platform;
     payload[@"environment"] = hub.scope.environmentString ?: hub.getClient.options.environment;
-
-    const auto timestamp = transaction.trace.originalStartTimestamp;
-    if (UNLIKELY(timestamp == nil)) {
-        SENTRY_LOG_WARN(@"There was no start timestamp on the provided transaction. Falling back "
-                        @"to old behavior of using the current time.");
-        payload[@"timestamp"] =
-            [[SentryDependencyContainer.sharedInstance.dateProvider date] sentry_toIso8601String];
-    } else {
-        payload[@"timestamp"] = [timestamp sentry_toIso8601String];
-    }
-
     payload[@"release"] = hub.getClient.options.releaseName;
-    payload[@"transaction"] = @ {
-        @"id" : transaction.eventId.sentryIdString,
-        @"trace_id" : transaction.trace.traceId.sentryIdString,
-        @"name" : transaction.transaction,
-        @"active_thread_id" : [transaction.trace.transactionContext sentry_threadInfo].threadId
-    };
 
     // add the gathered metrics
     auto metrics = serializedMetrics;
@@ -241,23 +222,25 @@
 #    if SENTRY_HAS_UIKIT
     const auto mutableMetrics =
         [NSMutableDictionary<NSString *, id> dictionaryWithDictionary:metrics];
-    const auto slowFrames
-        = sliceGPUData(gpuData.slowFrameTimestamps, transaction, /*useMostRecentRecording */ NO);
+    const auto slowFrames = sliceGPUData(gpuData.slowFrameTimestamps, startSystemTime,
+        endSystemTime, /*useMostRecentRecording */ NO);
     if (slowFrames.count > 0) {
         mutableMetrics[@"slow_frame_renders"] =
             @ { @"unit" : @"nanosecond", @"values" : slowFrames };
     }
 
-    const auto frozenFrames = sliceGPUData(gpuData.frozenFrameTimestamps, transaction,
-        /*useMostRecentRecording */ NO);
+    const auto frozenFrames
+        = sliceGPUData(gpuData.frozenFrameTimestamps, startSystemTime, endSystemTime,
+            /*useMostRecentRecording */ NO);
     if (frozenFrames.count > 0) {
         mutableMetrics[@"frozen_frame_renders"] =
             @ { @"unit" : @"nanosecond", @"values" : frozenFrames };
     }
 
     if (slowFrames.count > 0 || frozenFrames.count > 0) {
-        const auto frameRates = sliceGPUData(gpuData.frameRateTimestamps, transaction,
-            /*useMostRecentRecording */ YES);
+        const auto frameRates
+            = sliceGPUData(gpuData.frameRateTimestamps, startSystemTime, endSystemTime,
+                /*useMostRecentRecording */ YES);
         if (frameRates.count > 0) {
             mutableMetrics[@"screen_frame_rates"] = @ { @"unit" : @"hz", @"values" : frameRates };
         }
@@ -330,13 +313,13 @@ - (void)scheduleTimeoutTimer
 
 #    pragma mark - Public
 
-+ (void)startWithTracer:(SentryTracer *)tracer
++ (void)startWithTracer:(SentryId *)traceId
 {
     std::lock_guard<std::mutex> l(_gProfilerLock);
 
     if (_gCurrentProfiler && [_gCurrentProfiler isRunning]) {
         SENTRY_LOG_DEBUG(@"A profiler is already running.");
-        trackProfilerForTracer(_gCurrentProfiler, tracer);
+        trackProfilerForTracer(_gCurrentProfiler, traceId);
         return;
     }
 
@@ -346,7 +329,7 @@ + (void)startWithTracer:(SentryTracer *)tracer
         return;
     }
 
-    trackProfilerForTracer(_gCurrentProfiler, tracer);
+    trackProfilerForTracer(_gCurrentProfiler, traceId);
 }
 
 + (BOOL)isCurrentlyProfiling
@@ -358,21 +341,21 @@ + (BOOL)isCurrentlyProfiling
 + (nullable SentryEnvelopeItem *)createProfilingEnvelopeItemForTransaction:
     (SentryTransaction *)transaction
 {
-    const auto profiler = profilerForFinishedTracer(transaction.trace);
-    if (!profiler) {
-        SENTRY_LOG_WARN(@"Expected a profiler for tracer id %@ but none was found",
-            transaction.trace.traceId.sentryIdString);
+    const auto payload = [self collectProfileBetween:transaction.startSystemTime
+                                                 and:transaction.endSystemTime
+                                            forTrace:transaction.trace.traceId
+                                               onHub:transaction.trace.hub];
+    if (payload == nil) {
         return nil;
     }
 
-    const auto payload = [profiler serializeForTransaction:transaction];
-
-#    if defined(TEST) || defined(TESTCI)
-    [NSNotificationCenter.defaultCenter postNotificationName:@"SentryProfileCompleteNotification"
-                                                      object:nil
-                                                    userInfo:payload];
-#    endif // defined(TEST) || defined(TESTCI)
+    [self updateProfilePayload:payload forTransaction:transaction];
+    return [self createEnvelopeItemForProfilePayload:payload];
+}
 
++ (nullable SentryEnvelopeItem *)createEnvelopeItemForProfilePayload:
+    (NSDictionary<NSString *, id> *)payload;
+{
     const auto JSONData = [SentrySerialization dataWithJSONObject:payload];
     if (JSONData == nil) {
         SENTRY_LOG_DEBUG(@"Failed to encode profile to JSON.");
@@ -384,14 +367,57 @@ + (nullable SentryEnvelopeItem *)createProfilingEnvelopeItemForTransaction:
     return [[SentryEnvelopeItem alloc] initWithHeader:header data:JSONData];
 }
 
++ (nullable NSMutableDictionary<NSString *, id> *)collectProfileBetween:(uint64_t)startSystemTime
+                                                                    and:(uint64_t)endSystemTime
+                                                               forTrace:(SentryId *)traceId
+                                                                  onHub:(SentryHub *)hub;
+{
+    const auto profiler = profilerForFinishedTracer(traceId);
+    if (!profiler) {
+        return nil;
+    }
+
+    const auto payload = [profiler serializeBetween:startSystemTime and:endSystemTime onHub:hub];
+
+#    if defined(TEST) || defined(TESTCI)
+    [NSNotificationCenter.defaultCenter postNotificationName:@"SentryProfileCompleteNotification"
+                                                      object:nil
+                                                    userInfo:payload];
+#    endif // defined(TEST) || defined(TESTCI)
+    return payload;
+}
+
 #    pragma mark - Private
 
-- (NSDictionary<NSString *, id> *)serializeForTransaction:(SentryTransaction *)transaction
++ (void)updateProfilePayload:(NSMutableDictionary<NSString *, id> *)payload
+              forTransaction:(SentryTransaction *)transaction;
+{
+    payload[@"platform"] = transaction.platform;
+    payload[@"transaction"] = @{
+        @"id" : transaction.eventId.sentryIdString,
+        @"trace_id" : transaction.trace.traceId.sentryIdString,
+        @"name" : transaction.transaction,
+        @"active_thread_id" : [transaction.trace.transactionContext sentry_threadInfo].threadId
+    };
+    const auto timestamp = transaction.trace.originalStartTimestamp;
+    if (UNLIKELY(timestamp == nil)) {
+        SENTRY_LOG_WARN(@"There was no start timestamp on the provided transaction. Falling back "
+                        @"to old behavior of using the current time.");
+        payload[@"timestamp"] =
+            [[SentryDependencyContainer.sharedInstance.dateProvider date] sentry_toIso8601String];
+    } else {
+        payload[@"timestamp"] = [timestamp sentry_toIso8601String];
+    }
+}
+
+- (NSMutableDictionary<NSString *, id> *)serializeBetween:(uint64_t)startSystemTime
+                                                      and:(uint64_t)endSystemTime
+                                                    onHub:(SentryHub *)hub;
 {
-    return serializedProfileData([self._state copyProfilingData], transaction, self.profileId,
-        profilerTruncationReasonName(_truncationReason),
-        [_metricProfiler serializeForTransaction:transaction],
-        [_debugImageProvider getDebugImagesCrashed:NO], transaction.trace.hub
+    return serializedProfileData([self._state copyProfilingData], startSystemTime, endSystemTime,
+        self.profileId, profilerTruncationReasonName(_truncationReason),
+        [_metricProfiler serializeBetween:startSystemTime and:endSystemTime],
+        [_debugImageProvider getDebugImagesCrashed:NO], hub
 #    if SENTRY_HAS_UIKIT
         ,
         self._screenFrameData
diff --git a/Sources/Sentry/SentrySystemWrapper.mm b/Sources/Sentry/SentrySystemWrapper.mm
index 6e626700e8e..7c5525b01b5 100644
--- a/Sources/Sentry/SentrySystemWrapper.mm
+++ b/Sources/Sentry/SentrySystemWrapper.mm
@@ -1,8 +1,22 @@
 #import "SentrySystemWrapper.h"
+#import "SentryDependencyContainer.h"
 #import "SentryError.h"
+#import "SentryNSProcessInfoWrapper.h"
 #import <mach/mach.h>
+#include <thread>
 
-@implementation SentrySystemWrapper
+@implementation SentrySystemWrapper {
+    float processorCount;
+}
+
+- (instancetype)init
+{
+    if ((self = [super init])) {
+        processorCount
+            = (float)SentryDependencyContainer.sharedInstance.processInfoWrapper.processorCount;
+    }
+    return self;
+}
 
 - (SentryRAMBytes)memoryFootprintBytes:(NSError *__autoreleasing _Nullable *)error
 {
@@ -28,35 +42,48 @@ - (SentryRAMBytes)memoryFootprintBytes:(NSError *__autoreleasing _Nullable *)err
     return footprintBytes;
 }
 
-- (NSArray<NSNumber *> *)cpuUsagePerCore:(NSError **)error
+- (NSNumber *)cpuUsageWithError:(NSError **)error
 {
-    natural_t numCPUs = 0U;
-    processor_info_array_t cpuInfo;
-    mach_msg_type_number_t numCPUInfo;
-    const auto status = host_processor_info(
-        mach_host_self(), PROCESSOR_CPU_LOAD_INFO, &numCPUs, &cpuInfo, &numCPUInfo);
-    if (status != KERN_SUCCESS) {
+    mach_msg_type_number_t count;
+    thread_act_array_t list;
+
+    const auto taskThreadsStatus = task_threads(mach_task_self(), &list, &count);
+    if (taskThreadsStatus != KERN_SUCCESS) {
         if (error) {
             *error = NSErrorFromSentryErrorWithKernelError(
-                kSentryErrorKernel, @"host_processor_info reported an error.", status);
+                kSentryErrorKernel, @"task_threads reported an error.", taskThreadsStatus);
         }
+        vm_deallocate(
+            mach_task_self(), reinterpret_cast<vm_address_t>(list), sizeof(*list) * count);
         return nil;
     }
 
-    NSMutableArray *result = [NSMutableArray arrayWithCapacity:numCPUs];
-    for (natural_t core = 0U; core < numCPUs; ++core) {
-        const auto indexBase = CPU_STATE_MAX * core;
-        const float user = cpuInfo[indexBase + CPU_STATE_USER];
-        const float sys = cpuInfo[indexBase + CPU_STATE_SYSTEM];
-        const float nice = cpuInfo[indexBase + CPU_STATE_NICE];
-        const float idle = cpuInfo[indexBase + CPU_STATE_IDLE];
-        const auto inUse = user + sys + nice;
-        const auto total = inUse + idle;
-        const auto usagePercent = inUse / total * 100.f;
-        [result addObject:@(usagePercent)];
+    auto usage = 0.f;
+    for (decltype(count) i = 0; i < count; i++) {
+        const auto thread = list[i];
+
+        mach_msg_type_number_t infoSize = THREAD_BASIC_INFO_COUNT;
+        thread_basic_info_data_t data;
+        const auto threadInfoStatus = thread_info(
+            thread, THREAD_BASIC_INFO, reinterpret_cast<thread_info_t>(&data), &infoSize);
+        if (threadInfoStatus != KERN_SUCCESS) {
+            if (error) {
+                *error = NSErrorFromSentryErrorWithKernelError(
+                    kSentryErrorKernel, @"task_threads reported an error.", taskThreadsStatus);
+            }
+            vm_deallocate(
+                mach_task_self(), reinterpret_cast<vm_address_t>(list), sizeof(*list) * count);
+            return nil;
+        }
+
+        usage += data.cpu_usage / processorCount;
     }
 
-    return result;
+    vm_deallocate(mach_task_self(), reinterpret_cast<vm_address_t>(list), sizeof(*list) * count);
+
+    NSLog(@"CPU usage: %f", usage);
+
+    return @(usage);
 }
 
 @end
diff --git a/Sources/Sentry/SentryTracer.m b/Sources/Sentry/SentryTracer.m
index 880e194802d..20a2e091e52 100644
--- a/Sources/Sentry/SentryTracer.m
+++ b/Sources/Sentry/SentryTracer.m
@@ -165,7 +165,7 @@ - (instancetype)initWithTransactionContext:(SentryTransactionContext *)transacti
     if (_configuration.profilesSamplerDecision.decision == kSentrySampleDecisionYes) {
         _isProfiling = YES;
         _startSystemTime = SentryDependencyContainer.sharedInstance.dateProvider.systemTime;
-        [SentryProfiler startWithTracer:self];
+        [SentryProfiler startWithTracer:self.traceId];
     }
 #endif // SENTRY_TARGET_PROFILING_SUPPORTED
 
@@ -176,7 +176,7 @@ - (void)dealloc
 {
 #if SENTRY_TARGET_PROFILING_SUPPORTED
     if (self.isProfiling) {
-        discardProfilerForTracer(self);
+        discardProfilerForTracer(self.traceId);
     }
 #endif // SENTRY_TARGET_PROFILING_SUPPORTED
 }
diff --git a/Sources/Sentry/include/HybridPublic/PrivateSentrySDKOnly.h b/Sources/Sentry/include/HybridPublic/PrivateSentrySDKOnly.h
index 06044f827bc..79674c49cba 100644
--- a/Sources/Sentry/include/HybridPublic/PrivateSentrySDKOnly.h
+++ b/Sources/Sentry/include/HybridPublic/PrivateSentrySDKOnly.h
@@ -80,6 +80,20 @@ typedef void (^SentryOnAppStartMeasurementAvailable)(
  */
 + (NSDictionary *)getExtraContext;
 
+#if SENTRY_TARGET_PROFILING_SUPPORTED
+/**
+ * Start a profiler session associated with the given @c SentryId.
+ * @return The system time when the profiler session started.
+ */
++ (uint64_t)startProfilingForTrace:(SentryId *)traceId;
+
+/**
+ * Collect a profiler session data associated with the given @c SentryId.
+ */
++ (nullable NSDictionary<NSString *, id> *)collectProfileForTrace:(SentryId *)traceId
+                                                            since:(uint64_t)startSystemTime;
+#endif
+
 @property (class, nullable, nonatomic, copy)
     SentryOnAppStartMeasurementAvailable onAppStartMeasurementAvailable;
 
diff --git a/Sources/Sentry/include/SentryInternalDefines.h b/Sources/Sentry/include/SentryInternalDefines.h
index 167aca87561..9ed74c58572 100644
--- a/Sources/Sentry/include/SentryInternalDefines.h
+++ b/Sources/Sentry/include/SentryInternalDefines.h
@@ -2,6 +2,7 @@
 #import <Foundation/Foundation.h>
 
 static NSString *const SentryDebugImageType = @"macho";
+static NSString *const SentryPlatformName = @"cocoa";
 
 /**
  * Abort if assertion fails in debug, and log a warning if it fails in production.
diff --git a/Sources/Sentry/include/SentryMetricProfiler.h b/Sources/Sentry/include/SentryMetricProfiler.h
index cdb0041732e..ff2ddfa08a1 100644
--- a/Sources/Sentry/include/SentryMetricProfiler.h
+++ b/Sources/Sentry/include/SentryMetricProfiler.h
@@ -9,7 +9,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 SENTRY_EXTERN NSString *const kSentryMetricProfilerSerializationKeyMemoryFootprint;
-SENTRY_EXTERN NSString *const kSentryMetricProfilerSerializationKeyCPUUsageFormat;
+SENTRY_EXTERN NSString *const kSentryMetricProfilerSerializationKeyCPUUsage;
 
 SENTRY_EXTERN NSString *const kSentryMetricProfilerSerializationUnitBytes;
 SENTRY_EXTERN NSString *const kSentryMetricProfilerSerializationUnitPercentage;
@@ -58,8 +58,9 @@ typedef NSDictionary<NSString *, id /* <NSString, NSArray<SentrySerializedMetric
  * }
  * @endcode
  */
-- (NSMutableDictionary<NSString *, SentrySerializedMetricEntry *> *)serializeForTransaction:
-    (SentryTransaction *)transaction;
+- (NSMutableDictionary<NSString *, SentrySerializedMetricEntry *> *)
+    serializeBetween:(uint64_t)startSystemTime
+                 and:(uint64_t)endSystemTime;
 
 @end
 
diff --git a/Sources/Sentry/include/SentryProfileTimeseries.h b/Sources/Sentry/include/SentryProfileTimeseries.h
index 342cfce0a94..7aac0ef438f 100644
--- a/Sources/Sentry/include/SentryProfileTimeseries.h
+++ b/Sources/Sentry/include/SentryProfileTimeseries.h
@@ -11,7 +11,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 NSArray<SentrySample *> *_Nullable slicedProfileSamples(
-    NSArray<SentrySample *> *samples, SentryTransaction *transaction);
+    NSArray<SentrySample *> *samples, uint64_t startSystemTime, uint64_t endSystemTime);
 
 NS_ASSUME_NONNULL_END
 
diff --git a/Sources/Sentry/include/SentryProfiledTracerConcurrency.h b/Sources/Sentry/include/SentryProfiledTracerConcurrency.h
index 058a977e02e..9156dbdf50c 100644
--- a/Sources/Sentry/include/SentryProfiledTracerConcurrency.h
+++ b/Sources/Sentry/include/SentryProfiledTracerConcurrency.h
@@ -1,9 +1,9 @@
+#import "../Public/SentryId.h"
 #import "SentryCompiler.h"
 #import "SentryProfilingConditionals.h"
 #import <Foundation/Foundation.h>
 
 @class SentryProfiler;
-@class SentryTracer;
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 
@@ -15,13 +15,13 @@ SENTRY_EXTERN_C_BEGIN
  * Associate the provided profiler and tracer so that profiling data may be retrieved by the tracer
  * when it is ready to transmit its envelope.
  */
-void trackProfilerForTracer(SentryProfiler *profiler, SentryTracer *tracer);
+void trackProfilerForTracer(SentryProfiler *profiler, SentryId *traceId);
 
 /**
  * For transactions that will be discarded, clean up the bookkeeping state associated with them to
  * reclaim the memory they're using.
  */
-void discardProfilerForTracer(SentryTracer *tracer);
+void discardProfilerForTracer(SentryId *traceId);
 
 /**
  * Return the profiler instance associated with the tracer. If it was the last tracer for the
@@ -29,7 +29,7 @@ void discardProfilerForTracer(SentryTracer *tracer);
  * profiler instance, and if this is the last profiler being tracked, reset the
  * @c SentryFramesTracker data.
  */
-SentryProfiler *_Nullable profilerForFinishedTracer(SentryTracer *tracer);
+SentryProfiler *_Nullable profilerForFinishedTracer(SentryId *traceId);
 
 #    if defined(TEST) || defined(TESTCI)
 void resetConcurrencyTracking(void);
diff --git a/Sources/Sentry/include/SentryProfiler+Private.h b/Sources/Sentry/include/SentryProfiler+Private.h
index 50b6dea9760..6a50e64d38e 100644
--- a/Sources/Sentry/include/SentryProfiler+Private.h
+++ b/Sources/Sentry/include/SentryProfiler+Private.h
@@ -15,10 +15,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-NSDictionary<NSString *, id> *serializedProfileData(
-    NSDictionary<NSString *, id> *profileData, SentryTransaction *transaction, SentryId *profileID,
-    NSString *truncationReason, NSDictionary<NSString *, id> *serializedMetrics,
-    NSArray<SentryDebugMeta *> *debugMeta, SentryHub *hub
+NSMutableDictionary<NSString *, id> *serializedProfileData(
+    NSDictionary<NSString *, id> *profileData, uint64_t startSystemTime, uint64_t endSystemTime,
+    SentryId *profileID, NSString *truncationReason,
+    NSDictionary<NSString *, id> *serializedMetrics, NSArray<SentryDebugMeta *> *debugMeta,
+    SentryHub *hub
 #    if SENTRY_HAS_UIKIT
     ,
     SentryScreenFrames *gpuData
diff --git a/Sources/Sentry/include/SentryProfiler.h b/Sources/Sentry/include/SentryProfiler.h
index f262792c083..95f3cdbae93 100644
--- a/Sources/Sentry/include/SentryProfiler.h
+++ b/Sources/Sentry/include/SentryProfiler.h
@@ -8,6 +8,7 @@
 @class SentryFramesTracker;
 #endif // SENTRY_HAS_UIKIT
 @class SentryTransaction;
+@class SentryHub;
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 
@@ -43,7 +44,7 @@ SENTRY_EXTERN_C_END
 /**
  * Start a profiler, if one isn't already running.
  */
-+ (void)startWithTracer:(SentryTracer *)tracer;
++ (void)startWithTracer:(SentryId *)traceId;
 
 /**
  * Stop the profiler if it is running.
@@ -70,6 +71,13 @@ SENTRY_EXTERN_C_END
 + (nullable SentryEnvelopeItem *)createProfilingEnvelopeItemForTransaction:
     (SentryTransaction *)transaction;
 
+/**
+ * Collect profile data corresponding with the given traceId and time period.
+ * */
++ (nullable NSMutableDictionary<NSString *, id> *)collectProfileBetween:(uint64_t)startSystemTime
+                                                                    and:(uint64_t)endSystemTime
+                                                               forTrace:(SentryId *)traceId
+                                                                  onHub:(SentryHub *)hub;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Sources/Sentry/include/SentrySystemWrapper.h b/Sources/Sentry/include/SentrySystemWrapper.h
index 09d01a67d14..61c056e07d2 100644
--- a/Sources/Sentry/include/SentrySystemWrapper.h
+++ b/Sources/Sentry/include/SentrySystemWrapper.h
@@ -24,7 +24,7 @@ typedef mach_vm_size_t SentryRAMBytes;
  * returned by the underlying system call, e.g. @c @[ @c <core-0-CPU-usage>, @c <core-1-CPU-usage>,
  * @c ...] .
  */
-- (nullable NSArray<NSNumber *> *)cpuUsagePerCore:(NSError **)error;
+- (nullable NSNumber *)cpuUsageWithError:(NSError **)error;
 
 @end
 
diff --git a/Tests/HybridSDKTest/HybridPod.podspec b/Tests/HybridSDKTest/HybridPod.podspec
index 0f1cb6d8654..316e3c4c181 100644
--- a/Tests/HybridSDKTest/HybridPod.podspec
+++ b/Tests/HybridSDKTest/HybridPod.podspec
@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.frameworks = 'Foundation'
   s.swift_versions = "5.5"
-  s.dependency "Sentry/HybridSDK", "8.9.4"
+  s.dependency "Sentry/HybridSDK", "8.9.6"
   s.source_files = "HybridTest.swift"
 end
diff --git a/Tests/SentryProfilerTests/SentryProfilerSwiftTests.swift b/Tests/SentryProfilerTests/SentryProfilerSwiftTests.swift
index 30e025cfbcf..13e24de0052 100644
--- a/Tests/SentryProfilerTests/SentryProfilerSwiftTests.swift
+++ b/Tests/SentryProfilerTests/SentryProfilerSwiftTests.swift
@@ -52,8 +52,7 @@ class SentryProfilerSwiftTests: XCTestCase {
             SentryDependencyContainer.sharedInstance().dispatchFactory = dispatchFactory
             SentryDependencyContainer.sharedInstance().timerFactory = timeoutTimerFactory
 
-            systemWrapper.overrides.cpuUsagePerCore = mockCPUUsages.map { NSNumber(value: $0) }
-            processInfoWrapper.overrides.processorCount = UInt(mockCPUUsages.count)
+            systemWrapper.overrides.cpuUsage = NSNumber(value: mockCPUUsage)
             systemWrapper.overrides.memoryFootprintBytes = mockMemoryFootprint
 
 #if !os(macOS)
@@ -87,7 +86,7 @@ class SentryProfilerSwiftTests: XCTestCase {
 
         // mocking
 
-        let mockCPUUsages = [12.4, 63.5, 1.4, 4.6]
+        let mockCPUUsage = 66.6
         let mockMemoryFootprint: SentryRAMBytes = 123_455
         let mockUsageReadingsPerBatch = 2
 
@@ -597,10 +596,7 @@ private extension SentryProfilerSwiftTests {
 
         let expectedUsageReadings = fixture.mockUsageReadingsPerBatch * metricsBatches
 
-        for (i, expectedUsage) in fixture.mockCPUUsages.enumerated() {
-            let key = NSString(format: kSentryMetricProfilerSerializationKeyCPUUsageFormat as NSString, i) as String
-            try assertMetricValue(measurements: measurements, key: key, numberOfReadings: expectedUsageReadings, expectedValue: expectedUsage, transaction: transaction)
-        }
+        try assertMetricValue(measurements: measurements, key: kSentryMetricProfilerSerializationKeyCPUUsage, numberOfReadings: expectedUsageReadings, expectedValue: fixture.mockCPUUsage, transaction: transaction)
 
         try assertMetricValue(measurements: measurements, key: kSentryMetricProfilerSerializationKeyMemoryFootprint, numberOfReadings: expectedUsageReadings, expectedValue: fixture.mockMemoryFootprint, transaction: transaction)
 
diff --git a/Tests/SentryProfilerTests/SentryProfilerTests.mm b/Tests/SentryProfilerTests/SentryProfilerTests.mm
index 3fee749f04a..06aac947f28 100644
--- a/Tests/SentryProfilerTests/SentryProfilerTests.mm
+++ b/Tests/SentryProfilerTests/SentryProfilerTests.mm
@@ -101,14 +101,11 @@ - (void)testProfilerMutationDuringSlicing
 
     const auto operations = 50;
 
-    const auto context = [[SentrySpanContext alloc] initWithOperation:@"test trace"];
-    const auto trace = [[SentryTracer alloc] initWithContext:context];
-    const auto transaction = [[SentryTransaction alloc] initWithTrace:trace children:@[]];
-    transaction.startSystemTime = arc4random() % sampleIdx;
-    const auto remainingTime = sampleIdx - transaction.startSystemTime;
+    const auto startSystemTime = arc4random() % sampleIdx;
+    const auto remainingTime = sampleIdx - startSystemTime;
     const auto minDuration = 10;
-    transaction.endSystemTime = transaction.startSystemTime
-        + (arc4random() % (remainingTime - minDuration) + minDuration + 1);
+    const auto endSystemTime
+        = startSystemTime + (arc4random() % (remainingTime - minDuration) + minDuration + 1);
 
     const auto sliceExpectation =
         [self expectationWithDescription:@"all slice operations complete"];
@@ -116,7 +113,8 @@ - (void)testProfilerMutationDuringSlicing
 
     void (^sliceBlock)(void) = ^(void) {
         [state mutate:^(SentryProfilerMutableState *mutableState) {
-            __unused const auto slice = slicedProfileSamples(mutableState.samples, transaction);
+            __unused const auto slice
+                = slicedProfileSamples(mutableState.samples, startSystemTime, endSystemTime);
             [sliceExpectation fulfill];
         }];
     };
@@ -176,19 +174,8 @@ - (void)testProfilerMutationDuringSerialization
     // serialize the data as if it were captured in a transaction envelope
     const auto profileData = [state copyProfilingData];
 
-    const auto context = [[SentrySpanContext alloc] initWithOperation:@"test trace"];
-    const auto trace = [[SentryTracer alloc] initWithContext:context];
-    const auto transaction = [[SentryTransaction alloc] initWithTrace:trace children:@[]];
-    transaction.transaction = @"someTransaction";
-    transaction.trace.transactionContext =
-        [[SentryTransactionContext alloc] initWithName:@"someTransaction"
-                                             operation:@"someOperation"];
-    transaction.trace.transactionContext.threadInfo = [[SentryThread alloc] initWithThreadId:@1];
-    transaction.startSystemTime = 1;
-    transaction.endSystemTime = 2;
-
     const auto profileID = [[SentryId alloc] init];
-    const auto serialization = serializedProfileData(profileData, transaction, profileID,
+    const auto serialization = serializedProfileData(profileData, 1, 2, profileID,
         profilerTruncationReasonName(SentryProfilerTruncationReasonNormal), @{}, @[],
         [[SentryHub alloc] initWithClient:nil andScope:nil]
 #    if SENTRY_HAS_UIKIT
diff --git a/Tests/SentryProfilerTests/SentrySystemWrapperTests.swift b/Tests/SentryProfilerTests/SentrySystemWrapperTests.swift
index 2607ecba33d..a72130187f0 100644
--- a/Tests/SentryProfilerTests/SentrySystemWrapperTests.swift
+++ b/Tests/SentryProfilerTests/SentrySystemWrapperTests.swift
@@ -8,12 +8,8 @@ class SentrySystemWrapperTests: XCTestCase {
 
     func testCPUUsageReportsData() throws {
         XCTAssertNoThrow({
-            let cpuUsages = try self.fixture.systemWrapper.cpuUsagePerCore()
-            XCTAssertGreaterThan(cpuUsages.count, 0)
-            let range = 0.0 ... 100.0
-            cpuUsages.forEach {
-                XCTAssert(range.contains($0.doubleValue))
-            }
+            let cpuUsage = try XCTUnwrap(self.fixture.systemWrapper.cpuUsage())
+            XCTAssert((0.0 ... 100.0).contains(cpuUsage.doubleValue))
         })
     }
 
diff --git a/Tests/SentryTests/Helper/SentryDeviceTests.mm b/Tests/SentryTests/Helper/SentryDeviceTests.mm
index d7b14b61e28..1744821e3e2 100644
--- a/Tests/SentryTests/Helper/SentryDeviceTests.mm
+++ b/Tests/SentryTests/Helper/SentryDeviceTests.mm
@@ -94,6 +94,7 @@ - (void)testOSVersion
     SENTRY_ASSERT_PREFIX(
         osVersion, @"9.", @"10.", @"11.", @"12.", @"13.", @"14.", @"15.", @"16.", @"17.");
 #elif TARGET_OS_WATCH
+    // TODO: create a watch UI test target to test this branch
     SENTRY_ASSERT_PREFIX(osVersion, @"2.", @"3.", @"4.", @"5.", @"6.", @"7.", @"8.", @"9.");
 #else
     XCTFail(@"Unexpected OS.");
@@ -122,8 +123,7 @@ - (void)testOSName
     // cannot.
     SENTRY_ASSERT_EQUAL(osName, @"tvOS");
 #elif TARGET_OS_WATCH
-    // TODO: create a watch UI test target to test this branch as it cannot run on the watch
-    // simulator
+    // TODO: create a watch UI test target to test this branch
     SENTRY_ASSERT_EQUAL(osName, @"watchOS");
 #else
     XCTFail(@"Unexpected device OS");
diff --git a/Tests/SentryTests/Integrations/Performance/FramesTracking/SentryFramesTrackerTests.swift b/Tests/SentryTests/Integrations/Performance/FramesTracking/SentryFramesTrackerTests.swift
index 223e91a8f1c..f776683a24f 100644
--- a/Tests/SentryTests/Integrations/Performance/FramesTracking/SentryFramesTrackerTests.swift
+++ b/Tests/SentryTests/Integrations/Performance/FramesTracking/SentryFramesTrackerTests.swift
@@ -3,31 +3,31 @@ import XCTest
 
 #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
 class SentryFramesTrackerTests: XCTestCase {
-    
+
     private class Fixture {
-        
+
         var displayLinkWrapper: TestDisplayLinkWrapper
         var queue: DispatchQueue
         lazy var hub = TestHub(client: nil, andScope: nil)
         lazy var tracer = SentryTracer(transactionContext: TransactionContext(name: "test transaction", operation: "test operation"), hub: hub)
-        
+
         init() {
             displayLinkWrapper = TestDisplayLinkWrapper()
             queue = DispatchQueue(label: "SentryFramesTrackerTests", qos: .background, attributes: [.concurrent])
         }
-        
+
         lazy var sut: SentryFramesTracker = SentryFramesTracker(displayLinkWrapper: displayLinkWrapper)
     }
-    
+
     private var fixture: Fixture!
-    
+
     override func setUp() {
         super.setUp()
         fixture = Fixture()
 
 #if os(iOS) || os(macOS) || targetEnvironment(macCatalyst)
         // the profiler must be running for the frames tracker to record frame rate info etc, validated in assertProfilingData()
-        SentryProfiler.start(with: fixture.tracer)
+        SentryProfiler.start(withTracer: fixture.tracer.traceId)
 #endif
     }
 
@@ -35,28 +35,28 @@ class SentryFramesTrackerTests: XCTestCase {
         super.tearDown()
         clearTestState()
     }
-    
+
     func testIsNotRunning_WhenNotStarted() {
         XCTAssertFalse(fixture.sut.isRunning)
     }
-    
+
     func testIsRunning_WhenStarted() {
         let sut = fixture.sut
         sut.start()
         XCTAssertTrue(sut.isRunning)
     }
-    
+
     func testIsNotRunning_WhenStopped() {
         let sut = fixture.sut
         sut.start()
         sut.stop()
         XCTAssertFalse(sut.isRunning)
     }
-    
+
     func testSlowFrame() throws {
         let sut = fixture.sut
         sut.start()
-        
+
         fixture.displayLinkWrapper.call()
         _ = fixture.displayLinkWrapper.fastestSlowFrame()
         fixture.displayLinkWrapper.normalFrame()
@@ -64,11 +64,11 @@ class SentryFramesTrackerTests: XCTestCase {
 
         try assert(slow: 2, frozen: 0, total: 3)
     }
-    
+
     func testFrozenFrame() throws {
         let sut = fixture.sut
         sut.start()
-        
+
         fixture.displayLinkWrapper.call()
         _ = fixture.displayLinkWrapper.fastestSlowFrame()
         _ = fixture.displayLinkWrapper.fastestFrozenFrame()
@@ -91,7 +91,7 @@ class SentryFramesTrackerTests: XCTestCase {
     func testPerformanceOfTrackingFrames() throws {
         let sut = fixture.sut
         sut.start()
-        
+
         let frames: UInt = 1_000
         self.measure {
             for _ in 0 ..< frames {
diff --git a/Tests/SentryTests/PrivateSentrySDKOnlyTests.swift b/Tests/SentryTests/PrivateSentrySDKOnlyTests.swift
index c1fd7867864..a43c4c97728 100644
--- a/Tests/SentryTests/PrivateSentrySDKOnlyTests.swift
+++ b/Tests/SentryTests/PrivateSentrySDKOnlyTests.swift
@@ -2,7 +2,7 @@ import SentryTestUtils
 import XCTest
 
 class PrivateSentrySDKOnlyTests: XCTestCase {
-    
+
     override func tearDown() {
         super.tearDown()
         clearTestState()
@@ -11,21 +11,21 @@ class PrivateSentrySDKOnlyTests: XCTestCase {
     func testStoreEnvelope() {
         let client = TestClient(options: Options())
         SentrySDK.setCurrentHub(TestHub(client: client, andScope: nil))
-        
+
         let envelope = TestConstants.envelope
         PrivateSentrySDKOnly.store(envelope)
-        
+
         XCTAssertEqual(1, client?.storedEnvelopeInvocations.count)
         XCTAssertEqual(envelope, client?.storedEnvelopeInvocations.first)
     }
-    
+
     func testCaptureEnvelope() {
         let client = TestClient(options: Options())
         SentrySDK.setCurrentHub(TestHub(client: client, andScope: nil))
-        
+
         let envelope = TestConstants.envelope
         PrivateSentrySDKOnly.capture(envelope)
-        
+
         XCTAssertEqual(1, client?.captureEnvelopeInvocations.count)
         XCTAssertEqual(envelope, client?.captureEnvelopeInvocations.first)
     }
@@ -35,20 +35,20 @@ class PrivateSentrySDKOnlyTests: XCTestCase {
         let name = "Some SDK name"
         let originalVersion = SentryMeta.versionString
         XCTAssertNotEqual(originalVersion, "")
-        
+
         PrivateSentrySDKOnly.setSdkName(name)
         XCTAssertEqual(SentryMeta.sdkName, name)
         XCTAssertEqual(SentryMeta.versionString, originalVersion)
         XCTAssertEqual(PrivateSentrySDKOnly.getSdkName(), name)
         XCTAssertEqual(PrivateSentrySDKOnly.getSdkVersionString(), originalVersion)
-        
+
         PrivateSentrySDKOnly.setSdkName(originalName)
         XCTAssertEqual(SentryMeta.sdkName, originalName)
         XCTAssertEqual(SentryMeta.versionString, originalVersion)
         XCTAssertEqual(PrivateSentrySDKOnly.getSdkName(), originalName)
         XCTAssertEqual(PrivateSentrySDKOnly.getSdkVersionString(), originalVersion)
     }
-    
+
     func testSetSdkNameAndVersion() {
         let originalName = PrivateSentrySDKOnly.getSdkName()
         let originalVersion = PrivateSentrySDKOnly.getSdkVersionString()
@@ -60,23 +60,23 @@ class PrivateSentrySDKOnlyTests: XCTestCase {
         XCTAssertEqual(SentryMeta.versionString, version)
         XCTAssertEqual(PrivateSentrySDKOnly.getSdkName(), name)
         XCTAssertEqual(PrivateSentrySDKOnly.getSdkVersionString(), version)
-        
+
         PrivateSentrySDKOnly.setSdkName(originalName, andVersionString: originalVersion)
         XCTAssertEqual(SentryMeta.sdkName, originalName)
         XCTAssertEqual(SentryMeta.versionString, originalVersion)
         XCTAssertEqual(PrivateSentrySDKOnly.getSdkName(), originalName)
         XCTAssertEqual(PrivateSentrySDKOnly.getSdkVersionString(), originalVersion)
-        
+
     }
-    
+
     func testEnvelopeWithData() throws {
         let itemData = "{}\n{\"length\":0,\"type\":\"attachment\"}\n".data(using: .utf8)!
         XCTAssertNotNil(PrivateSentrySDKOnly.envelope(with: itemData))
     }
-    
+
     func testGetDebugImages() {
         let images = PrivateSentrySDKOnly.getDebugImages()
-        
+
         // Only make sure we get some images. The actual tests are in
         // SentryDebugImageProviderTests
         XCTAssertGreaterThan(images.count, 100)
@@ -86,9 +86,9 @@ class PrivateSentrySDKOnlyTests: XCTestCase {
     func testGetAppStartMeasurement() {
         let appStartMeasurement = TestData.getAppStartMeasurement(type: .warm)
         SentrySDK.setAppStartMeasurement(appStartMeasurement)
-        
+
         XCTAssertEqual(appStartMeasurement, PrivateSentrySDKOnly.appStartMeasurement)
-        
+
         SentrySDK.setAppStartMeasurement(nil)
         XCTAssertNil(PrivateSentrySDKOnly.appStartMeasurement)
     }
@@ -97,10 +97,10 @@ class PrivateSentrySDKOnlyTests: XCTestCase {
     func testGetInstallationId() {
         XCTAssertEqual(SentryInstallation.id(), PrivateSentrySDKOnly.installationID)
     }
-    
+
     func testSendAppStartMeasurement() {
         XCTAssertFalse(PrivateSentrySDKOnly.appStartMeasurementHybridSDKMode)
-        
+
         PrivateSentrySDKOnly.appStartMeasurementHybridSDKMode = true
         XCTAssertTrue(PrivateSentrySDKOnly.appStartMeasurementHybridSDKMode)
     }
@@ -119,28 +119,57 @@ class PrivateSentrySDKOnlyTests: XCTestCase {
         XCTAssertNil(PrivateSentrySDKOnly.options.dsn)
         XCTAssertEqual(PrivateSentrySDKOnly.options.enabled, true)
     }
-    
+
+    #if !os(tvOS) && !os(watchOS)
+    /**
+      * Smoke Tests profiling via PrivateSentrySDKOnly. Actual profiling unit tests are done elsewhere.
+     */
+    func testProfiling() {
+        let options = Options()
+        options.dsn = TestConstants.dsnAsString(username: "SentryFramesTrackingIntegrationTests")
+        let client = TestClient(options: options)
+        SentrySDK.setCurrentHub(TestHub(client: client, andScope: nil))
+
+        let traceIdA = SentryId()
+
+        let startTime = PrivateSentrySDKOnly.startProfiling(forTrace: traceIdA)
+        XCTAssertGreaterThan(startTime, 0)
+        Thread.sleep(forTimeInterval: 0.2)
+        let payload = PrivateSentrySDKOnly.collectProfile(forTrace: traceIdA, since: startTime)
+        XCTAssertNotNil(payload)
+        XCTAssertEqual(payload?["platform"] as? String, "cocoa")
+        XCTAssertNotNil(payload?["debug_meta"])
+        XCTAssertNotNil(payload?["device"])
+        XCTAssertNotNil(payload?["profile_id"])
+        let profile = payload?["profile"] as? NSDictionary
+        XCTAssertNotNil(profile?["thread_metadata"])
+        XCTAssertNotNil(profile?["samples"])
+        XCTAssertNotNil(profile?["stacks"])
+        XCTAssertNotNil(profile?["frames"])
+    }
+    #endif
+
     #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
-    
+
     func testIsFramesTrackingRunning() {
         XCTAssertFalse(PrivateSentrySDKOnly.isFramesTrackingRunning)
         SentryDependencyContainer.sharedInstance().framesTracker.start()
         XCTAssertTrue(PrivateSentrySDKOnly.isFramesTrackingRunning)
     }
-    
+
     func testGetFrames() {
         let tracker = SentryDependencyContainer.sharedInstance().framesTracker
         let displayLink = TestDisplayLinkWrapper()
-        
+
         tracker.setDisplayLinkWrapper(displayLink)
         tracker.start()
         displayLink.call()
-        
+
         let slow = 2
         let frozen = 1
         let normal = 100
         displayLink.givenFrames(slow, frozen, normal)
-        
+
         let currentFrames = PrivateSentrySDKOnly.currentScreenFrames
         XCTAssertEqual(UInt(slow + frozen + normal), currentFrames.total)
         XCTAssertEqual(UInt(frozen), currentFrames.frozen)
diff --git a/develop-docs/README.md b/develop-docs/README.md
index ee0fac525bc..56fc9f78f0d 100644
--- a/develop-docs/README.md
+++ b/develop-docs/README.md
@@ -12,7 +12,29 @@ This repository follows the [codesiging.guide](https://codesigning.guide/) in co
 Therefore the sample apps use manual code signing, see [fastlane docs](https://docs.fastlane.tools/codesigning/xcode-project/):
 > In most cases, fastlane will work out of the box with Xcode 9 and up if you selected manual code signing and choose a provisioning profile name for each of your targets.
 
-Reach out to @philipphofmann if you need access to the match git repository.
+### Creating new App Identifiers
+
+E.g. if you create a new extension target, like a File Provider for iOS-Swift, make sure it has a unique bundle identifier like `io.sentry.sample.iOS-Swift.FileProvider`. Then, run the following terminal command:
+
+```
+rbenv exec bundle exec fastlane produce -u andrew.mcknight@sentry.io --skip_itc -a io.sentry.sample.iOS-Swift.FileProvider
+```
+
+You'll be prompted for an Apple Developer Portal 2FA code, and the description for the identifier; in this example, "Sentry Cocoa Sample Swift File Provider Extension".
+
+### Creating provisioning profiles
+
+For an existing app identifier, run the terminal command, after changing the email address in the Matchfile to your personal ADP account's:
+
+```
+rbenv exec bundle exec fastlane match development --app_identifier io.sentry.sample.iOS-Swift.FileProvider
+```
+
+You can include the `--force` option to regenerate an existing profile.
+
+### Help
+
+Reach out to a [CODEOWNER](https://github.com/getsentry/sentry-cocoa/blob/main/.github/CODEOWNERS) if you need access to the match git repository.
 
 ## Unit Tests with Thread Sanitizer