diff --git a/fixtures/vsts.py b/fixtures/vsts.py
index 76ad6d83519c3b..4c9f4678670f21 100644
--- a/fixtures/vsts.py
+++ b/fixtures/vsts.py
@@ -66,6 +66,17 @@ def _stub_vsts(self):
             },
         )
 
+        responses.add(
+            responses.POST,
+            "https://login.microsoftonline.com/common/oauth2/v2.0/token",
+            json={
+                "access_token": self.access_token,
+                "token_type": "grant",
+                "expires_in": 300,  # seconds (5 min)
+                "refresh_token": self.refresh_token,
+            },
+        )
+
         responses.add(
             responses.GET,
             "https://app.vssps.visualstudio.com/_apis/accounts?memberId=%s&api-version=4.1"
@@ -195,19 +206,27 @@ def assert_vsts_oauth_redirect(self, redirect):
         assert redirect.netloc == "app.vssps.visualstudio.com"
         assert redirect.path == "/oauth2/authorize"
 
+    def assert_vsts_new_oauth_redirect(self, redirect):
+        assert redirect.scheme == "https"
+        assert redirect.netloc == "login.microsoftonline.com"
+        assert redirect.path == "/common/oauth2/v2.0/authorize"
+
     def assert_account_selection(self, response, account_id=None):
         account_id = account_id or self.vsts_account_id
         assert response.status_code == 200
         assert f'<option value="{account_id}"'.encode() in response.content
 
     @assume_test_silo_mode(SiloMode.CONTROL)
-    def assert_installation(self):
+    def assert_installation(self, new=False):
         # Initial request to the installation URL for VSTS
         resp = self.make_init_request()
         redirect = urlparse(resp["Location"])
 
         assert resp.status_code == 302
-        self.assert_vsts_oauth_redirect(redirect)
+        if new:
+            self.assert_vsts_new_oauth_redirect(redirect)
+        else:
+            self.assert_vsts_oauth_redirect(redirect)
 
         query = parse_qs(redirect.query)
 
diff --git a/migrations_lockfile.txt b/migrations_lockfile.txt
index 8560a91e4d917d..5b94065e474a37 100644
--- a/migrations_lockfile.txt
+++ b/migrations_lockfile.txt
@@ -10,7 +10,7 @@ hybridcloud: 0016_add_control_cacheversion
 nodestore: 0002_nodestore_no_dictfield
 remote_subscriptions: 0003_drop_remote_subscription
 replays: 0004_index_together
-sentry: 0763_add_created_by_to_broadcasts
+sentry: 0764_migrate_bad_status_substatus_rows
 social_auth: 0002_default_auto_field
 uptime: 0013_uptime_subscription_new_unique
 workflow_engine: 0005_data_source_detector
diff --git a/pyproject.toml b/pyproject.toml
index 08b02505395b69..de1cb687a3a0d2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -449,8 +449,7 @@ module = [
     "sentry.db.models.manager.*",
     "sentry.db.models.paranoia",
     "sentry.db.models.utils",
-    "sentry.deletions",
-    "sentry.deletions.tasks.groups",
+    "sentry.deletions.*",
     "sentry.digests.notifications",
     "sentry.eventstore.reprocessing.redis",
     "sentry.eventtypes.error",
diff --git a/requirements-dev-frozen.txt b/requirements-dev-frozen.txt
index dd9fa6a89f1a8c..85e73cdf5cd78a 100644
--- a/requirements-dev-frozen.txt
+++ b/requirements-dev-frozen.txt
@@ -179,7 +179,7 @@ s3transfer==0.10.0
 selenium==4.16.0
 sentry-arroyo==2.16.5
 sentry-cli==2.16.0
-sentry-devenv==1.10.0
+sentry-devenv==1.10.2
 sentry-forked-django-stubs==5.0.4.post2
 sentry-forked-djangorestframework-stubs==3.15.1.post1
 sentry-kafka-schemas==0.1.109
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 6e06c1e5ea70dc..61a113efa780e9 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,6 @@
 --index-url https://pypi.devinfra.sentry.io/simple
 
-sentry-devenv>=1.10.0
+sentry-devenv>=1.10.2
 
 covdefaults>=2.3.0
 docker>=6
diff --git a/src/sentry/api/endpoints/organization_events.py b/src/sentry/api/endpoints/organization_events.py
index d48e5bb59d3453..672c4441708ea8 100644
--- a/src/sentry/api/endpoints/organization_events.py
+++ b/src/sentry/api/endpoints/organization_events.py
@@ -152,14 +152,6 @@ class EventsApiResponse(TypedDict):
     meta: EventsMeta
 
 
-# When calling make build-spectacular-docs we hit this issue
-# https://github.com/tfranzel/drf-spectacular/issues/1041
-# This is a work around
-EventsMeta.__annotations__["datasetReason"] = str
-EventsMeta.__annotations__["isMetricsData"] = bool
-EventsMeta.__annotations__["isMetricsExtractedData"] = bool
-
-
 def rate_limit_events(
     request: Request, organization_id_or_slug: str | None = None, *args, **kwargs
 ) -> dict[str, dict[RateLimitCategory, RateLimit]]:
diff --git a/src/sentry/api/endpoints/organization_events_anomalies.py b/src/sentry/api/endpoints/organization_events_anomalies.py
new file mode 100644
index 00000000000000..33599c87d4a0f2
--- /dev/null
+++ b/src/sentry/api/endpoints/organization_events_anomalies.py
@@ -0,0 +1,98 @@
+from drf_spectacular.utils import extend_schema
+from rest_framework.request import Request
+from rest_framework.response import Response
+
+from sentry import features
+from sentry.api.api_owners import ApiOwner
+from sentry.api.api_publish_status import ApiPublishStatus
+from sentry.api.base import region_silo_endpoint
+from sentry.api.bases.organization_events import OrganizationEventsV2EndpointBase
+from sentry.api.exceptions import ResourceDoesNotExist
+from sentry.api.paginator import OffsetPaginator
+from sentry.api.serializers.base import serialize
+from sentry.apidocs.constants import (
+    RESPONSE_BAD_REQUEST,
+    RESPONSE_FORBIDDEN,
+    RESPONSE_NOT_FOUND,
+    RESPONSE_UNAUTHORIZED,
+)
+from sentry.apidocs.examples.organization_examples import OrganizationExamples
+from sentry.apidocs.parameters import GlobalParams
+from sentry.apidocs.utils import inline_sentry_response_serializer
+from sentry.models.organization import Organization
+from sentry.seer.anomaly_detection.get_historical_anomalies import (
+    get_historical_anomaly_data_from_seer_preview,
+)
+from sentry.seer.anomaly_detection.types import DetectAnomaliesResponse, TimeSeriesPoint
+
+
+@region_silo_endpoint
+class OrganizationEventsAnomaliesEndpoint(OrganizationEventsV2EndpointBase):
+    owner = ApiOwner.ALERTS_NOTIFICATIONS
+    publish_status = {
+        "POST": ApiPublishStatus.EXPERIMENTAL,
+    }
+
+    @extend_schema(
+        operation_id="Identify anomalies in historical data",
+        parameters=[GlobalParams.ORG_ID_OR_SLUG],
+        responses={
+            200: inline_sentry_response_serializer(
+                "ListAlertRuleAnomalies", DetectAnomaliesResponse
+            ),
+            400: RESPONSE_BAD_REQUEST,
+            401: RESPONSE_UNAUTHORIZED,
+            403: RESPONSE_FORBIDDEN,
+            404: RESPONSE_NOT_FOUND,
+        },
+        examples=OrganizationExamples.GET_HISTORICAL_ANOMALIES,
+    )
+    def _format_historical_data(self, data) -> list[TimeSeriesPoint] | None:
+        """
+        Format EventsStatsData into the format that the Seer API expects.
+        EventsStatsData is a list of lists with this format:
+            [epoch timestamp, {'count': count}]
+        Convert the data to this format:
+            list[TimeSeriesPoint]
+        """
+        if data is None:
+            return data
+
+        formatted_data: list[TimeSeriesPoint] = []
+        for datum in data:
+            ts_point = TimeSeriesPoint(timestamp=datum[0], value=datum[1].get("count", 0))
+            formatted_data.append(ts_point)
+        return formatted_data
+
+    def post(self, request: Request, organization: Organization) -> Response:
+        """
+        Return a list of anomalies for a time series of historical event data.
+        """
+        if not features.has("organizations:anomaly-detection-alerts", organization):
+            raise ResourceDoesNotExist("Your organization does not have access to this feature.")
+
+        historical_data = self._format_historical_data(request.data.get("historical_data"))
+        current_data = self._format_historical_data(request.data.get("current_data"))
+
+        config = request.data.get("config")
+        project_id = request.data.get("project_id")
+
+        if project_id is None or not config or not historical_data or not current_data:
+            return Response(
+                "Unable to get historical anomaly data: missing required argument(s) project, start, and/or end",
+                status=400,
+            )
+
+        anomalies = get_historical_anomaly_data_from_seer_preview(
+            current_data, historical_data, project_id, config
+        )
+        # NOTE: returns None if there's a problem with the Seer response
+        if anomalies is None:
+            return Response("Unable to get historical anomaly data", status=400)
+        # NOTE: returns empty list if there is not enough event data
+        return self.paginate(
+            request=request,
+            queryset=anomalies,
+            paginator_cls=OffsetPaginator,
+            on_results=lambda x: serialize(x, request.user),
+        )
diff --git a/src/sentry/api/endpoints/organization_member/details.py b/src/sentry/api/endpoints/organization_member/details.py
index 1e3a7c9fb5c334..57db9ef68552d2 100644
--- a/src/sentry/api/endpoints/organization_member/details.py
+++ b/src/sentry/api/endpoints/organization_member/details.py
@@ -126,6 +126,7 @@ def _get_member(
             403: RESPONSE_FORBIDDEN,
             404: RESPONSE_NOT_FOUND,
         },
+        examples=OrganizationExamples.UPDATE_ORG_MEMBER,
     )
     def get(
         self,
@@ -136,7 +137,7 @@ def get(
         """
         Retrieve an organization member's details.
 
-        Will return a pending invite as long as it's already approved.
+        Response will be a pending invite if it has been approved by organization owners or managers but is waiting to be accepted by the invitee.
         """
         allowed_roles = get_allowed_org_roles(request, organization, member)
         return Response(
diff --git a/src/sentry/api/endpoints/organization_member/index.py b/src/sentry/api/endpoints/organization_member/index.py
index fb2821d23c41d3..d92ac5988194c2 100644
--- a/src/sentry/api/endpoints/organization_member/index.py
+++ b/src/sentry/api/endpoints/organization_member/index.py
@@ -205,7 +205,7 @@ def get(self, request: Request, organization) -> Response:
         """
         List all organization members.
 
-        Response includes pending invites that are approved by organization admins but waiting to be accepted by the invitee.
+        Response includes pending invites that are approved by organization owners or managers but waiting to be accepted by the invitee.
         """
         queryset = OrganizationMember.objects.filter(
             Q(user_is_active=True, user_id__isnull=False) | Q(user_id__isnull=True),
diff --git a/src/sentry/api/endpoints/organization_release_details.py b/src/sentry/api/endpoints/organization_release_details.py
index 91c47608178fd3..d0f9986c181e96 100644
--- a/src/sentry/api/endpoints/organization_release_details.py
+++ b/src/sentry/api/endpoints/organization_release_details.py
@@ -5,7 +5,7 @@
 from rest_framework.response import Response
 from rest_framework.serializers import ListField
 
-from sentry import release_health
+from sentry import options, release_health
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import ReleaseAnalyticsMixin, region_silo_endpoint
@@ -526,7 +526,12 @@ def put(self, request: Request, organization, version) -> Response:
                     datetime=release.date_released,
                 )
 
-        return Response(serialize(release, request.user))
+        no_snuba_for_release_creation = options.get("releases.no_snuba_for_release_creation")
+        return Response(
+            serialize(
+                release, request.user, no_snuba_for_release_creation=no_snuba_for_release_creation
+            )
+        )
 
     @extend_schema(
         operation_id="Delete an Organization's Release",
diff --git a/src/sentry/api/endpoints/organization_releases.py b/src/sentry/api/endpoints/organization_releases.py
index a905454461ef24..de668f2730237a 100644
--- a/src/sentry/api/endpoints/organization_releases.py
+++ b/src/sentry/api/endpoints/organization_releases.py
@@ -588,7 +588,9 @@ def post(self, request: Request, organization) -> Response:
                 update_org_auth_token_last_used(request.auth, [project.id for project in projects])
 
             scope.set_tag("success_status", status)
-            return Response(serialize(release, request.user), status=status)
+            return Response(
+                serialize(release, request.user, no_snuba_for_release_creation=True), status=status
+            )
         scope.set_tag("failure_reason", "serializer_error")
         return Response(serializer.errors, status=400)
 
diff --git a/src/sentry/api/endpoints/project_release_details.py b/src/sentry/api/endpoints/project_release_details.py
index e07d96205fdde1..be4305d6eb44c7 100644
--- a/src/sentry/api/endpoints/project_release_details.py
+++ b/src/sentry/api/endpoints/project_release_details.py
@@ -2,6 +2,7 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
+from sentry import options
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import ReleaseAnalyticsMixin, region_silo_endpoint
 from sentry.api.bases.project import ProjectEndpoint, ProjectReleasePermission
@@ -144,8 +145,12 @@ def put(self, request: Request, project, version) -> Response:
                 data={"version": release.version},
                 datetime=release.date_released,
             )
-
-        return Response(serialize(release, request.user))
+        no_snuba_for_release_creation = options.get("releases.no_snuba_for_release_creation")
+        return Response(
+            serialize(
+                release, request.user, no_snuba_for_release_creation=no_snuba_for_release_creation
+            )
+        )
 
     def delete(self, request: Request, project, version) -> Response:
         """
diff --git a/src/sentry/api/endpoints/project_servicehook_details.py b/src/sentry/api/endpoints/project_servicehook_details.py
index 8031fa63a41755..d44bc117494d1f 100644
--- a/src/sentry/api/endpoints/project_servicehook_details.py
+++ b/src/sentry/api/endpoints/project_servicehook_details.py
@@ -12,7 +12,7 @@
 from sentry.api.serializers import serialize
 from sentry.api.validators import ServiceHookValidator
 from sentry.constants import ObjectStatus
-from sentry.models.servicehook import ServiceHook
+from sentry.sentry_apps.models.servicehook import ServiceHook
 
 
 @region_silo_endpoint
diff --git a/src/sentry/api/endpoints/project_servicehook_stats.py b/src/sentry/api/endpoints/project_servicehook_stats.py
index 970ed6be09acfe..dffeb8c606ae61 100644
--- a/src/sentry/api/endpoints/project_servicehook_stats.py
+++ b/src/sentry/api/endpoints/project_servicehook_stats.py
@@ -7,7 +7,7 @@
 from sentry.api.base import StatsMixin, region_silo_endpoint
 from sentry.api.bases.project import ProjectEndpoint
 from sentry.api.exceptions import ResourceDoesNotExist
-from sentry.models.servicehook import ServiceHook
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.tsdb.base import TSDBModel
 
 
diff --git a/src/sentry/api/endpoints/project_servicehooks.py b/src/sentry/api/endpoints/project_servicehooks.py
index 31b40ff451e7df..1c38a74a2b9514 100644
--- a/src/sentry/api/endpoints/project_servicehooks.py
+++ b/src/sentry/api/endpoints/project_servicehooks.py
@@ -12,7 +12,7 @@
 from sentry.api.serializers import serialize
 from sentry.api.validators import ServiceHookValidator
 from sentry.constants import ObjectStatus
-from sentry.models.servicehook import ServiceHook
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.sentry_apps.services.hook import hook_service
 
 
diff --git a/src/sentry/api/event_search.py b/src/sentry/api/event_search.py
index 5a4634684d945a..7aba67336a779d 100644
--- a/src/sentry/api/event_search.py
+++ b/src/sentry/api/event_search.py
@@ -137,13 +137,15 @@
 key                    = ~r"[a-zA-Z0-9_.-]+"
 quoted_key             = '"' ~r"[a-zA-Z0-9_.:-]+" '"'
 explicit_tag_key       = "tags" open_bracket search_key closed_bracket
+explicit_typed_tag_key = "tags" open_bracket search_key spaces comma spaces search_type closed_bracket
 aggregate_key          = key open_paren spaces function_args? spaces closed_paren
 function_args          = aggregate_param (spaces comma spaces !comma aggregate_param?)*
 aggregate_param        = quoted_aggregate_param / raw_aggregate_param
 raw_aggregate_param    = ~r"[^()\t\n, \"]+"
 quoted_aggregate_param = '"' ('\\"' / ~r'[^\t\n\"]')* '"'
 search_key             = key / quoted_key
-text_key               = explicit_tag_key / search_key
+search_type            = "number" / "string"
+text_key               = explicit_tag_key / explicit_typed_tag_key / search_key
 value                  = ~r"[^()\t\n ]*"
 quoted_value           = '"' ('\\"' / ~r'[^"]')* '"'
 in_value               = (&in_value_termination in_value_char)+
@@ -1046,6 +1048,12 @@ def visit_quoted_key(self, node, children):
     def visit_explicit_tag_key(self, node, children):
         return SearchKey(f"tags[{children[2].name}]")
 
+    def visit_explicit_typed_tag_key(self, node, children):
+        return SearchKey(f"tags[{children[2].name},{children[6]}]")
+
+    def visit_search_type(self, node, children):
+        return node.text
+
     def visit_aggregate_key(self, node, children):
         children = remove_optional_nodes(children)
         children = remove_space(children)
diff --git a/src/sentry/api/serializers/models/activity.py b/src/sentry/api/serializers/models/activity.py
index 2a429113ca5a7a..af60cec3770f8f 100644
--- a/src/sentry/api/serializers/models/activity.py
+++ b/src/sentry/api/serializers/models/activity.py
@@ -17,9 +17,11 @@ def __init__(self, environment_func=None):
     def get_attrs(self, item_list, user, **kwargs):
         # TODO(dcramer); assert on relations
         user_ids = [i.user_id for i in item_list if i.user_id]
-        user_list = user_service.serialize_many(
-            filter={"user_ids": user_ids}, as_user=serialize_generic_user(user)
-        )
+        user_list = []
+        if user_ids:
+            user_list = user_service.serialize_many(
+                filter={"user_ids": user_ids}, as_user=serialize_generic_user(user)
+            )
         users = {u["id"]: u for u in user_list}
 
         commit_ids = {
diff --git a/src/sentry/api/serializers/models/group.py b/src/sentry/api/serializers/models/group.py
index b9bc251d068201..924aafb1d71e56 100644
--- a/src/sentry/api/serializers/models/group.py
+++ b/src/sentry/api/serializers/models/group.py
@@ -183,9 +183,12 @@ def _serialize_assignees(self, item_list: Sequence[Group]) -> Mapping[int, Team
         for team in Team.objects.filter(id__in=all_team_ids.keys()):
             for group_id in all_team_ids[team.id]:
                 result[group_id] = team
-        for user in user_service.get_many_by_id(ids=list(all_user_ids.keys())):
-            for group_id in all_user_ids[user.id]:
-                result[group_id] = user
+
+        user_ids = list(all_user_ids.keys())
+        if user_ids:
+            for user in user_service.get_many_by_id(ids=user_ids):
+                for group_id in all_user_ids[user.id]:
+                    result[group_id] = user
 
         return result
 
diff --git a/src/sentry/api/serializers/models/organization_member/response.py b/src/sentry/api/serializers/models/organization_member/response.py
index ae9014ed55003e..862f80206d88d6 100644
--- a/src/sentry/api/serializers/models/organization_member/response.py
+++ b/src/sentry/api/serializers/models/organization_member/response.py
@@ -63,7 +63,7 @@ class OrganizationMemberSCIMSerializerResponse(OrganizationMemberSCIMSerializerO
 
 class _TeamRole(TypedDict):
     teamSlug: str
-    role: str
+    role: str | None
 
 
 @extend_schema_serializer(exclude_fields=["role", "roleName"])
diff --git a/src/sentry/api/serializers/models/release.py b/src/sentry/api/serializers/models/release.py
index 483b51c6b06f91..8b73b870a314ba 100644
--- a/src/sentry/api/serializers/models/release.py
+++ b/src/sentry/api/serializers/models/release.py
@@ -458,13 +458,16 @@ def get_attrs(self, item_list, user, **kwargs):
                 issue_counts_by_release,
             ) = self.__get_release_data_with_environments(release_project_envs)
 
-        owners = {
-            d["id"]: d
-            for d in user_service.serialize_many(
-                filter={"user_ids": [i.owner_id for i in item_list if i.owner_id]},
-                as_user=serialize_generic_user(user),
-            )
-        }
+        owners = {}
+        owner_ids = [i.owner_id for i in item_list if i.owner_id]
+        if owner_ids:
+            owners = {
+                d["id"]: d
+                for d in user_service.serialize_many(
+                    filter={"user_ids": owner_ids},
+                    as_user=serialize_generic_user(user),
+                )
+            }
 
         authors_metadata_attrs = _get_authors_metadata(item_list, user)
         release_metadata_attrs = _get_last_commit_metadata(item_list, user)
diff --git a/src/sentry/api/serializers/models/servicehook.py b/src/sentry/api/serializers/models/servicehook.py
index 290da2f54002e5..a0ee0838c9b42e 100644
--- a/src/sentry/api/serializers/models/servicehook.py
+++ b/src/sentry/api/serializers/models/servicehook.py
@@ -1,5 +1,5 @@
 from sentry.api.serializers import Serializer, register
-from sentry.models.servicehook import ServiceHook
+from sentry.sentry_apps.models.servicehook import ServiceHook
 
 
 @register(ServiceHook)
diff --git a/src/sentry/api/urls.py b/src/sentry/api/urls.py
index 8f3778a028b2c0..7ed0ee60551096 100644
--- a/src/sentry/api/urls.py
+++ b/src/sentry/api/urls.py
@@ -10,6 +10,7 @@
 from sentry.api.endpoints.issues.related_issues import RelatedIssuesEndpoint
 from sentry.api.endpoints.org_auth_token_details import OrgAuthTokenDetailsEndpoint
 from sentry.api.endpoints.org_auth_tokens import OrgAuthTokensEndpoint
+from sentry.api.endpoints.organization_events_anomalies import OrganizationEventsAnomaliesEndpoint
 from sentry.api.endpoints.organization_events_root_cause_analysis import (
     OrganizationEventsRootCauseAnalysisEndpoint,
 )
@@ -1416,6 +1417,11 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         OrganizationEventsStatsEndpoint.as_view(),
         name="sentry-api-0-organization-events-stats",
     ),
+    re_path(
+        r"^(?P<organization_id_or_slug>[^\/]+)/events/anomalies/$",
+        OrganizationEventsAnomaliesEndpoint.as_view(),
+        name="sentry-api-0-organization-events-anomalies",
+    ),
     re_path(
         r"^(?P<organization_id_or_slug>[^\/]+)/project-templates/$",
         OrganizationProjectTemplatesIndexEndpoint.as_view(),
diff --git a/src/sentry/api/validators/servicehook.py b/src/sentry/api/validators/servicehook.py
index d4a70148fb931b..6ec25f0108edda 100644
--- a/src/sentry/api/validators/servicehook.py
+++ b/src/sentry/api/validators/servicehook.py
@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from sentry.models.servicehook import SERVICE_HOOK_EVENTS
+from sentry.sentry_apps.models.servicehook import SERVICE_HOOK_EVENTS
 
 
 class ServiceHookValidator(serializers.Serializer):
diff --git a/src/sentry/apidocs/examples/organization_examples.py b/src/sentry/apidocs/examples/organization_examples.py
index 14d82d063a208d..0542f224ee4b51 100644
--- a/src/sentry/apidocs/examples/organization_examples.py
+++ b/src/sentry/apidocs/examples/organization_examples.py
@@ -1,5 +1,190 @@
 from drf_spectacular.utils import OpenApiExample
 
+ORG_ROLE_LIST = [
+    {
+        "id": "billing",
+        "name": "Billing",
+        "desc": "Can manage subscription and billing details.",
+        "scopes": ["org:billing"],
+        "allowed": True,
+        "isAllowed": True,
+        "isRetired": False,
+        "is_global": False,
+        "isGlobal": False,
+        "isTeamRolesAllowed": False,
+        "minimumTeamRole": "contributor",
+    },
+    {
+        "id": "member",
+        "name": "Member",
+        "desc": "Members can view and act on events, as well as view most other data within the organization.",
+        "scopes": [
+            "team:read",
+            "project:releases",
+            "org:read",
+            "event:read",
+            "alerts:write",
+            "member:read",
+            "alerts:read",
+            "event:admin",
+            "project:read",
+            "event:write",
+        ],
+        "allowed": True,
+        "isAllowed": True,
+        "isRetired": False,
+        "is_global": False,
+        "isGlobal": False,
+        "isTeamRolesAllowed": True,
+        "minimumTeamRole": "contributor",
+    },
+    {
+        "id": "admin",
+        "name": "Admin",
+        "desc": "Admin privileges on any teams of which they're a member. They can create new teams and projects, as well as remove teams and projects on which they already hold membership (or all teams, if open membership is enabled). Additionally, they can manage memberships of teams that they are members of. They cannot invite members to the organization.",
+        "scopes": [
+            "team:admin",
+            "org:integrations",
+            "project:admin",
+            "team:read",
+            "project:releases",
+            "org:read",
+            "team:write",
+            "event:read",
+            "alerts:write",
+            "member:read",
+            "alerts:read",
+            "event:admin",
+            "project:read",
+            "event:write",
+            "project:write",
+        ],
+        "allowed": True,
+        "isAllowed": True,
+        "isRetired": True,
+        "is_global": False,
+        "isGlobal": False,
+        "isTeamRolesAllowed": True,
+        "minimumTeamRole": "admin",
+    },
+    {
+        "id": "manager",
+        "name": "Manager",
+        "desc": "Gains admin access on all teams as well as the ability to add and remove members.",
+        "scopes": [
+            "team:admin",
+            "org:integrations",
+            "project:releases",
+            "team:write",
+            "member:read",
+            "org:write",
+            "project:write",
+            "project:admin",
+            "team:read",
+            "org:read",
+            "event:read",
+            "member:write",
+            "alerts:write",
+            "alerts:read",
+            "event:admin",
+            "project:read",
+            "event:write",
+            "member:admin",
+        ],
+        "allowed": True,
+        "isAllowed": True,
+        "isRetired": False,
+        "is_global": True,
+        "isGlobal": True,
+        "isTeamRolesAllowed": True,
+        "minimumTeamRole": "admin",
+    },
+    {
+        "id": "owner",
+        "name": "Owner",
+        "desc": "Unrestricted access to the organization, its data, and its settings. Can add, modify, and delete projects and members, as well as make billing and plan changes.",
+        "scopes": [
+            "team:admin",
+            "org:integrations",
+            "project:releases",
+            "org:admin",
+            "team:write",
+            "member:read",
+            "org:write",
+            "project:write",
+            "project:admin",
+            "team:read",
+            "org:read",
+            "event:read",
+            "member:write",
+            "alerts:write",
+            "org:billing",
+            "alerts:read",
+            "event:admin",
+            "project:read",
+            "event:write",
+            "member:admin",
+        ],
+        "allowed": True,
+        "isAllowed": True,
+        "isRetired": False,
+        "is_global": True,
+        "isGlobal": True,
+        "isTeamRolesAllowed": True,
+        "minimumTeamRole": "admin",
+    },
+]
+
+TEAM_ROLE_LIST = [
+    {
+        "id": "contributor",
+        "name": "Contributor",
+        "desc": "Contributors can view and act on events, as well as view most other data within the team's projects.",
+        "scopes": [
+            "project:read",
+            "project:releases",
+            "member:read",
+            "team:read",
+            "event:read",
+            "alerts:read",
+            "event:write",
+            "org:read",
+        ],
+        "allowed": False,
+        "isAllowed": False,
+        "isRetired": False,
+        "isTeamRolesAllowed": True,
+        "isMinimumRoleFor": None,
+    },
+    {
+        "id": "admin",
+        "name": "Team Admin",
+        "desc": "Admin privileges on the team. They can create and remove projects, and can manage the team's memberships.",
+        "scopes": [
+            "project:read",
+            "project:releases",
+            "member:read",
+            "event:admin",
+            "team:write",
+            "project:admin",
+            "team:read",
+            "org:integrations",
+            "alerts:write",
+            "team:admin",
+            "project:write",
+            "event:read",
+            "alerts:read",
+            "event:write",
+            "org:read",
+        ],
+        "allowed": False,
+        "isAllowed": False,
+        "isRetired": False,
+        "isTeamRolesAllowed": True,
+        "isMinimumRoleFor": "admin",
+    },
+]
+
 
 class OrganizationExamples:
     RETRIEVE_ORGANIZATION = [
@@ -106,189 +291,8 @@ class OrganizationExamples:
                 "experiments": {},
                 "isDefault": False,
                 "defaultRole": "member",
-                "orgRoleList": [
-                    {
-                        "id": "billing",
-                        "name": "Billing",
-                        "desc": "Can manage subscription and billing details.",
-                        "scopes": ["org:billing"],
-                        "allowed": False,
-                        "isAllowed": False,
-                        "isRetired": False,
-                        "isTeamRolesAllowed": False,
-                        "is_global": False,
-                        "isGlobal": False,
-                        "minimumTeamRole": "contributor",
-                    },
-                    {
-                        "id": "member",
-                        "name": "Member",
-                        "desc": "Members can view and act on events, as well as view most other data within the organization.",
-                        "scopes": [
-                            "project:read",
-                            "project:releases",
-                            "member:read",
-                            "event:admin",
-                            "team:read",
-                            "alerts:write",
-                            "event:read",
-                            "alerts:read",
-                            "event:write",
-                            "org:read",
-                        ],
-                        "allowed": False,
-                        "isAllowed": False,
-                        "isRetired": False,
-                        "isTeamRolesAllowed": True,
-                        "is_global": False,
-                        "isGlobal": False,
-                        "minimumTeamRole": "contributor",
-                    },
-                    {
-                        "id": "admin",
-                        "name": "Admin",
-                        "desc": "Admin privileges on any teams of which they're a member. They can create new teams and projects, as well as remove teams and projects on which they already hold membership (or all teams, if open membership is enabled). Additionally, they can manage memberships of teams that they are members of. They cannot invite members to the organization.",
-                        "scopes": [
-                            "project:read",
-                            "project:releases",
-                            "member:read",
-                            "event:admin",
-                            "team:write",
-                            "project:admin",
-                            "team:read",
-                            "org:integrations",
-                            "alerts:write",
-                            "team:admin",
-                            "project:write",
-                            "event:read",
-                            "alerts:read",
-                            "event:write",
-                            "org:read",
-                        ],
-                        "allowed": False,
-                        "isAllowed": False,
-                        "isRetired": False,
-                        "isTeamRolesAllowed": True,
-                        "is_global": False,
-                        "isGlobal": False,
-                        "minimumTeamRole": "admin",
-                    },
-                    {
-                        "id": "manager",
-                        "name": "Manager",
-                        "desc": "Gains admin access on all teams as well as the ability to add and remove members.",
-                        "scopes": [
-                            "member:write",
-                            "project:read",
-                            "member:read",
-                            "event:admin",
-                            "org:integrations",
-                            "member:admin",
-                            "alerts:write",
-                            "event:write",
-                            "org:write",
-                            "project:releases",
-                            "team:write",
-                            "project:admin",
-                            "team:read",
-                            "team:admin",
-                            "project:write",
-                            "event:read",
-                            "alerts:read",
-                            "org:read",
-                        ],
-                        "allowed": False,
-                        "isAllowed": False,
-                        "isRetired": False,
-                        "isTeamRolesAllowed": True,
-                        "is_global": True,
-                        "isGlobal": True,
-                        "minimumTeamRole": "admin",
-                    },
-                    {
-                        "id": "owner",
-                        "name": "Owner",
-                        "desc": "Unrestricted access to the organization, its data, and its settings. Can add, modify, and delete projects and members, as well as make billing and plan changes.",
-                        "scopes": [
-                            "member:write",
-                            "project:read",
-                            "member:read",
-                            "event:admin",
-                            "org:integrations",
-                            "member:admin",
-                            "alerts:write",
-                            "event:write",
-                            "org:write",
-                            "org:admin",
-                            "project:releases",
-                            "team:write",
-                            "project:admin",
-                            "team:read",
-                            "org:billing",
-                            "team:admin",
-                            "project:write",
-                            "event:read",
-                            "alerts:read",
-                            "org:read",
-                        ],
-                        "allowed": False,
-                        "isAllowed": False,
-                        "isRetired": False,
-                        "isTeamRolesAllowed": True,
-                        "is_global": True,
-                        "isGlobal": True,
-                        "minimumTeamRole": "admin",
-                    },
-                ],
-                "teamRoleList": [
-                    {
-                        "id": "contributor",
-                        "name": "Contributor",
-                        "desc": "Contributors can view and act on events, as well as view most other data within the team's projects.",
-                        "scopes": [
-                            "project:read",
-                            "project:releases",
-                            "member:read",
-                            "team:read",
-                            "event:read",
-                            "alerts:read",
-                            "event:write",
-                            "org:read",
-                        ],
-                        "allowed": False,
-                        "isAllowed": False,
-                        "isRetired": False,
-                        "isTeamRolesAllowed": True,
-                        "isMinimumRoleFor": None,
-                    },
-                    {
-                        "id": "admin",
-                        "name": "Team Admin",
-                        "desc": "Admin privileges on the team. They can create and remove projects, and can manage the team's memberships.",
-                        "scopes": [
-                            "project:read",
-                            "project:releases",
-                            "member:read",
-                            "event:admin",
-                            "team:write",
-                            "project:admin",
-                            "team:read",
-                            "org:integrations",
-                            "alerts:write",
-                            "team:admin",
-                            "project:write",
-                            "event:read",
-                            "alerts:read",
-                            "event:write",
-                            "org:read",
-                        ],
-                        "allowed": False,
-                        "isAllowed": False,
-                        "isRetired": False,
-                        "isTeamRolesAllowed": True,
-                        "isMinimumRoleFor": "admin",
-                    },
-                ],
+                "orgRoleList": ORG_ROLE_LIST,
+                "teamRoleList": TEAM_ROLE_LIST,
                 "openMembership": True,
                 "allowSharedIssues": True,
                 "enhancedPrivacy": False,
@@ -626,189 +630,8 @@ class OrganizationExamples:
                 ],
                 "invite_link": None,
                 "isOnlyOwner": False,
-                "orgRoleList": [
-                    {
-                        "id": "billing",
-                        "name": "Billing",
-                        "desc": "Can manage subscription and billing details.",
-                        "scopes": ["org:billing"],
-                        "allowed": True,
-                        "isAllowed": True,
-                        "isRetired": False,
-                        "is_global": False,
-                        "isGlobal": False,
-                        "isTeamRolesAllowed": False,
-                        "minimumTeamRole": "contributor",
-                    },
-                    {
-                        "id": "member",
-                        "name": "Member",
-                        "desc": "Members can view and act on events, as well as view most other data within the organization.",
-                        "scopes": [
-                            "team:read",
-                            "project:releases",
-                            "org:read",
-                            "event:read",
-                            "alerts:write",
-                            "member:read",
-                            "alerts:read",
-                            "event:admin",
-                            "project:read",
-                            "event:write",
-                        ],
-                        "allowed": True,
-                        "isAllowed": True,
-                        "isRetired": False,
-                        "is_global": False,
-                        "isGlobal": False,
-                        "isTeamRolesAllowed": True,
-                        "minimumTeamRole": "contributor",
-                    },
-                    {
-                        "id": "admin",
-                        "name": "Admin",
-                        "desc": "Admin privileges on any teams of which they're a member. They can create new teams and projects, as well as remove teams and projects on which they already hold membership (or all teams, if open membership is enabled). Additionally, they can manage memberships of teams that they are members of. They cannot invite members to the organization.",
-                        "scopes": [
-                            "team:admin",
-                            "org:integrations",
-                            "project:admin",
-                            "team:read",
-                            "project:releases",
-                            "org:read",
-                            "team:write",
-                            "event:read",
-                            "alerts:write",
-                            "member:read",
-                            "alerts:read",
-                            "event:admin",
-                            "project:read",
-                            "event:write",
-                            "project:write",
-                        ],
-                        "allowed": True,
-                        "isAllowed": True,
-                        "isRetired": True,
-                        "is_global": False,
-                        "isGlobal": False,
-                        "isTeamRolesAllowed": True,
-                        "minimumTeamRole": "admin",
-                    },
-                    {
-                        "id": "manager",
-                        "name": "Manager",
-                        "desc": "Gains admin access on all teams as well as the ability to add and remove members.",
-                        "scopes": [
-                            "team:admin",
-                            "org:integrations",
-                            "project:releases",
-                            "team:write",
-                            "member:read",
-                            "org:write",
-                            "project:write",
-                            "project:admin",
-                            "team:read",
-                            "org:read",
-                            "event:read",
-                            "member:write",
-                            "alerts:write",
-                            "alerts:read",
-                            "event:admin",
-                            "project:read",
-                            "event:write",
-                            "member:admin",
-                        ],
-                        "allowed": True,
-                        "isAllowed": True,
-                        "isRetired": False,
-                        "is_global": True,
-                        "isGlobal": True,
-                        "isTeamRolesAllowed": True,
-                        "minimumTeamRole": "admin",
-                    },
-                    {
-                        "id": "owner",
-                        "name": "Owner",
-                        "desc": "Unrestricted access to the organization, its data, and its settings. Can add, modify, and delete projects and members, as well as make billing and plan changes.",
-                        "scopes": [
-                            "team:admin",
-                            "org:integrations",
-                            "project:releases",
-                            "org:admin",
-                            "team:write",
-                            "member:read",
-                            "org:write",
-                            "project:write",
-                            "project:admin",
-                            "team:read",
-                            "org:read",
-                            "event:read",
-                            "member:write",
-                            "alerts:write",
-                            "org:billing",
-                            "alerts:read",
-                            "event:admin",
-                            "project:read",
-                            "event:write",
-                            "member:admin",
-                        ],
-                        "allowed": True,
-                        "isAllowed": True,
-                        "isRetired": False,
-                        "is_global": True,
-                        "isGlobal": True,
-                        "isTeamRolesAllowed": True,
-                        "minimumTeamRole": "admin",
-                    },
-                ],
-                "teamRoleList": [
-                    {
-                        "id": "contributor",
-                        "name": "Contributor",
-                        "desc": "Contributors can view and act on events, as well as view most other data within the team's projects.",
-                        "scopes": [
-                            "team:read",
-                            "project:releases",
-                            "org:read",
-                            "event:read",
-                            "member:read",
-                            "alerts:read",
-                            "project:read",
-                            "event:write",
-                        ],
-                        "allowed": False,
-                        "isAllowed": False,
-                        "isRetired": False,
-                        "isMinimumRoleFor": None,
-                        "isTeamRolesAllowed": True,
-                    },
-                    {
-                        "id": "admin",
-                        "name": "Team Admin",
-                        "desc": "Admin privileges on the team. They can create and remove projects, and can manage the team's memberships. They cannot invite members to the organization.",
-                        "scopes": [
-                            "team:admin",
-                            "org:integrations",
-                            "project:admin",
-                            "team:read",
-                            "project:releases",
-                            "org:read",
-                            "team:write",
-                            "event:read",
-                            "alerts:write",
-                            "member:read",
-                            "alerts:read",
-                            "event:admin",
-                            "project:read",
-                            "event:write",
-                            "project:write",
-                        ],
-                        "allowed": False,
-                        "isAllowed": False,
-                        "isRetired": False,
-                        "isMinimumRoleFor": "admin",
-                        "isTeamRolesAllowed": True,
-                    },
-                ],
+                "orgRoleList": ORG_ROLE_LIST,
+                "teamRoleList": TEAM_ROLE_LIST,
             },
             status_codes=["200"],
             response_only=True,
@@ -1084,3 +907,27 @@ class OrganizationExamples:
             response_only=True,
         )
     ]
+
+    GET_HISTORICAL_ANOMALIES = [
+        OpenApiExample(
+            "Identify anomalies in historical data",
+            value=[
+                {
+                    "anomaly": {
+                        "anomaly_score": -0.38810767243044786,
+                        "anomaly_type": "none",
+                    },
+                    "timestamp": 169,
+                    "value": 0.048480431,
+                },
+                {
+                    "anomaly": {
+                        "anomaly_score": -0.3890542800124323,
+                        "anomaly_type": "none",
+                    },
+                    "timestamp": 170,
+                    "value": 0.047910238,
+                },
+            ],
+        )
+    ]
diff --git a/src/sentry/auth/helper.py b/src/sentry/auth/helper.py
index 437ccb0d1caf37..5b2742db5f04ea 100644
--- a/src/sentry/auth/helper.py
+++ b/src/sentry/auth/helper.py
@@ -727,7 +727,7 @@ def __init__(
         self.organization: RpcOrganization = self.organization
         self.provider: Provider = self.provider
 
-    def get_provider(self, provider_key: str | None) -> PipelineProvider:
+    def get_provider(self, provider_key: str | None, **kwargs) -> PipelineProvider:
         if self.provider_model:
             return cast(PipelineProvider, self.provider_model.get_provider())
         elif provider_key:
diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py
index c5fab0be9d00b6..a95c5dd7f026c9 100644
--- a/src/sentry/conf/server.py
+++ b/src/sentry/conf/server.py
@@ -2184,10 +2184,6 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 # This flag activates consuming GroupAttribute messages in the development environment
 SENTRY_USE_GROUP_ATTRIBUTES = True
 
-# This flag activates code paths that are specific for customer domains
-# Deprecated: This setting will be replaced with feature checks for system:multi-region
-SENTRY_USE_CUSTOMER_DOMAINS = False
-
 # This flag activates replay analyzer service in the development environment
 SENTRY_USE_REPLAY_ANALYZER_SERVICE = False
 
@@ -2312,7 +2308,7 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
     "clickhouse": lambda settings, options: (
         {
             "image": (
-                "ghcr.io/getsentry/image-mirror-altinity-clickhouse-server:23.3.19.33.altinitystable"
+                "ghcr.io/getsentry/image-mirror-altinity-clickhouse-server:23.8.11.29.altinitystable"
             ),
             "ports": {"9000/tcp": 9000, "9009/tcp": 9009, "8123/tcp": 8123},
             "ulimits": [{"name": "nofile", "soft": 262144, "hard": 262144}],
diff --git a/src/sentry/deletions/__init__.py b/src/sentry/deletions/__init__.py
index f80ded434a15ed..c4f83f46e9bd1d 100644
--- a/src/sentry/deletions/__init__.py
+++ b/src/sentry/deletions/__init__.py
@@ -102,6 +102,7 @@ def load_defaults() -> None:
     from sentry.sentry_apps.models.sentry_app import SentryApp
     from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
     from sentry.sentry_apps.models.sentry_app_installation_token import SentryAppInstallationToken
+    from sentry.sentry_apps.models.servicehook import ServiceHook
     from sentry.snuba import models as snuba_models
 
     from . import defaults
@@ -171,7 +172,7 @@ def load_defaults() -> None:
     default_manager.register(
         SentryAppInstallationToken, defaults.SentryAppInstallationTokenDeletionTask
     )
-    default_manager.register(models.ServiceHook, defaults.ServiceHookDeletionTask)
+    default_manager.register(ServiceHook, defaults.ServiceHookDeletionTask)
     default_manager.register(models.SavedSearch, BulkModelDeletionTask)
     default_manager.register(models.Team, defaults.TeamDeletionTask)
     default_manager.register(models.UserReport, BulkModelDeletionTask)
diff --git a/src/sentry/deletions/base.py b/src/sentry/deletions/base.py
index ce82a9530a8e25..856d5ff2f5f497 100644
--- a/src/sentry/deletions/base.py
+++ b/src/sentry/deletions/base.py
@@ -2,8 +2,11 @@
 
 import logging
 import re
+from collections.abc import Mapping, Sequence
+from typing import TYPE_CHECKING, Any, Generic, TypeVar
 
 from sentry.constants import ObjectStatus
+from sentry.db.models.base import Model
 from sentry.users.services.user.model import RpcUser
 from sentry.users.services.user.service import user_service
 from sentry.utils import metrics
@@ -12,7 +15,16 @@
 _leaf_re = re.compile(r"^(UserReport|Event|Group)(.+)")
 
 
-def _delete_children(manager, relations, transaction_id=None, actor_id=None):
+if TYPE_CHECKING:
+    from sentry.deletions.manager import DeletionTaskManager
+
+
+def _delete_children(
+    manager: DeletionTaskManager,
+    relations: Sequence[BaseRelation],
+    transaction_id: str | None = None,
+    actor_id: int | None = None,
+) -> bool:
     # Ideally this runs through the deletion manager
     for relation in relations:
         task = manager.get(
@@ -34,17 +46,23 @@ def _delete_children(manager, relations, transaction_id=None, actor_id=None):
 
 
 class BaseRelation:
-    def __init__(self, params, task):
+    def __init__(self, params: Mapping[str, Any], task: type[BaseDeletionTask[Any]] | None) -> None:
         self.task = task
         self.params = params
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         class_type = type(self)
         return f"<{class_type.__module__}.{class_type.__name__}: task={self.task} params={self.params}>"
 
 
 class ModelRelation(BaseRelation):
-    def __init__(self, model, query, task=None, partition_key=None):
+    def __init__(
+        self,
+        model: type[ModelT],
+        query: Mapping[str, Any],
+        task: type[BaseDeletionTask[Any]] | None = None,
+        partition_key: str | None = None,
+    ) -> None:
         params = {"model": model, "query": query}
 
         if partition_key:
@@ -53,13 +71,21 @@ def __init__(self, model, query, task=None, partition_key=None):
         super().__init__(params=params, task=task)
 
 
-class BaseDeletionTask:
+ModelT = TypeVar("ModelT", bound=Model)
+
+
+class BaseDeletionTask(Generic[ModelT]):
     logger = logging.getLogger("sentry.deletions.async")
 
     DEFAULT_CHUNK_SIZE = 100
 
     def __init__(
-        self, manager, skip_models=None, transaction_id=None, actor_id=None, chunk_size=None
+        self,
+        manager: DeletionTaskManager,
+        skip_models: list[type[Model]] | None = None,
+        transaction_id: str | None = None,
+        actor_id: int | None = None,
+        chunk_size: int | None = None,
     ):
         self.manager = manager
         self.skip_models = set(skip_models) if skip_models else None
@@ -67,7 +93,7 @@ def __init__(
         self.actor_id = actor_id
         self.chunk_size = chunk_size if chunk_size is not None else self.DEFAULT_CHUNK_SIZE
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return "<{}: skip_models={} transaction_id={} actor_id={}>".format(
             type(self),
             self.skip_models,
@@ -82,7 +108,7 @@ def chunk(self) -> bool:
         """
         raise NotImplementedError
 
-    def should_proceed(self, instance):
+    def should_proceed(self, instance: ModelT) -> bool:
         """
         Used by root tasks to ensure deletion is ok to proceed.
         This allows deletes to be undone by API endpoints without
@@ -90,32 +116,26 @@ def should_proceed(self, instance):
         """
         return True
 
-    def get_child_relations(self, instance):
+    def get_child_relations(self, instance: ModelT) -> list[BaseRelation]:
         # TODO(dcramer): it'd be nice if we collected the default relationships
         return [
             # ModelRelation(Model, {'parent_id': instance.id})
         ]
 
-    def get_child_relations_bulk(self, instance_list):
+    def get_child_relations_bulk(self, instance_list: Sequence[ModelT]) -> list[BaseRelation]:
         return [
             # ModelRelation(Model, {'parent_id__in': [i.id for id in instance_list]})
         ]
 
-    def extend_relations(self, child_relations, obj):
-        return child_relations
-
-    def extend_relations_bulk(self, child_relations, obj_list):
-        return child_relations
-
-    def filter_relations(self, child_relations):
+    def filter_relations(self, child_relations: Sequence[BaseRelation]) -> list[BaseRelation]:
         if not self.skip_models or not child_relations:
-            return child_relations
+            return list(child_relations)
 
         return list(
             rel for rel in child_relations if rel.params.get("model") not in self.skip_models
         )
 
-    def delete_bulk(self, instance_list) -> bool:
+    def delete_bulk(self, instance_list: Sequence[ModelT]) -> bool:
         """
         Delete a batch of objects bound to this task.
 
@@ -125,7 +145,6 @@ def delete_bulk(self, instance_list) -> bool:
         self.mark_deletion_in_progress(instance_list)
 
         child_relations = self.get_child_relations_bulk(instance_list)
-        child_relations = self.extend_relations_bulk(child_relations, instance_list)
         child_relations = self.filter_relations(child_relations)
         if child_relations:
             has_more = self.delete_children(child_relations)
@@ -134,41 +153,50 @@ def delete_bulk(self, instance_list) -> bool:
 
         for instance in instance_list:
             child_relations = self.get_child_relations(instance)
-            child_relations = self.extend_relations(child_relations, instance)
             child_relations = self.filter_relations(child_relations)
             if child_relations:
                 has_more = self.delete_children(child_relations)
                 if has_more:
                     return has_more
 
-        return self.delete_instance_bulk(instance_list)
+        self.delete_instance_bulk(instance_list)
 
-    def delete_instance(self, instance):
+        return False
+
+    def delete_instance(self, instance: ModelT) -> None:
         raise NotImplementedError
 
-    def delete_instance_bulk(self, instance_list):
+    def delete_instance_bulk(self, instance_list: Sequence[ModelT]) -> None:
         for instance in instance_list:
             self.delete_instance(instance)
 
-    def delete_children(self, relations):
+    def delete_children(self, relations: list[BaseRelation]) -> bool:
         return _delete_children(self.manager, relations, self.transaction_id, self.actor_id)
 
-    def mark_deletion_in_progress(self, instance_list):
+    def mark_deletion_in_progress(self, instance_list: Sequence[ModelT]) -> None:
         pass
 
 
-class ModelDeletionTask(BaseDeletionTask):
+class ModelDeletionTask(BaseDeletionTask[ModelT]):
     DEFAULT_QUERY_LIMIT = None
     manager_name = "objects"
 
-    def __init__(self, manager, model, query, query_limit=None, order_by=None, **kwargs):
+    def __init__(
+        self,
+        manager: DeletionTaskManager,
+        model: type[ModelT],
+        query: Mapping[str, Any],
+        query_limit: int | None = None,
+        order_by: str | None = None,
+        **kwargs: Any,
+    ):
         super().__init__(manager, **kwargs)
         self.model = model
         self.query = query
         self.query_limit = query_limit or self.DEFAULT_QUERY_LIMIT or self.chunk_size
         self.order_by = order_by
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return "<{}: model={} query={} order_by={} transaction_id={} actor_id={}>".format(
             type(self),
             self.model,
@@ -178,18 +206,6 @@ def __repr__(self):
             self.actor_id,
         )
 
-    def extend_relations(self, child_relations, obj):
-        from sentry.deletions import default_manager
-
-        return child_relations + [rel(obj) for rel in default_manager.dependencies[self.model]]
-
-    def extend_relations_bulk(self, child_relations, obj_list):
-        from sentry.deletions import default_manager
-
-        return child_relations + [
-            rel(obj_list) for rel in default_manager.bulk_dependencies[self.model]
-        ]
-
     def chunk(self) -> bool:
         """
         Deletes a chunk of this instance's data. Return ``True`` if there is
@@ -213,7 +229,7 @@ def chunk(self) -> bool:
         # We have more work to do as we didn't run out of rows to delete.
         return True
 
-    def delete_instance(self, instance):
+    def delete_instance(self, instance: ModelT) -> None:
         instance_id = instance.id
         try:
             instance.delete()
@@ -236,14 +252,14 @@ def get_actor(self) -> RpcUser | None:
             return user_service.get_user(user_id=self.actor_id)
         return None
 
-    def mark_deletion_in_progress(self, instance_list):
+    def mark_deletion_in_progress(self, instance_list: Sequence[ModelT]) -> None:
         for instance in instance_list:
             status = getattr(instance, "status", None)
             if status not in (ObjectStatus.DELETION_IN_PROGRESS, None):
                 instance.update(status=ObjectStatus.DELETION_IN_PROGRESS)
 
 
-class BulkModelDeletionTask(ModelDeletionTask):
+class BulkModelDeletionTask(ModelDeletionTask[ModelT]):
     """
     An efficient mechanism for deleting larger volumes of rows in one pass,
     but will hard fail if the relations have resident foreign relations.
@@ -253,7 +269,14 @@ class BulkModelDeletionTask(ModelDeletionTask):
 
     DEFAULT_CHUNK_SIZE = 10000
 
-    def __init__(self, manager, model, query, partition_key=None, **kwargs):
+    def __init__(
+        self,
+        manager: DeletionTaskManager,
+        model: type[ModelT],
+        query: Mapping[str, Any],
+        partition_key: str | None = None,
+        **kwargs: Any,
+    ):
         super().__init__(manager, model, query, **kwargs)
 
         self.partition_key = partition_key
diff --git a/src/sentry/deletions/defaults/alert_rule_trigger.py b/src/sentry/deletions/defaults/alert_rule_trigger.py
index 9aa1469390a79f..131ee0078ddae3 100644
--- a/src/sentry/deletions/defaults/alert_rule_trigger.py
+++ b/src/sentry/deletions/defaults/alert_rule_trigger.py
@@ -1,8 +1,9 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.incidents.models.alert_rule import AlertRuleTrigger
 
 
-class AlertRuleTriggerDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class AlertRuleTriggerDeletionTask(ModelDeletionTask[AlertRuleTrigger]):
+    def get_child_relations(self, instance: AlertRuleTrigger) -> list[BaseRelation]:
         from sentry.incidents.models.alert_rule import AlertRuleTriggerAction
 
         return [
diff --git a/src/sentry/deletions/defaults/alert_rule_trigger_action.py b/src/sentry/deletions/defaults/alert_rule_trigger_action.py
index 4c050d4ca918ee..ed7c6307839d47 100644
--- a/src/sentry/deletions/defaults/alert_rule_trigger_action.py
+++ b/src/sentry/deletions/defaults/alert_rule_trigger_action.py
@@ -1,10 +1,11 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.incidents.models.alert_rule import AlertRuleTriggerAction
 
 
-class AlertRuleTriggerActionDeletionTask(ModelDeletionTask):
+class AlertRuleTriggerActionDeletionTask(ModelDeletionTask[AlertRuleTriggerAction]):
     manager_name = "objects_for_deletion"
 
-    def get_child_relations(self, instance):
+    def get_child_relations(self, instance: AlertRuleTriggerAction) -> list[BaseRelation]:
         from sentry.models.notificationmessage import NotificationMessage
 
         return [
diff --git a/src/sentry/deletions/defaults/alertrule.py b/src/sentry/deletions/defaults/alertrule.py
index 2911d3fbe620fa..715c04e63cbd19 100644
--- a/src/sentry/deletions/defaults/alertrule.py
+++ b/src/sentry/deletions/defaults/alertrule.py
@@ -1,12 +1,13 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.incidents.models.alert_rule import AlertRule
 
 
-class AlertRuleDeletionTask(ModelDeletionTask):
+class AlertRuleDeletionTask(ModelDeletionTask[AlertRule]):
     # The default manager for alert rules excludes snapshots
     # which we want to include when deleting an organization.
     manager_name = "objects_with_snapshots"
 
-    def get_child_relations(self, instance):
+    def get_child_relations(self, instance: AlertRule) -> list[BaseRelation]:
         from sentry.incidents.models.alert_rule import AlertRuleTrigger
 
         return [
diff --git a/src/sentry/deletions/defaults/apiapplication.py b/src/sentry/deletions/defaults/apiapplication.py
index f683adc0588ba9..5722b79076d8ec 100644
--- a/src/sentry/deletions/defaults/apiapplication.py
+++ b/src/sentry/deletions/defaults/apiapplication.py
@@ -1,16 +1,17 @@
-from sentry.models.apiapplication import ApiApplicationStatus
+from collections.abc import Sequence
 
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.models.apiapplication import ApiApplication, ApiApplicationStatus
 
 
-class ApiApplicationDeletionTask(ModelDeletionTask):
-    def should_proceed(self, instance):
+class ApiApplicationDeletionTask(ModelDeletionTask[ApiApplication]):
+    def should_proceed(self, instance: ApiApplication) -> bool:
         return instance.status in {
             ApiApplicationStatus.pending_deletion,
             ApiApplicationStatus.deletion_in_progress,
         }
 
-    def get_child_relations(self, instance):
+    def get_child_relations(self, instance: ApiApplication) -> list[BaseRelation]:
         from sentry.models.apigrant import ApiGrant
         from sentry.models.apitoken import ApiToken
 
@@ -18,7 +19,7 @@ def get_child_relations(self, instance):
         model_list = (ApiToken, ApiGrant)
         return [ModelRelation(m, {"application_id": instance.id}) for m in model_list]
 
-    def mark_deletion_in_progress(self, instance_list):
+    def mark_deletion_in_progress(self, instance_list: Sequence[ApiApplication]) -> None:
         from sentry.models.apiapplication import ApiApplicationStatus
 
         for instance in instance_list:
diff --git a/src/sentry/deletions/defaults/apigrant.py b/src/sentry/deletions/defaults/apigrant.py
index 32c48bf29f5cd6..ff3ba854debcff 100644
--- a/src/sentry/deletions/defaults/apigrant.py
+++ b/src/sentry/deletions/defaults/apigrant.py
@@ -1,22 +1,23 @@
+from collections.abc import Sequence
+
 from django.db import router
 
+from sentry.deletions.base import ModelDeletionTask
 from sentry.models.apigrant import ApiGrant
 from sentry.silo.safety import unguarded_write
 
-from ..base import ModelDeletionTask
-
 
-class ModelApiGrantDeletionTask(ModelDeletionTask):
+class ModelApiGrantDeletionTask(ModelDeletionTask[ApiGrant]):
     """
     Normally ApiGrants are deleted in bulk, but for cascades originating from sentry app installation, we wish to use
     the orm so that set null behavior functions correctly.  Do not register this as the default, but instead use it as
     the task= parameter to a relation.
     """
 
-    def mark_deletion_in_progress(self, instance_list):
+    def mark_deletion_in_progress(self, instance_list: Sequence[ApiGrant]) -> None:
         # no status to track
         pass
 
-    def delete_instance(self, instance):
+    def delete_instance(self, instance: ApiGrant) -> None:
         with unguarded_write(router.db_for_write(ApiGrant)):
             super().delete_instance(instance)
diff --git a/src/sentry/deletions/defaults/apitoken.py b/src/sentry/deletions/defaults/apitoken.py
index e413ba0d013bab..1f2d520c637156 100644
--- a/src/sentry/deletions/defaults/apitoken.py
+++ b/src/sentry/deletions/defaults/apitoken.py
@@ -1,13 +1,16 @@
-from ..base import ModelDeletionTask
+from collections.abc import Sequence
 
+from sentry.deletions.base import ModelDeletionTask
+from sentry.models.apitoken import ApiToken
 
-class ModelApiTokenDeletionTask(ModelDeletionTask):
+
+class ModelApiTokenDeletionTask(ModelDeletionTask[ApiToken]):
     """
     Normally ApiTokens are deleted in bulk, but for cascades originating from sentry app installation, we wish to use
     the orm so that set null behavior functions correctly.  Do not register this as the default, but instead use it as
     the task= parameter to a relation.
     """
 
-    def mark_deletion_in_progress(self, instance_list):
+    def mark_deletion_in_progress(self, instance_list: Sequence[ApiToken]) -> None:
         # no status to track
         pass
diff --git a/src/sentry/deletions/defaults/artifactbundle.py b/src/sentry/deletions/defaults/artifactbundle.py
index ff6fd847f36de2..d62d5f58df8956 100644
--- a/src/sentry/deletions/defaults/artifactbundle.py
+++ b/src/sentry/deletions/defaults/artifactbundle.py
@@ -1,8 +1,9 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.models.artifactbundle import ArtifactBundle
 
 
-class ArtifactBundleDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class ArtifactBundleDeletionTask(ModelDeletionTask[ArtifactBundle]):
+    def get_child_relations(self, instance: ArtifactBundle) -> list[BaseRelation]:
         from sentry.models.artifactbundle import (
             DebugIdArtifactBundle,
             ProjectArtifactBundle,
diff --git a/src/sentry/deletions/defaults/commit.py b/src/sentry/deletions/defaults/commit.py
index 14793f9978765d..d64086f95dd6f6 100644
--- a/src/sentry/deletions/defaults/commit.py
+++ b/src/sentry/deletions/defaults/commit.py
@@ -1,8 +1,9 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.models.commit import Commit
 
 
-class CommitDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class CommitDeletionTask(ModelDeletionTask[Commit]):
+    def get_child_relations(self, instance: Commit) -> list[BaseRelation]:
         from sentry.models.commitfilechange import CommitFileChange
         from sentry.models.releasecommit import ReleaseCommit
         from sentry.models.releaseheadcommit import ReleaseHeadCommit
diff --git a/src/sentry/deletions/defaults/commitauthor.py b/src/sentry/deletions/defaults/commitauthor.py
index 92345025b3d2f9..3d2e1935d93219 100644
--- a/src/sentry/deletions/defaults/commitauthor.py
+++ b/src/sentry/deletions/defaults/commitauthor.py
@@ -1,8 +1,9 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.models.commitauthor import CommitAuthor
 
 
-class CommitAuthorDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class CommitAuthorDeletionTask(ModelDeletionTask[CommitAuthor]):
+    def get_child_relations(self, instance: CommitAuthor) -> list[BaseRelation]:
         from sentry.models.commit import Commit
 
         return [
diff --git a/src/sentry/deletions/defaults/discoversavedquery.py b/src/sentry/deletions/defaults/discoversavedquery.py
index bfe9fa39dd639b..44314f99232fa9 100644
--- a/src/sentry/deletions/defaults/discoversavedquery.py
+++ b/src/sentry/deletions/defaults/discoversavedquery.py
@@ -1,8 +1,9 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.discover.models import DiscoverSavedQuery
 
 
-class DiscoverSavedQueryDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class DiscoverSavedQueryDeletionTask(ModelDeletionTask[DiscoverSavedQuery]):
+    def get_child_relations(self, instance: DiscoverSavedQuery) -> list[BaseRelation]:
         from sentry.discover.models import DiscoverSavedQueryProject
 
         return [
diff --git a/src/sentry/deletions/defaults/group.py b/src/sentry/deletions/defaults/group.py
index b983d8f0cf5bdd..c0da32c0bb6ccf 100644
--- a/src/sentry/deletions/defaults/group.py
+++ b/src/sentry/deletions/defaults/group.py
@@ -48,7 +48,7 @@
 )
 
 
-class EventDataDeletionTask(BaseDeletionTask):
+class EventDataDeletionTask(BaseDeletionTask[Group]):
     """
     Deletes nodestore data, EventAttachment and UserReports for group
     """
@@ -121,7 +121,7 @@ def chunk(self) -> bool:
         return True
 
 
-class GroupDeletionTask(ModelDeletionTask):
+class GroupDeletionTask(ModelDeletionTask[Group]):
     # Delete groups in blocks of 1000. Using 1000 aims to
     # balance the number of snuba replacements with memory limits.
     DEFAULT_CHUNK_SIZE = 1000
@@ -152,7 +152,9 @@ def delete_bulk(self, instance_list: Sequence[Group]) -> bool:
         self.delete_children(child_relations)
 
         # Remove group objects with children removed.
-        return self.delete_instance_bulk(instance_list)
+        self.delete_instance_bulk(instance_list)
+
+        return False
 
     def delete_instance(self, instance: Group) -> None:
         from sentry import similarity
diff --git a/src/sentry/deletions/defaults/grouphash.py b/src/sentry/deletions/defaults/grouphash.py
index a9769e5f0dc84f..8c4d431d85b32e 100644
--- a/src/sentry/deletions/defaults/grouphash.py
+++ b/src/sentry/deletions/defaults/grouphash.py
@@ -1,8 +1,9 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.models.grouphash import GroupHash
 
 
-class GroupHashDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class GroupHashDeletionTask(ModelDeletionTask[GroupHash]):
+    def get_child_relations(self, instance: GroupHash) -> list[BaseRelation]:
         from sentry.models.grouphashmetadata import GroupHashMetadata
 
         return [
diff --git a/src/sentry/deletions/defaults/grouphistory.py b/src/sentry/deletions/defaults/grouphistory.py
index 5612fac3435b8a..150e0fd1d7a66a 100644
--- a/src/sentry/deletions/defaults/grouphistory.py
+++ b/src/sentry/deletions/defaults/grouphistory.py
@@ -1,7 +1,8 @@
 from sentry.deletions.base import ModelDeletionTask
+from sentry.models.grouphistory import GroupHistory
 
 
-class GroupHistoryDeletionTask(ModelDeletionTask):
+class GroupHistoryDeletionTask(ModelDeletionTask[GroupHistory]):
     """
     Specialized deletion handling that operates per group
 
diff --git a/src/sentry/deletions/defaults/monitor.py b/src/sentry/deletions/defaults/monitor.py
index 4c477201c0b2e4..2af8a5eccd74a8 100644
--- a/src/sentry/deletions/defaults/monitor.py
+++ b/src/sentry/deletions/defaults/monitor.py
@@ -1,8 +1,9 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.monitors.models import Monitor
 
 
-class MonitorDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class MonitorDeletionTask(ModelDeletionTask[Monitor]):
+    def get_child_relations(self, instance: Monitor) -> list[BaseRelation]:
         from sentry.monitors import models
 
         return [
diff --git a/src/sentry/deletions/defaults/monitor_environment.py b/src/sentry/deletions/defaults/monitor_environment.py
index d166ab47249933..632550804f1cef 100644
--- a/src/sentry/deletions/defaults/monitor_environment.py
+++ b/src/sentry/deletions/defaults/monitor_environment.py
@@ -1,8 +1,9 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.monitors.models import MonitorEnvironment
 
 
-class MonitorEnvironmentDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class MonitorEnvironmentDeletionTask(ModelDeletionTask[MonitorEnvironment]):
+    def get_child_relations(self, instance: MonitorEnvironment) -> list[BaseRelation]:
         from sentry.monitors import models
 
         return [
diff --git a/src/sentry/deletions/defaults/organization.py b/src/sentry/deletions/defaults/organization.py
index 819b5bcf20de77..5aa3d452456e16 100644
--- a/src/sentry/deletions/defaults/organization.py
+++ b/src/sentry/deletions/defaults/organization.py
@@ -1,13 +1,14 @@
-from sentry.models.organization import OrganizationStatus
+from collections.abc import Sequence
+
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.models.organization import Organization, OrganizationStatus
 from sentry.organizations.services.organization_actions.impl import (
     update_organization_with_outbox_message,
 )
 
-from ..base import ModelDeletionTask, ModelRelation
-
 
-class OrganizationDeletionTask(ModelDeletionTask):
-    def should_proceed(self, instance):
+class OrganizationDeletionTask(ModelDeletionTask[Organization]):
+    def should_proceed(self, instance: Organization) -> bool:
         """
         Only delete organizations that haven't been undeleted.
         """
@@ -16,7 +17,7 @@ def should_proceed(self, instance):
             OrganizationStatus.DELETION_IN_PROGRESS,
         }
 
-    def get_child_relations(self, instance):
+    def get_child_relations(self, instance: Organization) -> list[BaseRelation]:
         from sentry.deletions.defaults.discoversavedquery import DiscoverSavedQueryDeletionTask
         from sentry.discover.models import DiscoverSavedQuery, TeamKeyTransaction
         from sentry.incidents.models.alert_rule import AlertRule
@@ -35,7 +36,7 @@ def get_child_relations(self, instance):
         from sentry.models.transaction_threshold import ProjectTransactionThreshold
 
         # Team must come first
-        relations = [ModelRelation(Team, {"organization_id": instance.id})]
+        relations: list[BaseRelation] = [ModelRelation(Team, {"organization_id": instance.id})]
 
         model_list = (
             OrganizationMember,
@@ -65,7 +66,7 @@ def get_child_relations(self, instance):
 
         return relations
 
-    def mark_deletion_in_progress(self, instance_list):
+    def mark_deletion_in_progress(self, instance_list: Sequence[Organization]) -> None:
         from sentry.models.organization import OrganizationStatus
 
         for instance in instance_list:
diff --git a/src/sentry/deletions/defaults/organizationintegration.py b/src/sentry/deletions/defaults/organizationintegration.py
index 941dcee637857e..57befb2fb04e67 100644
--- a/src/sentry/deletions/defaults/organizationintegration.py
+++ b/src/sentry/deletions/defaults/organizationintegration.py
@@ -1,19 +1,18 @@
 from sentry.constants import ObjectStatus
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.integrations.services.repository import repository_service
 from sentry.types.region import RegionMappingNotFound
 
-from ..base import ModelDeletionTask, ModelRelation
 
-
-class OrganizationIntegrationDeletionTask(ModelDeletionTask):
-    def should_proceed(self, instance):
+class OrganizationIntegrationDeletionTask(ModelDeletionTask[OrganizationIntegration]):
+    def should_proceed(self, instance: OrganizationIntegration) -> bool:
         return instance.status in {ObjectStatus.DELETION_IN_PROGRESS, ObjectStatus.PENDING_DELETION}
 
-    def get_child_relations(self, instance):
+    def get_child_relations(self, instance: OrganizationIntegration) -> list[BaseRelation]:
         from sentry.users.models.identity import Identity
 
-        relations = []
+        relations: list[BaseRelation] = []
 
         # delete the identity attached through the default_auth_id
         if instance.default_auth_id:
@@ -21,7 +20,7 @@ def get_child_relations(self, instance):
 
         return relations
 
-    def delete_instance(self, instance: OrganizationIntegration):
+    def delete_instance(self, instance: OrganizationIntegration) -> None:
         try:
             repository_service.disassociate_organization_integration(
                 organization_id=instance.organization_id,
diff --git a/src/sentry/deletions/defaults/organizationmember.py b/src/sentry/deletions/defaults/organizationmember.py
index df0d7b1b7aec17..3f51fc18166a33 100644
--- a/src/sentry/deletions/defaults/organizationmember.py
+++ b/src/sentry/deletions/defaults/organizationmember.py
@@ -1,11 +1,11 @@
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
 from sentry.models.groupsearchview import GroupSearchView
+from sentry.models.organizationmember import OrganizationMember
 
-from ..base import ModelDeletionTask, ModelRelation
 
-
-class OrganizationMemberDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
-        relations = [
+class OrganizationMemberDeletionTask(ModelDeletionTask[OrganizationMember]):
+    def get_child_relations(self, instance: OrganizationMember) -> list[BaseRelation]:
+        relations: list[BaseRelation] = [
             ModelRelation(
                 GroupSearchView,
                 {"user_id": instance.user_id, "organization_id": instance.organization_id},
diff --git a/src/sentry/deletions/defaults/platform_external_issue.py b/src/sentry/deletions/defaults/platform_external_issue.py
index 45c84fa9bf91eb..ac8ecc31328299 100644
--- a/src/sentry/deletions/defaults/platform_external_issue.py
+++ b/src/sentry/deletions/defaults/platform_external_issue.py
@@ -1,7 +1,10 @@
-from ..base import ModelDeletionTask
+from collections.abc import Sequence
 
+from sentry.deletions.base import ModelDeletionTask
+from sentry.models.platformexternalissue import PlatformExternalIssue
 
-class PlatformExternalIssueDeletionTask(ModelDeletionTask):
-    def mark_deletion_in_progress(self, instance_list):
+
+class PlatformExternalIssueDeletionTask(ModelDeletionTask[PlatformExternalIssue]):
+    def mark_deletion_in_progress(self, instance_list: Sequence[PlatformExternalIssue]) -> None:
         # No status to track this.
         pass
diff --git a/src/sentry/deletions/defaults/project.py b/src/sentry/deletions/defaults/project.py
index 52f4c98076a7dd..fb06ba353c6fc5 100644
--- a/src/sentry/deletions/defaults/project.py
+++ b/src/sentry/deletions/defaults/project.py
@@ -1,10 +1,16 @@
 from __future__ import annotations
 
-from ..base import BulkModelDeletionTask, ModelDeletionTask, ModelRelation
+from sentry.deletions.base import (
+    BaseRelation,
+    BulkModelDeletionTask,
+    ModelDeletionTask,
+    ModelRelation,
+)
+from sentry.models.project import Project
 
 
-class ProjectDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class ProjectDeletionTask(ModelDeletionTask[Project]):
+    def get_child_relations(self, instance: Project) -> list[BaseRelation]:
         from sentry.discover.models import DiscoverSavedQueryProject
         from sentry.incidents.models.alert_rule import AlertRule, AlertRuleProjects
         from sentry.incidents.models.incident import IncidentProject
@@ -33,14 +39,14 @@ def get_child_relations(self, instance):
         from sentry.models.release_threshold import ReleaseThreshold
         from sentry.models.releaseprojectenvironment import ReleaseProjectEnvironment
         from sentry.models.releases.release_project import ReleaseProject
-        from sentry.models.servicehook import ServiceHook, ServiceHookProject
         from sentry.models.transaction_threshold import ProjectTransactionThreshold
         from sentry.models.userreport import UserReport
         from sentry.monitors.models import Monitor
         from sentry.replays.models import ReplayRecordingSegment
+        from sentry.sentry_apps.models.servicehook import ServiceHook, ServiceHookProject
         from sentry.snuba.models import QuerySubscription
 
-        relations = [
+        relations: list[BaseRelation] = [
             # ProjectKey gets revoked immediately, in bulk
             ModelRelation(ProjectKey, {"project_id": instance.id})
         ]
diff --git a/src/sentry/deletions/defaults/pullrequest.py b/src/sentry/deletions/defaults/pullrequest.py
index 3a0651f2f32873..78bfd6ad2a0165 100644
--- a/src/sentry/deletions/defaults/pullrequest.py
+++ b/src/sentry/deletions/defaults/pullrequest.py
@@ -1,8 +1,9 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.models.pullrequest import PullRequest
 
 
-class PullRequestDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class PullRequestDeletionTask(ModelDeletionTask[PullRequest]):
+    def get_child_relations(self, instance: PullRequest) -> list[BaseRelation]:
         from sentry.models.pullrequest import PullRequestComment
 
         return [
diff --git a/src/sentry/deletions/defaults/querysubscription.py b/src/sentry/deletions/defaults/querysubscription.py
index 465bbc315f9e5c..9c9641706c406f 100644
--- a/src/sentry/deletions/defaults/querysubscription.py
+++ b/src/sentry/deletions/defaults/querysubscription.py
@@ -1,9 +1,8 @@
+from sentry.deletions.base import ModelDeletionTask
 from sentry.snuba.models import QuerySubscription
 
-from ..base import ModelDeletionTask
 
-
-class QuerySubscriptionDeletionTask(ModelDeletionTask):
+class QuerySubscriptionDeletionTask(ModelDeletionTask[QuerySubscription]):
     def delete_instance(self, instance: QuerySubscription) -> None:
         from sentry.incidents.models.incident import Incident
 
diff --git a/src/sentry/deletions/defaults/release.py b/src/sentry/deletions/defaults/release.py
index 114260468bc544..9499e13a2b3e6e 100644
--- a/src/sentry/deletions/defaults/release.py
+++ b/src/sentry/deletions/defaults/release.py
@@ -1,8 +1,9 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.models.release import Release
 
 
-class ReleaseDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class ReleaseDeletionTask(ModelDeletionTask[Release]):
+    def get_child_relations(self, instance: Release) -> list[BaseRelation]:
         from sentry.models.deploy import Deploy
         from sentry.models.distribution import Distribution
         from sentry.models.group import Group
diff --git a/src/sentry/deletions/defaults/repository.py b/src/sentry/deletions/defaults/repository.py
index 812de5a9673446..960befb3b93d01 100644
--- a/src/sentry/deletions/defaults/repository.py
+++ b/src/sentry/deletions/defaults/repository.py
@@ -1,10 +1,10 @@
 from sentry.constants import ObjectStatus
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.models.repository import Repository
 from sentry.signals import pending_delete
 
-from ..base import ModelDeletionTask, ModelRelation
 
-
-def _get_repository_child_relations(instance):
+def _get_repository_child_relations(instance: Repository) -> list[BaseRelation]:
     from sentry.integrations.models.repository_project_path_config import (
         RepositoryProjectPathConfig,
     )
@@ -18,17 +18,17 @@ def _get_repository_child_relations(instance):
     ]
 
 
-class RepositoryDeletionTask(ModelDeletionTask):
-    def should_proceed(self, instance):
+class RepositoryDeletionTask(ModelDeletionTask[Repository]):
+    def should_proceed(self, instance: Repository) -> bool:
         """
         Only delete repositories that haven't been undeleted.
         """
         return instance.status in {ObjectStatus.PENDING_DELETION, ObjectStatus.DELETION_IN_PROGRESS}
 
-    def get_child_relations(self, instance):
+    def get_child_relations(self, instance: Repository) -> list[BaseRelation]:
         return _get_repository_child_relations(instance)
 
-    def delete_instance(self, instance):
+    def delete_instance(self, instance: Repository) -> None:
         # TODO child_relations should also send pending_delete so we
         # don't have to do this here.
         pending_delete.send(sender=type(instance), instance=instance, actor=self.get_actor())
diff --git a/src/sentry/deletions/defaults/repositoryprojectpathconfig.py b/src/sentry/deletions/defaults/repositoryprojectpathconfig.py
index 8245808a812854..ccafd905877a31 100644
--- a/src/sentry/deletions/defaults/repositoryprojectpathconfig.py
+++ b/src/sentry/deletions/defaults/repositoryprojectpathconfig.py
@@ -1,8 +1,9 @@
-from ..base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.integrations.models.repository_project_path_config import RepositoryProjectPathConfig
 
 
-class RepositoryProjectPathConfigDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class RepositoryProjectPathConfigDeletionTask(ModelDeletionTask[RepositoryProjectPathConfig]):
+    def get_child_relations(self, instance: RepositoryProjectPathConfig) -> list[BaseRelation]:
         from sentry.models.projectcodeowners import ProjectCodeOwners
 
         return [
diff --git a/src/sentry/deletions/defaults/rule.py b/src/sentry/deletions/defaults/rule.py
index 2582ede051bbb3..31832098961b8d 100644
--- a/src/sentry/deletions/defaults/rule.py
+++ b/src/sentry/deletions/defaults/rule.py
@@ -1,8 +1,11 @@
-from ..base import ModelDeletionTask, ModelRelation
+from collections.abc import Sequence
 
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.models.rule import Rule
 
-class RuleDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+
+class RuleDeletionTask(ModelDeletionTask[Rule]):
+    def get_child_relations(self, instance: Rule) -> list[BaseRelation]:
         from sentry.models.grouprulestatus import GroupRuleStatus
         from sentry.models.rule import RuleActivity
         from sentry.models.rulefirehistory import RuleFireHistory
@@ -13,7 +16,7 @@ def get_child_relations(self, instance):
             ModelRelation(RuleActivity, {"rule_id": instance.id}),
         ]
 
-    def mark_deletion_in_progress(self, instance_list):
+    def mark_deletion_in_progress(self, instance_list: Sequence[Rule]) -> None:
         from sentry.constants import ObjectStatus
 
         for instance in instance_list:
diff --git a/src/sentry/deletions/defaults/rulefirehistory.py b/src/sentry/deletions/defaults/rulefirehistory.py
index a2f483ff78a128..67e4f54569cae4 100644
--- a/src/sentry/deletions/defaults/rulefirehistory.py
+++ b/src/sentry/deletions/defaults/rulefirehistory.py
@@ -1,8 +1,9 @@
-from sentry.deletions.base import ModelDeletionTask, ModelRelation
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.models.rulefirehistory import RuleFireHistory
 
 
-class RuleFireHistoryDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+class RuleFireHistoryDeletionTask(ModelDeletionTask[RuleFireHistory]):
+    def get_child_relations(self, instance: RuleFireHistory) -> list[BaseRelation]:
         from sentry.models.notificationmessage import NotificationMessage
 
         return [
diff --git a/src/sentry/deletions/defaults/sentry_app.py b/src/sentry/deletions/defaults/sentry_app.py
index a6549af04a85e3..b0e8a618fdb43f 100644
--- a/src/sentry/deletions/defaults/sentry_app.py
+++ b/src/sentry/deletions/defaults/sentry_app.py
@@ -1,8 +1,11 @@
-from ..base import ModelDeletionTask, ModelRelation
+from collections.abc import Sequence
 
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.sentry_apps.models.sentry_app import SentryApp
 
-class SentryAppDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+
+class SentryAppDeletionTask(ModelDeletionTask[SentryApp]):
+    def get_child_relations(self, instance: SentryApp) -> list[BaseRelation]:
         from sentry.models.apiapplication import ApiApplication
         from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
         from sentry.users.models.user import User
@@ -13,7 +16,7 @@ def get_child_relations(self, instance):
             ModelRelation(ApiApplication, {"id": instance.application_id}),
         ]
 
-    def mark_deletion_in_progress(self, instance_list):
+    def mark_deletion_in_progress(self, instance_list: Sequence[SentryApp]) -> None:
         from sentry.constants import SentryAppStatus
 
         for instance in instance_list:
diff --git a/src/sentry/deletions/defaults/sentry_app_installation.py b/src/sentry/deletions/defaults/sentry_app_installation.py
index cefeb358b76c6c..8fe7906f714795 100644
--- a/src/sentry/deletions/defaults/sentry_app_installation.py
+++ b/src/sentry/deletions/defaults/sentry_app_installation.py
@@ -1,11 +1,14 @@
-from ..base import ModelDeletionTask, ModelRelation
-from .apigrant import ModelApiGrantDeletionTask
+from collections.abc import Sequence
 
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.deletions.defaults.apigrant import ModelApiGrantDeletionTask
+from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
 
-class SentryAppInstallationDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+
+class SentryAppInstallationDeletionTask(ModelDeletionTask[SentryAppInstallation]):
+    def get_child_relations(self, instance: SentryAppInstallation) -> list[BaseRelation]:
         from sentry.models.apigrant import ApiGrant
-        from sentry.models.integrations.sentry_app_installation_for_provider import (
+        from sentry.sentry_apps.models.sentry_app_installation_for_provider import (
             SentryAppInstallationForProvider,
         )
         from sentry.sentry_apps.models.sentry_app_installation_token import (
@@ -20,5 +23,5 @@ def get_child_relations(self, instance):
             ),
         ]
 
-    def mark_deletion_in_progress(self, instance_list):
+    def mark_deletion_in_progress(self, instance_list: Sequence[SentryAppInstallation]) -> None:
         pass
diff --git a/src/sentry/deletions/defaults/sentry_app_installation_token.py b/src/sentry/deletions/defaults/sentry_app_installation_token.py
index 5c0b89d4a5c2d7..b4aae9b537d8d2 100644
--- a/src/sentry/deletions/defaults/sentry_app_installation_token.py
+++ b/src/sentry/deletions/defaults/sentry_app_installation_token.py
@@ -1,14 +1,19 @@
-from ..base import ModelDeletionTask, ModelRelation
-from .apitoken import ModelApiTokenDeletionTask
+from collections.abc import Sequence
 
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.deletions.defaults.apitoken import ModelApiTokenDeletionTask
+from sentry.sentry_apps.models.sentry_app_installation_token import SentryAppInstallationToken
 
-class SentryAppInstallationTokenDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+
+class SentryAppInstallationTokenDeletionTask(ModelDeletionTask[SentryAppInstallationToken]):
+    def get_child_relations(self, instance: SentryAppInstallationToken) -> list[BaseRelation]:
         from sentry.models.apitoken import ApiToken
 
         return [
             ModelRelation(ApiToken, {"id": instance.api_token_id}, task=ModelApiTokenDeletionTask),
         ]
 
-    def mark_deletion_in_progress(self, instance_list):
+    def mark_deletion_in_progress(
+        self, instance_list: Sequence[SentryAppInstallationToken]
+    ) -> None:
         pass
diff --git a/src/sentry/deletions/defaults/service_hook.py b/src/sentry/deletions/defaults/service_hook.py
index 6c290162f927f0..039aa60069bffa 100644
--- a/src/sentry/deletions/defaults/service_hook.py
+++ b/src/sentry/deletions/defaults/service_hook.py
@@ -1,7 +1,8 @@
-from ..base import ModelDeletionTask
+from sentry.deletions.base import ModelDeletionTask
+from sentry.sentry_apps.models.servicehook import ServiceHook
 
 
-class ServiceHookDeletionTask(ModelDeletionTask):
+class ServiceHookDeletionTask(ModelDeletionTask[ServiceHook]):
     # This subclass just represents an intentional decision to not cascade service hook deletions, and to
     # mark status using ObjectStatus on deletion.  The behavior is identical to the base class
     # so that intentions are clear.
diff --git a/src/sentry/deletions/defaults/team.py b/src/sentry/deletions/defaults/team.py
index 5b2c4db201f3f3..c0295f99f0b910 100644
--- a/src/sentry/deletions/defaults/team.py
+++ b/src/sentry/deletions/defaults/team.py
@@ -1,22 +1,25 @@
-from ..base import ModelDeletionTask, ModelRelation
+from collections.abc import Sequence
 
+from sentry.deletions.base import BaseRelation, ModelDeletionTask, ModelRelation
+from sentry.models.team import Team
 
-class TeamDeletionTask(ModelDeletionTask):
-    def get_child_relations(self, instance):
+
+class TeamDeletionTask(ModelDeletionTask[Team]):
+    def get_child_relations(self, instance: Team) -> list[BaseRelation]:
         from sentry.models.projectteam import ProjectTeam
 
         return [
             ModelRelation(ProjectTeam, {"team_id": instance.id}),
         ]
 
-    def mark_deletion_in_progress(self, instance_list):
+    def mark_deletion_in_progress(self, instance_list: Sequence[Team]) -> None:
         from sentry.models.team import TeamStatus
 
         for instance in instance_list:
             if instance.status != TeamStatus.DELETION_IN_PROGRESS:
                 instance.update(status=TeamStatus.DELETION_IN_PROGRESS)
 
-    def delete_instance(self, instance):
+    def delete_instance(self, instance: Team) -> None:
         from sentry.incidents.models.alert_rule import AlertRule
         from sentry.models.rule import Rule
         from sentry.monitors.models import Monitor
diff --git a/src/sentry/deletions/manager.py b/src/sentry/deletions/manager.py
index ce9e89810ead50..7f4e3615fbbc43 100644
--- a/src/sentry/deletions/manager.py
+++ b/src/sentry/deletions/manager.py
@@ -1,16 +1,18 @@
-from collections import defaultdict
+from collections.abc import MutableMapping
+from typing import Any
+
+from sentry.db.models.base import Model
+from sentry.deletions.base import BaseDeletionTask
 
 __all__ = ["DeletionTaskManager"]
 
 
 class DeletionTaskManager:
-    def __init__(self, default_task=None):
-        self.tasks = {}
+    def __init__(self, default_task: type[BaseDeletionTask[Any]] | None = None) -> None:
+        self.tasks: MutableMapping[type[Model], type[BaseDeletionTask[Any]]] = {}
         self.default_task = default_task
-        self.dependencies = defaultdict(set)
-        self.bulk_dependencies = defaultdict(set)
 
-    def exec_sync(self, instance):
+    def exec_sync(self, instance: Model) -> None:
         task = self.get(
             model=type(instance),
             query={"id": instance.id},
@@ -18,7 +20,7 @@ def exec_sync(self, instance):
         while task.chunk():
             pass
 
-    def exec_sync_many(self, instances):
+    def exec_sync_many(self, instances: list[Model]) -> None:
         if not instances:
             return
 
@@ -29,20 +31,18 @@ def exec_sync_many(self, instances):
         while task.chunk():
             pass
 
-    def get(self, task=None, **kwargs):
+    def get(
+        self,
+        task: type[BaseDeletionTask[Any]] | None = None,
+        **kwargs: Any,
+    ) -> BaseDeletionTask[Any]:
         if task is None:
             model = kwargs.get("model")
-            try:
-                task = self.tasks[model]
-            except KeyError:
-                task = self.default_task
+            assert model, "The model parameter is required if `task` is not provided"
+            task = self.tasks.get(model, self.default_task)
+        assert task is not None, "Task cannot be None"
+
         return task(manager=self, **kwargs)
 
-    def register(self, model, task):
+    def register(self, model: type[Model], task: type[BaseDeletionTask[Any]]) -> None:
         self.tasks[model] = task
-
-    def add_dependencies(self, model, dependencies):
-        self.dependencies[model] |= set(dependencies)
-
-    def add_bulk_dependencies(self, model, dependencies):
-        self.bulk_dependencies[model] |= set(dependencies)
diff --git a/src/sentry/deletions/tasks/hybrid_cloud.py b/src/sentry/deletions/tasks/hybrid_cloud.py
index 2746167293ac80..59e2eae95956d7 100644
--- a/src/sentry/deletions/tasks/hybrid_cloud.py
+++ b/src/sentry/deletions/tasks/hybrid_cloud.py
@@ -40,11 +40,11 @@ class WatermarkBatch:
     transaction_id: str
 
 
-def get_watermark_key(prefix: str, field: HybridCloudForeignKey) -> str:
+def get_watermark_key(prefix: str, field: HybridCloudForeignKey[Any, Any]) -> str:
     return f"{prefix}.{field.model._meta.db_table}.{field.name}"
 
 
-def get_watermark(prefix: str, field: HybridCloudForeignKey) -> tuple[int, str]:
+def get_watermark(prefix: str, field: HybridCloudForeignKey[Any, Any]) -> tuple[int, str]:
     with redis.clusters.get("default").get_local_client_for_key("deletions.watermark") as client:
         key = get_watermark_key(prefix, field)
         v = client.get(key)
@@ -59,7 +59,7 @@ def get_watermark(prefix: str, field: HybridCloudForeignKey) -> tuple[int, str]:
 
 
 def set_watermark(
-    prefix: str, field: HybridCloudForeignKey, value: int, prev_transaction_id: str
+    prefix: str, field: HybridCloudForeignKey[Any, Any], value: int, prev_transaction_id: str
 ) -> None:
     with redis.clusters.get("default").get_local_client_for_key("deletions.watermark") as client:
         client.set(
@@ -78,8 +78,8 @@ def set_watermark(
 
 def _chunk_watermark_batch(
     prefix: str,
-    field: HybridCloudForeignKey,
-    manager: BaseManager,
+    field: HybridCloudForeignKey[Any, Any],
+    manager: BaseManager[Any],
     *,
     batch_size: int,
     model: type[Model],
@@ -116,7 +116,7 @@ def _chunk_watermark_batch(
     acks_late=True,
     silo_mode=SiloMode.CONTROL,
 )
-def schedule_hybrid_cloud_foreign_key_jobs_control():
+def schedule_hybrid_cloud_foreign_key_jobs_control() -> None:
     if options.get("hybrid_cloud.disable_tombstone_cleanup"):
         return
 
@@ -131,7 +131,7 @@ def schedule_hybrid_cloud_foreign_key_jobs_control():
     acks_late=True,
     silo_mode=SiloMode.REGION,
 )
-def schedule_hybrid_cloud_foreign_key_jobs():
+def schedule_hybrid_cloud_foreign_key_jobs() -> None:
     if options.get("hybrid_cloud.disable_tombstone_cleanup"):
         return
 
@@ -258,7 +258,7 @@ def get_batch_size() -> int:
 
 
 def _process_tombstone_reconciliation(
-    field: HybridCloudForeignKey,
+    field: HybridCloudForeignKey[Any, Any],
     model: Any,
     tombstone_cls: type[TombstoneBase],
     row_after_tombstone: bool,
@@ -266,7 +266,7 @@ def _process_tombstone_reconciliation(
     from sentry import deletions
 
     prefix = "tombstone"
-    watermark_manager: BaseManager = tombstone_cls.objects
+    watermark_manager: BaseManager[Any] = tombstone_cls.objects
     if row_after_tombstone:
         prefix = "row"
         watermark_manager = field.model.objects
@@ -323,7 +323,7 @@ def _process_tombstone_reconciliation(
 def _get_model_ids_for_tombstone_cascade(
     tombstone_cls: type[TombstoneBase],
     model: type[Model],
-    field: HybridCloudForeignKey,
+    field: HybridCloudForeignKey[Any, Any],
     row_after_tombstone: bool,
     watermark_batch: WatermarkBatch,
 ) -> tuple[list[int], datetime.datetime]:
@@ -399,7 +399,7 @@ def _get_model_ids_for_tombstone_cascade(
 def get_ids_cross_db_for_row_watermark(
     tombstone_cls: type[TombstoneBase],
     model: type[Model],
-    field: HybridCloudForeignKey,
+    field: HybridCloudForeignKey[Any, Any],
     row_watermark_batch: WatermarkBatch,
 ) -> tuple[list[int], datetime.datetime]:
 
@@ -434,7 +434,7 @@ def get_ids_cross_db_for_row_watermark(
 def get_ids_cross_db_for_tombstone_watermark(
     tombstone_cls: type[TombstoneBase],
     model: type[Model],
-    field: HybridCloudForeignKey,
+    field: HybridCloudForeignKey[Any, Any],
     tombstone_watermark_batch: WatermarkBatch,
 ) -> tuple[list[int], datetime.datetime]:
     oldest_seen = timezone.now()
diff --git a/src/sentry/deletions/tasks/scheduled.py b/src/sentry/deletions/tasks/scheduled.py
index 72e615c5fbfc9b..e0ae8daa4f6f10 100644
--- a/src/sentry/deletions/tasks/scheduled.py
+++ b/src/sentry/deletions/tasks/scheduled.py
@@ -31,7 +31,7 @@
     acks_late=True,
     silo_mode=SiloMode.CONTROL,
 )
-def reattempt_deletions_control():
+def reattempt_deletions_control() -> None:
     _reattempt_deletions(ScheduledDeletion)
 
 
@@ -41,7 +41,7 @@ def reattempt_deletions_control():
     acks_late=True,
     silo_mode=SiloMode.REGION,
 )
-def reattempt_deletions():
+def reattempt_deletions() -> None:
     _reattempt_deletions(RegionScheduledDeletion)
 
 
@@ -101,7 +101,7 @@ def _run_scheduled_deletions(model_class: type[BaseScheduledDeletion], process_t
     silo_mode=SiloMode.CONTROL,
 )
 @retry(exclude=(DeleteAborted,))
-def run_deletion_control(deletion_id, first_pass=True, **kwargs: Any):
+def run_deletion_control(deletion_id: int, first_pass: bool = True, **kwargs: Any) -> None:
     _run_deletion(
         deletion_id=deletion_id,
         first_pass=first_pass,
@@ -119,7 +119,7 @@ def run_deletion_control(deletion_id, first_pass=True, **kwargs: Any):
     silo_mode=SiloMode.REGION,
 )
 @retry(exclude=(DeleteAborted,))
-def run_deletion(deletion_id, first_pass=True, **kwargs: Any):
+def run_deletion(deletion_id: int, first_pass: bool = True, **kwargs: Any) -> None:
     _run_deletion(
         deletion_id=deletion_id,
         first_pass=first_pass,
diff --git a/src/sentry/features/temporary.py b/src/sentry/features/temporary.py
index 81f3630f21ed07..aca40bc21abbea 100644
--- a/src/sentry/features/temporary.py
+++ b/src/sentry/features/temporary.py
@@ -190,6 +190,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:metric-alert-threshold-period", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enables the search bar for metrics samples list
     manager.add("organizations:metrics-samples-list-search", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Migrate Orgs to new Azure DevOps Integration
+    manager.add("organizations:migrate-azure-devops-integration", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable Session Stats down to a minute resolution
     manager.add("organizations:minute-resolution-sessions", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, default=True, api_expose=True)
     # Display CPU and memory metrics in transactions with profiles
diff --git a/src/sentry/identity/__init__.py b/src/sentry/identity/__init__.py
index 6a25c58b8b84c9..80c6b7e2a30c98 100644
--- a/src/sentry/identity/__init__.py
+++ b/src/sentry/identity/__init__.py
@@ -9,7 +9,7 @@
 from .oauth2 import *  # NOQA
 from .slack import *  # NOQA
 from .vercel import *  # NOQA
-from .vsts import VSTSIdentityProvider
+from .vsts import VSTSIdentityProvider, VSTSNewIdentityProvider
 from .vsts_extension import *  # NOQA
 
 default_manager = IdentityManager()
@@ -25,6 +25,7 @@
 register(SlackIdentityProvider)  # NOQA
 register(GitHubIdentityProvider)  # NOQA
 register(GitHubEnterpriseIdentityProvider)  # NOQA
+register(VSTSNewIdentityProvider)  # NOQA
 register(VSTSIdentityProvider)  # NOQA
 register(VstsExtensionIdentityProvider)  # NOQA
 register(VercelIdentityProvider)  # NOQA
diff --git a/src/sentry/identity/pipeline.py b/src/sentry/identity/pipeline.py
index 1e4f8f3b21f5cb..c4c577ed32295b 100644
--- a/src/sentry/identity/pipeline.py
+++ b/src/sentry/identity/pipeline.py
@@ -5,7 +5,10 @@
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-from sentry.pipeline import Pipeline
+from sentry import features
+from sentry.models.organization import Organization
+from sentry.organizations.services.organization.model import RpcOrganization
+from sentry.pipeline import Pipeline, PipelineProvider
 from sentry.users.models.identity import Identity, IdentityProvider
 from sentry.utils import metrics
 
@@ -35,6 +38,17 @@ def redirect_url(self):
         # Use configured redirect_url if specified for the pipeline if available
         return self.config.get("redirect_url", associate_url)
 
+    # TODO(iamrajjoshi): Delete this after Azure DevOps migration is complete
+    def get_provider(self, provider_key: str, **kwargs) -> PipelineProvider:
+        if kwargs.get("organization"):
+            organization: Organization | RpcOrganization = kwargs["organization"]
+        if provider_key == "vsts" and features.has(
+            "organizations:migrate-azure-devops-integration", organization
+        ):
+            provider_key = "vsts_new"
+
+        return super().get_provider(provider_key)
+
     def finish_pipeline(self):
         # NOTE: only reached in the case of linking a new identity
         # via Social Auth pipelines
diff --git a/src/sentry/identity/vsts/provider.py b/src/sentry/identity/vsts/provider.py
index cb483f446abde4..bc17268b06d4a1 100644
--- a/src/sentry/identity/vsts/provider.py
+++ b/src/sentry/identity/vsts/provider.py
@@ -135,3 +135,115 @@ def exchange_token(self, request: Request, pipeline, code):
         if req.headers["Content-Type"].startswith("application/x-www-form-urlencoded"):
             return dict(parse_qsl(body))
         return orjson.loads(body)
+
+
+# TODO(iamrajjoshi): Make this the default provider
+# We created this new flow in order to quickly update the DevOps integration to use
+# the new Azure AD OAuth2 flow.
+# This is a temporary solution until we can fully migrate to the new flow once customers are migrated
+class VSTSNewIdentityProvider(OAuth2Provider):
+    key = "vsts_new"
+    name = "Azure DevOps"
+
+    oauth_access_token_url = "https://login.microsoftonline.com/common/oauth2/v2.0/token"
+    oauth_authorize_url = "https://login.microsoftonline.com/common/oauth2/v2.0/authorize"
+
+    # Using a new option
+    def get_oauth_client_id(self):
+        return options.get("vsts_new.client-id")
+
+    def get_oauth_client_secret(self):
+        return options.get("vsts_new.client-secret")
+
+    def get_refresh_token_url(self):
+        return self.oauth_access_token_url
+
+    def get_pipeline_views(self):
+        return [
+            # made a new view to override `get_authorize_params` for the new params needed for the oauth
+            VSTSOAuth2LoginView(
+                authorize_url=self.oauth_authorize_url,
+                client_id=self.get_oauth_client_id(),
+                scope=" ".join(self.get_oauth_scopes()),
+            ),
+            VSTSNewOAuth2CallbackView(
+                access_token_url=self.oauth_access_token_url,
+                client_id=self.get_oauth_client_id(),
+                client_secret=self.get_oauth_client_secret(),
+            ),
+        ]
+
+    def get_refresh_token_headers(self):
+        return {"Content-Type": "application/x-www-form-urlencoded", "Content-Length": "1654"}
+
+    def get_refresh_token_params(self, refresh_token, *args, **kwargs):
+        # TODO(iamrajjoshi): Fix vsts-limited here
+        # Note: ignoring the below from the original provider
+        # # If "vso.code" is missing from the identity.scopes, we know that we installed
+        # using the "vsts-limited.client-secret" and therefore should use that to refresh
+        # the token.
+
+        oauth_redirect_url = kwargs.get("redirect_url")
+        if oauth_redirect_url is None:
+            raise ValueError("VSTS requires oauth redirect url when refreshing identity")
+
+        return {
+            "grant_type": "refresh_token",
+            "client_id": self.get_oauth_client_id(),
+            "client_secret": self.get_oauth_client_secret(),
+            "refresh_token": refresh_token,
+        }
+
+    def build_identity(self, data):
+        data = data["data"]
+        access_token = data.get("access_token")
+        if not access_token:
+            raise PermissionDenied()
+        user = get_user_info(access_token)
+
+        return {
+            "type": "vsts",
+            "id": user["id"],
+            "email": user["emailAddress"],
+            "email_verified": True,
+            "name": user["displayName"],
+            "scopes": sorted(self.oauth_scopes),
+            "data": self.get_oauth_data(data),
+        }
+
+
+class VSTSOAuth2LoginView(OAuth2LoginView):
+    def get_authorize_params(self, state, redirect_uri):
+        return {
+            "client_id": self.client_id,
+            "response_type": "code",
+            "redirect_uri": redirect_uri,
+            "response_mode": "query",
+            "scope": self.get_scope(),
+            "state": state,
+            "prompt": "consent",
+        }
+
+
+class VSTSNewOAuth2CallbackView(OAuth2CallbackView):
+    def exchange_token(self, request: Request, pipeline, code):
+        from urllib.parse import parse_qsl
+
+        from sentry.http import safe_urlopen, safe_urlread
+        from sentry.utils.http import absolute_uri
+
+        req = safe_urlopen(
+            url=self.access_token_url,
+            headers={"Content-Type": "application/x-www-form-urlencoded", "Content-Length": "1322"},
+            data={
+                "grant_type": "authorization_code",
+                "client_id": self.client_id,
+                "client_secret": self.client_secret,
+                "code": code,
+                "redirect_uri": absolute_uri(pipeline.redirect_url()),
+            },
+        )
+        body = safe_urlread(req)
+        if req.headers["Content-Type"].startswith("application/x-www-form-urlencoded"):
+            return dict(parse_qsl(body))
+        return orjson.loads(body)
diff --git a/src/sentry/integrations/github_enterprise/webhook.py b/src/sentry/integrations/github_enterprise/webhook.py
index d90b113a6e820d..33b700d0aadad1 100644
--- a/src/sentry/integrations/github_enterprise/webhook.py
+++ b/src/sentry/integrations/github_enterprise/webhook.py
@@ -173,7 +173,7 @@ def handle(self, request: HttpRequest) -> HttpResponse:
             sentry_sdk.capture_exception(e)
             return HttpResponse(MISSING_GITHUB_ENTERPRISE_HOST_ERROR, status=400)
 
-        extra = {"host": host}
+        extra: dict[str, str | None] = {"host": host}
         # If we do tag the host early we can't even investigate
         scope.set_tag("host", host)
 
@@ -282,7 +282,12 @@ def handle(self, request: HttpRequest) -> HttpResponse:
             else:
                 # the host is allowed to skip signature verification
                 # log it, and continue on.
+                extra["github_enterprise_version"] = request.headers.get(
+                    "x-github-enterprise-version"
+                )
+                extra["ip_address"] = request.headers.get("x-real-ip")
                 logger.info("github_enterprise.webhook.allowed-missing-signature", extra=extra)
+                sentry_sdk.capture_message("Allowed missing signature")
 
         except (MalformedSignatureError, IndexError) as e:
             logger.warning("github_enterprise.webhook.malformed-signature", extra=extra)
diff --git a/src/sentry/integrations/vercel/integration.py b/src/sentry/integrations/vercel/integration.py
index b0ef97aaabf0c1..4e3549b9b342a9 100644
--- a/src/sentry/integrations/vercel/integration.py
+++ b/src/sentry/integrations/vercel/integration.py
@@ -19,14 +19,14 @@
 )
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.services.integration import integration_service
-from sentry.models.integrations.sentry_app_installation_for_provider import (
-    SentryAppInstallationForProvider,
-)
 from sentry.organizations.services.organization import RpcOrganizationSummary
 from sentry.pipeline import NestedPipelineView
 from sentry.projects.services.project_key import project_key_service
 from sentry.sentry_apps.logic import SentryAppCreator
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
+from sentry.sentry_apps.models.sentry_app_installation_for_provider import (
+    SentryAppInstallationForProvider,
+)
 from sentry.sentry_apps.models.sentry_app_installation_token import SentryAppInstallationToken
 from sentry.shared_integrations.exceptions import ApiError, IntegrationError
 from sentry.users.models.user import User
diff --git a/src/sentry/integrations/vercel/webhook.py b/src/sentry/integrations/vercel/webhook.py
index 7813b1ce9b2a23..af9db32bcce275 100644
--- a/src/sentry/integrations/vercel/webhook.py
+++ b/src/sentry/integrations/vercel/webhook.py
@@ -19,11 +19,11 @@
 from sentry.hybridcloud.services.organization_mapping import organization_mapping_service
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
-from sentry.models.integrations.sentry_app_installation_for_provider import (
-    SentryAppInstallationForProvider,
-)
 from sentry.models.project import Project
 from sentry.projects.services.project import project_service
+from sentry.sentry_apps.models.sentry_app_installation_for_provider import (
+    SentryAppInstallationForProvider,
+)
 from sentry.sentry_apps.models.sentry_app_installation_token import SentryAppInstallationToken
 from sentry.shared_integrations.exceptions import IntegrationError
 from sentry.utils.audit import create_audit_entry
diff --git a/src/sentry/integrations/vsts/client.py b/src/sentry/integrations/vsts/client.py
index 6d419aaa0e15e0..7bab65d8fda586 100644
--- a/src/sentry/integrations/vsts/client.py
+++ b/src/sentry/integrations/vsts/client.py
@@ -11,6 +11,7 @@
 from sentry.exceptions import InvalidIdentity
 from sentry.integrations.base import IntegrationFeatureNotImplementedError
 from sentry.integrations.client import ApiClient
+from sentry.integrations.services.integration.service import integration_service
 from sentry.integrations.source_code_management.repository import RepositoryClient
 from sentry.models.repository import Repository
 from sentry.shared_integrations.client.base import BaseApiResponseX
@@ -158,6 +159,7 @@ def request(
 class VstsApiClient(IntegrationProxyClient, VstsApiMixin, RepositoryClient):
     integration_name = "vsts"
     _identity: Identity | None = None
+    INVALID_CLIENT_ERROR = "invalid_client"
 
     def __init__(
         self,
@@ -199,9 +201,24 @@ def _refresh_auth_if_expired(self):
         if time_expires is None:
             raise InvalidIdentity("VstsApiClient requires identity with specified expired time")
         if int(time_expires) <= int(time()):
-            self.identity.get_provider().refresh_identity(
-                self.identity, redirect_url=self.oauth_redirect_url
+            # TODO(iamrajjoshi): Remove this after migration
+            # Need this here because there is no way to get any identifier which would tell us which method we should use to refresh the token
+            from sentry.identity.vsts.provider import VSTSNewIdentityProvider
+            from sentry.integrations.vsts.integration import VstsIntegrationProvider
+
+            integration = integration_service.get_integration(
+                organization_integration_id=self.org_integration_id
             )
+            # check if integration has migrated to new identity provider
+            migration_version = integration.metadata.get("integration_migration_version", 0)
+            if migration_version < VstsIntegrationProvider.CURRENT_MIGRATION_VERSION:
+                self.identity.get_provider().refresh_identity(
+                    self.identity, redirect_url=self.oauth_redirect_url
+                )
+            else:
+                VSTSNewIdentityProvider().refresh_identity(
+                    self.identity, redirect_url=self.oauth_redirect_url
+                )
 
     @control_silo_function
     def authorize_request(
diff --git a/src/sentry/integrations/vsts/integration.py b/src/sentry/integrations/vsts/integration.py
index adcec1cecb9750..831f39458bf648 100644
--- a/src/sentry/integrations/vsts/integration.py
+++ b/src/sentry/integrations/vsts/integration.py
@@ -385,6 +385,8 @@ class VstsIntegrationProvider(IntegrationProvider):
     oauth_redirect_url = "/extensions/vsts/setup/"
     needs_default_identity = True
     integration_cls = VstsIntegration
+    CURRENT_MIGRATION_VERSION = 1
+    NEW_SCOPES = ("offline_access", "499b84ac-1321-427f-aa17-267ca6975798/.default")
 
     features = frozenset(
         [
@@ -422,6 +424,13 @@ def post_install(
             )
 
     def get_scopes(self) -> Sequence[str]:
+        # TODO(iamrajjoshi): Delete this after Azure DevOps migration is complete
+        if features.has(
+            "organizations:migrate-azure-devops-integration", self.pipeline.organization
+        ):
+            # This is the new way we need to pass scopes to the OAuth flow
+            # https://stackoverflow.com/questions/75729931/get-access-token-for-azure-devops-pat
+            return VstsIntegrationProvider.NEW_SCOPES
         return ("vso.code", "vso.graph", "vso.serviceendpoint_manage", "vso.work_write")
 
     def get_pipeline_views(self) -> Sequence[PipelineView]:
@@ -459,12 +468,50 @@ def build_integration(self, state: Mapping[str, Any]) -> Mapping[str, Any]:
             },
         }
 
+        # TODO(iamrajjoshi): Clean this up this after Azure DevOps migration is complete
         try:
             integration_model = IntegrationModel.objects.get(
                 provider="vsts", external_id=account["accountId"], status=ObjectStatus.ACTIVE
             )
-            # preserve previously created subscription information
-            integration["metadata"]["subscription"] = integration_model.metadata["subscription"]
+
+            # Get Integration Metadata
+            integration_migration_version = integration_model.metadata.get(
+                "integration_migration_version", 0
+            )
+
+            if (
+                features.has(
+                    "organizations:migrate-azure-devops-integration", self.pipeline.organization
+                )
+                and integration_migration_version
+                < VstsIntegrationProvider.CURRENT_MIGRATION_VERSION
+            ):
+                subscription_id, subscription_secret = self.create_subscription(
+                    base_url=base_url, oauth_data=oauth_data
+                )
+                integration["metadata"]["subscription"] = {
+                    "id": subscription_id,
+                    "secret": subscription_secret,
+                }
+
+                integration["metadata"][
+                    "integration_migration_version"
+                ] = VstsIntegrationProvider.CURRENT_MIGRATION_VERSION
+
+                logger.info(
+                    "vsts.build_integration.migrated",
+                    extra={
+                        "organization_id": self.pipeline.organization.id,
+                        "user_id": user["id"],
+                        "account": account,
+                        "migration_version": VstsIntegrationProvider.CURRENT_MIGRATION_VERSION,
+                        "subscription_id": subscription_id,
+                        "integration_id": integration_model.id,
+                    },
+                )
+            else:
+                # preserve previously created subscription information
+                integration["metadata"]["subscription"] = integration_model.metadata["subscription"]
 
             logger.info(
                 "vsts.build_integration",
diff --git a/src/sentry/migrations/0001_squashed_0484_break_org_member_user_fk.py b/src/sentry/migrations/0001_squashed_0484_break_org_member_user_fk.py
index a0e34f1cc57827..76ce0088bbaedf 100644
--- a/src/sentry/migrations/0001_squashed_0484_break_org_member_user_fk.py
+++ b/src/sentry/migrations/0001_squashed_0484_break_org_member_user_fk.py
@@ -32,9 +32,9 @@
 import sentry.models.broadcast
 import sentry.models.groupshare
 import sentry.models.scheduledeletion
-import sentry.models.servicehook
 import sentry.sentry_apps.models.sentry_app
 import sentry.sentry_apps.models.sentry_app_installation
+import sentry.sentry_apps.models.servicehook
 import sentry.users.models.authenticator
 import sentry.users.models.user
 import sentry.utils.security.hash
@@ -2029,7 +2029,10 @@ class Migration(CheckedMigration):
                     ),
                 ),
                 ("url", models.URLField(max_length=512)),
-                ("secret", models.TextField(default=sentry.models.servicehook.generate_secret)),
+                (
+                    "secret",
+                    models.TextField(default=sentry.sentry_apps.models.servicehook.generate_secret),
+                ),
                 ("events", sentry.db.models.fields.array.ArrayField(null=True)),
                 (
                     "status",
diff --git a/src/sentry/migrations/0764_migrate_bad_status_substatus_rows.py b/src/sentry/migrations/0764_migrate_bad_status_substatus_rows.py
new file mode 100644
index 00000000000000..3c9dac93b025c2
--- /dev/null
+++ b/src/sentry/migrations/0764_migrate_bad_status_substatus_rows.py
@@ -0,0 +1,170 @@
+# Generated by Django 5.1.1 on 2024-09-17 21:16
+
+from datetime import timedelta
+
+from django.apps.registry import Apps
+from django.db import migrations
+from django.db.backends.base.schema import BaseDatabaseSchemaEditor
+from django.utils import timezone
+
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.utils.query import RangeQuerySetWrapperWithProgressBarApprox
+
+
+class ActivityType:
+    SET_IGNORED = 3
+
+
+class GroupHistoryStatus:
+    REGRESSED = 7
+    ARCHIVED_UNTIL_ESCALATING = 15
+    ARCHIVED_FOREVER = 16
+    ARCHIVED_UNTIL_CONDITION_MET = 17
+
+
+class GroupSubStatus:
+    # GroupStatus.IGNORED
+    UNTIL_ESCALATING = 1
+    # Group is ignored/archived for a count/user count/duration
+    UNTIL_CONDITION_MET = 4
+    # Group is ignored/archived forever
+    FOREVER = 5
+
+    # GroupStatus.UNRESOLVED
+    ESCALATING = 2
+    ONGOING = 3
+    REGRESSED = 6
+    NEW = 7
+
+
+class GroupStatus:
+    UNRESOLVED = 0
+    RESOLVED = 1
+    IGNORED = 2
+    PENDING_DELETION = 3
+    DELETION_IN_PROGRESS = 4
+    PENDING_MERGE = 5
+
+    # The group's events are being re-processed and after that the group will
+    # be deleted. In this state no new events shall be added to the group.
+    REPROCESSING = 6
+
+    # TODO(dcramer): remove in 9.0
+    MUTED = IGNORED
+
+
+UNRESOLVED_SUBSTATUS_CHOICES = {
+    GroupSubStatus.ONGOING,
+    GroupSubStatus.ESCALATING,
+    GroupSubStatus.REGRESSED,
+    GroupSubStatus.NEW,
+}
+
+IGNORED_SUBSTATUS_CHOICES = {
+    GroupSubStatus.UNTIL_ESCALATING,
+    GroupSubStatus.FOREVER,
+    GroupSubStatus.UNTIL_CONDITION_MET,
+}
+
+# End copy
+
+ACTIVITY_DATA_FIELDS = {
+    "ignoreCount",
+    "ignoreDuration",
+    "ignoreUntil",
+    "ignoreUserCount",
+    "ignoreUserWindow",
+    "ignoreWindow",
+}
+
+
+def fix_substatus_for_groups(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None:
+    Group = apps.get_model("sentry", "Group")
+    Activity = apps.get_model("sentry", "Activity")
+    GroupSnooze = apps.get_model("sentry", "GroupSnooze")
+    GroupHistory = apps.get_model("sentry", "GroupHistory")
+
+    seven_days_ago = timezone.now() - timedelta(days=7)
+    group_history = GroupHistory.objects.filter(
+        date_added__gt=seven_days_ago, status=GroupHistoryStatus.REGRESSED
+    )
+    activity = Activity.objects.filter(type=ActivityType.SET_IGNORED)
+    for group in RangeQuerySetWrapperWithProgressBarApprox(Group.objects.all()):
+        if (
+            group.status not in [GroupStatus.UNRESOLVED, GroupStatus.IGNORED]
+            and group.substatus is None
+        ):
+            # These groups are correct
+            continue
+
+        new_substatus = None
+
+        if group.status == GroupStatus.IGNORED:
+            if group.substatus in IGNORED_SUBSTATUS_CHOICES:
+                # These groups are correct
+                continue
+
+            group_activity = activity.filter(group_id=group.id).order_by("-datetime").first()
+            if group_activity:
+                # If ignoreUntilEscalating is set, we should set the substatus to UNTIL_ESCALATING
+                if group_activity.data.get("ignoreUntilEscalating", False):
+                    new_substatus = GroupSubStatus.UNTIL_ESCALATING
+                # If any other field in the activity data is set, we should set the substatus to UNTIL_CONDITION_MET
+                elif any(group_activity.data.get(field) for field in ACTIVITY_DATA_FIELDS):
+                    new_substatus = GroupSubStatus.UNTIL_CONDITION_MET
+
+            # If no activity is found or the activity data is not set, check the group snooze table
+            if not new_substatus:
+                snooze = GroupSnooze.objects.filter(group=group)
+                if snooze.exists():
+                    # If snooze exists, we should set the substatus to UNTIL_CONDITION_MET
+                    new_substatus = GroupSubStatus.UNTIL_CONDITION_MET
+                else:
+                    # If we have no other information stored about the group's status conditions, the group is ignored forever
+                    new_substatus = GroupSubStatus.FOREVER
+
+        elif group.status == GroupStatus.UNRESOLVED:
+            if group.substatus in UNRESOLVED_SUBSTATUS_CHOICES:
+                # These groups are correct
+                continue
+
+            if group.first_seen > seven_days_ago:
+                new_substatus = GroupSubStatus.NEW
+            else:
+                histories = group_history.filter(group=group)
+                if histories.exists():
+                    new_substatus = GroupSubStatus.REGRESSED
+
+            if new_substatus is None:
+                new_substatus = GroupSubStatus.ONGOING
+
+        group.substatus = new_substatus
+        group.save(update_fields=["substatus"])
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = True
+
+    dependencies = [
+        ("sentry", "0763_add_created_by_to_broadcasts"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            fix_substatus_for_groups,
+            migrations.RunPython.noop,
+            hints={"tables": ["sentry_groupedmessage", "sentry_grouphistory"]},
+        ),
+    ]
diff --git a/src/sentry/models/__init__.py b/src/sentry/models/__init__.py
index 95861aa372fbf4..f300d344c9a829 100644
--- a/src/sentry/models/__init__.py
+++ b/src/sentry/models/__init__.py
@@ -107,7 +107,6 @@
 from .scheduledeletion import *  # NOQA
 from .search_common import *  # NOQA
 from .sentryshot import *  # NOQA
-from .servicehook import *  # NOQA
 from .sourcemapprocessingissue import *  # NOQA
 from .statistical_detectors import *  # NOQA
 from .team import *  # NOQA
diff --git a/src/sentry/models/authprovider.py b/src/sentry/models/authprovider.py
index 1e6c5ea4a5281d..3ba7be6bfa5f22 100644
--- a/src/sentry/models/authprovider.py
+++ b/src/sentry/models/authprovider.py
@@ -122,11 +122,11 @@ def get_scim_token(self):
         return get_scim_token(self.flags.scim_enabled, self.organization_id, self.provider)
 
     def enable_scim(self, user):
-        from sentry.models.integrations.sentry_app_installation_for_provider import (
-            SentryAppInstallationForProvider,
-        )
         from sentry.sentry_apps.logic import SentryAppCreator
         from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
+        from sentry.sentry_apps.models.sentry_app_installation_for_provider import (
+            SentryAppInstallationForProvider,
+        )
 
         if (
             not self.get_provider().can_use_scim(self.organization_id, user)
@@ -186,7 +186,7 @@ def outboxes_for_reset_idp_flags(self) -> list[ControlOutbox]:
 
     def disable_scim(self):
         from sentry import deletions
-        from sentry.models.integrations.sentry_app_installation_for_provider import (
+        from sentry.sentry_apps.models.sentry_app_installation_for_provider import (
             SentryAppInstallationForProvider,
         )
 
diff --git a/src/sentry/models/integrations/__init__.py b/src/sentry/models/integrations/__init__.py
index 3d7cd36200965e..c56c940a443d8a 100644
--- a/src/sentry/models/integrations/__init__.py
+++ b/src/sentry/models/integrations/__init__.py
@@ -1,12 +1,6 @@
-__all__ = (
-    "SentryApp",
-    "SentryAppInstallationForProvider",
-)
+__all__ = ("SentryApp",)
 
 
 # REQUIRED for migrations to run.
 from sentry.integrations.types import ExternalProviders  # NOQA
-from sentry.models.integrations.sentry_app_installation_for_provider import (
-    SentryAppInstallationForProvider,
-)
 from sentry.sentry_apps.models.sentry_app import SentryApp
diff --git a/src/sentry/models/project.py b/src/sentry/models/project.py
index 62a08ad6fcdb68..6a1a43cd28046e 100644
--- a/src/sentry/models/project.py
+++ b/src/sentry/models/project.py
@@ -65,6 +65,8 @@
     "apple-macos",
     "bun",
     "capacitor",
+    "cloudflare-pages",
+    "cloudflare-workers",
     "cordova",
     "dart",
     "deno",
@@ -99,7 +101,6 @@
     "javascript",
     "javascript-angular",
     "javascript-astro",
-    "javascript-cloudflare",
     "javascript-ember",
     "javascript-gatsby",
     "javascript-nextjs",
diff --git a/src/sentry/models/scheduledeletion.py b/src/sentry/models/scheduledeletion.py
index 021d2e65514690..60411b4a4e1dc5 100644
--- a/src/sentry/models/scheduledeletion.py
+++ b/src/sentry/models/scheduledeletion.py
@@ -121,9 +121,13 @@ def get_model(self):
 
     def get_instance(self):
         from sentry import deletions
+        from sentry.deletions.base import ModelDeletionTask
 
         model = self.get_model()
-        query_manager = getattr(model, deletions.get(model=model, query=None).manager_name)
+        deletion_task = deletions.get(model=model, query=None)
+        query_manager = model.objects
+        if isinstance(deletion_task, ModelDeletionTask):
+            query_manager = getattr(model, deletion_task.manager_name)
         return query_manager.get(pk=self.object_id)
 
     def get_actor(self) -> RpcUser | None:
diff --git a/src/sentry/options/defaults.py b/src/sentry/options/defaults.py
index 03ec73e690e70f..0df79019e0ee9a 100644
--- a/src/sentry/options/defaults.py
+++ b/src/sentry/options/defaults.py
@@ -572,6 +572,11 @@
 # VSTS Integration
 register("vsts.client-id", flags=FLAG_PRIORITIZE_DISK | FLAG_AUTOMATOR_MODIFIABLE)
 register("vsts.client-secret", flags=FLAG_CREDENTIAL | FLAG_PRIORITIZE_DISK)
+
+# New VSTS Integration
+register("vsts_new.client-id", flags=FLAG_PRIORITIZE_DISK | FLAG_AUTOMATOR_MODIFIABLE)
+register("vsts_new.client-secret", flags=FLAG_CREDENTIAL | FLAG_PRIORITIZE_DISK)
+
 # VSTS Integration - with limited scopes
 register("vsts-limited.client-id", flags=FLAG_PRIORITIZE_DISK | FLAG_AUTOMATOR_MODIFIABLE)
 register("vsts-limited.client-secret", flags=FLAG_CREDENTIAL | FLAG_PRIORITIZE_DISK)
@@ -2729,3 +2734,10 @@
     default=[],
     flags=FLAG_ALLOW_EMPTY | FLAG_AUTOMATOR_MODIFIABLE,
 )
+
+register(
+    "releases.no_snuba_for_release_creation",
+    type=Bool,
+    default=False,
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)
diff --git a/src/sentry/pipeline/base.py b/src/sentry/pipeline/base.py
index 8bcfbc26944731..e7b2f5e3040c46 100644
--- a/src/sentry/pipeline/base.py
+++ b/src/sentry/pipeline/base.py
@@ -95,7 +95,7 @@ def unpack_state(cls, request: HttpRequest) -> PipelineRequestState | None:
 
         return PipelineRequestState(state, provider_model, organization, provider_key)
 
-    def get_provider(self, provider_key: str) -> PipelineProvider:
+    def get_provider(self, provider_key: str, **kwargs) -> PipelineProvider:
         provider: PipelineProvider = self.provider_manager.get(provider_key)
         return provider
 
@@ -118,7 +118,7 @@ def __init__(
         )
         self.state = self.session_store_cls(request, self.pipeline_name, ttl=PIPELINE_STATE_TTL)
         self.provider_model = provider_model
-        self.provider = self.get_provider(provider_key)
+        self.provider = self.get_provider(provider_key, organization=organization)
 
         self.config = config or {}
         self.provider.set_pipeline(self)
diff --git a/src/sentry/receivers/outbox/control.py b/src/sentry/receivers/outbox/control.py
index 891acfc3b0a44c..46931fe263dbc5 100644
--- a/src/sentry/receivers/outbox/control.py
+++ b/src/sentry/receivers/outbox/control.py
@@ -9,7 +9,6 @@
 from __future__ import annotations
 
 import logging
-from collections import defaultdict
 from collections.abc import Mapping
 from typing import Any
 
@@ -17,18 +16,15 @@
 
 from sentry.hybridcloud.outbox.category import OutboxCategory
 from sentry.hybridcloud.outbox.signals import process_control_outbox
-from sentry.hybridcloud.rpc.caching import region_caching_service
 from sentry.integrations.models.integration import Integration
 from sentry.issues.services.issue import issue_service
 from sentry.models.apiapplication import ApiApplication
 from sentry.models.files.utils import get_relocation_storage
-from sentry.models.organizationmapping import OrganizationMapping
 from sentry.organizations.services.organization import RpcOrganizationSignal, organization_service
 from sentry.receivers.outbox import maybe_process_tombstone
 from sentry.relocation.services.relocation_export.service import region_relocation_export_service
 from sentry.sentry_apps.models.sentry_app import SentryApp
-from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
-from sentry.sentry_apps.services.app.service import get_by_application_id, get_installation
+from sentry.tasks.sentry_apps import clear_region_cache
 
 logger = logging.getLogger(__name__)
 
@@ -54,32 +50,9 @@ def process_sentry_app_updates(object_identifier: int, region_name: str, **kwds:
     ) is None:
         return
 
-    # When a sentry app's definition changes purge cache for all the installations.
-    # This could get slow for large applications, but generally big applications don't change often.
-    install_query = SentryAppInstallation.objects.filter(sentry_app=sentry_app).values(
-        "id", "organization_id"
-    )
-    # There isn't a constraint on org : sentryapp so we have to handle lists
-    install_map: dict[int, list[int]] = defaultdict(list)
-    for install_row in install_query:
-        install_map[install_row["organization_id"]].append(install_row["id"])
-
-    # Clear application_id cache
-    region_caching_service.clear_key(
-        key=get_by_application_id.key_from(sentry_app.application_id), region_name=region_name
-    )
-
-    # Limit our operations to the region this outbox is for.
-    # This could be a single query if we use raw_sql.
-    region_query = OrganizationMapping.objects.filter(
-        organization_id__in=list(install_map.keys()), region_name=region_name
-    ).values("organization_id")
-    for region_row in region_query:
-        installs = install_map[region_row["organization_id"]]
-        for install_id in installs:
-            region_caching_service.clear_key(
-                key=get_installation.key_from(install_id), region_name=region_name
-            )
+    # Spawn a task to clear caches, as there can be 1000+ installations
+    # for a sentry app.
+    clear_region_cache.delay(sentry_app_id=sentry_app.id, region_name=region_name)
 
 
 @receiver(process_control_outbox, sender=OutboxCategory.API_APPLICATION_UPDATE)
@@ -167,10 +140,6 @@ def process_relocation_reply_with_export(payload: Mapping[str, Any], **kwds):
     except Exception:
         raise FileNotFoundError("Could not open SaaS -> SaaS export in proxy relocation bucket.")
 
-    # TODO(mark) remove this after the stuck outbox is cleared
-    if slug == "test-reloc-ct":
-        return
-
     with encrypted_bytes:
         region_relocation_export_service.reply_with_export(
             relocation_uuid=payload["relocation_uuid"],
diff --git a/src/sentry/replays/consumers/recording_buffered.py b/src/sentry/replays/consumers/recording_buffered.py
index 2d04e75629762a..05021dbe51f73b 100644
--- a/src/sentry/replays/consumers/recording_buffered.py
+++ b/src/sentry/replays/consumers/recording_buffered.py
@@ -56,6 +56,7 @@
 from sentry_kafka_schemas.schema_types.ingest_replay_recordings_v1 import ReplayRecording
 
 from sentry.conf.types.kafka_definition import Topic, get_topic_codec
+from sentry.models.project import Project
 from sentry.replays.lib.storage import (
     RecordingSegmentStorageMeta,
     make_recording_filename,
@@ -318,8 +319,9 @@ def process_message(buffer: RecordingBuffer, message: bytes) -> None:
                 else None
             )
 
+        project = Project.objects.get_from_cache(id=decoded_message["project_id"])
         replay_actions = parse_replay_actions(
-            decoded_message["project_id"],
+            project,
             decoded_message["replay_id"],
             decoded_message["retention_days"],
             parsed_recording_data,
diff --git a/src/sentry/replays/scripts/delete_replays.py b/src/sentry/replays/scripts/delete_replays.py
index 773b6d733cefc5..0926480409e2cd 100644
--- a/src/sentry/replays/scripts/delete_replays.py
+++ b/src/sentry/replays/scripts/delete_replays.py
@@ -3,7 +3,7 @@
 import contextlib
 import logging
 from collections.abc import Sequence
-from datetime import datetime
+from datetime import datetime, timezone
 
 from sentry.api.event_search import SearchFilter, parse_search_query
 from sentry.models.organization import Organization
@@ -28,6 +28,9 @@ def delete_replays(
     search_filters = translate_cli_tags_param_to_snuba_tag_param(tags)
     offset = 0
 
+    start_utc = start_utc.replace(tzinfo=timezone.utc)
+    end_utc = end_utc.replace(tzinfo=timezone.utc)
+
     has_more = True
     while has_more:
         response = query_replays_collection_paginated(
diff --git a/src/sentry/replays/usecases/ingest/__init__.py b/src/sentry/replays/usecases/ingest/__init__.py
index 80beeade6d0bba..137e832b4df851 100644
--- a/src/sentry/replays/usecases/ingest/__init__.py
+++ b/src/sentry/replays/usecases/ingest/__init__.py
@@ -262,9 +262,10 @@ def recording_post_processor(
             op="replays.usecases.ingest.parse_and_emit_replay_actions",
             description="parse_and_emit_replay_actions",
         ):
+            project = Project.objects.get_from_cache(id=message.project_id)
             parse_and_emit_replay_actions(
                 retention_days=message.retention_days,
-                project_id=message.project_id,
+                project=project,
                 replay_id=message.replay_id,
                 segment_data=parsed_segment_data,
                 replay_event=parsed_replay_event,
diff --git a/src/sentry/replays/usecases/ingest/dom_index.py b/src/sentry/replays/usecases/ingest/dom_index.py
index aa915d30591109..e211891d9c1792 100644
--- a/src/sentry/replays/usecases/ingest/dom_index.py
+++ b/src/sentry/replays/usecases/ingest/dom_index.py
@@ -62,7 +62,7 @@ class ReplayActionsEvent(TypedDict):
 
 
 def parse_and_emit_replay_actions(
-    project_id: int,
+    project: Project,
     replay_id: str,
     retention_days: int,
     segment_data: list[dict[str, Any]],
@@ -70,7 +70,7 @@ def parse_and_emit_replay_actions(
 ) -> None:
     with metrics.timer("replays.usecases.ingest.dom_index.parse_and_emit_replay_actions"):
         message = parse_replay_actions(
-            project_id, replay_id, retention_days, segment_data, replay_event
+            project, replay_id, retention_days, segment_data, replay_event
         )
         if message is not None:
             emit_replay_actions(message)
@@ -82,19 +82,19 @@ def emit_replay_actions(action: ReplayActionsEvent) -> None:
 
 
 def parse_replay_actions(
-    project_id: int,
+    project: Project,
     replay_id: str,
     retention_days: int,
     segment_data: list[dict[str, Any]],
     replay_event: dict[str, Any] | None,
 ) -> ReplayActionsEvent | None:
     """Parse RRWeb payload to ReplayActionsEvent."""
-    actions = get_user_actions(project_id, replay_id, segment_data, replay_event)
+    actions = get_user_actions(project, replay_id, segment_data, replay_event)
     if len(actions) == 0:
         return None
 
     payload = create_replay_actions_payload(replay_id, actions)
-    return create_replay_actions_event(replay_id, project_id, retention_days, payload)
+    return create_replay_actions_event(replay_id, project.id, retention_days, payload)
 
 
 def create_replay_actions_event(
@@ -153,7 +153,7 @@ def log_canvas_size(
 
 
 def get_user_actions(
-    project_id: int,
+    project: Project,
     replay_id: str,
     events: list[dict[str, Any]],
     replay_event: dict[str, Any] | None,
@@ -177,6 +177,10 @@ def get_user_actions(
             "textContent": "Helloworld!"
         }
     """
+    # Feature flag and project option queries
+    should_report_rage = _should_report_rage_click_issue(project)
+    should_report_hydration = _should_report_hydration_error_issue(project)
+
     result: list[ReplayActionsEventPayloadClick] = []
     for event in _iter_custom_events(events):
         if len(result) == 20:
@@ -185,7 +189,14 @@ def get_user_actions(
         tag = event.get("data", {}).get("tag")
 
         if tag == "breadcrumb":
-            click = _handle_breadcrumb(event, project_id, replay_id, replay_event)
+            click = _handle_breadcrumb(
+                event,
+                project,
+                replay_id,
+                replay_event,
+                should_report_rage_click_issue=should_report_rage,
+                should_report_hydration_error_issue=should_report_hydration,
+            )
             if click is not None:
                 result.append(click)
         # look for request / response breadcrumbs and report metrics on them
@@ -193,7 +204,7 @@ def get_user_actions(
             _handle_resource_metric_event(event)
         # log the SDK options sent from the SDK 1/500 times
         if tag == "options" and random.randint(0, 499) < 1:
-            _handle_options_logging_event(project_id, replay_id, event)
+            _handle_options_logging_event(project.id, replay_id, event)
         # log large dom mutation breadcrumb events 1/100 times
 
         payload = event.get("data", {}).get("payload", {})
@@ -203,7 +214,7 @@ def get_user_actions(
             and payload.get("category") == "replay.mutations"
             and random.randint(0, 500) < 1
         ):
-            _handle_mutations_event(project_id, replay_id, event)
+            _handle_mutations_event(project.id, replay_id, event)
 
     return result
 
@@ -287,12 +298,10 @@ def _parse_classes(classes: str) -> list[str]:
     return list(filter(lambda n: n != "", classes.split(" ")))[:10]
 
 
-def _should_report_hydration_error_issue(project_id: int) -> bool:
-    project = Project.objects.get(id=project_id)
+def _should_report_hydration_error_issue(project: Project) -> bool:
     """
-    The feature is controlled by Sentry admins for release of the feature,
-    while the project option is controlled by the project owner, and is a
-    permanent setting
+    Checks the feature that's controlled by Sentry admins for release of the feature,
+    and the permanent project option, controlled by the project owner.
     """
     return features.has(
         "organizations:session-replay-hydration-error-issue-creation",
@@ -300,8 +309,10 @@ def _should_report_hydration_error_issue(project_id: int) -> bool:
     ) and project.get_option("sentry:replay_hydration_error_issues")
 
 
-def _should_report_rage_click_issue(project_id: int) -> bool:
-    project = Project.objects.get(id=project_id)
+def _should_report_rage_click_issue(project: Project) -> bool:
+    """
+    Checks the project option, controlled by a project owner.
+    """
     return project.get_option("sentry:replay_rage_click_issues")
 
 
@@ -374,7 +385,12 @@ def _handle_mutations_event(project_id: int, replay_id: str, event: dict[str, An
 
 
 def _handle_breadcrumb(
-    event: dict[str, Any], project_id: int, replay_id: str, replay_event: dict[str, Any] | None
+    event: dict[str, Any],
+    project: Project,
+    replay_id: str,
+    replay_event: dict[str, Any] | None,
+    should_report_rage_click_issue=False,
+    should_report_hydration_error_issue=False,
 ) -> ReplayActionsEventPayloadClick | None:
 
     click = None
@@ -399,15 +415,15 @@ def _handle_breadcrumb(
                 payload["data"].get("clickCount", 0) or payload["data"].get("clickcount", 0)
             ) >= 5
             click = create_click_event(
-                payload, replay_id, is_dead=True, is_rage=is_rage, project_id=project_id
+                payload, replay_id, is_dead=True, is_rage=is_rage, project_id=project.id
             )
             if click is not None:
                 if is_rage:
                     metrics.incr("replay.rage_click_detected")
-                    if _should_report_rage_click_issue(project_id):
+                    if should_report_rage_click_issue:
                         if replay_event is not None:
                             report_rage_click_issue_with_replay_event(
-                                project_id,
+                                project.id,
                                 replay_id,
                                 payload["timestamp"],
                                 payload["message"],
@@ -418,7 +434,7 @@ def _handle_breadcrumb(
                             )
         # Log the event for tracking.
         log = event["data"].get("payload", {}).copy()
-        log["project_id"] = project_id
+        log["project_id"] = project.id
         log["replay_id"] = replay_id
         log["dom_tree"] = log.pop("message")
 
@@ -426,16 +442,16 @@ def _handle_breadcrumb(
 
     elif category == "ui.click":
         click = create_click_event(
-            payload, replay_id, is_dead=False, is_rage=False, project_id=project_id
+            payload, replay_id, is_dead=False, is_rage=False, project_id=project.id
         )
         if click is not None:
             return click
 
     elif category == "replay.hydrate-error":
         metrics.incr("replay.hydration_error_breadcrumb")
-        if replay_event is not None and _should_report_hydration_error_issue(project_id):
+        if replay_event is not None and should_report_hydration_error_issue:
             report_hydration_error_issue_with_replay_event(
-                project_id,
+                project.id,
                 replay_id,
                 payload["timestamp"],
                 payload.get("data", {}).get("url"),
diff --git a/src/sentry/replays/usecases/query/__init__.py b/src/sentry/replays/usecases/query/__init__.py
index 6d86a1a81e3256..5b1bbe2edaf5a5 100644
--- a/src/sentry/replays/usecases/query/__init__.py
+++ b/src/sentry/replays/usecases/query/__init__.py
@@ -41,6 +41,7 @@
 from sentry.models.organization import Organization
 from sentry.replays.lib.new_query.errors import CouldNotParseValue, OperatorNotSupported
 from sentry.replays.lib.new_query.fields import ColumnField, ExpressionField, FieldProtocol
+from sentry.replays.usecases.query.errors import RetryAggregated
 from sentry.replays.usecases.query.fields import ComputedField, TagField
 from sentry.utils.snuba import RateLimitExceeded, raw_snql_query
 
@@ -339,9 +340,9 @@ def _query_using_scalar_strategy(
     period_start: datetime,
     period_stop: datetime,
 ):
-    if not can_scalar_search_subquery(search_filters) or not sort_is_scalar_compatible(
-        sort or DEFAULT_SORT_FIELD
-    ):
+    can_scalar_search = can_scalar_search_subquery(search_filters, period_start)
+    can_scalar_sort = sort_is_scalar_compatible(sort or DEFAULT_SORT_FIELD)
+    if not can_scalar_search or not can_scalar_sort:
         return _query_using_aggregated_strategy(
             search_filters,
             sort,
@@ -357,8 +358,17 @@ def _query_using_scalar_strategy(
     # To fix this issue remove the ability to search against "varying" columns and apply a
     # "segment_id = 0" condition to the WHERE clause.
 
-    where = handle_search_filters(scalar_search_config, search_filters)
-    orderby = handle_ordering(agg_sort_config, sort or "-" + DEFAULT_SORT_FIELD)
+    try:
+        where = handle_search_filters(scalar_search_config, search_filters)
+        orderby = handle_ordering(agg_sort_config, sort or "-" + DEFAULT_SORT_FIELD)
+    except RetryAggregated:
+        return _query_using_aggregated_strategy(
+            search_filters,
+            sort,
+            project_ids,
+            period_start,
+            period_stop,
+        )
 
     query = Query(
         match=Entity("replays"),
diff --git a/src/sentry/replays/usecases/query/conditions/__init__.py b/src/sentry/replays/usecases/query/conditions/__init__.py
index 42168dee31ecbb..c4ca15cd99723b 100644
--- a/src/sentry/replays/usecases/query/conditions/__init__.py
+++ b/src/sentry/replays/usecases/query/conditions/__init__.py
@@ -16,9 +16,9 @@
     "SumOfRageClickSelectorComposite",
     "SumOfStringArray",
     "SumOfStringScalar",
-    "SumOfTagScalar",
+    "SumOfTagAggregate",
     "SumOfUUIDArray",
-    "TagScalar",
+    "TagAggregate",
 ]
 
 
@@ -44,4 +44,4 @@
     SumOfDeadClickSelectorComposite,
     SumOfRageClickSelectorComposite,
 )
-from .tags import SumOfTagScalar, TagScalar
+from .tags import SumOfTagAggregate, TagAggregate
diff --git a/src/sentry/replays/usecases/query/conditions/tags.py b/src/sentry/replays/usecases/query/conditions/tags.py
index 52e504cd96a97f..b2807720fc8da1 100644
--- a/src/sentry/replays/usecases/query/conditions/tags.py
+++ b/src/sentry/replays/usecases/query/conditions/tags.py
@@ -4,11 +4,47 @@
 from snuba_sdk.expressions import Expression
 
 from sentry.replays.lib.new_query.conditions import GenericBase
-from sentry.replays.lib.new_query.utils import contains, does_not_contain
+from sentry.replays.lib.new_query.utils import (
+    contains,
+    does_not_contain,
+    translate_condition_to_function,
+)
+from sentry.replays.usecases.query.errors import RetryAggregated
 
 
 class TagScalar(GenericBase):
-    """Tag scalar condition class."""
+    @staticmethod
+    def visit_eq(expression_name: str, value: str) -> Condition:
+        hashed_needle = Function("cityHash64", parameters=[f"{expression_name}={value}"])
+        expression = Function("has", parameters=[Column("_tags_hash_map"), hashed_needle])
+        return Condition(expression, Op.EQ, 1)
+
+    @staticmethod
+    def visit_in(expression_name: str, value: list[str]) -> Condition:
+        expressions = [
+            translate_condition_to_function(TagScalar.visit_eq(expression_name, v)) for v in value
+        ]
+        return Condition(Function("or", parameters=expressions), Op.EQ, 1)
+
+    @staticmethod
+    def visit_neq(expression_name: str, value: str) -> Condition:
+        raise RetryAggregated
+
+    @staticmethod
+    def visit_not_in(expression_name: str, value: list[str]) -> Condition:
+        raise RetryAggregated
+
+    @staticmethod
+    def visit_match(expression_name: str, value: str) -> Condition:
+        raise RetryAggregated
+
+    @staticmethod
+    def visit_not_match(expression_name: str, value: str) -> Condition:
+        raise RetryAggregated
+
+
+class TagAggregate(GenericBase):
+    """Tag aggregate condition class."""
 
     @staticmethod
     def visit_eq(expression_name: str, value: str) -> Condition:
@@ -35,30 +71,30 @@ def visit_not_match(expression_name: str, value: str) -> Condition:
         return Condition(_match_key_value_wildcard(expression_name, value), Op.EQ, 0)
 
 
-class SumOfTagScalar(GenericBase):
+class SumOfTagAggregate(GenericBase):
     @staticmethod
     def visit_eq(expression: Expression, value: str) -> Condition:
-        return contains(TagScalar.visit_eq(expression, value))
+        return contains(TagAggregate.visit_eq(expression, value))
 
     @staticmethod
     def visit_neq(expression: Expression, value: str) -> Condition:
-        return does_not_contain(TagScalar.visit_eq(expression, value))
+        return does_not_contain(TagAggregate.visit_eq(expression, value))
 
     @staticmethod
     def visit_match(expression: Expression, value: str) -> Condition:
-        return contains(TagScalar.visit_match(expression, value))
+        return contains(TagAggregate.visit_match(expression, value))
 
     @staticmethod
     def visit_not_match(expression: Expression, value: str) -> Condition:
-        return does_not_contain(TagScalar.visit_match(expression, value))
+        return does_not_contain(TagAggregate.visit_match(expression, value))
 
     @staticmethod
     def visit_in(expression: Expression, value: list[str]) -> Condition:
-        return contains(TagScalar.visit_in(expression, value))
+        return contains(TagAggregate.visit_in(expression, value))
 
     @staticmethod
     def visit_not_in(expression: Expression, value: list[str]) -> Condition:
-        return does_not_contain(TagScalar.visit_in(expression, value))
+        return does_not_contain(TagAggregate.visit_in(expression, value))
 
 
 def _match_key_value_exact(key: str, value: str) -> Function:
diff --git a/src/sentry/replays/usecases/query/configs/aggregate.py b/src/sentry/replays/usecases/query/configs/aggregate.py
index e22170a072ea16..740a9e333528e0 100644
--- a/src/sentry/replays/usecases/query/configs/aggregate.py
+++ b/src/sentry/replays/usecases/query/configs/aggregate.py
@@ -42,6 +42,7 @@
 )
 from sentry.replays.usecases.query.conditions.aggregate import SumOfUUIDScalar
 from sentry.replays.usecases.query.conditions.event_ids import SumOfErrorIdScalar, SumOfInfoIdScalar
+from sentry.replays.usecases.query.conditions.tags import SumOfTagAggregate
 from sentry.replays.usecases.query.fields import ComputedField, TagField
 
 
@@ -154,4 +155,4 @@ def array_string_field(column_name: str) -> StringColumnField:
 
 # Field-names which could not be found in the set are tag-keys and will, by default, look for
 # the `*` key to find their search instructions. If this is not defined an error is returned.
-search_config["*"] = TagField()
+search_config["*"] = TagField(query=SumOfTagAggregate)
diff --git a/src/sentry/replays/usecases/query/configs/scalar.py b/src/sentry/replays/usecases/query/configs/scalar.py
index f8e2c1c0d6615f..efb3a022589e0c 100644
--- a/src/sentry/replays/usecases/query/configs/scalar.py
+++ b/src/sentry/replays/usecases/query/configs/scalar.py
@@ -1,7 +1,9 @@
 """Scalar query filtering configuration module."""
+
 from __future__ import annotations
 
 from collections.abc import Sequence
+from datetime import datetime, timezone
 
 from sentry.api.event_search import ParenExpression, SearchFilter
 from sentry.replays.lib.new_query.conditions import (
@@ -20,7 +22,9 @@
     RageClickSelectorComposite,
 )
 from sentry.replays.usecases.query.conditions.event_ids import ErrorIdScalar
-from sentry.replays.usecases.query.fields import ComputedField
+from sentry.replays.usecases.query.conditions.tags import TagScalar
+from sentry.replays.usecases.query.configs.aggregate import search_config as aggregate_search_config
+from sentry.replays.usecases.query.fields import ComputedField, TagField
 
 
 def string_field(column_name: str) -> StringColumnField:
@@ -71,6 +75,7 @@ def string_field(column_name: str) -> StringColumnField:
 varying_search_config["trace"] = varying_search_config["trace_ids"]
 varying_search_config["url"] = varying_search_config["urls"]
 varying_search_config["user.ip"] = varying_search_config["user.ip_address"]
+varying_search_config["*"] = TagField(query=TagScalar)
 
 
 # Click Search Config
@@ -98,6 +103,7 @@ def string_field(column_name: str) -> StringColumnField:
 
 def can_scalar_search_subquery(
     search_filters: Sequence[ParenExpression | SearchFilter | str],
+    started_at: datetime,
 ) -> bool:
     """Return "True" if a scalar event search can be performed."""
     has_seen_varying_field = False
@@ -109,7 +115,7 @@ def can_scalar_search_subquery(
         # ParenExpressions are recursive.  So we recursively call our own function and return early
         # if any of the fields fail.
         elif isinstance(search_filter, ParenExpression):
-            is_ok = can_scalar_search_subquery(search_filter.children)
+            is_ok = can_scalar_search_subquery(search_filter.children, started_at)
             if not is_ok:
                 return False
         else:
@@ -117,7 +123,18 @@ def can_scalar_search_subquery(
 
             # If the search-filter does not exist in either configuration then return false.
             if name not in static_search_config and name not in varying_search_config:
-                return False
+                # If the field is not a tag or the query's start period is greater than the
+                # period when the new field was introduced then we can not apply the
+                # optimization.
+                #
+                # TODO(cmanallen): Remove date condition after 90 days (~12/17/2024).
+                if name in aggregate_search_config or started_at < datetime(
+                    2024, 9, 17, tzinfo=timezone.utc
+                ):
+                    return False
+                else:
+                    has_seen_varying_field = True
+                    continue
 
             if name in varying_search_config:
                 # If a varying field has been seen before then we can't use a row-based sub-query. We
diff --git a/src/sentry/replays/usecases/query/errors.py b/src/sentry/replays/usecases/query/errors.py
new file mode 100644
index 00000000000000..16d2c5121d7e60
--- /dev/null
+++ b/src/sentry/replays/usecases/query/errors.py
@@ -0,0 +1,4 @@
+class RetryAggregated(Exception):
+    """Raised when a query can only be executed by an aggregate."""
+
+    ...
diff --git a/src/sentry/replays/usecases/query/fields.py b/src/sentry/replays/usecases/query/fields.py
index 804079ab99300c..a494e90e0b483d 100644
--- a/src/sentry/replays/usecases/query/fields.py
+++ b/src/sentry/replays/usecases/query/fields.py
@@ -9,8 +9,8 @@
 from sentry.api.event_search import SearchFilter
 from sentry.replays.lib.new_query.errors import OperatorNotSupported
 from sentry.replays.lib.new_query.parsers import parse_str
-from sentry.replays.usecases.query.conditions import SumOfTagScalar
 from sentry.replays.usecases.query.conditions.base import ComputedBase
+from sentry.replays.usecases.query.conditions.tags import SumOfTagAggregate, TagScalar
 
 T = TypeVar("T")
 
@@ -95,9 +95,9 @@ def _apply_scalar(self, operator: str, value: T) -> Condition:
 
 
 class TagField:
-    def __init__(self) -> None:
+    def __init__(self, query: type[SumOfTagAggregate] | type[TagScalar]) -> None:
         self.parse = parse_str
-        self.query = SumOfTagScalar
+        self.query = query
 
     def apply(self, search_filter: SearchFilter) -> Condition:
         """Apply a search operation against any named expression.
diff --git a/src/sentry/search/events/builder/base.py b/src/sentry/search/events/builder/base.py
index 956707eabb7f87..0e69f09db0572f 100644
--- a/src/sentry/search/events/builder/base.py
+++ b/src/sentry/search/events/builder/base.py
@@ -260,6 +260,11 @@ def __init__(
         self.prefixed_to_tag_map: dict[str, str] = {}
         self.tag_to_prefixed_map: dict[str, str] = {}
 
+        # Tags with their type in them can't be passed to clickhouse because of the space
+        # This map is so we can convert those back before the user sees the internal alias
+        self.typed_tag_to_alias_map: dict[str, str] = {}
+        self.alias_to_typed_tag_map: dict[str, str] = {}
+
         self.requires_other_aggregates = False
         self.limit = self.resolve_limit(limit)
         self.offset = None if offset is None else Offset(offset)
@@ -850,6 +855,9 @@ def resolve_orderby(self, orderby: list[str] | str | None) -> list[OrderBy]:
                 or isinstance(resolved_orderby, AliasedExpression)
             ):
                 bare_orderby = resolved_orderby.alias
+            # tags that are typed have a different alias because we can't pass commas down
+            elif bare_orderby in self.typed_tag_to_alias_map:
+                bare_orderby = self.typed_tag_to_alias_map[bare_orderby]
 
             for selected_column in self.columns:
                 if isinstance(selected_column, Column) and selected_column == resolved_orderby:
@@ -1529,12 +1537,14 @@ def run_query(
     def process_results(self, results: Any) -> EventsResponse:
         with sentry_sdk.start_span(op="QueryBuilder", description="process_results") as span:
             span.set_data("result_count", len(results.get("data", [])))
-            translated_columns = {}
+            translated_columns = self.alias_to_typed_tag_map
             if self.builder_config.transform_alias_to_input_format:
-                translated_columns = {
-                    column: function_details.field
-                    for column, function_details in self.function_alias_map.items()
-                }
+                translated_columns.update(
+                    {
+                        column: function_details.field
+                        for column, function_details in self.function_alias_map.items()
+                    }
+                )
 
                 for column in list(self.function_alias_map):
                     translated_column = translated_columns.get(column, column)
diff --git a/src/sentry/search/events/builder/spans_indexed.py b/src/sentry/search/events/builder/spans_indexed.py
index 98f85003d72130..7a6f31ec3561bd 100644
--- a/src/sentry/search/events/builder/spans_indexed.py
+++ b/src/sentry/search/events/builder/spans_indexed.py
@@ -1,6 +1,7 @@
 from sentry_relay.consts import SPAN_STATUS_CODE_TO_NAME
-from snuba_sdk import Column, Function
+from snuba_sdk import AliasedExpression, Column, Function
 
+from sentry.exceptions import InvalidSearchQuery
 from sentry.search.events import constants
 from sentry.search.events.builder.base import BaseQueryBuilder
 from sentry.search.events.builder.discover import TimeseriesQueryBuilder, TopEventsQueryBuilder
@@ -73,6 +74,41 @@ def _get_dataset_name(self) -> str:
             return "events_analytics_platform"
         return self.dataset.value
 
+    def resolve_field(self, raw_field: str, alias: bool = False) -> Column:
+        # try the typed regex first
+        if len(raw_field) <= 200:
+            tag_match = constants.TYPED_TAG_KEY_RE.search(raw_field)
+        else:
+            raise InvalidSearchQuery(f"{raw_field} is too long, can be a maximum of 200 characters")
+        field = tag_match.group("tag") if tag_match else None
+        field_type = tag_match.group("type") if tag_match else None
+        if (
+            field is None
+            or field_type is None
+            or not constants.VALID_FIELD_PATTERN.match(field)
+            # attr field is less permissive than tags, we can't have - in them
+            or "-" in field
+        ):
+            return super().resolve_field(raw_field, alias)
+
+        if field_type not in ["number", "string"]:
+            raise InvalidSearchQuery(
+                f"Unknown type for field {raw_field}, only string and number are supported"
+            )
+
+        if field_type == "string":
+            col = Column(f"attr_str[{field}]")
+        else:
+            col = Column(f"attr_num[{field}]")
+
+        if alias:
+            field_alias = f"tags_{field}@{field_type}"
+            self.typed_tag_to_alias_map[raw_field] = field_alias
+            self.alias_to_typed_tag_map[field_alias] = raw_field
+            return AliasedExpression(col, field_alias)
+        else:
+            return col
+
 
 class TimeseriesSpanIndexedQueryBuilder(SpansIndexedQueryBuilderMixin, TimeseriesQueryBuilder):
     config_class = SpansIndexedDatasetConfig
diff --git a/src/sentry/search/events/constants.py b/src/sentry/search/events/constants.py
index db60e15ddec53b..a88c2429fc700f 100644
--- a/src/sentry/search/events/constants.py
+++ b/src/sentry/search/events/constants.py
@@ -101,6 +101,7 @@ class ThresholdDict(TypedDict):
 }
 
 TAG_KEY_RE = re.compile(r"^(sentry_tags|tags)\[(?P<tag>.*)\]$")
+TYPED_TAG_KEY_RE = re.compile(r"^(sentry_tags|tags)\[(?P<tag>.*),\s*(?P<type>.*)\]$")
 # Based on general/src/protocol/tags.rs in relay
 VALID_FIELD_PATTERN = re.compile(r"^[a-zA-Z0-9_.:-]*$")
 
diff --git a/src/sentry/seer/anomaly_detection/get_historical_anomalies.py b/src/sentry/seer/anomaly_detection/get_historical_anomalies.py
index 5306e26ed21198..2d3fe4882f99b8 100644
--- a/src/sentry/seer/anomaly_detection/get_historical_anomalies.py
+++ b/src/sentry/seer/anomaly_detection/get_historical_anomalies.py
@@ -8,7 +8,11 @@
 from sentry.incidents.models.alert_rule import AlertRule, AlertRuleStatus
 from sentry.models.project import Project
 from sentry.net.http import connection_from_url
-from sentry.seer.anomaly_detection.types import AnomalyDetectionConfig, DetectAnomaliesRequest
+from sentry.seer.anomaly_detection.types import (
+    AnomalyDetectionConfig,
+    DetectAnomaliesRequest,
+    TimeSeriesPoint,
+)
 from sentry.seer.anomaly_detection.utils import (
     fetch_historical_data,
     format_historical_data,
@@ -28,6 +32,31 @@
 )
 
 
+def get_historical_anomaly_data_from_seer_preview(
+    current_data: list[TimeSeriesPoint],
+    historical_data: list[TimeSeriesPoint],
+    project_id: int,
+    config: AnomalyDetectionConfig,
+) -> list | None:
+    """
+    Send current and historical timeseries data to Seer and return anomaly detection response on the current timeseries.
+
+    Dummy function. TODO: write out the Seer request logic.
+    """
+    return [
+        {
+            "anomaly": {"anomaly_score": -0.38810767243044786, "anomaly_type": "none"},
+            "timestamp": 169,
+            "value": 0.048480431,
+        },
+        {
+            "anomaly": {"anomaly_score": -0.3890542800124323, "anomaly_type": "none"},
+            "timestamp": 170,
+            "value": 0.047910238,
+        },
+    ]
+
+
 def get_historical_anomaly_data_from_seer(
     alert_rule: AlertRule, project: Project, start_string: str, end_string: str
 ) -> list | None:
diff --git a/src/sentry/sentry_apps/models/__init__.py b/src/sentry/sentry_apps/models/__init__.py
index eeaffc28f173ea..05288934069583 100644
--- a/src/sentry/sentry_apps/models/__init__.py
+++ b/src/sentry/sentry_apps/models/__init__.py
@@ -1,6 +1,15 @@
 from .sentry_app import SentryApp
 from .sentry_app_component import SentryAppComponent
 from .sentry_app_installation import SentryAppInstallation
+from .sentry_app_installation_for_provider import SentryAppInstallationForProvider
 from .sentry_app_installation_token import SentryAppInstallationToken
+from .servicehook import ServiceHook
 
-__all__ = ("SentryApp", "SentryAppInstallationToken", "SentryAppInstallation", "SentryAppComponent")
+__all__ = (
+    "SentryApp",
+    "SentryAppInstallationToken",
+    "SentryAppInstallation",
+    "ServiceHook",
+    "SentryAppInstallationForProvider",
+    "SentryAppComponent",
+)
diff --git a/src/sentry/models/integrations/sentry_app_installation_for_provider.py b/src/sentry/sentry_apps/models/sentry_app_installation_for_provider.py
similarity index 100%
rename from src/sentry/models/integrations/sentry_app_installation_for_provider.py
rename to src/sentry/sentry_apps/models/sentry_app_installation_for_provider.py
diff --git a/src/sentry/models/servicehook.py b/src/sentry/sentry_apps/models/servicehook.py
similarity index 100%
rename from src/sentry/models/servicehook.py
rename to src/sentry/sentry_apps/models/servicehook.py
diff --git a/src/sentry/sentry_apps/services/hook/impl.py b/src/sentry/sentry_apps/services/hook/impl.py
index ae475916e2dde1..8e0da305f0862e 100644
--- a/src/sentry/sentry_apps/services/hook/impl.py
+++ b/src/sentry/sentry_apps/services/hook/impl.py
@@ -3,8 +3,8 @@
 from django.db import router, transaction
 
 from sentry import deletions
-from sentry.models.servicehook import ServiceHook
 from sentry.sentry_apps.logic import expand_events
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.sentry_apps.services.hook import HookService, RpcServiceHook
 from sentry.sentry_apps.services.hook.serial import serialize_service_hook
 
diff --git a/src/sentry/sentry_apps/services/hook/serial.py b/src/sentry/sentry_apps/services/hook/serial.py
index 6f951809cb4edc..adf272c0c93f4f 100644
--- a/src/sentry/sentry_apps/services/hook/serial.py
+++ b/src/sentry/sentry_apps/services/hook/serial.py
@@ -1,4 +1,4 @@
-from sentry.models.servicehook import ServiceHook
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.sentry_apps.services.hook import RpcServiceHook
 
 
diff --git a/src/sentry/tasks/embeddings_grouping/backfill_seer_grouping_records_for_project.py b/src/sentry/tasks/embeddings_grouping/backfill_seer_grouping_records_for_project.py
index 864d4bfce56db7..487b00ba86d691 100644
--- a/src/sentry/tasks/embeddings_grouping/backfill_seer_grouping_records_for_project.py
+++ b/src/sentry/tasks/embeddings_grouping/backfill_seer_grouping_records_for_project.py
@@ -7,6 +7,7 @@
 from sentry import options
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.grouping.api import GroupingConfigNotFound
+from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
 from sentry.models.project import Project
 from sentry.seer.similarity.utils import killswitch_enabled, project_is_seer_eligible
 from sentry.silo.base import SiloMode
@@ -31,6 +32,7 @@
 BACKFILL_NAME = "backfill_grouping_records"
 BULK_DELETE_METADATA_CHUNK_SIZE = 100
 SEER_ACCEPTABLE_FAILURE_REASONS = ["Gateway Timeout", "Service Unavailable"]
+EVENT_INFO_EXCEPTIONS = (GroupingConfigNotFound, ResourceDoesNotExist, InvalidEnhancerConfig)
 
 logger = logging.getLogger(__name__)
 
@@ -219,7 +221,7 @@ def backfill_seer_grouping_records_for_project(
         nodestore_results, group_hashes_dict = get_events_from_nodestore(
             project, filtered_snuba_results, groups_to_backfill_with_no_embedding_has_snuba_row
         )
-    except (GroupingConfigNotFound, ResourceDoesNotExist):
+    except EVENT_INFO_EXCEPTIONS:
         metrics.incr("sentry.tasks.backfill_seer_grouping_records.grouping_config_error")
         nodestore_results, group_hashes_dict = GroupStacktraceData(data=[], stacktrace_list=[]), {}
 
diff --git a/src/sentry/tasks/post_process.py b/src/sentry/tasks/post_process.py
index 81bfc3917f45f9..a1aca3af81357a 100644
--- a/src/sentry/tasks/post_process.py
+++ b/src/sentry/tasks/post_process.py
@@ -69,7 +69,7 @@ class PostProcessJob(TypedDict, total=False):
 
 
 def _get_service_hooks(project_id):
-    from sentry.models.servicehook import ServiceHook
+    from sentry.sentry_apps.models.servicehook import ServiceHook
 
     cache_key = f"servicehooks:1:{project_id}"
     result = cache.get(cache_key)
@@ -83,7 +83,7 @@ def _get_service_hooks(project_id):
 
 def _should_send_error_created_hooks(project):
     from sentry.models.organization import Organization
-    from sentry.models.servicehook import ServiceHook
+    from sentry.sentry_apps.models.servicehook import ServiceHook
 
     cache_key = f"servicehooks-error-created:1:{project.id}"
     result = cache.get(cache_key)
diff --git a/src/sentry/tasks/repository.py b/src/sentry/tasks/repository.py
index d49de2ff553710..054756150b0de5 100644
--- a/src/sentry/tasks/repository.py
+++ b/src/sentry/tasks/repository.py
@@ -27,10 +27,6 @@ def repository_cascade_delete_on_hide(repo_id: int) -> None:
     while has_more:
         # get child relations
         child_relations = _get_repository_child_relations(repo)
-        # extend relations
-        child_relations = child_relations + [
-            rel(repo) for rel in default_manager.dependencies[Repository]
-        ]
         # no need to filter relations; delete them
         if child_relations:
             has_more = _delete_children(manager=default_manager, relations=child_relations)
diff --git a/src/sentry/tasks/sentry_apps.py b/src/sentry/tasks/sentry_apps.py
index 3b02bddab29162..6fc7abf4cb6de7 100644
--- a/src/sentry/tasks/sentry_apps.py
+++ b/src/sentry/tasks/sentry_apps.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+from collections import defaultdict
 from collections.abc import Mapping
 from typing import Any
 
@@ -12,14 +13,20 @@
 from sentry.api.serializers import AppPlatformEvent, serialize
 from sentry.constants import SentryAppInstallationStatus
 from sentry.eventstore.models import Event, GroupEvent
+from sentry.hybridcloud.rpc.caching import region_caching_service
 from sentry.models.activity import Activity
 from sentry.models.group import Group
 from sentry.models.organization import Organization
+from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.project import Project
-from sentry.models.servicehook import ServiceHook, ServiceHookProject
-from sentry.sentry_apps.models.sentry_app import VALID_EVENTS
+from sentry.sentry_apps.models.sentry_app import VALID_EVENTS, SentryApp
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
-from sentry.sentry_apps.services.app.service import app_service
+from sentry.sentry_apps.models.servicehook import ServiceHook, ServiceHookProject
+from sentry.sentry_apps.services.app.service import (
+    app_service,
+    get_by_application_id,
+    get_installation,
+)
 from sentry.shared_integrations.exceptions import ApiHostError, ApiTimeoutError, ClientError
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task, retry
@@ -247,6 +254,44 @@ def installation_webhook(installation_id, user_id, *args, **kwargs):
     InstallationNotifier.run(install=install, user=user, action="created")
 
 
+@instrumented_task(
+    name="sentry.sentry_apps.tasks.installations.clear_region_cache", **CONTROL_TASK_OPTIONS
+)
+def clear_region_cache(sentry_app_id: int, region_name: str) -> None:
+    try:
+        sentry_app = SentryApp.objects.get(id=sentry_app_id)
+    except SentryApp.DoesNotExist:
+        return
+
+    # When a sentry app's definition changes purge cache for all the installations.
+    # This could get slow for large applications, but generally big applications don't change often.
+    install_query = SentryAppInstallation.objects.filter(
+        sentry_app=sentry_app,
+    ).values("id", "organization_id")
+
+    # There isn't a constraint on org : sentryapp so we have to handle lists
+    install_map: dict[int, list[int]] = defaultdict(list)
+    for install_row in install_query:
+        install_map[install_row["organization_id"]].append(install_row["id"])
+
+    # Clear application_id cache
+    region_caching_service.clear_key(
+        key=get_by_application_id.key_from(sentry_app.application_id), region_name=region_name
+    )
+
+    # Limit our operations to the region this outbox is for.
+    # This could be a single query if we use raw_sql.
+    region_query = OrganizationMapping.objects.filter(
+        organization_id__in=list(install_map.keys()), region_name=region_name
+    ).values("organization_id")
+    for region_row in region_query:
+        installs = install_map[region_row["organization_id"]]
+        for install_id in installs:
+            region_caching_service.clear_key(
+                key=get_installation.key_from(install_id), region_name=region_name
+            )
+
+
 @instrumented_task(name="sentry.tasks.sentry_apps.workflow_notification", **TASK_OPTIONS)
 @retry_decorator
 def workflow_notification(installation_id, issue_id, type, user_id, *args, **kwargs):
diff --git a/src/sentry/tasks/servicehooks.py b/src/sentry/tasks/servicehooks.py
index e064f57f948fa1..8fb42b5d30b9d2 100644
--- a/src/sentry/tasks/servicehooks.py
+++ b/src/sentry/tasks/servicehooks.py
@@ -2,7 +2,7 @@
 
 from sentry.api.serializers import serialize
 from sentry.http import safe_urlopen
-from sentry.models.servicehook import ServiceHook
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task, retry
 from sentry.tsdb.base import TSDBModel
diff --git a/src/sentry/testutils/cases.py b/src/sentry/testutils/cases.py
index beffdb7c5f4069..97c39f023bfad9 100644
--- a/src/sentry/testutils/cases.py
+++ b/src/sentry/testutils/cases.py
@@ -3402,6 +3402,7 @@ def create_span(
         project: Project | None = None,
         start_ts: datetime | None = None,
         duration: int = 1000,
+        measurements: dict[str, Any] | None = None,
     ) -> dict[str, Any]:
         """Create span json, not required for store_span, but with no params passed should just work out of the box"""
         if organization is None:
@@ -3440,6 +3441,8 @@ def create_span(
         # coerce to string
         for tag, value in dict(span["tags"]).items():
             span["tags"][tag] = str(value)
+        if measurements:
+            span["measurements"] = measurements
         return span
 
 
diff --git a/src/sentry/testutils/factories.py b/src/sentry/testutils/factories.py
index e316e6ae9ed13a..cf9b019fcee394 100644
--- a/src/sentry/testutils/factories.py
+++ b/src/sentry/testutils/factories.py
@@ -101,9 +101,6 @@
 from sentry.models.grouphistory import GroupHistory
 from sentry.models.grouplink import GroupLink
 from sentry.models.grouprelease import GroupRelease
-from sentry.models.integrations.sentry_app_installation_for_provider import (
-    SentryAppInstallationForProvider,
-)
 from sentry.models.notificationaction import (
     ActionService,
     ActionTarget,
@@ -131,7 +128,6 @@
 from sentry.models.rule import Rule
 from sentry.models.rulesnooze import RuleSnooze
 from sentry.models.savedsearch import SavedSearch
-from sentry.models.servicehook import ServiceHook
 from sentry.models.team import Team
 from sentry.models.userreport import UserReport
 from sentry.organizations.services.organization import RpcOrganization, RpcUserOrganizationContext
@@ -142,6 +138,10 @@
 from sentry.sentry_apps.logic import SentryAppCreator
 from sentry.sentry_apps.models.sentry_app import SentryApp
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
+from sentry.sentry_apps.models.sentry_app_installation_for_provider import (
+    SentryAppInstallationForProvider,
+)
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.sentry_apps.services.app.serial import serialize_sentry_app_installation
 from sentry.sentry_apps.services.hook import hook_service
 from sentry.signals import project_created
diff --git a/src/sentry/uptime/detectors/url_extraction.py b/src/sentry/uptime/detectors/url_extraction.py
index b0e5ba681c0c7b..ec6705c69186f9 100644
--- a/src/sentry/uptime/detectors/url_extraction.py
+++ b/src/sentry/uptime/detectors/url_extraction.py
@@ -6,6 +6,7 @@
 from django.core.exceptions import ValidationError
 from django.core.validators import URLValidator, validate_ipv46_address
 from tldextract import TLDExtract
+from tldextract.tldextract import ExtractResult
 
 if TYPE_CHECKING:
     pass
@@ -51,3 +52,9 @@ def extract_base_url(url: str | None) -> str | None:
     extracted_url = extractor.extract_urllib(split_url)
     fqdn = extracted_url.fqdn
     return f"{split_url.scheme}://{fqdn}" if fqdn else None
+
+
+def extract_domain_parts(url: str) -> ExtractResult:
+    # We enable private PSL domains so that hosting services that use
+    # subdomains are treated as suffixes for the purposes of monitoring.
+    return extractor.extract_str(url, include_psl_private_domains=True)
diff --git a/src/sentry/uptime/endpoints/validators.py b/src/sentry/uptime/endpoints/validators.py
index 07470f7f4ed950..16710850e1720b 100644
--- a/src/sentry/uptime/endpoints/validators.py
+++ b/src/sentry/uptime/endpoints/validators.py
@@ -8,13 +8,27 @@
 from sentry.api.fields import ActorField
 from sentry.api.serializers.rest_framework import CamelSnakeSerializer
 from sentry.auth.superuser import is_active_superuser
-from sentry.uptime.models import ProjectUptimeSubscriptionMode
+from sentry.uptime.detectors.url_extraction import extract_domain_parts
+from sentry.uptime.models import ProjectUptimeSubscription, ProjectUptimeSubscriptionMode
 from sentry.uptime.subscriptions.subscriptions import (
     create_project_uptime_subscription,
     create_uptime_subscription,
 )
 from sentry.utils.audit import create_audit_entry
 
+MAX_MONITORS_PER_DOMAIN = 100
+"""
+The bounding upper limit on how many ProjectUptimeSubscription's can exist for
+a single domain + suffix.
+
+This takes into accunt subdomains by including them in the count. For example,
+for the domain `sentry.io` both the hosts `subdomain-one.sentry.io` and
+`subdomain-2.sentry.io` will both count towards the limit
+
+Importantly domains like `vercel.dev` are considered TLDs as defined by the
+public suffix list (PSL). See `extract_domain_parts` fo more details
+"""
+
 
 @extend_schema_serializer()
 class UptimeMonitorValidator(CamelSnakeSerializer):
@@ -34,6 +48,19 @@ class UptimeMonitorValidator(CamelSnakeSerializer):
     )
     mode = serializers.IntegerField(required=False)
 
+    def validate_url(self, url):
+        url_parts = extract_domain_parts(url)
+        existing_count = ProjectUptimeSubscription.objects.filter(
+            uptime_subscription__url_domain=url_parts.domain,
+            uptime_subscription__url_domain_suffix=url_parts.suffix,
+        ).count()
+
+        if existing_count >= MAX_MONITORS_PER_DOMAIN:
+            raise serializers.ValidationError(
+                f"The domain *.{url_parts.domain}.{url_parts.suffix} has already been used in {MAX_MONITORS_PER_DOMAIN} uptime monitoring alerts, which is the limit. You cannot create any additional alerts for this domain."
+            )
+        return url
+
     def validate_mode(self, mode):
         if not is_active_superuser(self.context["request"]):
             raise serializers.ValidationError("Only superusers can modify `mode`")
diff --git a/src/sentry/uptime/subscriptions/subscriptions.py b/src/sentry/uptime/subscriptions/subscriptions.py
index daaa8b422ac609..110ece7e66ddb4 100644
--- a/src/sentry/uptime/subscriptions/subscriptions.py
+++ b/src/sentry/uptime/subscriptions/subscriptions.py
@@ -3,7 +3,7 @@
 
 from sentry.models.project import Project
 from sentry.types.actor import Actor
-from sentry.uptime.detectors.url_extraction import extractor
+from sentry.uptime.detectors.url_extraction import extract_domain_parts
 from sentry.uptime.models import (
     ProjectUptimeSubscription,
     ProjectUptimeSubscriptionMode,
@@ -32,9 +32,7 @@ def create_uptime_subscription(
     """
     # We extract the domain and suffix of the url here. This is used to prevent there being too many checks to a single
     # domain.
-    # We enable private PSL domains so that hosting services that use subdomains are treated as suffixes for the
-    # purposes of monitoring.
-    result = extractor.extract_str(url, include_psl_private_domains=True)
+    result = extract_domain_parts(url)
     subscription, created = UptimeSubscription.objects.get_or_create(
         url=url,
         interval_seconds=interval_seconds,
diff --git a/src/sentry/utils/platform_categories.py b/src/sentry/utils/platform_categories.py
index ec8b30aa980b0e..25c3e65b992809 100644
--- a/src/sentry/utils/platform_categories.py
+++ b/src/sentry/utils/platform_categories.py
@@ -50,6 +50,8 @@
 # When changing this file, make sure to keep sentry/static/app/data/platformCategories.tsx in sync.
 BACKEND = {
     "bun",
+    "cloudflare-pages",
+    "cloudflare-workers",
     "deno",
     "dotnet",
     "dotnet-aspnet",
@@ -72,7 +74,6 @@
     "java-logging",
     "java-spring-boot",
     "java-spring",
-    "javascript-cloudflare",
     "kotlin",
     "native",
     "node",
@@ -119,7 +120,7 @@
 SERVERLESS = {
     "dotnet-awslambda",
     "dotnet-gcpfunctions",
-    "javascript-cloudflare",
+    "cloudflare-workers",
     "node-awslambda",
     "node-azurefunctions",
     "node-gcpfunctions",
diff --git a/src/sentry/utils/snuba.py b/src/sentry/utils/snuba.py
index bf70cb598739b1..82b1f61f7d4ffc 100644
--- a/src/sentry/utils/snuba.py
+++ b/src/sentry/utils/snuba.py
@@ -1464,7 +1464,11 @@ def _resolve_column(col):
             return col
         if isinstance(col, int) or isinstance(col, float):
             return col
-        if isinstance(col, str) and (col.startswith("tags[") or QUOTED_LITERAL_RE.match(col)):
+        if (
+            dataset != Dataset.SpansEAP
+            and isinstance(col, str)
+            and (col.startswith("tags[") or QUOTED_LITERAL_RE.match(col))
+        ):
             return col
 
         # Some dataset specific logic:
@@ -1476,6 +1480,9 @@ def _resolve_column(col):
             if isinstance(col, str) and col.startswith("sentry_tags["):
                 # Replace the first instance of sentry tags with attr str instead
                 return col.replace("sentry_tags", "attr_str", 1)
+            if isinstance(col, str) and col.startswith("tags["):
+                # Replace the first instance of sentry tags with attr str instead
+                return col.replace("tags", "attr_str", 1)
             measurement_name = get_measurement_name(col)
             if measurement_name:
                 return f"attr_num[{measurement_name}]"
diff --git a/static/app/components/events/autofix/autofixBanner.spec.tsx b/static/app/components/events/autofix/autofixBanner.spec.tsx
index c55a26b59293ef..af955cef27c17b 100644
--- a/static/app/components/events/autofix/autofixBanner.spec.tsx
+++ b/static/app/components/events/autofix/autofixBanner.spec.tsx
@@ -35,7 +35,7 @@ describe('AutofixBanner', () => {
     expect(screen.getByRole('button', {name: /Set up Autofix/i})).toBeInTheDocument();
   });
 
-  it('renders the banner with "Run Autofix" button when setup is done', () => {
+  it('renders the banner with "Open Autofix" button when setup is done', () => {
     render(
       <AutofixBanner
         group={mockGroup}
@@ -46,7 +46,7 @@ describe('AutofixBanner', () => {
     );
 
     expect(screen.getByText(/Try Autofix/i)).toBeInTheDocument();
-    expect(screen.getByRole('button', {name: /Run Autofix/i})).toBeInTheDocument();
+    expect(screen.getByRole('button', {name: /Open Autofix/i})).toBeInTheDocument();
   });
 
   it('opens the AutofixSetupModal when "Set up Autofix" is clicked', async () => {
diff --git a/static/app/components/events/autofix/autofixBanner.tsx b/static/app/components/events/autofix/autofixBanner.tsx
index 2332f8fecfc7fb..efb45193fbc742 100644
--- a/static/app/components/events/autofix/autofixBanner.tsx
+++ b/static/app/components/events/autofix/autofixBanner.tsx
@@ -55,7 +55,7 @@ function SuccessfulSetup({
 
   return (
     <Button onClick={() => openAutofix()} size="sm" ref={openButtonRef}>
-      {t('Run Autofix')}
+      {t('Open Autofix')}
     </Button>
   );
 }
diff --git a/static/app/components/events/autofix/autofixChanges.tsx b/static/app/components/events/autofix/autofixChanges.tsx
index 5e03f6baa84cf7..1bce114ece1276 100644
--- a/static/app/components/events/autofix/autofixChanges.tsx
+++ b/static/app/components/events/autofix/autofixChanges.tsx
@@ -1,5 +1,6 @@
 import {Fragment, useEffect, useState} from 'react';
 import styled from '@emotion/styled';
+import {AnimatePresence, type AnimationProps, motion} from 'framer-motion';
 
 import {addErrorMessage} from 'sentry/actionCreators/indicator';
 import {openModal} from 'sentry/actionCreators/modal';
@@ -22,6 +23,7 @@ import {IconOpen} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {setApiQueryData, useMutation, useQueryClient} from 'sentry/utils/queryClient';
+import testableTransition from 'sentry/utils/testableTransition';
 import useApi from 'sentry/utils/useApi';
 
 type AutofixChangesProps = {
@@ -184,6 +186,13 @@ function AutofixRepoChange({
   );
 }
 
+const cardAnimationProps: AnimationProps = {
+  exit: {opacity: 0},
+  initial: {opacity: 0, y: 20},
+  animate: {opacity: 1, y: 0},
+  transition: testableTransition({duration: 0.3}),
+};
+
 export function AutofixChanges({step, onRetry, groupId}: AutofixChangesProps) {
   const data = useAutofixData({groupId});
 
@@ -225,17 +234,21 @@ export function AutofixChanges({step, onRetry, groupId}: AutofixChangesProps) {
   }
 
   return (
-    <ChangesContainer>
-      <ClippedBox clipHeight={408}>
-        <HeaderText>{t('Fixes')}</HeaderText>
-        {step.changes.map((change, i) => (
-          <Fragment key={change.repo_external_id}>
-            {i > 0 && <Separator />}
-            <AutofixRepoChange change={change} groupId={groupId} />
-          </Fragment>
-        ))}
-      </ClippedBox>
-    </ChangesContainer>
+    <AnimatePresence initial>
+      <AnimationWrapper key="card" {...cardAnimationProps}>
+        <ChangesContainer>
+          <ClippedBox clipHeight={408}>
+            <HeaderText>{t('Fixes')}</HeaderText>
+            {step.changes.map((change, i) => (
+              <Fragment key={change.repo_external_id}>
+                {i > 0 && <Separator />}
+                <AutofixRepoChange change={change} groupId={groupId} />
+              </Fragment>
+            ))}
+          </ClippedBox>
+        </ChangesContainer>
+      </AnimationWrapper>
+    </AnimatePresence>
   );
 }
 
@@ -246,6 +259,8 @@ const PreviewContent = styled('div')`
   margin-top: ${space(2)};
 `;
 
+const AnimationWrapper = styled(motion.div)``;
+
 const PrefixText = styled('span')``;
 
 const ChangesContainer = styled('div')`
@@ -253,7 +268,9 @@ const ChangesContainer = styled('div')`
   border-radius: ${p => p.theme.borderRadius};
   overflow: hidden;
   box-shadow: ${p => p.theme.dropShadowHeavy};
-  padding: ${space(2)};
+  padding-left: ${space(2)};
+  padding-right: ${space(2)};
+  padding-top: ${space(1)};
 `;
 
 const Content = styled('div')`
diff --git a/static/app/components/events/autofix/autofixDrawer.spec.tsx b/static/app/components/events/autofix/autofixDrawer.spec.tsx
index a29e3b14aef016..9c00a410d1e5e7 100644
--- a/static/app/components/events/autofix/autofixDrawer.spec.tsx
+++ b/static/app/components/events/autofix/autofixDrawer.spec.tsx
@@ -34,7 +34,7 @@ describe('AutofixDrawer', () => {
 
     expect(screen.getByRole('heading', {name: 'Autofix'})).toBeInTheDocument();
 
-    expect(screen.getByText('Ready to begin analyzing the issue?')).toBeInTheDocument();
+    expect(screen.getByText('Autofix is ready to start')).toBeInTheDocument();
 
     const startButton = screen.getByRole('button', {name: 'Start'});
     expect(startButton).toBeInTheDocument();
@@ -88,7 +88,7 @@ describe('AutofixDrawer', () => {
     await userEvent.click(startOverButton);
 
     await waitFor(() => {
-      expect(screen.getByText('Ready to begin analyzing the issue?')).toBeInTheDocument();
+      expect(screen.getByText('Autofix is ready to start')).toBeInTheDocument();
       expect(screen.getByRole('button', {name: 'Start'})).toBeInTheDocument();
     });
   });
diff --git a/static/app/components/events/autofix/autofixDrawer.tsx b/static/app/components/events/autofix/autofixDrawer.tsx
index d886c0e345ba29..ecdb157262db87 100644
--- a/static/app/components/events/autofix/autofixDrawer.tsx
+++ b/static/app/components/events/autofix/autofixDrawer.tsx
@@ -1,15 +1,17 @@
 import {useState} from 'react';
 import styled from '@emotion/styled';
 
+import bannerImage from 'sentry-images/spot/ai-suggestion-banner.svg';
+
 import ProjectAvatar from 'sentry/components/avatar/projectAvatar';
 import {Breadcrumbs as NavigationBreadcrumbs} from 'sentry/components/breadcrumbs';
 import {Button} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
 import AutofixFeedback from 'sentry/components/events/autofix/autofixFeedback';
-import AutofixMessageBox from 'sentry/components/events/autofix/autofixMessageBox';
 import {AutofixSteps} from 'sentry/components/events/autofix/autofixSteps';
 import {useAiAutofix} from 'sentry/components/events/autofix/useAutofix';
 import {DrawerBody, DrawerHeader} from 'sentry/components/globalDrawer/components';
+import Input from 'sentry/components/input';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Event} from 'sentry/types/event';
@@ -19,6 +21,43 @@ import {getShortEventId} from 'sentry/utils/events';
 import useRouteAnalyticsParams from 'sentry/utils/routeAnalytics/useRouteAnalyticsParams';
 import {MIN_NAV_HEIGHT} from 'sentry/views/issueDetails/streamline/eventNavigation';
 
+interface AutofixStartBoxProps {
+  onSend: (message: string) => void;
+}
+
+function AutofixStartBox({onSend}: AutofixStartBoxProps) {
+  const [message, setMessage] = useState('');
+
+  const send = () => {
+    onSend(message);
+  };
+
+  return (
+    <StartBox>
+      <Header>Autofix is ready to start</Header>
+      <br />
+      <p>
+        We'll begin by trying to figure out the root cause, analyzing the issue details
+        and the codebase. If you have any other helpful context on the issue before we
+        begin, you can share that below.
+      </p>
+      <Input
+        type="text"
+        value={message}
+        onChange={e => setMessage(e.target.value)}
+        placeholder={'Provide any extra context here...'}
+      />
+      <br />
+      <Button priority="primary" onClick={send}>
+        Start
+      </Button>
+      <IllustrationContainer>
+        <Illustration src={bannerImage} />
+      </IllustrationContainer>
+    </StartBox>
+  );
+}
+
 interface AutofixDrawerProps {
   event: Event;
   group: Group;
@@ -72,18 +111,7 @@ export function AutofixDrawer({group, project, event}: AutofixDrawerProps) {
       </AutofixNavigator>
       <AutofixDrawerBody ref={setContainer}>
         {!autofixData ? (
-          <AutofixMessageBox
-            displayText={'Ready to begin analyzing the issue?'}
-            step={null}
-            inputPlaceholder={'Optionally provide any extra context before we start...'}
-            responseRequired={false}
-            onSend={triggerAutofix}
-            actionText={'Start'}
-            allowEmptyMessage
-            isDisabled={false}
-            runId={''}
-            groupId={group.id}
-          />
+          <AutofixStartBox onSend={triggerAutofix} />
         ) : (
           <AutofixSteps
             data={autofixData}
@@ -97,6 +125,23 @@ export function AutofixDrawer({group, project, event}: AutofixDrawerProps) {
   );
 }
 
+const IllustrationContainer = styled('div')`
+  padding-top: ${space(4)};
+`;
+
+const Illustration = styled('img')`
+  height: 100%;
+`;
+
+const StartBox = styled('div')`
+  padding: ${space(2)};
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  height: 100%;
+  width: 100%;
+`;
+
 const AutofixDrawerContainer = styled('div')`
   height: 100%;
   display: grid;
diff --git a/static/app/components/events/autofix/autofixInsightCards.tsx b/static/app/components/events/autofix/autofixInsightCards.tsx
index 9da51e11919dd0..65d191d17a223a 100644
--- a/static/app/components/events/autofix/autofixInsightCards.tsx
+++ b/static/app/components/events/autofix/autofixInsightCards.tsx
@@ -2,6 +2,8 @@ import {useState} from 'react';
 import styled from '@emotion/styled';
 import {AnimatePresence, type AnimationProps, motion} from 'framer-motion';
 
+import bannerImage from 'sentry-images/spot/ai-suggestion-banner.svg';
+
 import {Button} from 'sentry/components/button';
 import {
   replaceHeadersWithBold,
@@ -237,21 +239,66 @@ function AutofixInsightCards({
 }: AutofixInsightCardsProps) {
   return (
     <InsightsContainer>
-      {insights.map((insight, index) =>
-        !insight ? null : (
-          <AutofixInsightCard
-            key={index}
-            insight={insight}
-            hasCardBelow={index < insights.length - 1 || hasStepBelow}
-            hasCardAbove={hasStepAbove && index === 0}
-            repos={repos}
-          />
-        )
+      {!hasStepAbove && (
+        <div>
+          <TitleText>Insights</TitleText>
+          <IconContainer>
+            <IconArrow direction={'down'} />
+          </IconContainer>
+        </div>
       )}
+      {insights.length > 0 ? (
+        insights.map((insight, index) =>
+          !insight ? null : (
+            <AutofixInsightCard
+              key={index}
+              insight={insight}
+              hasCardBelow={index < insights.length - 1 || hasStepBelow}
+              hasCardAbove={hasStepAbove && index === 0}
+              repos={repos}
+            />
+          )
+        )
+      ) : !hasStepAbove && !hasStepBelow ? (
+        <NoInsightsYet>
+          <p>
+            Autofix will share important conclusions here as it discovers them, building a
+            line of reasoning up to the root cause.
+          </p>
+          <IllustrationContainer>
+            <Illustration src={bannerImage} />
+          </IllustrationContainer>
+        </NoInsightsYet>
+      ) : null}
     </InsightsContainer>
   );
 }
 
+const IllustrationContainer = styled('div')`
+  padding-top: ${space(4)};
+`;
+
+const Illustration = styled('img')`
+  height: 100%;
+`;
+
+const NoInsightsYet = styled('div')`
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  padding-left: ${space(4)};
+  padding-right: ${space(4)};
+  text-align: center;
+`;
+
+const TitleText = styled('p')`
+  font-size: ${p => p.theme.fontSizeLarge};
+  font-weight: ${p => p.theme.fontWeightBold};
+  margin: 0;
+  display: flex;
+  justify-content: center;
+`;
+
 const InsightsContainer = styled('div')``;
 
 const InsightContainer = styled(motion.div)`
@@ -295,6 +342,7 @@ const TextBreak = styled('span')`
 
 const BackgroundPanel = styled('div')`
   padding: ${space(1)};
+  margin-bottom: ${space(1)};
   background: ${p => p.theme.backgroundSecondary};
   border-radius: ${p => p.theme.borderRadius};
 `;
@@ -308,7 +356,6 @@ const MiniHeader = styled('p')`
 const ExpandableContext = styled('div')`
   width: 100%;
   background: ${p => p.theme.alert.info.backgroundLight};
-  border-radius: ${p => p.theme.borderRadius};
 `;
 
 const ContextHeader = styled(Button)`
@@ -318,6 +365,7 @@ const ContextHeader = styled(Button)`
   border: none;
   font-weight: normal;
   background: ${p => p.theme.backgroundSecondary};
+  border-radius: 0px;
 `;
 
 const ContextHeaderWrapper = styled('div')`
diff --git a/static/app/components/events/autofix/autofixMessageBox.tsx b/static/app/components/events/autofix/autofixMessageBox.tsx
index b1618e4fa94143..30ea803310c99a 100644
--- a/static/app/components/events/autofix/autofixMessageBox.tsx
+++ b/static/app/components/events/autofix/autofixMessageBox.tsx
@@ -1,4 +1,4 @@
-import {Fragment, useState} from 'react';
+import {type FormEvent, Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
@@ -8,6 +8,7 @@ import Input from 'sentry/components/input';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {
   IconCheckmark,
+  IconChevron,
   IconClose,
   IconCode,
   IconFatal,
@@ -56,7 +57,10 @@ interface AutofixMessageBoxProps {
   responseRequired: boolean;
   runId: string;
   step: AutofixStep | null;
-  children?: React.ReactNode;
+  emptyInfoText?: string;
+  notEmptyInfoText?: string;
+  primaryAction?: boolean;
+  scrollIntoView?: (() => void) | null;
 }
 
 function StepIcon({step}: {step: AutofixStep}) {
@@ -93,6 +97,7 @@ function AutofixMessageBox({
   displayText = '',
   step = null,
   inputPlaceholder = 'Say something...',
+  primaryAction = false,
   responseRequired = false,
   onSend,
   actionText = 'Send',
@@ -100,12 +105,15 @@ function AutofixMessageBox({
   isDisabled = false,
   groupId,
   runId,
-  children,
+  emptyInfoText = '',
+  notEmptyInfoText = '',
+  scrollIntoView = null,
 }: AutofixMessageBoxProps) {
   const [message, setMessage] = useState('');
   const {mutate: send} = useSendMessage({groupId, runId});
 
-  const handleSend = () => {
+  const handleSend = (e: FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
     if (message.trim() !== '' || allowEmptyMessage) {
       if (onSend != null) {
         onSend(message);
@@ -131,6 +139,14 @@ function AutofixMessageBox({
                 __html: singleLineRenderer(step.title),
               }}
             />
+            {scrollIntoView !== null && (
+              <Button
+                onClick={scrollIntoView}
+                priority="link"
+                icon={<IconChevron isCircled direction="down" />}
+                aria-label={t('Jump to content')}
+              />
+            )}
           </StepHeader>
         )}
         <Message
@@ -138,37 +154,45 @@ function AutofixMessageBox({
             __html: marked(displayText),
           }}
         />
-        <ActionBar>{children}</ActionBar>
+        <ActionBar>
+          <p>{message.length > 0 ? notEmptyInfoText : emptyInfoText}</p>
+        </ActionBar>
       </DisplayArea>
-      <InputArea>
-        {!responseRequired ? (
-          <Fragment>
-            <NormalInput
-              type="text"
-              value={message}
-              onChange={e => setMessage(e.target.value)}
-              placeholder={inputPlaceholder}
-              disabled={isDisabled}
-            />
-            <Button onClick={handleSend} disabled={isDisabled}>
-              {actionText}
-            </Button>
-          </Fragment>
-        ) : (
-          <Fragment>
-            <RequiredInput
-              type="text"
-              value={message}
-              onChange={e => setMessage(e.target.value)}
-              placeholder={'Please answer to continue...'}
-              disabled={isDisabled}
-            />
-            <Button onClick={handleSend} disabled={isDisabled}>
-              {actionText}
-            </Button>
-          </Fragment>
-        )}
-      </InputArea>
+      <form onSubmit={handleSend}>
+        <InputArea>
+          {!responseRequired ? (
+            <Fragment>
+              <NormalInput
+                type="text"
+                value={message}
+                onChange={e => setMessage(e.target.value)}
+                placeholder={inputPlaceholder}
+                disabled={isDisabled}
+              />
+              <Button
+                type="submit"
+                priority={primaryAction ? 'primary' : 'default'}
+                disabled={isDisabled}
+              >
+                {actionText}
+              </Button>
+            </Fragment>
+          ) : (
+            <Fragment>
+              <RequiredInput
+                type="text"
+                value={message}
+                disabled={isDisabled}
+                onChange={e => setMessage(e.target.value)}
+                placeholder={'Please answer to continue...'}
+              />
+              <Button type="submit" priority={'primary'} disabled={isDisabled}>
+                {actionText}
+              </Button>
+            </Fragment>
+          )}
+        </InputArea>
+      </form>
     </Container>
   );
 }
@@ -186,7 +210,7 @@ const Container = styled('div')`
 `;
 
 const DisplayArea = styled('div')`
-  height: 10em;
+  height: 8em;
   overflow-y: hidden;
   padding: 8px;
   border-radius: 4px;
@@ -255,7 +279,8 @@ const ProcessingStatusIndicator = styled(LoadingIndicator)`
 
 const ActionBar = styled('div')`
   position: absolute;
-  bottom: 4em;
+  bottom: 3em;
+  color: ${p => p.theme.subText};
 `;
 
 export default AutofixMessageBox;
diff --git a/static/app/components/events/autofix/autofixRootCause.spec.tsx b/static/app/components/events/autofix/autofixRootCause.spec.tsx
index a2a8e1c7440eac..ef91264ee3b2cc 100644
--- a/static/app/components/events/autofix/autofixRootCause.spec.tsx
+++ b/static/app/components/events/autofix/autofixRootCause.spec.tsx
@@ -17,7 +17,9 @@ describe('AutofixRootCause', function () {
     render(<AutofixRootCause {...defaultProps} />);
 
     // Displays all root cause and code context info
-    expect(screen.getByText('This is the title of a root cause.')).toBeInTheDocument();
+    expect(
+      screen.getByText('Potential Root Cause: This is the title of a root cause.')
+    ).toBeInTheDocument();
     expect(
       screen.getByText('This is the description of a root cause.')
     ).toBeInTheDocument();
diff --git a/static/app/components/events/autofix/autofixRootCause.tsx b/static/app/components/events/autofix/autofixRootCause.tsx
index e9debe6e8b94f6..fdc4b387244840 100644
--- a/static/app/components/events/autofix/autofixRootCause.tsx
+++ b/static/app/components/events/autofix/autofixRootCause.tsx
@@ -43,7 +43,7 @@ type AutofixRootCauseProps = {
   runId: string;
 };
 
-const animationProps: AnimationProps = {
+const contentAnimationProps: AnimationProps = {
   exit: {opacity: 0},
   initial: {opacity: 0},
   animate: {opacity: 1},
@@ -196,7 +196,7 @@ function RootCauseContent({
     <ContentWrapper selected={selected}>
       <AnimatePresence initial={false}>
         {selected && (
-          <AnimationWrapper key="content" {...animationProps}>
+          <AnimationWrapper key="content" {...contentAnimationProps}>
             {children}
           </AnimationWrapper>
         )}
@@ -271,7 +271,7 @@ function CauseOption({
       <RootCauseOptionHeader>
         <Title
           dangerouslySetInnerHTML={{
-            __html: singleLineRenderer(cause.title),
+            __html: singleLineRenderer(`Potential Root Cause: ${cause.title}`),
           }}
         />
       </RootCauseOptionHeader>
@@ -393,7 +393,6 @@ function AutofixRootCauseDisplay({
     <PotentialCausesContainer>
       <ClippedBox clipHeight={408}>
         <OptionsPadding>
-          <HeaderText>{t('Potential Root Cause')}</HeaderText>
           {causes.map(cause => (
             <CauseOption
               key={cause.id}
@@ -411,6 +410,13 @@ function AutofixRootCauseDisplay({
   );
 }
 
+const cardAnimationProps: AnimationProps = {
+  exit: {opacity: 0},
+  initial: {opacity: 0, y: 20},
+  animate: {opacity: 1, y: 0},
+  transition: testableTransition({duration: 0.3}),
+};
+
 export function AutofixRootCause(props: AutofixRootCauseProps) {
   if (props.causes.length === 0) {
     return (
@@ -422,7 +428,13 @@ export function AutofixRootCause(props: AutofixRootCauseProps) {
     );
   }
 
-  return <AutofixRootCauseDisplay {...props} />;
+  return (
+    <AnimatePresence initial>
+      <AnimationWrapper key="card" {...cardAnimationProps}>
+        <AutofixRootCauseDisplay {...props} />
+      </AnimationWrapper>
+    </AnimatePresence>
+  );
 }
 
 export function AutofixRootCauseCodeContexts({
@@ -473,13 +485,17 @@ const PotentialCausesContainer = styled(CausesContainer)`
 `;
 
 const OptionsPadding = styled('div')`
-  padding: ${space(2)};
+  padding-left: ${space(1)};
+  padding-right: ${space(1)};
+  padding-top: ${space(1)};
 `;
 
 const RootCauseOption = styled('div')<{selected: boolean}>`
-  position: relative;
   background: ${p => (p.selected ? p.theme.background : p.theme.backgroundElevated)};
   cursor: ${p => (p.selected ? 'default' : 'pointer')};
+  padding-top: ${space(1)};
+  padding-left: ${space(2)};
+  padding-right: ${space(2)};
 `;
 
 const RootCauseOptionHeader = styled('div')`
@@ -491,6 +507,7 @@ const RootCauseOptionHeader = styled('div')`
 
 const Title = styled('div')`
   font-weight: ${p => p.theme.fontWeightBold};
+  font-size: ${p => p.theme.fontSizeLarge};
 `;
 
 const CauseDescription = styled('div')`
diff --git a/static/app/components/events/autofix/autofixSteps.tsx b/static/app/components/events/autofix/autofixSteps.tsx
index bacd141fbc5b61..d2f91ac2aae450 100644
--- a/static/app/components/events/autofix/autofixSteps.tsx
+++ b/static/app/components/events/autofix/autofixSteps.tsx
@@ -1,8 +1,7 @@
-import {Fragment} from 'react';
+import {Fragment, useEffect, useRef, useState} from 'react';
 import styled from '@emotion/styled';
 import {AnimatePresence, type AnimationProps, motion} from 'framer-motion';
 
-import {Button} from 'sentry/components/button';
 import {AutofixChanges} from 'sentry/components/events/autofix/autofixChanges';
 import AutofixInsightCards from 'sentry/components/events/autofix/autofixInsightCards';
 import AutofixMessageBox from 'sentry/components/events/autofix/autofixMessageBox';
@@ -28,12 +27,13 @@ const animationProps: AnimationProps = {
 };
 interface StepProps {
   groupId: string;
+  hasErroredStepBefore: boolean;
+  hasStepAbove: boolean;
+  hasStepBelow: boolean;
   onRetry: () => void;
   repos: AutofixRepository[];
   runId: string;
   step: AutofixStep;
-  totalSteps: number;
-  stepNumber?: number;
 }
 
 interface AutofixStepsProps {
@@ -64,8 +64,9 @@ export function Step({
   runId,
   onRetry,
   repos,
-  stepNumber,
-  totalSteps,
+  hasStepBelow,
+  hasStepAbove,
+  hasErroredStepBefore,
 }: StepProps) {
   const isActive = step.status !== 'PENDING' && step.status !== 'CANCELLED';
 
@@ -75,15 +76,12 @@ export function Step({
         <AnimatePresence initial={false}>
           <AnimationWrapper key="content" {...animationProps}>
             <Fragment>
-              {step.completedMessage && <StepBody>{step.completedMessage}</StepBody>}
               {step.type === AutofixStepType.DEFAULT && (
                 <AutofixInsightCards
                   insights={step.insights}
                   repos={repos}
-                  hasStepBelow={
-                    stepNumber !== undefined ? stepNumber < totalSteps : false
-                  }
-                  hasStepAbove={stepNumber !== undefined ? stepNumber > 1 : false}
+                  hasStepBelow={hasStepBelow}
+                  hasStepAbove={hasStepAbove}
                 />
               )}
               {step.type === AutofixStepType.ROOT_CAUSE_ANALYSIS && (
@@ -98,6 +96,13 @@ export function Step({
               {step.type === AutofixStepType.CHANGES && (
                 <AutofixChanges step={step} groupId={groupId} onRetry={onRetry} />
               )}
+              {hasErroredStepBefore && hasStepBelow && (
+                <StepMessage>
+                  Autofix encountered an error.
+                  <br />
+                  Restarting step from scratch...
+                </StepMessage>
+              )}
             </Fragment>
           </AnimationWrapper>
         </AnimatePresence>
@@ -106,23 +111,51 @@ export function Step({
   );
 }
 
+function useInView(ref: HTMLElement | null) {
+  const [inView, setInView] = useState(false);
+
+  useEffect(() => {
+    const observer = new IntersectionObserver(([entry]) => {
+      setInView(entry.isIntersecting);
+    });
+
+    if (!ref)
+      return () => {
+        observer.disconnect();
+      };
+
+    observer.observe(ref);
+    return () => {
+      observer.disconnect();
+    };
+  }, [ref]);
+  return inView;
+}
+
 export function AutofixSteps({data, groupId, runId, onRetry}: AutofixStepsProps) {
   const steps = data.steps;
   const repos = data.repositories;
 
+  const stepsRef = useRef<(HTMLDivElement | null)[]>([]);
+
   const {mutate: handleSelectFix} = useSelectCause({groupId, runId});
-  const provideCustomRootCause = (text: string) => {
-    handleSelectFix({customRootCause: text});
-  };
-  const useSuggestedRootCause = () => {
-    if (!steps) return;
-    const step = steps[steps.length - 1];
-    if (step.type !== AutofixStepType.ROOT_CAUSE_ANALYSIS) return;
-    const cause = step.causes[0];
-    const id = cause.id;
-    handleSelectFix({causeId: id});
+  const selectRootCause = (text: string) => {
+    if (text.length > 0) {
+      handleSelectFix({customRootCause: text});
+    } else {
+      if (!steps) return;
+      const step = steps[steps.length - 1];
+      if (step.type !== AutofixStepType.ROOT_CAUSE_ANALYSIS) return;
+      const cause = step.causes[0];
+      const id = cause.id;
+      handleSelectFix({causeId: id});
+    }
   };
 
+  const lastStepVisible = useInView(
+    stepsRef.current.length ? stepsRef.current[stepsRef.current.length - 1] : null
+  );
+
   if (!steps) {
     return null;
   }
@@ -139,20 +172,35 @@ export function AutofixSteps({data, groupId, runId, onRetry}: AutofixStepsProps)
     lastStep.type === AutofixStepType.CHANGES && lastStep.status === 'COMPLETED';
   const disabled = areCodeChangesShowing ? true : false;
 
+  const previousStep = steps.length > 2 ? steps[steps.length - 2] : null;
+  const previousStepErrored =
+    previousStep !== null &&
+    previousStep?.type === lastStep.type &&
+    previousStep.status === 'ERROR';
+
+  const scrollToMatchingStep = () => {
+    const matchingStepIndex = steps.findIndex(step => step.type === lastStep.type);
+    if (matchingStepIndex !== -1 && stepsRef.current[matchingStepIndex]) {
+      stepsRef.current[matchingStepIndex]?.scrollIntoView({behavior: 'smooth'});
+    }
+  };
+
   return (
     <div>
       <StepsContainer>
         {steps.map((step, index) => (
-          <Step
-            step={step}
-            key={step.id}
-            stepNumber={index + 1}
-            totalSteps={steps.length}
-            groupId={groupId}
-            runId={runId}
-            onRetry={onRetry}
-            repos={repos}
-          />
+          <div ref={el => (stepsRef.current[index] = el)} key={step.id}>
+            <Step
+              step={step}
+              hasStepBelow={index + 1 < steps.length}
+              hasStepAbove={index > 0}
+              groupId={groupId}
+              runId={runId}
+              onRetry={onRetry}
+              repos={repos}
+              hasErroredStepBefore={previousStepErrored}
+            />
+          </div>
         ))}
       </StepsContainer>
 
@@ -162,29 +210,44 @@ export function AutofixSteps({data, groupId, runId, onRetry}: AutofixStepsProps)
         inputPlaceholder={
           !isRootCauseSelectionStep
             ? 'Say something...'
-            : 'Propose your own root cause...'
+            : 'Or propose your own root cause instead...'
         }
         responseRequired={false}
-        onSend={!isRootCauseSelectionStep ? null : provideCustomRootCause}
-        actionText={'Send'}
-        allowEmptyMessage={false}
+        onSend={!isRootCauseSelectionStep ? null : selectRootCause}
+        actionText={!isRootCauseSelectionStep ? 'Send' : 'Find a Fix'}
+        allowEmptyMessage={!isRootCauseSelectionStep ? false : true}
         isDisabled={disabled}
         groupId={groupId}
         runId={runId}
-      >
-        {isRootCauseSelectionStep && (
-          <ActionBar>
-            <Button onClick={useSuggestedRootCause}>Fix the root cause above</Button>
-            <ActionBarText>OR</ActionBarText>
-          </ActionBar>
-        )}
-      </AutofixMessageBox>
+        primaryAction={isRootCauseSelectionStep}
+        emptyInfoText={
+          !isRootCauseSelectionStep ? '' : 'Selected: suggested root cause above'
+        }
+        notEmptyInfoText={
+          !isRootCauseSelectionStep ? '' : 'Selected: your custom root cause below'
+        }
+        scrollIntoView={
+          !lastStepVisible &&
+          (lastStep.type === AutofixStepType.ROOT_CAUSE_ANALYSIS ||
+            lastStep.type === AutofixStepType.CHANGES)
+            ? scrollToMatchingStep
+            : null
+        }
+      />
     </div>
   );
 }
 
+const StepMessage = styled('div')`
+  overflow: hidden;
+  padding: ${space(2)};
+  color: ${p => p.theme.subText};
+  justify-content: center;
+  text-align: center;
+`;
+
 const StepsContainer = styled('div')`
-  margin-bottom: 15em;
+  margin-bottom: 13em;
 `;
 
 const StepCard = styled('div')<{active?: boolean}>`
@@ -196,11 +259,6 @@ const StepCard = styled('div')<{active?: boolean}>`
   }
 `;
 
-const StepBody = styled('p')`
-  padding: 0 ${space(2)} ${space(2)} ${space(2)};
-  margin: -${space(1)} 0 0 0;
-`;
-
 const ContentWrapper = styled(motion.div)`
   display: grid;
   grid-template-rows: 1fr;
@@ -214,14 +272,4 @@ const ContentWrapper = styled(motion.div)`
   }
 `;
 
-const ActionBar = styled('div')`
-  flex-direction: row;
-  display: flex;
-`;
-const ActionBarText = styled('p')`
-  padding-left: ${space(1)};
-  padding-bottom: 0;
-  margin-top: ${space(1)};
-`;
-
 const AnimationWrapper = styled(motion.div)``;
diff --git a/static/app/components/events/autofix/index.spec.tsx b/static/app/components/events/autofix/index.spec.tsx
index 540fe0934bb4f6..20f815939161a7 100644
--- a/static/app/components/events/autofix/index.spec.tsx
+++ b/static/app/components/events/autofix/index.spec.tsx
@@ -77,6 +77,6 @@ describe('Autofix', () => {
 
     render(<Autofix event={event} group={group} />);
 
-    expect(await screen.findByRole('button', {name: 'Run Autofix'})).toBeInTheDocument();
+    expect(await screen.findByRole('button', {name: 'Open Autofix'})).toBeInTheDocument();
   });
 });
diff --git a/static/app/components/events/breadcrumbs/breadcrumbsDrawer.tsx b/static/app/components/events/breadcrumbs/breadcrumbsDrawer.tsx
index f2b16699be1759..5d3d9520be0f4c 100644
--- a/static/app/components/events/breadcrumbs/breadcrumbsDrawer.tsx
+++ b/static/app/components/events/breadcrumbs/breadcrumbsDrawer.tsx
@@ -1,4 +1,4 @@
-import {useCallback, useMemo, useState} from 'react';
+import {useMemo, useState} from 'react';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 
@@ -24,13 +24,14 @@ import {
   NavigationCrumbs,
   SearchInput,
   ShortId,
-} from 'sentry/components/events/eventReplay/eventDrawer';
+} from 'sentry/components/events/eventDrawer';
 import {
   applyBreadcrumbSearch,
   BREADCRUMB_SORT_LOCALSTORAGE_KEY,
   BREADCRUMB_SORT_OPTIONS,
   BreadcrumbSort,
 } from 'sentry/components/events/interfaces/breadcrumbs';
+import useFocusControl from 'sentry/components/events/useFocusControl';
 import {InputGroup} from 'sentry/components/inputGroup';
 import {IconClock, IconFilter, IconSearch, IconSort, IconTimer} from 'sentry/icons';
 import {t} from 'sentry/locale';
@@ -49,21 +50,6 @@ export const enum BreadcrumbControlOptions {
   SORT = 'sort',
 }
 
-function useFocusControl(initialFocusControl?: BreadcrumbControlOptions) {
-  const [focusControl, setFocusControl] = useState(initialFocusControl);
-  // If the focused control element is blurred, unset the state to remove styles
-  // This will allow us to simulate :focus-visible on the button elements.
-  const getFocusProps = useCallback(
-    (option: BreadcrumbControlOptions) => {
-      return option === focusControl
-        ? {autoFocus: true, onBlur: () => setFocusControl(undefined)}
-        : {};
-    },
-    [focusControl]
-  );
-  return {getFocusProps};
-}
-
 interface BreadcrumbsDrawerProps {
   breadcrumbs: EnhancedCrumb[];
   event: Event;
diff --git a/static/app/components/events/eventReplay/eventDrawer.tsx b/static/app/components/events/eventDrawer.tsx
similarity index 100%
rename from static/app/components/events/eventReplay/eventDrawer.tsx
rename to static/app/components/events/eventDrawer.tsx
diff --git a/static/app/components/events/featureFlags/eventFeatureFlagList.tsx b/static/app/components/events/featureFlags/eventFeatureFlagList.tsx
index a8bd9dda3da71c..9ce421ed1eba7f 100644
--- a/static/app/components/events/featureFlags/eventFeatureFlagList.tsx
+++ b/static/app/components/events/featureFlags/eventFeatureFlagList.tsx
@@ -9,6 +9,7 @@ import {
   CardContainer,
   FeatureFlagDrawer,
   FLAG_SORT_OPTIONS,
+  FlagControlOptions,
   FlagSort,
   getLabel,
 } from 'sentry/components/events/featureFlags/featureFlagDrawer';
@@ -16,7 +17,7 @@ import useDrawer from 'sentry/components/globalDrawer';
 import KeyValueData, {
   type KeyValueDataContentProps,
 } from 'sentry/components/keyValueData';
-import {IconMegaphone, IconSort} from 'sentry/icons';
+import {IconMegaphone, IconSearch, IconSort} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import type {Event, FeatureFlag} from 'sentry/types/event';
 import type {Group} from 'sentry/types/group';
@@ -91,35 +92,39 @@ export function EventFeatureFlagList({
         ? [...hydratedFlags].reverse()
         : hydratedFlags;
 
-  const onViewAllFlags = useCallback(() => {
-    trackAnalytics('flags.view-all-clicked', {
-      organization,
-    });
-    openDrawer(
-      () => (
-        <FeatureFlagDrawer
-          group={group}
-          event={event}
-          project={project}
-          hydratedFlags={hydratedFlags}
-          initialSort={sortMethod}
-        />
-      ),
-      {
-        ariaLabel: t('Feature flags drawer'),
-        // We prevent a click on the 'View All' button from closing the drawer so that
-        // we don't reopen it immediately, and instead let the button handle this itself.
-        shouldCloseOnInteractOutside: element => {
-          const viewAllButton = viewAllButtonRef.current;
-          if (viewAllButton?.contains(element)) {
-            return false;
-          }
-          return true;
-        },
-        transitionProps: {stiffness: 1000},
-      }
-    );
-  }, [openDrawer, event, group, project, sortMethod, hydratedFlags, organization]);
+  const onViewAllFlags = useCallback(
+    (focusControl?: FlagControlOptions) => {
+      trackAnalytics('flags.view-all-clicked', {
+        organization,
+      });
+      openDrawer(
+        () => (
+          <FeatureFlagDrawer
+            group={group}
+            event={event}
+            project={project}
+            hydratedFlags={hydratedFlags}
+            initialSort={sortMethod}
+            focusControl={focusControl}
+          />
+        ),
+        {
+          ariaLabel: t('Feature flags drawer'),
+          // We prevent a click on the 'View All' button from closing the drawer so that
+          // we don't reopen it immediately, and instead let the button handle this itself.
+          shouldCloseOnInteractOutside: element => {
+            const viewAllButton = viewAllButtonRef.current;
+            if (viewAllButton?.contains(element)) {
+              return false;
+            }
+            return true;
+          },
+          transitionProps: {stiffness: 1000},
+        }
+      );
+    },
+    [openDrawer, event, group, project, sortMethod, hydratedFlags, organization]
+  );
 
   if (!hydratedFlags.length) {
     return null;
@@ -128,10 +133,18 @@ export function EventFeatureFlagList({
   const actions = (
     <ButtonBar gap={1}>
       {feedbackButton}
+      <Button
+        aria-label={t('Open Feature Flag Search')}
+        icon={<IconSearch size="xs" />}
+        size="xs"
+        title={t('Open Search')}
+        onClick={() => onViewAllFlags(FlagControlOptions.SEARCH)}
+      />
       <Button
         size="xs"
         aria-label={t('View All')}
         ref={viewAllButtonRef}
+        title={t('View All Flags')}
         onClick={() => {
           isDrawerOpen ? closeDrawer() : onViewAllFlags();
         }}
diff --git a/static/app/components/events/featureFlags/featureFlagDrawer.tsx b/static/app/components/events/featureFlags/featureFlagDrawer.tsx
index d5b94baa79fc10..b15d33186e1f60 100644
--- a/static/app/components/events/featureFlags/featureFlagDrawer.tsx
+++ b/static/app/components/events/featureFlags/featureFlagDrawer.tsx
@@ -15,7 +15,8 @@ import {
   NavigationCrumbs,
   SearchInput,
   ShortId,
-} from 'sentry/components/events/eventReplay/eventDrawer';
+} from 'sentry/components/events/eventDrawer';
+import useFocusControl from 'sentry/components/events/useFocusControl';
 import {InputGroup} from 'sentry/components/inputGroup';
 import KeyValueData, {
   type KeyValueDataContentProps,
@@ -74,6 +75,7 @@ interface FlagDrawerProps {
   hydratedFlags: KeyValueDataContentProps[];
   initialSort: FlagSort;
   project: Project;
+  focusControl?: FlagControlOptions;
 }
 
 export function FeatureFlagDrawer({
@@ -82,10 +84,12 @@ export function FeatureFlagDrawer({
   project,
   initialSort,
   hydratedFlags,
+  focusControl: initialFocusControl,
 }: FlagDrawerProps) {
   const [sortMethod, setSortMethod] = useState<FlagSort>(initialSort);
   const [search, setSearch] = useState('');
   const organization = useOrganization();
+  const {getFocusProps} = useFocusControl(initialFocusControl);
 
   const handleSortAlphabetical = (flags: KeyValueDataContentProps[]) => {
     return [...flags].sort((a, b) => {
@@ -111,6 +115,7 @@ export function FeatureFlagDrawer({
             setSearch(e.target.value.toLowerCase());
           }}
           aria-label={t('Search Flags')}
+          {...getFocusProps(FlagControlOptions.SEARCH)}
         />
         <InputGroup.TrailingItems disablePointerEvents>
           <IconSearch size="xs" />
diff --git a/static/app/components/events/useFocusControl.tsx b/static/app/components/events/useFocusControl.tsx
new file mode 100644
index 00000000000000..352b0a1002d32f
--- /dev/null
+++ b/static/app/components/events/useFocusControl.tsx
@@ -0,0 +1,21 @@
+import {useCallback, useState} from 'react';
+
+import type {BreadcrumbControlOptions} from 'sentry/components/events/breadcrumbs/breadcrumbsDrawer';
+import type {FlagControlOptions} from 'sentry/components/events/featureFlags/featureFlagDrawer';
+
+type FocusControlOption = BreadcrumbControlOptions | FlagControlOptions;
+
+export default function useFocusControl(initialFocusControl?: FocusControlOption) {
+  const [focusControl, setFocusControl] = useState(initialFocusControl);
+  // If the focused control element is blurred, unset the state to remove styles
+  // This will allow us to simulate :focus-visible on the button elements.
+  const getFocusProps = useCallback(
+    (option: FocusControlOption) => {
+      return option === focusControl
+        ? {autoFocus: true, onBlur: () => setFocusControl(undefined)}
+        : {};
+    },
+    [focusControl]
+  );
+  return {getFocusProps};
+}
diff --git a/static/app/components/onboarding/gettingStartedDoc/layout.tsx b/static/app/components/onboarding/gettingStartedDoc/layout.tsx
deleted file mode 100644
index 856f2b6b997ae2..00000000000000
--- a/static/app/components/onboarding/gettingStartedDoc/layout.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-import type {ComponentProps} from 'react';
-import {Fragment} from 'react';
-import styled from '@emotion/styled';
-
-import HookOrDefault from 'sentry/components/hookOrDefault';
-import ExternalLink from 'sentry/components/links/externalLink';
-import List from 'sentry/components/list';
-import ListItem from 'sentry/components/list/listItem';
-import {AuthTokenGeneratorProvider} from 'sentry/components/onboarding/gettingStartedDoc/authTokenGenerator';
-import type {StepProps} from 'sentry/components/onboarding/gettingStartedDoc/step';
-import {Step} from 'sentry/components/onboarding/gettingStartedDoc/step';
-import type {NextStep} from 'sentry/components/onboarding/gettingStartedDoc/types';
-import {PlatformOptionsControl} from 'sentry/components/onboarding/platformOptionsControl';
-import {ProductSelection} from 'sentry/components/onboarding/productSelection';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {PlatformKey} from 'sentry/types/project';
-import useOrganization from 'sentry/utils/useOrganization';
-
-const ProductSelectionAvailabilityHook = HookOrDefault({
-  hookName: 'component:product-selection-availability',
-  defaultComponent: ProductSelection,
-});
-
-export type LayoutProps = {
-  projectId: string;
-  projectSlug: string;
-  steps: StepProps[];
-  /**
-   * An introduction displayed before the steps
-   */
-  introduction?: React.ReactNode;
-  newOrg?: boolean;
-  nextSteps?: NextStep[];
-  platformKey?: PlatformKey;
-  platformOptions?: ComponentProps<typeof PlatformOptionsControl>['platformOptions'];
-};
-
-export function Layout({
-  steps,
-  platformKey,
-  newOrg,
-  nextSteps = [],
-  platformOptions,
-  introduction,
-  projectSlug,
-  projectId,
-}: LayoutProps) {
-  const organization = useOrganization();
-
-  return (
-    <AuthTokenGeneratorProvider projectSlug={projectSlug}>
-      <Wrapper>
-        <Header>
-          {introduction && <Introduction>{introduction}</Introduction>}
-          <ProductSelectionAvailabilityHook
-            organization={organization}
-            platform={platformKey}
-            projectId={projectId}
-          />
-          {platformOptions ? (
-            <PlatformOptionsControl platformOptions={platformOptions} />
-          ) : null}
-        </Header>
-        <Divider withBottomMargin={newOrg} />
-        <Steps>
-          {steps.map(step => (
-            <Step key={step.title ?? step.type} {...step} />
-          ))}
-        </Steps>
-        {nextSteps.length > 0 && (
-          <Fragment>
-            <Divider />
-            <h4>{t('Next Steps')}</h4>
-            <List symbol="bullet">
-              {nextSteps.map(step => (
-                <ListItem key={step.name}>
-                  <ExternalLink href={step.link}>{step.name}</ExternalLink>
-                  {': '}
-                  {step.description}
-                </ListItem>
-              ))}
-            </List>
-          </Fragment>
-        )}
-      </Wrapper>
-    </AuthTokenGeneratorProvider>
-  );
-}
-
-const Header = styled('div')`
-  display: flex;
-  flex-direction: column;
-  gap: ${space(2)};
-`;
-
-const Divider = styled('hr')<{withBottomMargin?: boolean}>`
-  height: 1px;
-  width: 100%;
-  background: ${p => p.theme.border};
-  border: none;
-  ${p => p.withBottomMargin && `margin-bottom: ${space(3)}`}
-`;
-
-const Steps = styled('div')`
-  display: flex;
-  flex-direction: column;
-  gap: 1.5rem;
-`;
-
-const Introduction = styled('div')`
-  display: flex;
-  flex-direction: column;
-  gap: ${space(1)};
-`;
-
-const Wrapper = styled('div')`
-  h4 {
-    margin-bottom: 0.5em;
-  }
-  && {
-    p {
-      margin-bottom: 0;
-    }
-    h5 {
-      margin-bottom: 0;
-    }
-  }
-`;
diff --git a/static/app/components/onboarding/gettingStartedDoc/sdkDocumentation.spec.tsx b/static/app/components/onboarding/gettingStartedDoc/sdkDocumentation.spec.tsx
index bba80853586576..4de5b207a40cfd 100644
--- a/static/app/components/onboarding/gettingStartedDoc/sdkDocumentation.spec.tsx
+++ b/static/app/components/onboarding/gettingStartedDoc/sdkDocumentation.spec.tsx
@@ -72,7 +72,7 @@ describe('Renders SDK Documentation corretly based on platform id and language',
   });
 
   it('JavaScript', async function () {
-    const {organization, project} = initializeOrg({
+    const {organization, project, router} = initializeOrg({
       projects: [
         {
           ...initializeOrg().project,
@@ -80,6 +80,13 @@ describe('Renders SDK Documentation corretly based on platform id and language',
           platform: 'javascript',
         },
       ],
+      router: {
+        location: {
+          query: {
+            installationMode: 'manual',
+          },
+        },
+      },
     });
 
     renderMockRequests({project, orgSlug: organization.slug});
@@ -99,7 +106,10 @@ describe('Renders SDK Documentation corretly based on platform id and language',
           organization={organization}
           activeProductSelection={[]}
         />
-      </OnboardingContextProvider>
+      </OnboardingContextProvider>,
+      {
+        router,
+      }
     );
 
     // Renders main headings
diff --git a/static/app/components/onboarding/productSelection.spec.tsx b/static/app/components/onboarding/productSelection.spec.tsx
index d06e8fe2ae1817..aa4bf053cc44af 100644
--- a/static/app/components/onboarding/productSelection.spec.tsx
+++ b/static/app/components/onboarding/productSelection.spec.tsx
@@ -106,57 +106,6 @@ describe('Onboarding Product Selection', function () {
     ).toBeInTheDocument();
   });
 
-  it('renders for Loader Script', async function () {
-    const {router, project} = initializeOrg({
-      router: {
-        location: {
-          query: {
-            showLoader: 'true',
-            product: [
-              ProductSolution.PERFORMANCE_MONITORING,
-              ProductSolution.SESSION_REPLAY,
-            ],
-          },
-        },
-        params: {},
-      },
-    });
-
-    render(
-      <ProductSelection
-        organization={organization}
-        platform="javascript"
-        projectId={project.id}
-      />,
-      {
-        router,
-      }
-    );
-
-    // Introduction
-    expect(
-      screen.getByText(
-        textWithMarkupMatcher(/In this quick guide you’ll use our Loader Script/)
-      )
-    ).toBeInTheDocument();
-    expect(
-      screen.getByText(
-        textWithMarkupMatcher(/Prefer to set up Sentry using npm or yarn\?/)
-      )
-    ).toBeInTheDocument();
-
-    await userEvent.click(screen.getByText('View npm/yarn instructions'));
-
-    expect(router.replace).toHaveBeenCalledWith(
-      expect.objectContaining({
-        query: {
-          product: ['performance-monitoring', 'session-replay'],
-          showLoader: false,
-        },
-      })
-    );
-  });
-
   it('renders disabled product', async function () {
     const {router, project} = initializeOrg({
       router: {
diff --git a/static/app/components/onboarding/productSelection.tsx b/static/app/components/onboarding/productSelection.tsx
index 0f48e4795c71ca..673a38d38e030b 100644
--- a/static/app/components/onboarding/productSelection.tsx
+++ b/static/app/components/onboarding/productSelection.tsx
@@ -5,7 +5,6 @@ import styled from '@emotion/styled';
 
 import {openModal} from 'sentry/actionCreators/modal';
 import {FeatureDisabledModal} from 'sentry/components/acl/featureDisabledModal';
-import {Alert} from 'sentry/components/alert';
 import {Button} from 'sentry/components/button';
 import Checkbox from 'sentry/components/checkbox';
 import ExternalLink from 'sentry/components/links/externalLink';
@@ -17,7 +16,6 @@ import HookStore from 'sentry/stores/hookStore';
 import {space} from 'sentry/styles/space';
 import type {Organization} from 'sentry/types/organization';
 import type {PlatformKey} from 'sentry/types/project';
-import {trackAnalytics} from 'sentry/utils/analytics';
 import {useOnboardingQueryParams} from 'sentry/views/onboarding/components/useOnboardingQueryParams';
 import TextBlock from 'sentry/views/settings/components/text/textBlock';
 
@@ -317,13 +315,11 @@ export function ProductSelection({
   organization,
   platform,
   productsPerPlatform = platformProductAvailability,
-  projectId,
   onChange,
   onLoad,
 }: ProductSelectionProps) {
   const [params, setParams] = useOnboardingQueryParams();
   const urlProducts = useMemo(() => params.product ?? [], [params.product]);
-  const supportLoader = platform === 'javascript';
 
   const products: ProductSolution[] | undefined = platform
     ? productsPerPlatform[platform]
@@ -340,8 +336,6 @@ export function ProductSelection({
   useEffect(() => {
     onLoad?.(defaultProducts);
     setParams({
-      showLoader:
-        supportLoader && params.showLoader === undefined ? true : params.showLoader,
       product: defaultProducts,
     });
     // Adding defaultProducts to the dependency array causes an max-depth error
@@ -385,18 +379,6 @@ export function ProductSelection({
     [defaultProducts, organization, setParams, urlProducts, onChange]
   );
 
-  const handleToggleLoader = useCallback(() => {
-    if (!params.showLoader === false && platform) {
-      trackAnalytics('onboarding.js_loader_npm_docs_shown', {
-        organization,
-        platform,
-        project_id: projectId,
-      });
-    }
-
-    setParams({showLoader: !params.showLoader});
-  }, [setParams, platform, projectId, organization, params.showLoader]);
-
   if (!products) {
     // if the platform does not support any product, we don't render anything
     return null;
@@ -407,20 +389,17 @@ export function ProductSelection({
   // until we improve multi snippet suppport
   const showPackageManagerInfo =
     (platform?.indexOf('javascript') === 0 || platform?.indexOf('node') === 0) &&
-    platform !== 'javascript-astro';
+    platform !== 'javascript-astro' &&
+    platform !== 'javascript';
 
   return (
     <Fragment>
       {showPackageManagerInfo && (
         <TextBlock noMargin>
-          {supportLoader
-            ? tct('In this quick guide you’ll use our [loaderScript] to set up:', {
-                loaderScript: <strong>Loader Script</strong>,
-              })
-            : tct('In this quick guide you’ll use [npm] or [yarn] to set up:', {
-                npm: <strong>npm</strong>,
-                yarn: <strong>yarn</strong>,
-              })}
+          {tct('In this quick guide you’ll use [npm] or [yarn] to set up:', {
+            npm: <strong>npm</strong>,
+            yarn: <strong>yarn</strong>,
+          })}
         </TextBlock>
       )}
       <Products>
@@ -470,44 +449,10 @@ export function ProductSelection({
           />
         )}
       </Products>
-      {showPackageManagerInfo && supportLoader && (
-        <AlternativeInstallationAlert type="info" showIcon>
-          {params.showLoader
-            ? tct('Prefer to set up Sentry using [npm:npm] or [yarn:yarn]? [goHere]', {
-                npm: <strong />,
-                yarn: <strong />,
-                goHere: (
-                  <SkipLazyLoaderButton
-                    onClick={handleToggleLoader}
-                    size="xs"
-                    priority="default"
-                  >
-                    {t('View npm/yarn instructions')}
-                  </SkipLazyLoaderButton>
-                ),
-              })
-            : tct('Prefer to set up Sentry using [bold:Loader Script]? [goHere]', {
-                bold: <strong />,
-                goHere: (
-                  <SkipLazyLoaderButton
-                    onClick={handleToggleLoader}
-                    size="xs"
-                    priority="default"
-                  >
-                    {t('View loader instructions')}
-                  </SkipLazyLoaderButton>
-                ),
-              })}
-        </AlternativeInstallationAlert>
-      )}
     </Fragment>
   );
 }
 
-const SkipLazyLoaderButton = styled(Button)`
-  margin-left: ${space(1)};
-`;
-
 const Products = styled('div')`
   display: flex;
   flex-wrap: wrap;
@@ -564,15 +509,3 @@ const TooltipDescription = styled('div')`
   gap: ${space(0.5)};
   justify-content: flex-start;
 `;
-
-const AlternativeInstallationAlert = styled(Alert)`
-  margin-bottom: 0px;
-  /*
-   * The first child is the icon.
-   * We render a button within the message, so to ensure proper alignment,
-   * the height of the first child (icon) needs to be set to 'auto'.
-   */
-  > *:first-child {
-    height: auto;
-  }
-`;
diff --git a/static/app/components/organizations/datePageFilter.tsx b/static/app/components/organizations/datePageFilter.tsx
index 28633b8d046b1c..77dd93baf65758 100644
--- a/static/app/components/organizations/datePageFilter.tsx
+++ b/static/app/components/organizations/datePageFilter.tsx
@@ -1,17 +1,11 @@
-import styled from '@emotion/styled';
-
 import {updateDateTime} from 'sentry/actionCreators/pageFilters';
 import type {TimeRangeSelectorProps} from 'sentry/components/timeRangeSelector';
 import {TimeRangeSelector} from 'sentry/components/timeRangeSelector';
-import {IconCalendar} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import useRouter from 'sentry/utils/useRouter';
 
-import {
-  DesyncedFilterIndicator,
-  DesyncedFilterMessage,
-} from './pageFilters/desyncedFilter';
+import {DesyncedFilterMessage} from './pageFilters/desyncedFilter';
 
 interface DatePageFilterProps
   extends Partial<
@@ -48,6 +42,7 @@ export function DatePageFilter({
       utc={utc}
       relative={period}
       disabled={disabled ?? !pageFilterIsReady}
+      desynced={desynced}
       onChange={timePeriodUpdate => {
         const {relative, ...startEndUtc} = timePeriodUpdate;
         const newTimePeriod = {period: relative, ...startEndUtc};
@@ -63,21 +58,7 @@ export function DatePageFilter({
       menuTitle={menuTitle ?? t('Filter Time Range')}
       menuWidth={menuWidth ?? desynced ? '22em' : undefined}
       menuBody={desynced && <DesyncedFilterMessage />}
-      triggerProps={{
-        icon: (
-          <TriggerIconWrap>
-            <IconCalendar />
-            {desynced && <DesyncedFilterIndicator />}
-          </TriggerIconWrap>
-        ),
-        ...triggerProps,
-      }}
+      triggerProps={triggerProps}
     />
   );
 }
-
-const TriggerIconWrap = styled('div')`
-  position: relative;
-  display: flex;
-  align-items: center;
-`;
diff --git a/static/app/components/organizations/environmentPageFilter/trigger.tsx b/static/app/components/organizations/environmentPageFilter/trigger.tsx
index f003681aa312bf..7146b4b5e9a937 100644
--- a/static/app/components/organizations/environmentPageFilter/trigger.tsx
+++ b/static/app/components/organizations/environmentPageFilter/trigger.tsx
@@ -4,7 +4,6 @@ import styled from '@emotion/styled';
 import Badge from 'sentry/components/badge/badge';
 import type {DropdownButtonProps} from 'sentry/components/dropdownButton';
 import DropdownButton from 'sentry/components/dropdownButton';
-import {IconWindow} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {trimSlug} from 'sentry/utils/string/trimSlug';
@@ -43,14 +42,11 @@ function BaseEnvironmentPageFilterTrigger(
       {...props}
       ref={forwardedRef}
       data-test-id="page-filter-environment-selector"
-      icon={
-        <TriggerIconWrap>
-          <IconWindow />
-          {desynced && <DesyncedFilterIndicator role="presentation" />}
-        </TriggerIconWrap>
-      }
     >
-      <TriggerLabel>{ready ? label : t('Loading\u2026')}</TriggerLabel>
+      <TriggerLabelWrap>
+        <TriggerLabel>{ready ? label : t('Loading\u2026')}</TriggerLabel>
+        {desynced && <DesyncedFilterIndicator role="presentation" />}
+      </TriggerLabelWrap>
       {remainingCount > 0 && <StyledBadge text={`+${remainingCount}`} />}
     </DropdownButton>
   );
@@ -58,17 +54,16 @@ function BaseEnvironmentPageFilterTrigger(
 
 export const EnvironmentPageFilterTrigger = forwardRef(BaseEnvironmentPageFilterTrigger);
 
+const TriggerLabelWrap = styled('span')`
+  position: relative;
+  min-width: 0;
+`;
+
 const TriggerLabel = styled('span')`
   ${p => p.theme.overflowEllipsis};
   width: auto;
 `;
 
-const TriggerIconWrap = styled('div')`
-  position: relative;
-  display: flex;
-  align-items: center;
-`;
-
 const StyledBadge = styled(Badge)`
   margin-top: -${space(0.5)};
   margin-bottom: -${space(0.5)};
diff --git a/static/app/components/organizations/pageFilterBar.tsx b/static/app/components/organizations/pageFilterBar.tsx
index cf68149840b617..19591a991d78e1 100644
--- a/static/app/components/organizations/pageFilterBar.tsx
+++ b/static/app/components/organizations/pageFilterBar.tsx
@@ -1,5 +1,7 @@
 import styled from '@emotion/styled';
 
+import {space} from 'sentry/styles/space';
+
 const PageFilterBar = styled('div')<{condensed?: boolean}>`
   display: flex;
   position: relative;
@@ -37,6 +39,14 @@ const PageFilterBar = styled('div')<{condensed?: boolean}>`
     z-index: 0;
   }
 
+  /* Less inner padding between buttons */
+  & > div:not(:first-child) > button[aria-haspopup] {
+    padding-left: ${space(1.5)};
+  }
+  & > div:not(:last-child) > button[aria-haspopup] {
+    padding-right: ${space(1.5)};
+  }
+
   & button[aria-haspopup]:focus-visible {
     border-color: ${p => p.theme.focusBorder};
     box-shadow: 0 0 0 1px ${p => p.theme.focusBorder};
diff --git a/static/app/components/organizations/pageFilters/desyncedFilter.tsx b/static/app/components/organizations/pageFilters/desyncedFilter.tsx
index 05f3a920244478..21cb8708ceccda 100644
--- a/static/app/components/organizations/pageFilters/desyncedFilter.tsx
+++ b/static/app/components/organizations/pageFilters/desyncedFilter.tsx
@@ -36,14 +36,14 @@ export function DesyncedFilterMessage() {
 }
 
 export const DesyncedFilterIndicator = styled('div')`
-  width: 9px;
-  height: 9px;
+  width: 8px;
+  height: 8px;
   border-radius: 50%;
   background: ${p => p.theme.active};
   border: solid 1px ${p => p.theme.background};
   position: absolute;
-  top: -${space(0.5)};
-  right: -${space(0.5)};
+  top: -${space(0.25)};
+  right: -${space(0.75)};
 `;
 
 const DesyncedFilterMessageWrap = styled('div')`
diff --git a/static/app/components/organizations/projectPageFilter/trigger.tsx b/static/app/components/organizations/projectPageFilter/trigger.tsx
index 8005a32380698f..93b09ff1281862 100644
--- a/static/app/components/organizations/projectPageFilter/trigger.tsx
+++ b/static/app/components/organizations/projectPageFilter/trigger.tsx
@@ -5,7 +5,6 @@ import Badge from 'sentry/components/badge/badge';
 import type {DropdownButtonProps} from 'sentry/components/dropdownButton';
 import DropdownButton from 'sentry/components/dropdownButton';
 import PlatformList from 'sentry/components/platformList';
-import {IconProject} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Project} from 'sentry/types/project';
@@ -81,19 +80,19 @@ function BaseProjectPageFilterTrigger(
       ref={forwardedRef}
       data-test-id="page-filter-project-selector"
       icon={
-        <TriggerIconWrap>
-          {!ready || isAllProjectsSelected || isMyProjectsSelected ? (
-            <IconProject />
-          ) : (
-            <PlatformList
-              platforms={projectsToShow.map(p => p.platform ?? 'other').reverse()}
-            />
-          )}
-          {desynced && <DesyncedFilterIndicator role="presentation" />}
-        </TriggerIconWrap>
+        ready &&
+        !isAllProjectsSelected &&
+        !isMyProjectsSelected && (
+          <PlatformList
+            platforms={projectsToShow.map(p => p.platform ?? 'other').reverse()}
+          />
+        )
       }
     >
-      <TriggerLabel>{ready ? label : t('Loading\u2026')}</TriggerLabel>
+      <TriggerLabelWrap>
+        <TriggerLabel>{ready ? label : t('Loading\u2026')}</TriggerLabel>
+        {desynced && <DesyncedFilterIndicator role="presentation" />}
+      </TriggerLabelWrap>
       {remainingCount > 0 && <StyledBadge text={`+${remainingCount}`} />}
     </DropdownButton>
   );
@@ -101,16 +100,15 @@ function BaseProjectPageFilterTrigger(
 
 export const ProjectPageFilterTrigger = forwardRef(BaseProjectPageFilterTrigger);
 
-const TriggerLabel = styled('span')`
-  ${p => p.theme.overflowEllipsis};
+const TriggerLabelWrap = styled('span')`
   position: relative;
-  width: auto;
+  min-width: 0;
 `;
 
-const TriggerIconWrap = styled('div')`
+const TriggerLabel = styled('span')`
+  ${p => p.theme.overflowEllipsis};
   position: relative;
-  display: flex;
-  align-items: center;
+  width: auto;
 `;
 
 const StyledBadge = styled(Badge)`
diff --git a/static/app/components/searchQueryBuilder/index.spec.tsx b/static/app/components/searchQueryBuilder/index.spec.tsx
index b3a578f5d42ccf..ecdebcfe8cf9bf 100644
--- a/static/app/components/searchQueryBuilder/index.spec.tsx
+++ b/static/app/components/searchQueryBuilder/index.spec.tsx
@@ -1718,7 +1718,8 @@ describe('SearchQueryBuilder', function () {
         ['spaces', 'a b', '"a b"'],
         ['quotes', 'a"b', '"a\\"b"'],
         ['parens', 'foo()', '"foo()"'],
-      ])('tag values escape %s', async (_, value, expected) => {
+        ['commas', '"a,b"', '"a,b"'],
+      ])('typed tag values escape %s', async (_, value, expected) => {
         const mockOnChange = jest.fn();
         render(
           <SearchQueryBuilder
@@ -1742,6 +1743,52 @@ describe('SearchQueryBuilder', function () {
         });
       });
 
+      it.each([
+        ['spaces', 'a b', '"a b"'],
+        ['quotes', 'a"b', '"a\\"b"'],
+        ['parens', 'foo()', '"foo()"'],
+        ['commas', 'a,b', '"a,b"'],
+      ])('selected tag value suggestions escape %s', async (_, value, expected) => {
+        const mockOnChange = jest.fn();
+        const mockGetTagValues = jest.fn().mockResolvedValue([value]);
+        render(
+          <SearchQueryBuilder
+            {...defaultProps}
+            onChange={mockOnChange}
+            initialQuery="custom_tag_name:"
+            getTagValues={mockGetTagValues}
+          />
+        );
+
+        await userEvent.click(
+          screen.getByRole('button', {name: 'Edit value for filter: custom_tag_name'})
+        );
+        await userEvent.click(await screen.findByRole('option', {name: value}));
+
+        // Value should be surrounded by quotes and escaped
+        await waitFor(() => {
+          expect(mockOnChange).toHaveBeenCalledWith(
+            `custom_tag_name:${expected}`,
+            expect.anything()
+          );
+        });
+
+        // Open menu again and check to see if value is correct
+        await userEvent.click(
+          screen.getByRole('button', {name: 'Edit value for filter: custom_tag_name'})
+        );
+
+        // Input value should have the escaped value (with a trailing comma)
+        expect(screen.getByRole('combobox', {name: 'Edit filter value'})).toHaveValue(
+          expected + ','
+        );
+
+        // The original value should be selected in the dropdown
+        expect(
+          within(await screen.findByRole('option', {name: value})).getByRole('checkbox')
+        ).toBeChecked();
+      });
+
       it('can replace a value with a new one', async function () {
         render(
           <SearchQueryBuilder {...defaultProps} initialQuery="browser.name:[1,c,3]" />
diff --git a/static/app/components/searchQueryBuilder/index.stories.tsx b/static/app/components/searchQueryBuilder/index.stories.tsx
index 0c43e2d55652ae..3a0b68dcc6454f 100644
--- a/static/app/components/searchQueryBuilder/index.stories.tsx
+++ b/static/app/components/searchQueryBuilder/index.stories.tsx
@@ -48,7 +48,7 @@ const FILTER_KEYS: TagCollection = {
     name: 'Browser Name',
     kind: FieldKind.FIELD,
     predefined: true,
-    values: ['Chrome', 'Firefox', 'Safari', 'Edge'],
+    values: ['Chrome', 'Firefox', 'Safari', 'Edge', 'Internet Explorer', 'Opera 1,2'],
   },
   [FieldKey.IS]: {
     key: FieldKey.IS,
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/parametersCombobox.tsx b/static/app/components/searchQueryBuilder/tokens/filter/parametersCombobox.tsx
index bed49c98eaf2be..487acc2167edd0 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/parametersCombobox.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/parametersCombobox.tsx
@@ -7,7 +7,7 @@ import {getEscapedKey} from 'sentry/components/compactSelect/utils';
 import {useSearchQueryBuilder} from 'sentry/components/searchQueryBuilder/context';
 import {SearchQueryBuilderCombobox} from 'sentry/components/searchQueryBuilder/tokens/combobox';
 import {FunctionDescription} from 'sentry/components/searchQueryBuilder/tokens/filter/functionDescription';
-import {replaceCommaSeparatedValue} from 'sentry/components/searchQueryBuilder/tokens/filter/utils';
+import {replaceCommaSeparatedValue} from 'sentry/components/searchQueryBuilder/tokens/filter/replaceCommaSeparatedValue';
 import type {AggregateFilter} from 'sentry/components/searchSyntax/parser';
 import {t} from 'sentry/locale';
 import {FieldKind, FieldValueType} from 'sentry/utils/fields';
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/grammar.pegjs b/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/grammar.pegjs
new file mode 100644
index 00000000000000..7c87c913442706
--- /dev/null
+++ b/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/grammar.pegjs
@@ -0,0 +1,44 @@
+{
+    const { TokenConverter, config = {} } = options;
+    const tc = new TokenConverter({text, location, config});
+}
+
+text_in_list
+  = item1:text_in_value
+    items:item* {
+      return tc.tokenValueTextList(item1, items);
+    }
+
+item = s1:spaces c:comma s2:spaces value:(!comma text_in_value)? {
+  return [s1, c, s2, value ?? [undefined, tc.tokenValueText('', false)]];
+}
+
+text_in_value
+  = quoted_value / in_value / empty_value
+
+empty_value
+  = spaces {
+    return tc.tokenValueText(text(), false);
+  }
+
+in_value
+  = (in_value_char)+ {
+    return tc.tokenValueText(text(), false);
+  }
+
+quoted_value
+  = '"' value:('\\"' / [^"])* '"' {
+    return tc.tokenValueText(value.join(''), true);
+  }
+
+in_value_termination
+  = in_value_char (!in_value_end in_value_char)* in_value_end
+
+in_value_char
+  = [^,]
+
+in_value_end
+  = (spaces comma)
+
+comma = ","
+spaces = " "*
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/parser.spec.tsx b/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/parser.spec.tsx
new file mode 100644
index 00000000000000..aa1333237fb8d8
--- /dev/null
+++ b/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/parser.spec.tsx
@@ -0,0 +1,97 @@
+import {parseMultiSelectFilterValue} from 'sentry/components/searchQueryBuilder/tokens/filter/parsers/string/parser';
+
+describe('parseMultiSelectValue', function () {
+  it('single value', function () {
+    const result = parseMultiSelectFilterValue('a');
+
+    expect(result).not.toBeNull();
+
+    expect(result!.items).toHaveLength(1);
+    expect(result?.items[0].value?.value).toEqual('a');
+  });
+
+  it('multiple value', function () {
+    const result = parseMultiSelectFilterValue('a,b,c');
+
+    expect(result).not.toBeNull();
+
+    expect(result!.items).toHaveLength(3);
+    expect(result?.items[0].value?.value).toEqual('a');
+    expect(result?.items[1].value?.value).toEqual('b');
+    expect(result?.items[2].value?.value).toEqual('c');
+  });
+
+  it('quoted value', function () {
+    const result = parseMultiSelectFilterValue('a,"b",c');
+
+    expect(result).not.toBeNull();
+
+    expect(result!.items).toHaveLength(3);
+    expect(result?.items[0].value?.value).toEqual('a');
+
+    expect(result?.items[1].value?.value).toEqual('b');
+    expect(result?.items[1].value?.text).toEqual('"b"');
+    expect(result?.items[1].value?.quoted).toBe(true);
+
+    expect(result?.items[2].value?.value).toEqual('c');
+  });
+
+  it('just quotes', function () {
+    const result = parseMultiSelectFilterValue('""');
+
+    expect(result).not.toBeNull();
+
+    expect(result!.items).toHaveLength(1);
+    const item = result!.items[0];
+
+    expect(item.value?.value).toEqual('');
+    expect(item.value?.text).toEqual('""');
+    expect(item.value?.quoted).toBe(true);
+  });
+
+  it('single empty value', function () {
+    const result = parseMultiSelectFilterValue('');
+
+    expect(result).not.toBeNull();
+
+    expect(result!.items).toHaveLength(1);
+    const item = result!.items[0];
+
+    expect(item.value!.value).toBe('');
+  });
+
+  it('multiple empty value', function () {
+    const result = parseMultiSelectFilterValue('a,,b');
+
+    expect(result).not.toBeNull();
+
+    expect(result!.items).toHaveLength(3);
+
+    expect(result?.items[0].value?.value).toEqual('a');
+    expect(result?.items[1].value?.value).toBe('');
+    expect(result?.items[2].value?.value).toEqual('b');
+  });
+
+  it('trailing comma', function () {
+    const result = parseMultiSelectFilterValue('a,');
+
+    expect(result).not.toBeNull();
+
+    expect(result!.items).toHaveLength(2);
+
+    expect(result?.items[0].value?.value).toEqual('a');
+    expect(result?.items[1].value?.value).toBe('');
+  });
+
+  it('spaces', function () {
+    const result = parseMultiSelectFilterValue('a,b c,d');
+
+    expect(result).not.toBeNull();
+
+    expect(result!.items).toHaveLength(3);
+
+    expect(result?.items[0].value?.value).toEqual('a');
+    expect(result?.items[1].value?.value).toEqual('b c');
+    expect(result?.items[2].value?.value).toEqual('d');
+  });
+});
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/parser.tsx b/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/parser.tsx
new file mode 100644
index 00000000000000..a45f0195d2d348
--- /dev/null
+++ b/static/app/components/searchQueryBuilder/tokens/filter/parsers/string/parser.tsx
@@ -0,0 +1,24 @@
+import {
+  type Token,
+  TokenConverter,
+  type TokenResult,
+} from 'sentry/components/searchSyntax/parser';
+
+import grammar from './grammar.pegjs';
+
+/**
+ * Parses the user input value of a multi select filter.
+ *
+ * This is different from the search syntax parser in the following ways:
+ * - Does not look for surrounding []
+ * - Does not disallow spaces or parens outside of quoted values
+ */
+export function parseMultiSelectFilterValue(
+  value: string
+): TokenResult<Token.VALUE_TEXT_LIST> | null {
+  try {
+    return grammar.parse(value, {TokenConverter});
+  } catch (e) {
+    return null;
+  }
+}
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/replaceCommaSeparatedValue.spec.tsx b/static/app/components/searchQueryBuilder/tokens/filter/replaceCommaSeparatedValue.spec.tsx
new file mode 100644
index 00000000000000..b057047c963324
--- /dev/null
+++ b/static/app/components/searchQueryBuilder/tokens/filter/replaceCommaSeparatedValue.spec.tsx
@@ -0,0 +1,31 @@
+import {replaceCommaSeparatedValue} from 'sentry/components/searchQueryBuilder/tokens/filter/replaceCommaSeparatedValue';
+
+describe('replaceCommaSeparatedValue', function () {
+  it('replaces a value without commas', function () {
+    expect(replaceCommaSeparatedValue('foo', 3, 'bar')).toBe('bar');
+  });
+
+  it('replaces an empty value at end', function () {
+    expect(replaceCommaSeparatedValue('foo,', 4, 'bar')).toBe('foo,bar');
+  });
+
+  it('replaces an empty value at start', function () {
+    expect(replaceCommaSeparatedValue(',foo', 0, 'bar')).toBe('bar,foo');
+  });
+
+  it('replaces an empty value in middle', function () {
+    expect(replaceCommaSeparatedValue('foo,,baz', 4, 'bar')).toBe('foo,bar,baz');
+  });
+
+  it('replaces an non-empty value at end', function () {
+    expect(replaceCommaSeparatedValue('foo,abc', 4, 'bar')).toBe('foo,bar');
+  });
+
+  it('replaces an non-empty value at start', function () {
+    expect(replaceCommaSeparatedValue('abc,foo', 0, 'bar')).toBe('bar,foo');
+  });
+
+  it('replaces an non-empty value in middle', function () {
+    expect(replaceCommaSeparatedValue('foo,abc,baz', 4, 'bar')).toBe('foo,bar,baz');
+  });
+});
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/replaceCommaSeparatedValue.tsx b/static/app/components/searchQueryBuilder/tokens/filter/replaceCommaSeparatedValue.tsx
new file mode 100644
index 00000000000000..f6e37935d8738d
--- /dev/null
+++ b/static/app/components/searchQueryBuilder/tokens/filter/replaceCommaSeparatedValue.tsx
@@ -0,0 +1,41 @@
+import {parseMultiSelectFilterValue} from 'sentry/components/searchQueryBuilder/tokens/filter/parsers/string/parser';
+
+/**
+ * Replaces the focused parameter (at cursorPosition) with the new value.
+ * If cursorPosition is null, will default to the end of the string.
+ *
+ * Example:
+ * replaceCommaSeparatedValue('foo,bar,baz', 5, 'new') => 'foo,new,baz'
+ */
+export function replaceCommaSeparatedValue(
+  value: string,
+  cursorPosition: number | null,
+  replacement: string
+) {
+  const parsed = parseMultiSelectFilterValue(value);
+
+  if (!parsed) {
+    return value;
+  }
+
+  if (cursorPosition === null) {
+    cursorPosition = value.length;
+  }
+
+  const matchingIndex = parsed.items.findIndex(
+    item =>
+      item.value &&
+      item.value?.location.start.offset <= cursorPosition &&
+      item.value?.location.end.offset >= cursorPosition
+  );
+
+  if (matchingIndex === -1) {
+    return replacement;
+  }
+
+  return [
+    ...parsed.items.slice(0, matchingIndex).map(item => item.value?.text ?? ''),
+    replacement,
+    ...parsed.items.slice(matchingIndex + 1).map(item => item.value?.text ?? ''),
+  ].join(',');
+}
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/utils.tsx b/static/app/components/searchQueryBuilder/tokens/filter/utils.tsx
index ec67c53ff7d1b1..35e8464dcc7bde 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/utils.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/utils.tsx
@@ -16,7 +16,7 @@ import {
   getFieldDefinition,
 } from 'sentry/utils/fields';
 
-const SHOULD_ESCAPE_REGEX = /[\s"()]/;
+const SHOULD_ESCAPE_REGEX = /[\s"(),]/;
 
 export function isAggregateFilterToken(
   token: TokenResult<Token.FILTER>
@@ -91,32 +91,6 @@ export function formatFilterValue(token: TokenResult<Token.FILTER>['value']): st
   }
 }
 
-/**
- * Replaces the focused parameter (at cursorPosition) with the new value.
- * If cursorPosition is null, will default to the end of the string.
- *
- * Example:
- * replaceCommaSeparatedValue('foo,bar,baz', 5, 'new') => 'foo,new,baz'
- */
-export function replaceCommaSeparatedValue(
-  value: string,
-  cursorPosition: number | null,
-  replacement: string
-) {
-  const items = value.split(',');
-
-  let characterCount = 0;
-  for (let i = 0; i < items.length; i++) {
-    characterCount += items[i].length + 1;
-    if (characterCount > (cursorPosition ?? value.length + 1)) {
-      const newItems = [...items.slice(0, i), replacement, ...items.slice(i + 1)];
-      return newItems.map(item => item.trim()).join(',');
-    }
-  }
-
-  return value;
-}
-
 /**
  * Gets the value type for a given token.
  *
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/valueCombobox.tsx b/static/app/components/searchQueryBuilder/tokens/filter/valueCombobox.tsx
index c363712b451193..93314c5ec985c8 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/valueCombobox.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/valueCombobox.tsx
@@ -12,12 +12,13 @@ import {
   type CustomComboboxMenu,
   SearchQueryBuilderCombobox,
 } from 'sentry/components/searchQueryBuilder/tokens/combobox';
+import {parseMultiSelectFilterValue} from 'sentry/components/searchQueryBuilder/tokens/filter/parsers/string/parser';
+import {replaceCommaSeparatedValue} from 'sentry/components/searchQueryBuilder/tokens/filter/replaceCommaSeparatedValue';
 import SpecificDatePicker from 'sentry/components/searchQueryBuilder/tokens/filter/specificDatePicker';
 import {
   escapeTagValue,
   formatFilterValue,
   getFilterValueType,
-  replaceCommaSeparatedValue,
   unescapeTagValue,
 } from 'sentry/components/searchQueryBuilder/tokens/filter/utils';
 import {ValueListBox} from 'sentry/components/searchQueryBuilder/tokens/filter/valueListBox';
@@ -74,15 +75,19 @@ function isStringFilterValues(
 }
 
 function getMultiSelectInputValue(token: TokenResult<Token.FILTER>) {
+  // Even if this is a multi-select filter, it won't be parsed as such if only a single value is provided
   if (
     token.value.type !== Token.VALUE_TEXT_LIST &&
     token.value.type !== Token.VALUE_NUMBER_LIST
   ) {
-    const value = token.value.value;
-    return value ? value + ',' : '';
+    if (!token.value.value) {
+      return '';
+    }
+
+    return token.value.text + ',';
   }
 
-  const items = token.value.items.map(item => item.value.value);
+  const items = token.value.items.map(item => item.value?.text ?? '');
 
   if (items.length === 0) {
     return '';
@@ -92,21 +97,45 @@ function getMultiSelectInputValue(token: TokenResult<Token.FILTER>) {
 }
 
 function prepareInputValueForSaving(valueType: FieldValueType, inputValue: string) {
-  const values = uniq(
-    inputValue
-      .split(',')
-      .map(v => cleanFilterValue({valueType, value: v.trim()}))
-      .filter(v => v && v.length > 0)
-  );
+  const parsed = parseMultiSelectFilterValue(inputValue);
+
+  if (!parsed) {
+    return '""';
+  }
+
+  const values =
+    parsed.items
+      .map(item =>
+        item.value?.quoted
+          ? item.value?.text ?? ''
+          : cleanFilterValue({valueType, value: item.value?.text ?? ''})
+      )
+      .filter(text => text?.length) ?? [];
 
-  return values.length > 1 ? `[${values.join(',')}]` : values[0] ?? '""';
+  const uniqueValues = uniq(values);
+
+  return uniqueValues.length > 1
+    ? `[${uniqueValues.join(',')}]`
+    : uniqueValues[0] ?? '""';
 }
 
-function getSelectedValuesFromText(text: string) {
-  return text
-    .split(',')
-    .map(v => unescapeTagValue(v.trim()))
-    .filter(v => v.length > 0);
+function getSelectedValuesFromText(
+  text: string,
+  {escaped = true}: {escaped?: boolean} = {}
+) {
+  const parsed = parseMultiSelectFilterValue(text);
+
+  if (!parsed) {
+    return [];
+  }
+
+  return parsed.items
+    .filter(item => item.value?.value)
+    .map(item => {
+      return (
+        (escaped ? item.value?.text : unescapeTagValue(item.value?.value ?? '')) ?? ''
+      );
+    });
 }
 
 function getValueAtCursorPosition(text: string, cursorPosition: number | null) {
@@ -489,8 +518,11 @@ export function SearchQueryBuilderValueCombobox({
     ? getValueAtCursorPosition(inputValue, selectionIndex)
     : inputValue;
 
-  const selectedValues = useMemo(
-    () => (canSelectMultipleValues ? getSelectedValuesFromText(inputValue) : []),
+  const selectedValuesUnescaped = useMemo(
+    () =>
+      canSelectMultipleValues
+        ? getSelectedValuesFromText(inputValue, {escaped: false})
+        : [],
     [canSelectMultipleValues, inputValue]
   );
 
@@ -517,7 +549,7 @@ export function SearchQueryBuilderValueCombobox({
   const {items, suggestionSectionItems, isFetching} = useFilterSuggestions({
     token,
     filterValue,
-    selectedValues,
+    selectedValues: selectedValuesUnescaped,
     ctrlKeyPressed,
   });
 
@@ -553,11 +585,15 @@ export function SearchQueryBuilderValueCombobox({
       }
 
       if (canSelectMultipleValues) {
-        if (selectedValues.includes(value)) {
+        if (selectedValuesUnescaped.includes(value)) {
           const newValue = prepareInputValueForSaving(
             getFilterValueType(token, fieldDefinition),
-            selectedValues.filter(v => v !== value).join(',')
+            selectedValuesUnescaped
+              .filter(v => v !== value)
+              .map(escapeTagValue)
+              .join(',')
           );
+
           dispatch({
             type: 'UPDATE_TOKEN_VALUE',
             token: token,
@@ -576,7 +612,7 @@ export function SearchQueryBuilderValueCombobox({
           token: token,
           value: prepareInputValueForSaving(
             getFilterValueType(token, fieldDefinition),
-            replaceCommaSeparatedValue(inputValue, selectionIndex, value)
+            replaceCommaSeparatedValue(inputValue, selectionIndex, escapeTagValue(value))
           ),
         });
 
@@ -595,16 +631,16 @@ export function SearchQueryBuilderValueCombobox({
       return true;
     },
     [
-      analyticsData,
+      token,
+      fieldDefinition,
       canSelectMultipleValues,
+      analyticsData,
+      selectedValuesUnescaped,
       dispatch,
-      fieldDefinition,
       inputValue,
-      onCommit,
-      selectedValues,
       selectionIndex,
-      token,
       ctrlKeyPressed,
+      onCommit,
     ]
   );
 
diff --git a/static/app/components/sidebar/broadcasts.spec.tsx b/static/app/components/sidebar/broadcasts.spec.tsx
index de3710dd04c527..00e83e5da13de1 100644
--- a/static/app/components/sidebar/broadcasts.spec.tsx
+++ b/static/app/components/sidebar/broadcasts.spec.tsx
@@ -51,7 +51,7 @@ describe('Broadcasts', function () {
   });
 
   it('renders a broadcast item with media content correctly', async function () {
-    const organization = OrganizationFixture({features: ['what-is-new-revamp']});
+    const organization = OrganizationFixture();
     const broadcast = BroadcastFixture({
       mediaUrl:
         'https://images.ctfassets.net/em6l9zw4tzag/2vWdw7ZaApWxygugalbyOC/285525e5b7c9fbfa8fb814a69ab214cd/PerformancePageSketches_hero.jpg?w=2520&h=945&q=50&fm=webp',
@@ -87,24 +87,4 @@ describe('Broadcasts', function () {
       })
     );
   });
-
-  it('renders deprecated broadcast experience', async function () {
-    const organization = OrganizationFixture();
-    const broadcast = BroadcastFixture();
-
-    renderMockRequests({orgSlug: organization.slug, broadcastsResponse: [broadcast]});
-
-    render(
-      <Broadcasts
-        orientation="left"
-        collapsed={false}
-        currentPanel={SidebarPanelKey.BROADCASTS}
-        onShowPanel={() => jest.fn()}
-        hidePanel={jest.fn()}
-        organization={organization}
-      />
-    );
-
-    expect(await screen.findByRole('link', {name: broadcast.cta})).toBeInTheDocument();
-  });
 });
diff --git a/static/app/components/sidebar/broadcasts.tsx b/static/app/components/sidebar/broadcasts.tsx
index 6e38966090d261..14b1d3a43905b3 100644
--- a/static/app/components/sidebar/broadcasts.tsx
+++ b/static/app/components/sidebar/broadcasts.tsx
@@ -8,7 +8,6 @@ import {BroadcastPanelItem} from 'sentry/components/sidebar/broadcastPanelItem';
 import SidebarItem from 'sentry/components/sidebar/sidebarItem';
 import SidebarPanel from 'sentry/components/sidebar/sidebarPanel';
 import SidebarPanelEmpty from 'sentry/components/sidebar/sidebarPanelEmpty';
-import SidebarPanelItem from 'sentry/components/sidebar/sidebarPanelItem';
 import {IconBroadcast} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
@@ -36,22 +35,18 @@ function BroadcastSidebarContent({
   collapsed,
   loading,
   broadcasts,
-  whatIsNewRevampFeature,
   hidePanel,
   onResetCounter,
 }: {
   broadcasts: Broadcast[];
   loading: boolean;
   onResetCounter: () => void;
-  whatIsNewRevampFeature: boolean;
 } & Pick<CommonSidebarProps, 'orientation' | 'collapsed' | 'hidePanel'>) {
   useEffect(() => {
     return () => {
-      if (whatIsNewRevampFeature) {
-        onResetCounter();
-      }
+      onResetCounter();
     };
-  }, [onResetCounter, whatIsNewRevampFeature]);
+  }, [onResetCounter]);
 
   return (
     <SidebarPanel
@@ -67,7 +62,7 @@ function BroadcastSidebarContent({
         <SidebarPanelEmpty>
           {t('No recent updates from the Sentry team.')}
         </SidebarPanelEmpty>
-      ) : whatIsNewRevampFeature ? (
+      ) : (
         broadcasts.map(item => (
           <BroadcastPanelItem
             key={item.id}
@@ -79,17 +74,6 @@ function BroadcastSidebarContent({
             category={item.category}
           />
         ))
-      ) : (
-        broadcasts.map(item => (
-          <SidebarPanelItem
-            key={item.id}
-            hasSeen={item.hasSeen}
-            title={item.title}
-            message={item.message}
-            link={item.link}
-            cta={item.cta}
-          />
-        ))
       )}
     </SidebarPanel>
   );
@@ -158,10 +142,6 @@ class Broadcasts extends Component<Props, State> {
     this.props.onShowPanel();
   };
 
-  get hasWhatsNewRevampFeature() {
-    return this.props.organization.features.includes('what-is-new-revamp');
-  }
-
   markSeen = async () => {
     const unseenBroadcastIds = this.unseenIds;
     if (unseenBroadcastIds.length === 0) {
@@ -169,10 +149,6 @@ class Broadcasts extends Component<Props, State> {
     }
 
     await markBroadcastsAsSeen(this.props.api, unseenBroadcastIds);
-
-    if (!this.hasWhatsNewRevampFeature) {
-      this.handleResetCounter();
-    }
   };
 
   get unseenIds() {
@@ -215,7 +191,6 @@ class Broadcasts extends Component<Props, State> {
               broadcasts={broadcasts}
               collapsed={collapsed}
               orientation={orientation}
-              whatIsNewRevampFeature={this.hasWhatsNewRevampFeature}
               onResetCounter={this.handleResetCounter}
             />
           )}
diff --git a/static/app/components/sidebar/sidebarItem.tsx b/static/app/components/sidebar/sidebarItem.tsx
index 833d6d24d51469..ae670d5ae95eff 100644
--- a/static/app/components/sidebar/sidebarItem.tsx
+++ b/static/app/components/sidebar/sidebarItem.tsx
@@ -335,7 +335,9 @@ export function isItemActive(
       location.pathname.includes('/alerts/') &&
       !location.pathname.startsWith('/settings/')) ||
     (item?.label === 'Releases' && location.pathname.includes('/release-thresholds/')) ||
-    (item?.label === 'Performance' && location.pathname.includes('/performance/'))
+    (item?.label === 'Performance' &&
+      location.pathname.includes('/performance/') &&
+      !location.pathname.startsWith('/settings/'))
   );
 }
 
diff --git a/static/app/components/timeRangeSelector/index.tsx b/static/app/components/timeRangeSelector/index.tsx
index db42ee6156815d..b9276443c8ae34 100644
--- a/static/app/components/timeRangeSelector/index.tsx
+++ b/static/app/components/timeRangeSelector/index.tsx
@@ -7,8 +7,9 @@ import {CompactSelect} from 'sentry/components/compactSelect';
 import type {Item} from 'sentry/components/dropdownAutoComplete/types';
 import DropdownButton from 'sentry/components/dropdownButton';
 import HookOrDefault from 'sentry/components/hookOrDefault';
+import {DesyncedFilterIndicator} from 'sentry/components/organizations/pageFilters/desyncedFilter';
 import {DEFAULT_RELATIVE_PERIODS, DEFAULT_STATS_PERIOD} from 'sentry/constants';
-import {IconArrow, IconCalendar} from 'sentry/icons';
+import {IconArrow} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {DateString} from 'sentry/types/core';
@@ -78,6 +79,11 @@ export interface TimeRangeSelectorProps
    * unclearable.
    */
   defaultPeriod?: string;
+  /**
+   * (Specific to DatePageFilter) Whether the current value is out of sync with the
+   * stored persistent value.
+   */
+  desynced?: boolean;
   /**
    * Forces the user to select from the set of defined relative options
    */
@@ -158,6 +164,7 @@ export function TimeRangeSelector({
   menuBody,
   menuFooter,
   menuFooterMessage,
+  desynced,
   ...selectProps
 }: TimeRangeSelectorProps) {
   const router = useRouter();
@@ -348,12 +355,16 @@ export function TimeRangeSelector({
                 <DropdownButton
                   isOpen={isOpen}
                   size={selectProps.size}
-                  icon={<IconCalendar />}
                   data-test-id="page-filter-timerange-selector"
                   {...triggerProps}
                   {...selectProps.triggerProps}
                 >
-                  <TriggerLabel>{selectProps.triggerLabel ?? defaultLabel}</TriggerLabel>
+                  <TriggerLabelWrap>
+                    <TriggerLabel>
+                      {selectProps.triggerLabel ?? defaultLabel}
+                    </TriggerLabel>
+                    {desynced && <DesyncedFilterIndicator />}
+                  </TriggerLabelWrap>
                 </DropdownButton>
               );
             })
@@ -466,6 +477,11 @@ export function TimeRangeSelector({
   );
 }
 
+const TriggerLabelWrap = styled('span')`
+  position: relative;
+  min-width: 0;
+`;
+
 const TriggerLabel = styled('span')`
   ${p => p.theme.overflowEllipsis}
   width: auto;
diff --git a/static/app/gettingStartedDocs/javascript/astro.tsx b/static/app/gettingStartedDocs/javascript/astro.tsx
index 7359868cd5b72d..1861a7360c9900 100644
--- a/static/app/gettingStartedDocs/javascript/astro.tsx
+++ b/static/app/gettingStartedDocs/javascript/astro.tsx
@@ -303,10 +303,9 @@ import * as Sentry from "@sentry/astro";`,
             },
           ],
           additionalInfo: tct(
-            `Note that creating your own [code:sentry.client.config.js] file will override the default settings in your [code2:astro.config.js] file. Learn more about this [link:here].`,
+            `Note that creating your own [code:sentry.client.config.js] file will override the default settings in your [code:astro.config.js] file. Learn more about this [link:here].`,
             {
               code: <code />,
-              code2: <code />,
               link: (
                 <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/astro/manual-setup/#manual-sdk-initialization" />
               ),
diff --git a/static/app/gettingStartedDocs/javascript/javascript.spec.tsx b/static/app/gettingStartedDocs/javascript/javascript.spec.tsx
index 92ae7ad3df62eb..5e2a593bdd454f 100644
--- a/static/app/gettingStartedDocs/javascript/javascript.spec.tsx
+++ b/static/app/gettingStartedDocs/javascript/javascript.spec.tsx
@@ -4,11 +4,15 @@ import {textWithMarkupMatcher} from 'sentry-test/utils';
 
 import {ProductSolution} from 'sentry/components/onboarding/productSelection';
 
-import docs from './javascript';
+import docs, {InstallationMode} from './javascript';
 
 describe('javascript onboarding docs', function () {
   it('renders onboarding docs correctly', () => {
-    renderWithOnboardingLayout(docs);
+    renderWithOnboardingLayout(docs, {
+      selectedOptions: {
+        installationMode: InstallationMode.MANUAL,
+      },
+    });
 
     // Renders main headings
     expect(screen.getByRole('heading', {name: 'Install'})).toBeInTheDocument();
@@ -31,6 +35,9 @@ describe('javascript onboarding docs', function () {
         ProductSolution.PERFORMANCE_MONITORING,
         ProductSolution.SESSION_REPLAY,
       ],
+      selectedOptions: {
+        installationMode: InstallationMode.MANUAL,
+      },
     });
 
     expect(
@@ -50,6 +57,9 @@ describe('javascript onboarding docs', function () {
         ProductSolution.ERROR_MONITORING,
         ProductSolution.PERFORMANCE_MONITORING,
       ],
+      selectedOptions: {
+        installationMode: InstallationMode.MANUAL,
+      },
     });
 
     expect(
@@ -63,6 +73,9 @@ describe('javascript onboarding docs', function () {
         ProductSolution.ERROR_MONITORING,
         ProductSolution.SESSION_REPLAY,
       ],
+      selectedOptions: {
+        installationMode: InstallationMode.MANUAL,
+      },
     });
 
     expect(
@@ -76,6 +89,9 @@ describe('javascript onboarding docs', function () {
   it('enables profiling by setting profiling sample rates', () => {
     renderWithOnboardingLayout(docs, {
       selectedProducts: [ProductSolution.ERROR_MONITORING, ProductSolution.PROFILING],
+      selectedOptions: {
+        installationMode: InstallationMode.MANUAL,
+      },
     });
 
     expect(
@@ -85,4 +101,26 @@ describe('javascript onboarding docs', function () {
       screen.getByText(textWithMarkupMatcher(/profilesSampleRate: 1\.0/))
     ).toBeInTheDocument();
   });
+
+  it('renders Loader Script by default', function () {
+    renderWithOnboardingLayout(docs);
+
+    expect(screen.getByRole('radio', {name: 'Loader Script'})).toBeChecked();
+
+    expect(
+      screen.getByRole('heading', {name: 'Configure SDK (Optional)'})
+    ).toBeInTheDocument();
+  });
+
+  it('renders package manager installation', function () {
+    renderWithOnboardingLayout(docs, {
+      selectedOptions: {
+        installationMode: InstallationMode.MANUAL,
+      },
+    });
+
+    expect(screen.getByRole('radio', {name: 'Npm/Yarn'})).toBeChecked();
+
+    expect(screen.getByRole('heading', {name: 'Configure SDK'})).toBeInTheDocument();
+  });
 });
diff --git a/static/app/gettingStartedDocs/javascript/javascript.tsx b/static/app/gettingStartedDocs/javascript/javascript.tsx
index 7b69f2f3cda87f..4b3b2bc5a6d5c7 100644
--- a/static/app/gettingStartedDocs/javascript/javascript.tsx
+++ b/static/app/gettingStartedDocs/javascript/javascript.tsx
@@ -1,9 +1,12 @@
+import {css} from '@emotion/react';
+
 import ExternalLink from 'sentry/components/links/externalLink';
 import crashReportCallout from 'sentry/components/onboarding/gettingStartedDoc/feedback/crashReportCallout';
 import widgetCallout from 'sentry/components/onboarding/gettingStartedDoc/feedback/widgetCallout';
 import TracePropagationMessage from 'sentry/components/onboarding/gettingStartedDoc/replay/tracePropagationMessage';
 import {StepType} from 'sentry/components/onboarding/gettingStartedDoc/step';
 import type {
+  BasePlatformOptions,
   Docs,
   DocsParams,
   OnboardingConfig,
@@ -28,8 +31,39 @@ import {
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
 import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
 import {t, tct} from 'sentry/locale';
+import {space} from 'sentry/styles/space';
+import {trackAnalytics} from 'sentry/utils/analytics';
+import TextBlock from 'sentry/views/settings/components/text/textBlock';
+
+import {updateDynamicSdkLoaderOptions} from './jsLoader/updateDynamicSdkLoaderOptions';
+
+export enum InstallationMode {
+  AUTO = 'auto',
+  MANUAL = 'manual',
+}
+
+const platformOptions = {
+  installationMode: {
+    label: t('Installation Mode'),
+    items: [
+      {
+        label: t('Loader Script'),
+        value: InstallationMode.AUTO,
+      },
+      {
+        label: t('Npm/Yarn'),
+        value: InstallationMode.MANUAL,
+      },
+    ],
+    defaultValue: InstallationMode.AUTO,
+  },
+} satisfies BasePlatformOptions;
 
-type Params = DocsParams;
+type PlatformOptions = typeof platformOptions;
+type Params = DocsParams<PlatformOptions>;
+
+const isAutoInstall = (params: Params) =>
+  params.platformOptions.installationMode === InstallationMode.AUTO;
 
 const getSdkSetupSnippet = (params: Params) => `
 import * as Sentry from "@sentry/browser";
@@ -112,64 +146,227 @@ const getInstallConfig = () => [
   },
 ];
 
-const onboarding: OnboardingConfig = {
-  introduction: MaybeBrowserProfilingBetaWarning,
-  install: () => [
+const getVerifyConfig = () => [
+  {
+    type: StepType.VERIFY,
+    description: t(
+      "This snippet contains an intentional error and can be used as a test to make sure that everything's working as expected."
+    ),
+    configurations: [
+      {
+        code: [
+          {
+            label: 'Javascript',
+            value: 'javascript',
+            language: 'javascript',
+            code: getVerifyJSSnippet(),
+          },
+        ],
+      },
+    ],
+  },
+];
+
+const loaderScriptOnboarding: OnboardingConfig<PlatformOptions> = {
+  introduction: () =>
+    tct('In this quick guide you’ll use our [strong: Loader Script] to set up:', {
+      strong: <strong />,
+    }),
+  install: params => [
     {
       type: StepType.INSTALL,
-      description: t(
-        'Sentry captures data by using an SDK within your application’s runtime.'
-      ),
-      configurations: getInstallConfig(),
+      description: t('Add this script tag to the top of the page:'),
+      configurations: [
+        {
+          language: 'html',
+          code: [
+            {
+              label: 'HTML',
+              value: 'html',
+              language: 'html',
+              code: `
+<script
+  src="${params.dsn.cdn}"
+  crossorigin="anonymous"
+></script>`,
+            },
+          ],
+        },
+      ],
     },
   ],
-  configure: (params: Params) => [
+  configure: params => [
     {
       type: StepType.CONFIGURE,
       description: t(
         "Initialize Sentry as early as possible in your application's lifecycle."
       ),
+      isOptional: true,
       configurations: [
         {
+          language: 'html',
           code: [
             {
-              label: 'JavaScript',
-              value: 'javascript',
-              language: 'javascript',
-              code: getSdkSetupSnippet(params),
+              label: 'HTML',
+              value: 'html',
+              language: 'html',
+              code: `
+<script>
+  Sentry.onLoad(function() {
+    Sentry.init({${
+      !(params.isPerformanceSelected || params.isReplaySelected)
+        ? `
+        // You can add any additional configuration here`
+        : ''
+    }${
+      params.isPerformanceSelected
+        ? `
+        // Tracing
+        tracesSampleRate: 1.0, // Capture 100% of the transactions`
+        : ''
+    }${
+      params.isReplaySelected
+        ? `
+        // Session Replay
+        replaysSessionSampleRate: 0.1, // This sets the sample rate at 10%. You may want to change it to 100% while in development and then sample at a lower rate in production.
+        replaysOnErrorSampleRate: 1.0, // If you're not already sampling the entire session, change the sample rate to 100% when sampling sessions where errors occur.`
+        : ''
+    }
+      });
+  });
+</script>`,
             },
           ],
         },
-        ...(params.isProfilingSelected
-          ? [getProfilingDocumentHeaderConfigurationStep()]
-          : []),
       ],
+      onOptionalToggleClick: showOptionalConfig => {
+        if (showOptionalConfig) {
+          trackAnalytics('onboarding.js_loader_npm_docs_optional_shown', {
+            organization: params.organization,
+            platform: params.platformKey,
+            project_id: params.projectId,
+          });
+        }
+      },
     },
-    getUploadSourceMapsStep({
-      guideLink: 'https://docs.sentry.io/platforms/javascript/sourcemaps/',
-      ...params,
+  ],
+  verify: getVerifyConfig,
+  nextSteps: () => [
+    {
+      id: 'performance-monitoring',
+      name: t('Tracing'),
+      description: t(
+        'Track down transactions to connect the dots between 10-second page loads and poor-performing API calls or slow database queries.'
+      ),
+      link: 'https://docs.sentry.io/platforms/javascript/tracing/',
+    },
+    {
+      id: 'session-replay',
+      name: t('Session Replay'),
+      description: t(
+        'Get to the root cause of an error or latency issue faster by seeing all the technical details related to that issue in one visual replay on your web application.'
+      ),
+      link: 'https://docs.sentry.io/platforms/javascript/session-replay/',
+    },
+    {
+      id: 'source-maps',
+      name: t('Source Maps'),
+      description: t('Learn how to enable readable stack traces in your Sentry errors.'),
+      link: 'https://docs.sentry.io/platforms/javascript/sourcemaps/',
+    },
+    {
+      id: 'sdk-configuration',
+      name: t('SDK Configuration'),
+      description: t(
+        'Learn about additional configuration options for the Javascript SDK.'
+      ),
+      link: 'https://docs.sentry.io/platforms/javascript/configuration/',
+    },
+  ],
+  onPageLoad: params => {
+    return () => {
+      trackAnalytics('onboarding.setup_loader_docs_rendered', {
+        organization: params.organization,
+        platform: params.platformKey,
+        project_id: params.projectId,
+      });
+    };
+  },
+  onPlatformOptionsChange: params => {
+    return () => {
+      trackAnalytics('onboarding.js_loader_npm_docs_shown', {
+        organization: params.organization,
+        platform: params.platformKey,
+        project_id: params.projectId,
+      });
+    };
+  },
+  onProductSelectionChange: params => {
+    return products => {
+      updateDynamicSdkLoaderOptions({
+        orgSlug: params.organization.slug,
+        projectSlug: params.projectSlug,
+        products,
+        projectKey: params.projectKeyId,
+        api: params.api,
+      });
+    };
+  },
+  onProductSelectionLoad: params => {
+    return products => {
+      updateDynamicSdkLoaderOptions({
+        orgSlug: params.organization.slug,
+        projectSlug: params.projectSlug,
+        products,
+        projectKey: params.projectKeyId,
+        api: params.api,
+      });
+    };
+  },
+};
+
+const packageManagerOnboarding: OnboardingConfig<PlatformOptions> = {
+  introduction: () =>
+    tct('In this quick guide you’ll use [strong:npm] or [strong:yarn] to set up:', {
+      strong: <strong />,
     }),
+  install: () => [
+    {
+      type: StepType.INSTALL,
+      description: t(
+        'Sentry captures data by using an SDK within your application’s runtime.'
+      ),
+      configurations: getInstallConfig(),
+    },
   ],
-  verify: () => [
+  configure: params => [
     {
-      type: StepType.VERIFY,
+      type: StepType.CONFIGURE,
       description: t(
-        "This snippet contains an intentional error and can be used as a test to make sure that everything's working as expected."
+        "Initialize Sentry as early as possible in your application's lifecycle."
       ),
       configurations: [
         {
           code: [
             {
-              label: 'Javascript',
+              label: 'JavaScript',
               value: 'javascript',
               language: 'javascript',
-              code: getVerifyJSSnippet(),
+              code: getSdkSetupSnippet(params),
             },
           ],
         },
+        ...(params.isProfilingSelected
+          ? [getProfilingDocumentHeaderConfigurationStep()]
+          : []),
       ],
     },
+    getUploadSourceMapsStep({
+      guideLink: 'https://docs.sentry.io/platforms/javascript/sourcemaps/',
+      ...params,
+    }),
   ],
+  verify: getVerifyConfig,
   nextSteps: () => [
     {
       id: 'performance-monitoring',
@@ -188,9 +385,78 @@ const onboarding: OnboardingConfig = {
       link: 'https://docs.sentry.io/platforms/javascript/session-replay/',
     },
   ],
+  onPageLoad: params => {
+    return () => {
+      trackAnalytics('onboarding.js_loader_npm_docs_shown', {
+        organization: params.organization,
+        platform: params.platformKey,
+        project_id: params.projectId,
+      });
+    };
+  },
+  onPlatformOptionsChange: params => {
+    return () => {
+      trackAnalytics('onboarding.setup_loader_docs_rendered', {
+        organization: params.organization,
+        platform: params.platformKey,
+        project_id: params.projectId,
+      });
+    };
+  },
+};
+
+const onboarding: OnboardingConfig<PlatformOptions> = {
+  introduction: params => (
+    <div
+      css={css`
+        display: flex;
+        flex-direction: column;
+        gap: ${space(1)};
+      `}
+    >
+      <MaybeBrowserProfilingBetaWarning {...params} />
+      <TextBlock noMargin>
+        {isAutoInstall(params)
+          ? loaderScriptOnboarding.introduction?.(params)
+          : packageManagerOnboarding.introduction?.(params)}
+      </TextBlock>
+    </div>
+  ),
+  install: params =>
+    isAutoInstall(params)
+      ? loaderScriptOnboarding.install(params)
+      : packageManagerOnboarding.install(params),
+  configure: (params: Params) =>
+    isAutoInstall(params)
+      ? loaderScriptOnboarding.configure(params)
+      : packageManagerOnboarding.configure(params),
+  verify: params =>
+    isAutoInstall(params)
+      ? loaderScriptOnboarding.verify(params)
+      : packageManagerOnboarding.verify(params),
+  nextSteps: params =>
+    isAutoInstall(params)
+      ? loaderScriptOnboarding.nextSteps?.(params)
+      : packageManagerOnboarding.nextSteps?.(params),
+  onPageLoad: params =>
+    isAutoInstall(params)
+      ? loaderScriptOnboarding.onPageLoad?.(params)
+      : packageManagerOnboarding.onPageLoad?.(params),
+  onProductSelectionChange: params =>
+    isAutoInstall(params)
+      ? loaderScriptOnboarding.onProductSelectionChange?.(params)
+      : packageManagerOnboarding.onProductSelectionChange?.(params),
+  onPlatformOptionsChange: params =>
+    isAutoInstall(params)
+      ? loaderScriptOnboarding.onPlatformOptionsChange?.(params)
+      : packageManagerOnboarding.onPlatformOptionsChange?.(params),
+  onProductSelectionLoad: params =>
+    isAutoInstall(params)
+      ? loaderScriptOnboarding.onProductSelectionLoad?.(params)
+      : packageManagerOnboarding.onProductSelectionLoad?.(params),
 };
 
-const replayOnboarding: OnboardingConfig = {
+const replayOnboarding: OnboardingConfig<PlatformOptions> = {
   install: () => [
     {
       type: StepType.INSTALL,
@@ -228,7 +494,7 @@ const replayOnboarding: OnboardingConfig = {
   nextSteps: () => [],
 };
 
-const feedbackOnboarding: OnboardingConfig = {
+const feedbackOnboarding: OnboardingConfig<PlatformOptions> = {
   install: () => [
     {
       type: StepType.INSTALL,
@@ -271,7 +537,7 @@ const feedbackOnboarding: OnboardingConfig = {
   nextSteps: () => [],
 };
 
-const crashReportOnboarding: OnboardingConfig = {
+const crashReportOnboarding: OnboardingConfig<PlatformOptions> = {
   introduction: () => getCrashReportModalIntroduction(),
   install: (params: Params) => getCrashReportJavaScriptInstallStep(params),
   configure: () => [
@@ -289,7 +555,7 @@ const crashReportOnboarding: OnboardingConfig = {
   nextSteps: () => [],
 };
 
-const performanceOnboarding: OnboardingConfig = {
+const performanceOnboarding: OnboardingConfig<PlatformOptions> = {
   introduction: () =>
     t(
       "Adding Performance to your Browser JavaScript project is simple. Make sure you've got these basics down."
@@ -382,7 +648,7 @@ transaction.finish(); // Finishing the transaction will send it to Sentry`,
   nextSteps: () => [],
 };
 
-const docs: Docs = {
+const docs: Docs<PlatformOptions> = {
   onboarding,
   feedbackOnboardingNpm: feedbackOnboarding,
   replayOnboarding,
@@ -390,6 +656,7 @@ const docs: Docs = {
   performanceOnboarding,
   customMetricsOnboarding: getJSMetricsOnboarding({getInstallConfig}),
   crashReportOnboarding,
+  platformOptions,
 };
 
 export default docs;
diff --git a/static/app/gettingStartedDocs/javascript/jsLoader/updateDynamicSdkLoaderOptions.ts b/static/app/gettingStartedDocs/javascript/jsLoader/updateDynamicSdkLoaderOptions.ts
new file mode 100644
index 00000000000000..7e9c857919b33c
--- /dev/null
+++ b/static/app/gettingStartedDocs/javascript/jsLoader/updateDynamicSdkLoaderOptions.ts
@@ -0,0 +1,50 @@
+import type {Client} from 'sentry/api';
+import {ProductSolution} from 'sentry/components/onboarding/productSelection';
+import {t} from 'sentry/locale';
+import type {Organization} from 'sentry/types/organization';
+import type {Project, ProjectKey} from 'sentry/types/project';
+import {handleXhrErrorResponse} from 'sentry/utils/handleXhrErrorResponse';
+
+export async function updateDynamicSdkLoaderOptions({
+  orgSlug,
+  projectSlug,
+  products,
+  api,
+  projectKey,
+}: {
+  api: Client;
+  orgSlug: Organization['slug'];
+  projectKey: ProjectKey['id'];
+  projectSlug: Project['slug'];
+  products?: ProductSolution[];
+}) {
+  const newDynamicSdkLoaderOptions: ProjectKey['dynamicSdkLoaderOptions'] = {
+    hasPerformance: false,
+    hasReplay: false,
+    hasDebug: false,
+  };
+
+  (products ?? []).forEach(product => {
+    // eslint-disable-next-line default-case
+    switch (product) {
+      case ProductSolution.PERFORMANCE_MONITORING:
+        newDynamicSdkLoaderOptions.hasPerformance = true;
+        break;
+      case ProductSolution.SESSION_REPLAY:
+        newDynamicSdkLoaderOptions.hasReplay = true;
+        break;
+    }
+  });
+
+  try {
+    await api.requestPromise(`/projects/${orgSlug}/${projectSlug}/keys/${projectKey}/`, {
+      method: 'PUT',
+      data: {
+        dynamicSdkLoaderOptions: newDynamicSdkLoaderOptions,
+      },
+    });
+  } catch (error) {
+    const message = t('Unable to dynamically update the SDK loader configuration');
+    handleXhrErrorResponse(message, error);
+  }
+}
diff --git a/static/app/gettingStartedDocs/javascript/solidstart.tsx b/static/app/gettingStartedDocs/javascript/solidstart.tsx
index d12d4ecd5df806..32257df04ae7c1 100644
--- a/static/app/gettingStartedDocs/javascript/solidstart.tsx
+++ b/static/app/gettingStartedDocs/javascript/solidstart.tsx
@@ -95,7 +95,7 @@ const getSdkServerSetupSnippet = (params: Params) => `
 import * as Sentry from "@sentry/solidstart";
 
 Sentry.init({
-  dsn: "__PUBLIC_DSN__",
+  dsn: "${params.dsn.public}",
   ${
     params.isPerformanceSelected
       ? `
diff --git a/static/app/gettingStartedDocs/javascript/vue.tsx b/static/app/gettingStartedDocs/javascript/vue.tsx
index d463a273dc24ef..94cdc5cc781159 100644
--- a/static/app/gettingStartedDocs/javascript/vue.tsx
+++ b/static/app/gettingStartedDocs/javascript/vue.tsx
@@ -222,7 +222,9 @@ function getSiblingImportsSetupConfiguration(siblingOption: string): string {
   switch (siblingOption) {
     case VueVersion.VUE3:
       return `import {createApp} from "vue";
-          import {createRouter} from "vue-router";`;
+          import {createRouter} from "vue-router";
+          import router from "./router";
+          `;
     case VueVersion.VUE2:
     default:
       return `import Vue from "vue";
@@ -251,9 +253,6 @@ function getVueConstSetup(siblingOption: string): string {
           const app = createApp({
             // ...
           });
-          const router = createRouter({
-            // ...
-          });
           `;
     case VueVersion.VUE2:
       return `
diff --git a/static/app/gettingStartedDocs/node/connect.tsx b/static/app/gettingStartedDocs/node/connect.tsx
index dc7ba29a23a1bc..d417f4b3033937 100644
--- a/static/app/gettingStartedDocs/node/connect.tsx
+++ b/static/app/gettingStartedDocs/node/connect.tsx
@@ -50,7 +50,7 @@ const onboarding: OnboardingConfig = {
     {
       type: StepType.CONFIGURE,
       description: t(
-        "Initialize Sentry as early as possible in your application's lifecycle. Otherwise, auto-instrumentation will not work."
+        "Initialize Sentry as early as possible in your application's lifecycle."
       ),
       configurations: [
         {
@@ -70,10 +70,9 @@ const onboarding: OnboardingConfig = {
         },
         {
           description: tct(
-            "Make sure to import [code1:instrument.js/mjs] at the top of your file. Set up the error handler after all controllers and before any other error middleware. This setup is typically done in your application's entry point file, which is usually [code2:index.(js|ts)]. If you're running your application in ESM mode, or looking for alternative ways to set up Sentry, read about [docs:installation methods in our docs].",
+            "Make sure to import [code:instrument.js/mjs] at the top of your file. Set up the error handler after all controllers and before any other error middleware. This setup is typically done in your application's entry point file, which is usually [code:index.(js|ts)]. If you're running your application in ESM mode, or looking for alternative ways to set up Sentry, read about [docs:installation methods in our docs].",
             {
-              code1: <code />,
-              code2: <code />,
+              code: <code />,
               docs: (
                 <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/connect/install/" />
               ),
diff --git a/static/app/gettingStartedDocs/node/express.tsx b/static/app/gettingStartedDocs/node/express.tsx
index 3046b314983f10..31b41073f8d15a 100644
--- a/static/app/gettingStartedDocs/node/express.tsx
+++ b/static/app/gettingStartedDocs/node/express.tsx
@@ -64,7 +64,7 @@ const onboarding: OnboardingConfig = {
     {
       type: StepType.CONFIGURE,
       description: t(
-        "Initialize Sentry as early as possible in your application's lifecycle. Otherwise, auto-instrumentation will not work."
+        "Initialize Sentry as early as possible in your application's lifecycle."
       ),
       configurations: [
         {
@@ -84,10 +84,9 @@ const onboarding: OnboardingConfig = {
         },
         {
           description: tct(
-            "Make sure to import [code1:instrument.js/mjs] at the top of your file. Set up the error handler after all controllers and before any other error middleware. This setup is typically done in your application's entry point file, which is usually [code2:index.(js|ts)]. If you're running your application in ESM mode, or looking for alternative ways to set up Sentry, read about [docs:installation methods in our docs].",
+            "Make sure to import [code:instrument.js/mjs] at the top of your file. Set up the error handler after all controllers and before any other error middleware. This setup is typically done in your application's entry point file, which is usually [code:index.(js|ts)]. If you're running your application in ESM mode, or looking for alternative ways to set up Sentry, read about [docs:installation methods in our docs].",
             {
-              code1: <code />,
-              code2: <code />,
+              code: <code />,
               docs: (
                 <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/express/install/" />
               ),
diff --git a/static/app/gettingStartedDocs/node/fastify.tsx b/static/app/gettingStartedDocs/node/fastify.tsx
index 38010bbf9d2579..7d20e49c0738ec 100644
--- a/static/app/gettingStartedDocs/node/fastify.tsx
+++ b/static/app/gettingStartedDocs/node/fastify.tsx
@@ -53,7 +53,7 @@ const onboarding: OnboardingConfig = {
     {
       type: StepType.CONFIGURE,
       description: t(
-        "Initialize Sentry as early as possible in your application's lifecycle. Otherwise, auto-instrumentation will not work."
+        "Initialize Sentry as early as possible in your application's lifecycle."
       ),
       configurations: [
         {
@@ -73,10 +73,9 @@ const onboarding: OnboardingConfig = {
         },
         {
           description: tct(
-            "Make sure to import [code1:instrument.js/mjs] at the top of your file. Set up the error handler. This setup is typically done in your application's entry point file, which is usually [code2:index.(js|ts)]. If you're running your application in ESM mode, or looking for alternative ways to set up Sentry, read about [docs:installation methods in our docs].",
+            "Make sure to import [code:instrument.js/mjs] at the top of your file. Set up the error handler. This setup is typically done in your application's entry point file, which is usually [code:index.(js|ts)]. If you're running your application in ESM mode, or looking for alternative ways to set up Sentry, read about [docs:installation methods in our docs].",
             {
-              code1: <code />,
-              code2: <code />,
+              code: <code />,
               docs: (
                 <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/fastify/install/" />
               ),
diff --git a/static/app/gettingStartedDocs/node/hapi.tsx b/static/app/gettingStartedDocs/node/hapi.tsx
index 43c3baccd4935e..0fe73f422a0653 100644
--- a/static/app/gettingStartedDocs/node/hapi.tsx
+++ b/static/app/gettingStartedDocs/node/hapi.tsx
@@ -64,7 +64,7 @@ const onboarding: OnboardingConfig = {
     {
       type: StepType.CONFIGURE,
       description: t(
-        "Initialize Sentry as early as possible in your application's lifecycle. Otherwise, auto-instrumentation will not work."
+        "Initialize Sentry as early as possible in your application's lifecycle."
       ),
       configurations: [
         {
@@ -84,10 +84,9 @@ const onboarding: OnboardingConfig = {
         },
         {
           description: tct(
-            "Make sure to import [code1:instrument.js/mjs] at the top of your file. Set up the error handler. This setup is typically done in your application's entry point file, which is usually [code2:index.(js|ts)]. If you're running your application in ESM mode, or looking for alternative ways to set up Sentry, read about [docs:installation methods in our docs].",
+            "Make sure to import [code:instrument.js/mjs] at the top of your file. Set up the error handler. This setup is typically done in your application's entry point file, which is usually [code:index.(js|ts)]. If you're running your application in ESM mode, or looking for alternative ways to set up Sentry, read about [docs:installation methods in our docs].",
             {
-              code1: <code />,
-              code2: <code />,
+              code: <code />,
               docs: (
                 <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/hapi/install/" />
               ),
diff --git a/static/app/gettingStartedDocs/node/koa.tsx b/static/app/gettingStartedDocs/node/koa.tsx
index 0d9e5121ed665f..2771e0f58a3fe0 100644
--- a/static/app/gettingStartedDocs/node/koa.tsx
+++ b/static/app/gettingStartedDocs/node/koa.tsx
@@ -57,7 +57,7 @@ const onboarding: OnboardingConfig = {
     {
       type: StepType.CONFIGURE,
       description: t(
-        "Initialize Sentry as early as possible in your application's lifecycle. Otherwise, auto-instrumentation will not work."
+        "Initialize Sentry as early as possible in your application's lifecycle."
       ),
       configurations: [
         {
@@ -77,10 +77,9 @@ const onboarding: OnboardingConfig = {
         },
         {
           description: tct(
-            "Make sure to import [code1:instrument.js/mjs] at the top of your file. Set up the error handler after all controllers and before any other error middleware. This setup is typically done in your application's entry point file, which is usually [code2:index.(js|ts)]. If you're running your application in ESM mode, or looking for alternative ways to set up Sentry, read about [docs:installation methods in our docs].",
+            "Make sure to import [code:instrument.js/mjs] at the top of your file. Set up the error handler after all controllers and before any other error middleware. This setup is typically done in your application's entry point file, which is usually [code:index.(js|ts)]. If you're running your application in ESM mode, or looking for alternative ways to set up Sentry, read about [docs:installation methods in our docs].",
             {
-              code1: <code />,
-              code2: <code />,
+              code: <code />,
               docs: (
                 <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/koa/install/" />
               ),
diff --git a/static/app/gettingStartedDocs/node/nestjs.tsx b/static/app/gettingStartedDocs/node/nestjs.tsx
index 44cde672b51b61..cbf16773be1129 100644
--- a/static/app/gettingStartedDocs/node/nestjs.tsx
+++ b/static/app/gettingStartedDocs/node/nestjs.tsx
@@ -106,7 +106,7 @@ const onboarding: OnboardingConfig = {
     {
       type: StepType.CONFIGURE,
       description: t(
-        "Initialize Sentry as early as possible in your application's lifecycle. Otherwise, auto-instrumentation will not work."
+        "Initialize Sentry as early as possible in your application's lifecycle."
       ),
       configurations: [
         {
@@ -126,10 +126,9 @@ const onboarding: OnboardingConfig = {
         },
         {
           description: tct(
-            'Import [code1:instrument.js/mjs] in your [code2:main.ts/js] file:',
+            'Make sure to import [code:instrument.js/mjs] at the top of your [code:main.ts/js] file:',
             {
-              code1: <code />,
-              code2: <code />,
+              code: <code />,
               docs: (
                 <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/nestjs/install/" />
               ),
@@ -147,9 +146,9 @@ const onboarding: OnboardingConfig = {
         },
         {
           description: tct(
-            'Afterwards, add the [code1:SentryModule] as a root module to your main module:',
+            'Add the [code:SentryModule] as a root module to your main module:',
             {
-              code1: <code />,
+              code: <code />,
               docs: (
                 <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/nestjs/install/" />
               ),
@@ -167,12 +166,9 @@ const onboarding: OnboardingConfig = {
         },
         {
           description: tct(
-            'In case you are using a global catch-all exception filter (which is either a filter registered with [code1:app.useGlobalFilters()] or a filter registered in your app module providers annotated with a [code2:@Catch()] decorator without arguments), add a [code3:@WithSentry()] decorator to the [code4:catch()] method of this global error filter. This decorator will report all unexpected errors that are received by your global error filter to Sentry:',
+            'If you are using a global catch-all exception filter add a [code:@WithSentry()] decorator to the [code:catch()] method of this global error filter. This will report all unhandled errors to Sentry',
             {
-              code1: <code />,
-              code2: <code />,
-              code3: <code />,
-              code4: <code />,
+              code: <code />,
             }
           ),
           code: [
@@ -187,7 +183,7 @@ const onboarding: OnboardingConfig = {
         },
         {
           description: tct(
-            'In case you do not have a global catch-all exception filter, add the [code:SentryGlobalFilter] to the providers of your main module. This filter will report all unhandled errors to Sentry that are not caught by any other error filter. Important: The [code:SentryGlobalFilter] needs to be registered before any other exception filters. Also note that in NestJS + GraphQL applications the [code:SentryGlobalFilter] needs to be replaced with the [code:SentryGlobalGraphQLFilter].',
+            'Alternatively, add the [code:SentryGlobalFilter] (or [code:SentryGlobalGraphQLFilter] if you are using GraphQL) before any other exception filters to the providers of your main module.',
             {
               code: <code />,
             }
diff --git a/static/app/gettingStartedDocs/node/node.tsx b/static/app/gettingStartedDocs/node/node.tsx
index 3e7be4dab8675d..0e475838d8a623 100644
--- a/static/app/gettingStartedDocs/node/node.tsx
+++ b/static/app/gettingStartedDocs/node/node.tsx
@@ -47,7 +47,7 @@ const onboarding: OnboardingConfig = {
     {
       type: StepType.CONFIGURE,
       description: t(
-        "Initialize Sentry as early as possible in your application's lifecycle. Otherwise, auto-instrumentation will not work."
+        "Initialize Sentry as early as possible in your application's lifecycle."
       ),
       configurations: [
         {
@@ -67,10 +67,9 @@ const onboarding: OnboardingConfig = {
         },
         {
           description: tct(
-            "Make sure to import [code1:instrument.js/mjs] at the top of your file. Set up the error handler after all controllers and before any other error middleware. This setup is typically done in your application's entry point file, which is usually [code2:index.(js|ts)]. If you're running your application in ESM mode, or looking for alternative ways to set up Sentry, read about [docs:installation methods in our docs].",
+            "Make sure to import [code:instrument.js/mjs] at the top of your file. Set up the error handler after all controllers and before any other error middleware. This setup is typically done in your application's entry point file, which is usually [code:index.(js|ts)]. If you're running your application in ESM mode, or looking for alternative ways to set up Sentry, read about [docs:installation methods in our docs].",
             {
-              code1: <code />,
-              code2: <code />,
+              code: <code />,
               docs: (
                 <ExternalLink href="https://docs.sentry.io/platforms/javascript/guides/node/install/" />
               ),
diff --git a/static/app/gettingStartedDocs/python/python.tsx b/static/app/gettingStartedDocs/python/python.tsx
index 9fe7cdda8ebbdd..7c987523b8e0e7 100644
--- a/static/app/gettingStartedDocs/python/python.tsx
+++ b/static/app/gettingStartedDocs/python/python.tsx
@@ -136,7 +136,7 @@ export const performanceOnboarding: OnboardingConfig = {
 import sentry-sdk
 
 sentry_sdk.init(
-  dsn: "${params.dsn.public}",
+  dsn="${params.dsn.public}",
   enable_tracing=True,
 )`,
           additionalInfo: tct(
diff --git a/static/app/views/alerts/wizard/index.spec.tsx b/static/app/views/alerts/wizard/index.spec.tsx
index 461da2ff989a86..af0bf4feed087a 100644
--- a/static/app/views/alerts/wizard/index.spec.tsx
+++ b/static/app/views/alerts/wizard/index.spec.tsx
@@ -103,4 +103,30 @@ describe('AlertWizard', () => {
     const alertGroups = screen.getAllByRole('radiogroup');
     expect(alertGroups.length).toEqual(1);
   });
+
+  it('shows uptime alert according to feature flag', () => {
+    const {organization, project, routerProps, router} = initializeOrg({
+      organization: {
+        features: [
+          'alert-crash-free-metrics',
+          'incidents',
+          'performance-view',
+          'crash-rate-alerts',
+          'organizations:uptime-display-wizard-create',
+        ],
+        access: ['org:write', 'alerts:write'],
+      },
+    });
+
+    render(
+      <AlertWizard
+        organization={organization}
+        projectId={project.slug}
+        {...routerProps}
+      />,
+      {router, organization}
+    );
+
+    expect(screen.getByText('Uptime Monitor')).toBeInTheDocument();
+  });
 });
diff --git a/static/app/views/alerts/wizard/index.tsx b/static/app/views/alerts/wizard/index.tsx
index 0d0ae0d534b296..31f781fd58e60c 100644
--- a/static/app/views/alerts/wizard/index.tsx
+++ b/static/app/views/alerts/wizard/index.tsx
@@ -116,7 +116,11 @@ function AlertWizard({organization, params, location, projectId}: AlertWizardPro
               priority="primary"
               to={{
                 pathname: `/organizations/${organization.slug}/alerts/new/${
-                  isMetricAlert ? AlertRuleType.METRIC : AlertRuleType.ISSUE
+                  isMetricAlert
+                    ? AlertRuleType.METRIC
+                    : alertOption === 'uptime_monitor'
+                      ? AlertRuleType.UPTIME
+                      : AlertRuleType.ISSUE
                 }/`,
                 query: {
                   ...(metricRuleTemplate ? metricRuleTemplate : {}),
diff --git a/static/app/views/alerts/wizard/options.tsx b/static/app/views/alerts/wizard/options.tsx
index 100f7e60061074..7eef2fdb46516f 100644
--- a/static/app/views/alerts/wizard/options.tsx
+++ b/static/app/views/alerts/wizard/options.tsx
@@ -46,7 +46,8 @@ export type AlertType =
   | 'custom_metrics'
   | 'llm_tokens'
   | 'llm_cost'
-  | 'insights_metrics';
+  | 'insights_metrics'
+  | 'uptime_monitor';
 
 export enum MEPAlertsQueryType {
   ERROR = 0,
@@ -60,7 +61,7 @@ export enum MEPAlertsDataset {
   METRICS_ENHANCED = 'metricsEnhanced',
 }
 
-export type MetricAlertType = Exclude<AlertType, 'issues'>;
+export type MetricAlertType = Exclude<AlertType, 'issues' | 'uptime_monitor'>;
 
 export const DatasetMEPAlertQueryTypes: Record<
   Exclude<Dataset, 'search_issues' | Dataset.SESSIONS>, // IssuePlatform (search_issues) is not used in alerts, so we can exclude it here
@@ -90,6 +91,7 @@ export const AlertWizardAlertNames: Record<AlertType, string> = {
   llm_cost: t('LLM cost'),
   llm_tokens: t('LLM token usage'),
   insights_metrics: t('Insights Metric'),
+  uptime_monitor: t('Uptime Monitor'),
 };
 
 type AlertWizardCategory = {
@@ -131,6 +133,12 @@ export const getAlertWizardCategories = (org: Organization) => {
         options: ['llm_tokens', 'llm_cost'],
       });
     }
+    if (org.features.includes('organizations:uptime-display-wizard-create')) {
+      result.push({
+        categoryHeading: t('Uptime'),
+        options: ['uptime_monitor'],
+      });
+    }
     result.push({
       categoryHeading: hasCustomMetrics(org) ? t('Metrics') : t('Custom'),
       options: [hasCustomMetrics(org) ? 'custom_metrics' : 'custom_transactions'],
diff --git a/static/app/views/alerts/wizard/panelContent.tsx b/static/app/views/alerts/wizard/panelContent.tsx
index 7ff00ad376fc2e..b9fb29deb5fb46 100644
--- a/static/app/views/alerts/wizard/panelContent.tsx
+++ b/static/app/views/alerts/wizard/panelContent.tsx
@@ -182,4 +182,8 @@ export const AlertWizardPanelContent: Record<AlertType, PanelContent> = {
     ],
     illustration: diagramCrashFreeUsers,
   },
+  uptime_monitor: {
+    description: t('Monitor the availability and reliability of your web services.'),
+    examples: [t('When a URL is detected to be down, create an issue.')],
+  },
 };
diff --git a/static/app/views/app/index.tsx b/static/app/views/app/index.tsx
index e0efe2a18e1bda..f616a08b965de1 100644
--- a/static/app/views/app/index.tsx
+++ b/static/app/views/app/index.tsx
@@ -32,6 +32,7 @@ import {useLocation} from 'sentry/utils/useLocation';
 import {useUser} from 'sentry/utils/useUser';
 import type {InstallWizardProps} from 'sentry/views/admin/installWizard';
 import {AsyncSDKIntegrationContextProvider} from 'sentry/views/app/asyncSDKIntegrationProvider';
+import LastKnownRouteContextProvider from 'sentry/views/lastKnownRouteContextProvider';
 import {OrganizationContextProvider} from 'sentry/views/organizationContext';
 import RouteAnalyticsContextProvider from 'sentry/views/routeAnalyticsContextProvider';
 
@@ -241,22 +242,24 @@ function App({children, params}: Props) {
 
   return (
     <Profiler id="App" onRender={onRenderCallback}>
-      <RouteAnalyticsContextProvider>
-        <OrganizationContextProvider>
-          <AsyncSDKIntegrationContextProvider>
-            <GlobalDrawer>
-              <GlobalFeedbackForm>
-                <MainContainer tabIndex={-1} ref={mainContainerRef}>
-                  <GlobalModal onClose={handleModalClose} />
-                  <SystemAlerts className="messages-container" />
-                  <Indicators className="indicators-container" />
-                  <ErrorBoundary>{renderBody()}</ErrorBoundary>
-                </MainContainer>
-              </GlobalFeedbackForm>
-            </GlobalDrawer>
-          </AsyncSDKIntegrationContextProvider>
-        </OrganizationContextProvider>
-      </RouteAnalyticsContextProvider>
+      <LastKnownRouteContextProvider>
+        <RouteAnalyticsContextProvider>
+          <OrganizationContextProvider>
+            <AsyncSDKIntegrationContextProvider>
+              <GlobalDrawer>
+                <GlobalFeedbackForm>
+                  <MainContainer tabIndex={-1} ref={mainContainerRef}>
+                    <GlobalModal onClose={handleModalClose} />
+                    <SystemAlerts className="messages-container" />
+                    <Indicators className="indicators-container" />
+                    <ErrorBoundary>{renderBody()}</ErrorBoundary>
+                  </MainContainer>
+                </GlobalFeedbackForm>
+              </GlobalDrawer>
+            </AsyncSDKIntegrationContextProvider>
+          </OrganizationContextProvider>
+        </RouteAnalyticsContextProvider>
+      </LastKnownRouteContextProvider>
     </Profiler>
   );
 }
diff --git a/static/app/views/dashboards/widgetCard/autoSizedText.tsx b/static/app/views/dashboards/widgetCard/autoSizedText.tsx
index 81c28f053f0cf5..f6e4a58ca57f54 100644
--- a/static/app/views/dashboards/widgetCard/autoSizedText.tsx
+++ b/static/app/views/dashboards/widgetCard/autoSizedText.tsx
@@ -51,52 +51,44 @@ export function AutoSizedText({children}: Props) {
 
       let iterationCount = 0;
 
-      Sentry.withScope(scope => {
-        const span = Sentry.startInactiveSpan({
-          op: 'function',
-          name: 'AutoSizedText.iterate',
-          forceTransaction: true,
-        });
-
-        const t1 = performance.now();
-
-        // Run the resize iteration in a loop. This blocks the main UI thread and prevents
-        // visible layout jitter. If this was done through a `ResizeObserver` or React State
-        // each step in the resize iteration would be visible to the user
-        while (iterationCount <= ITERATION_LIMIT) {
-          const childDimensions = getElementDimensions(childElement);
-
-          const widthDifference = parentDimensions.width - childDimensions.width;
-          const heightDifference = parentDimensions.height - childDimensions.height;
-
-          const childFitsIntoParent = heightDifference >= 0 && widthDifference >= 0;
-          const childIsWithinWidthTolerance =
-            Math.abs(widthDifference) <= MAXIMUM_DIFFERENCE;
-          const childIsWithinHeightTolerance =
-            Math.abs(heightDifference) <= MAXIMUM_DIFFERENCE;
-
-          if (
-            childFitsIntoParent &&
-            (childIsWithinWidthTolerance || childIsWithinHeightTolerance)
-          ) {
-            // Stop the iteration, we've found a fit!
-            span.setAttribute('widthDifference', widthDifference);
-            span.setAttribute('heightDifference', heightDifference);
-            break;
-          }
-
-          adjustFontSize(childDimensions, parentDimensions);
-
-          iterationCount += 1;
+      const span = Sentry.startInactiveSpan({
+        op: 'function',
+        name: 'AutoSizedText.iterate',
+        onlyIfParent: true,
+      });
+
+      // Run the resize iteration in a loop. This blocks the main UI thread and prevents
+      // visible layout jitter. If this was done through a `ResizeObserver` or React State
+      // each step in the resize iteration would be visible to the user
+      while (iterationCount <= ITERATION_LIMIT) {
+        const childDimensions = getElementDimensions(childElement);
+
+        const widthDifference = parentDimensions.width - childDimensions.width;
+        const heightDifference = parentDimensions.height - childDimensions.height;
+
+        const childFitsIntoParent = heightDifference >= 0 && widthDifference >= 0;
+        const childIsWithinWidthTolerance =
+          Math.abs(widthDifference) <= MAXIMUM_DIFFERENCE;
+        const childIsWithinHeightTolerance =
+          Math.abs(heightDifference) <= MAXIMUM_DIFFERENCE;
+
+        if (
+          childFitsIntoParent &&
+          (childIsWithinWidthTolerance || childIsWithinHeightTolerance)
+        ) {
+          // Stop the iteration, we've found a fit!
+          span.setAttribute('widthDifference', widthDifference);
+          span.setAttribute('heightDifference', heightDifference);
+          break;
         }
-        const t2 = performance.now();
 
-        scope.setTag('didExceedIterationLimit', iterationCount >= ITERATION_LIMIT);
+        adjustFontSize(childDimensions, parentDimensions);
 
-        span.setAttribute('iterationCount', iterationCount);
-        span.setAttribute('durationFromPerformanceAPI', t2 - t1);
-        span.end();
-      });
+        iterationCount += 1;
+      }
+
+      span.setAttribute('iterationCount', iterationCount);
+      span.end();
     });
 
     observer.observe(parentElement);
diff --git a/static/app/views/insights/common/components/fullSpanDescription.tsx b/static/app/views/insights/common/components/fullSpanDescription.tsx
index 70b7ff2e8b0517..e174ef47432f80 100644
--- a/static/app/views/insights/common/components/fullSpanDescription.tsx
+++ b/static/app/views/insights/common/components/fullSpanDescription.tsx
@@ -1,13 +1,20 @@
-import {Fragment} from 'react';
+import {Fragment, type ReactNode} from 'react';
 import styled from '@emotion/styled';
 
+import ClippedBox from 'sentry/components/clippedBox';
 import {CodeSnippet} from 'sentry/components/codeSnippet';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
+import {IconOpen} from 'sentry/icons';
+import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
+import {MutableSearch} from 'sentry/utils/tokenizeSearch';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
+import {useSpansIndexed} from 'sentry/views/insights/common/queries/useDiscover';
 import {useFullSpanFromTrace} from 'sentry/views/insights/common/queries/useFullSpanFromTrace';
 import {prettyPrintJsonString} from 'sentry/views/insights/database/utils/jsonUtils';
-import {ModuleName} from 'sentry/views/insights/types';
+import {ModuleName, SpanIndexedField} from 'sentry/views/insights/types';
 
 const formatter = new SQLishFormatter();
 
@@ -29,16 +36,32 @@ export function FullSpanDescription({
   filters,
   moduleName,
 }: Props) {
+  const {data: indexedSpans, isFetching: areIndexedSpansLoading} = useSpansIndexed(
+    {
+      search: MutableSearch.fromQueryObject({'span.group': group}),
+      limit: 1,
+      fields: [
+        SpanIndexedField.PROJECT_ID,
+        SpanIndexedField.TRANSACTION_ID,
+        SpanIndexedField.SPAN_DESCRIPTION,
+      ],
+    },
+    'api.starfish.span-description'
+  );
+  const indexedSpan = indexedSpans?.[0];
+
+  // This is used as backup in case we don't have the necessary data available in the indexed span
   const {
     data: fullSpan,
     isLoading,
     isFetching,
-  } = useFullSpanFromTrace(group, [INDEXED_SPAN_SORT], Boolean(group), filters);
+  } = useFullSpanFromTrace(group, [INDEXED_SPAN_SORT], Boolean(indexedSpan), filters);
 
-  const description = fullSpan?.description ?? shortDescription;
+  const description =
+    indexedSpan?.['span.description'] ?? fullSpan?.description ?? shortDescription;
   const system = fullSpan?.data?.['db.system'];
 
-  if (isLoading && isFetching) {
+  if (areIndexedSpansLoading || (isLoading && isFetching)) {
     return (
       <PaddedSpinner>
         <LoadingIndicator mini hideMessage relative />
@@ -53,24 +76,37 @@ export function FullSpanDescription({
   if (moduleName === ModuleName.DB) {
     if (system === 'mongodb') {
       let stringifiedQuery = '';
+      let result: ReturnType<typeof prettyPrintJsonString> | undefined = undefined;
 
-      if (fullSpan?.sentry_tags) {
-        stringifiedQuery = prettyPrintJsonString(fullSpan?.sentry_tags?.description);
+      if (indexedSpan?.['span.description']) {
+        result = prettyPrintJsonString(indexedSpan?.['span.description']);
       } else if (description) {
-        stringifiedQuery = prettyPrintJsonString(description);
+        result = prettyPrintJsonString(description);
       } else if (fullSpan?.sentry_tags?.description) {
-        stringifiedQuery = prettyPrintJsonString(fullSpan?.sentry_tags?.description);
+        result = prettyPrintJsonString(fullSpan?.sentry_tags.description);
+      } else if (fullSpan?.sentry_tags?.description) {
+        result = prettyPrintJsonString(fullSpan?.sentry_tags?.description);
       } else {
         stringifiedQuery = description || fullSpan?.sentry_tags?.description || 'N/A';
       }
 
-      return <CodeSnippet language="json">{stringifiedQuery}</CodeSnippet>;
+      if (result) {
+        stringifiedQuery = result.prettifiedQuery;
+      }
+
+      return (
+        <QueryClippedBox group={group}>
+          <CodeSnippet language="json">{stringifiedQuery}</CodeSnippet>
+        </QueryClippedBox>
+      );
     }
 
     return (
-      <CodeSnippet language="sql">
-        {formatter.toString(description, {maxLineLength: LINE_LENGTH})}
-      </CodeSnippet>
+      <QueryClippedBox group={group}>
+        <CodeSnippet language="sql">
+          {formatter.toString(description, {maxLineLength: LINE_LENGTH})}
+        </CodeSnippet>
+      </QueryClippedBox>
     );
   }
 
@@ -81,8 +117,40 @@ export function FullSpanDescription({
   return <Fragment>{description}</Fragment>;
 }
 
+type TruncatedQueryClipBoxProps = {
+  children: ReactNode;
+  group: string | undefined;
+};
+
+function QueryClippedBox({group, children}: TruncatedQueryClipBoxProps) {
+  const location = useLocation();
+  const navigate = useNavigate();
+
+  return (
+    <StyledClippedBox
+      btnText={t('View full query')}
+      clipHeight={500}
+      buttonProps={{
+        icon: <IconOpen />,
+        onClick: () =>
+          navigate({
+            pathname: `${location.pathname}spans/span/${group}/`,
+          }),
+      }}
+    >
+      {children}
+    </StyledClippedBox>
+  );
+}
+
 const LINE_LENGTH = 60;
 
 const PaddedSpinner = styled('div')`
   padding: 0 ${space(0.5)};
 `;
+
+const StyledClippedBox = styled(ClippedBox)`
+  > div > div {
+    z-index: 1;
+  }
+`;
diff --git a/static/app/views/insights/common/components/issues.tsx b/static/app/views/insights/common/components/issues.tsx
index 296bd4b9e97c8e..bd7b29cbb6b7ee 100644
--- a/static/app/views/insights/common/components/issues.tsx
+++ b/static/app/views/insights/common/components/issues.tsx
@@ -32,7 +32,7 @@ function Issue({data}: {data: Group}) {
   return (
     <StyledPanelItem as="tr">
       <IssueSummaryWrapper>
-        <IssueSummary data={data} organization={organization} event_id={'0'} />
+        <IssueSummary data={data} organization={organization} />
         <EventOrGroupExtraDetails data={data} />
       </IssueSummaryWrapper>
       <ChartWrapper>
diff --git a/static/app/views/insights/common/components/spanDescription.tsx b/static/app/views/insights/common/components/spanDescription.tsx
index 38c2d33b7b5894..c83a9c8692e2f5 100644
--- a/static/app/views/insights/common/components/spanDescription.tsx
+++ b/static/app/views/insights/common/components/spanDescription.tsx
@@ -90,7 +90,7 @@ export function DatabaseSpanDescription({
         return rawDescription ?? 'N/A';
       }
 
-      return prettyPrintJsonString(bestDescription);
+      return prettyPrintJsonString(bestDescription).prettifiedQuery;
     }
 
     return formatter.toString(rawDescription ?? '');
diff --git a/static/app/views/insights/database/utils/jsonUtils.tsx b/static/app/views/insights/database/utils/jsonUtils.tsx
index 79c423dbc60a1d..2ee90a524b4615 100644
--- a/static/app/views/insights/database/utils/jsonUtils.tsx
+++ b/static/app/views/insights/database/utils/jsonUtils.tsx
@@ -9,16 +9,28 @@ export const isValidJson = (str: string) => {
   return true;
 };
 
-export function prettyPrintJsonString(json: string) {
+export function prettyPrintJsonString(json: string): {
+  failed: boolean;
+  isTruncated: boolean;
+  prettifiedQuery: string;
+} {
   try {
-    return JSON.stringify(JSON.parse(json), null, 4);
+    return {
+      prettifiedQuery: JSON.stringify(JSON.parse(json), null, 4),
+      isTruncated: false,
+      failed: false,
+    };
   } catch {
     // Attempt to repair the JSON
     try {
       const repairedJson = jsonrepair(json);
-      return JSON.stringify(JSON.parse(repairedJson), null, 4);
+      return {
+        prettifiedQuery: JSON.stringify(JSON.parse(repairedJson), null, 4),
+        isTruncated: true,
+        failed: false,
+      };
     } catch {
-      return json;
+      return {prettifiedQuery: json, isTruncated: false, failed: true};
     }
   }
 }
diff --git a/static/app/views/issueDetails/groupEventAttachments/groupEventAttachmentsDrawer.tsx b/static/app/views/issueDetails/groupEventAttachments/groupEventAttachmentsDrawer.tsx
index f8bbdb6996371b..544932d8c29f92 100644
--- a/static/app/views/issueDetails/groupEventAttachments/groupEventAttachmentsDrawer.tsx
+++ b/static/app/views/issueDetails/groupEventAttachments/groupEventAttachmentsDrawer.tsx
@@ -10,7 +10,7 @@ import {
   Header,
   NavigationCrumbs,
   ShortId,
-} from 'sentry/components/events/eventReplay/eventDrawer';
+} from 'sentry/components/events/eventDrawer';
 import LoadingError from 'sentry/components/loadingError';
 import Pagination from 'sentry/components/pagination';
 import {t} from 'sentry/locale';
diff --git a/static/app/views/issueList/customViewsHeader.tsx b/static/app/views/issueList/customViewsHeader.tsx
index 0de5d4f7dbf5bf..3fd9088d83c6ed 100644
--- a/static/app/views/issueList/customViewsHeader.tsx
+++ b/static/app/views/issueList/customViewsHeader.tsx
@@ -126,15 +126,15 @@ function CustomViewsIssueListHeaderTabsContent({
   // TODO(msun): Use the location from useLocation instead of props router in the future
   const {cursor: _cursor, page: _page, ...queryParams} = router?.location.query;
 
+  const {query, sort, viewId, project, environment} = queryParams;
+
   const queryParamsWithPageFilters = {
     ...queryParams,
-    project: pageFilters.selection.projects,
-    environment: pageFilters.selection.environments,
+    project: project ?? pageFilters.selection.projects,
+    environment: environment ?? pageFilters.selection.environments,
     ...normalizeDateTimeParams(pageFilters.selection.datetime),
   };
 
-  const {query, sort, viewId} = queryParams;
-
   const viewsToTabs = views.map(
     ({id, name, query: viewQuery, querySort: viewQuerySort}, index): Tab => {
       const tabId = id ?? `default${index.toString()}`;
diff --git a/static/app/views/lastKnownRouteContextProvider.tsx b/static/app/views/lastKnownRouteContextProvider.tsx
new file mode 100644
index 00000000000000..38fae90648a579
--- /dev/null
+++ b/static/app/views/lastKnownRouteContextProvider.tsx
@@ -0,0 +1,31 @@
+import {createContext, useContext} from 'react';
+
+import getRouteStringFromRoutes from 'sentry/utils/getRouteStringFromRoutes';
+import usePrevious from 'sentry/utils/usePrevious';
+import {useRoutes} from 'sentry/utils/useRoutes';
+
+interface Props {
+  children: React.ReactNode;
+}
+
+export const LastKnownRouteContext = createContext<string>('<unknown>');
+
+export function useLastKnownRoute() {
+  return useContext(LastKnownRouteContext);
+}
+
+/**
+ * This provider tracks the last known route that the user has navigated to.
+ * This is used to better group issues when we hit "route not found" errors.
+ */
+export default function LastKnownRouteContextProvider({children}: Props) {
+  const route = useRoutes();
+  const prevRoute = usePrevious(route);
+  const lastKnownRoute = getRouteStringFromRoutes(prevRoute);
+
+  return (
+    <LastKnownRouteContext.Provider value={lastKnownRoute}>
+      {children}
+    </LastKnownRouteContext.Provider>
+  );
+}
diff --git a/static/app/views/onboarding/components/useOnboardingQueryParams.tsx b/static/app/views/onboarding/components/useOnboardingQueryParams.tsx
index 628fe7f85f6c1d..c327a6cda337ec 100644
--- a/static/app/views/onboarding/components/useOnboardingQueryParams.tsx
+++ b/static/app/views/onboarding/components/useOnboardingQueryParams.tsx
@@ -10,10 +10,6 @@ type QueryValues = {
    * Used to show product selection (error monitoring, tracing, profiling and session replay) for certain platforms, e.g. javascript-react
    */
   product: string[];
-  /**
-   * Used to show the loader script for when the platform is javascript
-   */
-  showLoader: boolean;
   /**
    * Used to show or not the integration onboarding for certain platforms, e.g. AWS (python)
    */
@@ -29,7 +25,6 @@ export function useOnboardingQueryParams(): [
   const params = useLocationQuery({
     fields: {
       product: decodeList,
-      showLoader: decodeBoolean,
       showManualSetup: decodeBoolean,
     },
   });
diff --git a/static/app/views/onboarding/setupDocs.spec.tsx b/static/app/views/onboarding/setupDocs.spec.tsx
index 394f4cfe0f89f6..8ba07951a51ed6 100644
--- a/static/app/views/onboarding/setupDocs.spec.tsx
+++ b/static/app/views/onboarding/setupDocs.spec.tsx
@@ -1,7 +1,13 @@
+import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectKeysFixture} from 'sentry-fixture/projectKeys';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
-import {render, screen, waitForElementToBeRemoved} from 'sentry-test/reactTestingLibrary';
+import {
+  render,
+  screen,
+  userEvent,
+  waitForElementToBeRemoved,
+} from 'sentry-test/reactTestingLibrary';
 
 import {OnboardingContextProvider} from 'sentry/components/onboarding/onboardingContext';
 import {ProductSolution} from 'sentry/components/onboarding/productSelection';
@@ -367,11 +373,11 @@ describe('Onboarding Setup Docs', function () {
         router: {
           location: {
             query: {
-              showLoader: 'true',
               product: [
                 ProductSolution.PERFORMANCE_MONITORING,
                 ProductSolution.SESSION_REPLAY,
               ],
+              installationMode: 'auto',
             },
           },
         },
@@ -382,6 +388,9 @@ describe('Onboarding Setup Docs', function () {
             platform: 'javascript',
           },
         ],
+        organization: OrganizationFixture({
+          features: ['session-replay', 'performance-view'],
+        }),
       });
 
       const updateLoaderMock = MockApiClient.addMockResponse({
@@ -398,7 +407,7 @@ describe('Onboarding Setup Docs', function () {
         orgSlug: organization.slug,
       });
 
-      const {rerender} = render(
+      render(
         <OnboardingContextProvider>
           <SetupDocs
             active
@@ -420,7 +429,7 @@ describe('Onboarding Setup Docs', function () {
       );
 
       expect(
-        await screen.findByRole('heading', {name: 'Configure Browser JavaScript SDK'})
+        await screen.findByRole('radio', {name: 'Loader Script'})
       ).toBeInTheDocument();
 
       expect(updateLoaderMock).toHaveBeenCalledTimes(1);
@@ -440,41 +449,21 @@ describe('Onboarding Setup Docs', function () {
         }
       );
 
-      // update query in URL
-      router.location.query = {
-        showLoader: 'true',
-        product: [ProductSolution.SESSION_REPLAY],
-      };
-      rerender(
-        <OnboardingContextProvider>
-          <SetupDocs
-            active
-            onComplete={() => {}}
-            stepIndex={2}
-            router={router}
-            route={{}}
-            location={router.location}
-            genSkipOnboardingLink={() => ''}
-            orgId={organization.slug}
-            search=""
-            recentCreatedProject={project as OnboardingRecentCreatedProject}
-          />
-        </OnboardingContextProvider>
-      );
-
       expect(
-        await screen.findByRole('heading', {name: 'Configure Browser JavaScript SDK'})
+        await screen.findByRole('radio', {name: 'Loader Script'})
       ).toBeInTheDocument();
 
+      await userEvent.click(screen.getByRole('checkbox', {name: 'Session Replay'}));
       expect(updateLoaderMock).toHaveBeenCalledTimes(2);
+
       expect(updateLoaderMock).toHaveBeenLastCalledWith(
         expect.any(String), // The URL
         {
           data: {
             dynamicSdkLoaderOptions: {
               hasDebug: false,
-              hasPerformance: false,
-              hasReplay: true,
+              hasPerformance: true,
+              hasReplay: false,
             },
           },
           error: expect.any(Function),
diff --git a/static/app/views/onboarding/setupDocs.tsx b/static/app/views/onboarding/setupDocs.tsx
index 1d62bf03f0b14d..8f6716ef092a01 100644
--- a/static/app/views/onboarding/setupDocs.tsx
+++ b/static/app/views/onboarding/setupDocs.tsx
@@ -14,7 +14,6 @@ import {decodeList} from 'sentry/utils/queryString';
 import useOrganization from 'sentry/utils/useOrganization';
 import SetupIntroduction from 'sentry/views/onboarding/components/setupIntroduction';
 import {useOnboardingQueryParams} from 'sentry/views/onboarding/components/useOnboardingQueryParams';
-import {SetupDocsLoader} from 'sentry/views/onboarding/setupDocsLoader';
 import {OtherPlatformsInfo} from 'sentry/views/projectInstall/otherPlatformsInfo';
 
 import FirstEventFooter from './components/firstEventFooter';
@@ -66,13 +65,6 @@ function SetupDocs({location, recentCreatedProject: project}: StepProps) {
                   projectSlug={project.slug}
                   platform={currentPlatform.name}
                 />
-              ) : params.showLoader ? (
-                <SetupDocsLoader
-                  organization={organization}
-                  project={project}
-                  location={location}
-                  platform={currentPlatform.id}
-                />
               ) : (
                 <SdkDocumentation
                   platform={currentPlatform}
diff --git a/static/app/views/onboarding/setupDocsLoader.tsx b/static/app/views/onboarding/setupDocsLoader.tsx
deleted file mode 100644
index d83748df09fd19..00000000000000
--- a/static/app/views/onboarding/setupDocsLoader.tsx
+++ /dev/null
@@ -1,366 +0,0 @@
-import {Fragment, useCallback, useEffect, useState} from 'react';
-import styled from '@emotion/styled';
-import {motion} from 'framer-motion';
-import type {Location} from 'history';
-import beautify from 'js-beautify';
-
-import {Button} from 'sentry/components/button';
-import {CodeSnippet} from 'sentry/components/codeSnippet';
-import HookOrDefault from 'sentry/components/hookOrDefault';
-import ExternalLink from 'sentry/components/links/externalLink';
-import LoadingError from 'sentry/components/loadingError';
-import {DocumentationWrapper} from 'sentry/components/onboarding/documentationWrapper';
-import {
-  ProductSelection,
-  ProductSolution,
-} from 'sentry/components/onboarding/productSelection';
-import {IconChevron} from 'sentry/icons';
-import {t} from 'sentry/locale';
-import {space} from 'sentry/styles/space';
-import type {Organization} from 'sentry/types/organization';
-import type {PlatformKey, Project, ProjectKey} from 'sentry/types/project';
-import {trackAnalytics} from 'sentry/utils/analytics';
-import {handleXhrErrorResponse} from 'sentry/utils/handleXhrErrorResponse';
-import {decodeList} from 'sentry/utils/queryString';
-import useApi from 'sentry/utils/useApi';
-
-const ProductSelectionAvailabilityHook = HookOrDefault({
-  hookName: 'component:product-selection-availability',
-  defaultComponent: ProductSelection,
-});
-
-export function SetupDocsLoader({
-  organization,
-  location,
-  project,
-  platform,
-}: {
-  location: Location;
-  organization: Organization;
-  platform: PlatformKey | null;
-  project: Project;
-}) {
-  const api = useApi();
-  const currentPlatform = platform ?? project?.platform ?? 'other';
-  const [projectKey, setProjectKey] = useState<ProjectKey | null>(null);
-  const [hasLoadingError, setHasLoadingError] = useState(false);
-  const [projectKeyUpdateError, setProjectKeyUpdateError] = useState(false);
-
-  const productsQuery =
-    (location.query.product as ProductSolution | ProductSolution[] | undefined) ?? [];
-  const products = decodeList(productsQuery) as ProductSolution[];
-
-  const fetchData = useCallback(async () => {
-    const keysApiUrl = `/projects/${organization.slug}/${project.slug}/keys/`;
-
-    try {
-      const loadedKeys = await api.requestPromise(keysApiUrl);
-
-      if (loadedKeys.length === 0) {
-        setHasLoadingError(true);
-        return;
-      }
-
-      setProjectKey(loadedKeys[0]);
-      setHasLoadingError(false);
-    } catch (error) {
-      setHasLoadingError(error);
-      throw error;
-    }
-  }, [api, organization.slug, project.slug]);
-
-  // Automatically update the products on the project key when the user changes the product selection
-  // Note that on initial visit, this will also update the project key with the default products (=all products)
-  // This DOES NOT take into account any initial products that may already be set on the project key - they will always be overwritten!
-  const handleUpdateSelectedProducts = useCallback(async () => {
-    const keyId = projectKey?.id;
-
-    if (!keyId) {
-      return;
-    }
-
-    const newDynamicSdkLoaderOptions: ProjectKey['dynamicSdkLoaderOptions'] = {
-      hasPerformance: false,
-      hasReplay: false,
-      hasDebug: false,
-    };
-
-    products.forEach(product => {
-      // eslint-disable-next-line default-case
-      switch (product) {
-        case ProductSolution.PERFORMANCE_MONITORING:
-          newDynamicSdkLoaderOptions.hasPerformance = true;
-          break;
-        case ProductSolution.SESSION_REPLAY:
-          newDynamicSdkLoaderOptions.hasReplay = true;
-          break;
-      }
-    });
-
-    try {
-      await api.requestPromise(
-        `/projects/${organization.slug}/${project.slug}/keys/${keyId}/`,
-        {
-          method: 'PUT',
-          data: {
-            dynamicSdkLoaderOptions: newDynamicSdkLoaderOptions,
-          },
-        }
-      );
-      setProjectKeyUpdateError(false);
-    } catch (error) {
-      const message = t('Unable to updated dynamic SDK loader configuration');
-      handleXhrErrorResponse(message, error);
-      setProjectKeyUpdateError(true);
-    }
-  }, [api, organization.slug, project.slug, projectKey?.id, products]);
-
-  const track = useCallback(() => {
-    if (!project?.id) {
-      return;
-    }
-
-    trackAnalytics('onboarding.setup_loader_docs_rendered', {
-      organization,
-      platform: currentPlatform,
-      project_id: project?.id,
-    });
-  }, [organization, currentPlatform, project?.id]);
-
-  useEffect(() => {
-    fetchData();
-  }, [fetchData, organization.slug, project.slug]);
-
-  useEffect(() => {
-    handleUpdateSelectedProducts();
-  }, [handleUpdateSelectedProducts, location.query.product]);
-
-  useEffect(() => {
-    track();
-  }, [track]);
-
-  return (
-    <Fragment>
-      <Header>
-        <ProductSelectionAvailabilityHook
-          organization={organization}
-          platform={currentPlatform}
-          projectId={project.id}
-        />
-      </Header>
-      <Divider />
-      {projectKeyUpdateError && (
-        <LoadingError
-          message={t('Failed to update the project key with the selected products.')}
-          onRetry={handleUpdateSelectedProducts}
-        />
-      )}
-
-      {!hasLoadingError ? (
-        projectKey !== null && (
-          <ProjectKeyInfo
-            projectKey={projectKey}
-            platform={platform}
-            organization={organization}
-            project={project}
-            products={products}
-          />
-        )
-      ) : (
-        <LoadingError
-          message={t('Failed to load Client Keys for the project.')}
-          onRetry={fetchData}
-        />
-      )}
-    </Fragment>
-  );
-}
-
-function ProjectKeyInfo({
-  projectKey,
-  platform,
-  organization,
-  project,
-  products,
-}: {
-  organization: Organization;
-  platform: PlatformKey | null;
-  products: ProductSolution[];
-  project: Project;
-  projectKey: ProjectKey;
-}) {
-  const [showOptionalConfig, setShowOptionalConfig] = useState(false);
-
-  const loaderLink = projectKey.dsn.cdn;
-  const currentPlatform = platform ?? project?.platform ?? 'other';
-  const hasPerformance = products.includes(ProductSolution.PERFORMANCE_MONITORING);
-  const hasSessionReplay = products.includes(ProductSolution.SESSION_REPLAY);
-
-  const configCodeSnippet = beautify.html(
-    `<script>
-Sentry.onLoad(function() {
-  Sentry.init({${
-    !(hasPerformance || hasSessionReplay)
-      ? `
-    // You can add any additional configuration here`
-      : ''
-  }${
-    hasPerformance
-      ? `
-    // Tracing
-    tracesSampleRate: 1.0, // Capture 100% of the transactions`
-      : ''
-  }${
-    hasSessionReplay
-      ? `
-    // Session Replay
-    replaysSessionSampleRate: 0.1, // This sets the sample rate at 10%. You may want to change it to 100% while in development and then sample at a lower rate in production.
-    replaysOnErrorSampleRate: 1.0, // If you're not already sampling the entire session, change the sample rate to 100% when sampling sessions where errors occur.`
-      : ''
-  }
-  });
-});
-</script>`,
-    {indent_size: 2}
-  );
-
-  const verifyCodeSnippet = beautify.html(
-    `<script>
-  myUndefinedFunction();
-</script>`,
-    {indent_size: 2}
-  );
-
-  const toggleOptionalConfiguration = useCallback(() => {
-    const show = !showOptionalConfig;
-
-    setShowOptionalConfig(show);
-
-    if (show) {
-      trackAnalytics('onboarding.js_loader_optional_configuration_shown', {
-        organization,
-        platform: currentPlatform,
-        project_id: project.id,
-      });
-    }
-  }, [organization, project.id, currentPlatform, showOptionalConfig]);
-
-  return (
-    <DocsWrapper>
-      <DocumentationWrapper>
-        <h2>{t('Install')}</h2>
-        <p>{t('Add this script tag to the top of the page:')}</p>
-
-        <CodeSnippet dark language="html">
-          {beautify.html(
-            `<script src="${loaderLink}" crossorigin="anonymous"></script>`,
-            {indent_size: 2, wrap_attributes: 'force-expand-multiline'}
-          )}
-        </CodeSnippet>
-
-        <OptionalConfigWrapper>
-          <ToggleButton
-            priority="link"
-            borderless
-            size="zero"
-            icon={<IconChevron direction={showOptionalConfig ? 'down' : 'right'} />}
-            aria-label={t('Toggle optional configuration')}
-            onClick={toggleOptionalConfiguration}
-          />
-          <h2 onClick={toggleOptionalConfiguration}>{t('Configuration (Optional)')}</h2>
-        </OptionalConfigWrapper>
-        {showOptionalConfig && (
-          <div>
-            <p>
-              {t(
-                "Initialize Sentry as early as possible in your application's lifecycle."
-              )}
-            </p>
-            <CodeSnippet dark language="html">
-              {configCodeSnippet}
-            </CodeSnippet>
-          </div>
-        )}
-
-        <h2>{t('Verify')}</h2>
-        <p>
-          {t(
-            "This snippet contains an intentional error and can be used as a test to make sure that everything's working as expected."
-          )}
-        </p>
-        <CodeSnippet dark language="html">
-          {verifyCodeSnippet}
-        </CodeSnippet>
-
-        <hr />
-
-        <h2>{t('Next Steps')}</h2>
-        <ul>
-          <li>
-            <ExternalLink href="https://docs.sentry.io/platforms/javascript/sourcemaps/">
-              {t('Source Maps')}
-            </ExternalLink>
-            {': '}
-            {t('Learn how to enable readable stack traces in your Sentry errors.')}
-          </li>
-          <li>
-            <ExternalLink href="https://docs.sentry.io/platforms/javascript/configuration/">
-              {t('SDK Configuration')}
-            </ExternalLink>
-            {': '}
-            {t('Learn how to configure your SDK using our Loader Script')}
-          </li>
-          {!products.includes(ProductSolution.PERFORMANCE_MONITORING) && (
-            <li>
-              <ExternalLink href="https://docs.sentry.io/platforms/javascript/tracing/">
-                {t('Tracing')}
-              </ExternalLink>
-              {': '}
-              {t(
-                'Track down transactions to connect the dots between 10-second page loads and poor-performing API calls or slow database queries.'
-              )}
-            </li>
-          )}
-          {!products.includes(ProductSolution.SESSION_REPLAY) && (
-            <li>
-              <ExternalLink href="https://docs.sentry.io/platforms/javascript/session-replay/">
-                {t('Session Replay')}
-              </ExternalLink>
-              {': '}
-              {t(
-                'Get to the root cause of an error or latency issue faster by seeing all the technical details related to that issue in one visual replay on your web application.'
-              )}
-            </li>
-          )}
-        </ul>
-      </DocumentationWrapper>
-    </DocsWrapper>
-  );
-}
-
-const DocsWrapper = styled(motion.div)``;
-
-const Header = styled('div')`
-  display: flex;
-  flex-direction: column;
-  gap: ${space(2)};
-`;
-
-const OptionalConfigWrapper = styled('div')`
-  display: flex;
-  cursor: pointer;
-`;
-
-const ToggleButton = styled(Button)`
-  &,
-  :hover {
-    color: ${p => p.theme.gray500};
-  }
-`;
-
-const Divider = styled('hr')<{withBottomMargin?: boolean}>`
-  height: 1px;
-  width: 100%;
-  background: ${p => p.theme.border};
-  border: none;
-`;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issueSummary.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issueSummary.tsx
index 321c9aa89ec313..98148369e6a898 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issueSummary.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/issues/issueSummary.tsx
@@ -16,8 +16,8 @@ import useOrganization from 'sentry/utils/useOrganization';
 
 interface EventOrGroupHeaderProps {
   data: Group;
-  event_id: string;
   organization: Organization;
+  event_id?: string;
 }
 
 /**
@@ -51,7 +51,7 @@ function IssueTitleChildren(props: IssueTitleChildrenProps) {
 
 interface IssueTitleProps {
   data: Group;
-  event_id: string;
+  event_id?: string;
 }
 function IssueTitle(props: IssueTitleProps) {
   const organization = useOrganization();
@@ -71,7 +71,9 @@ function IssueTitle(props: IssueTitleProps) {
     <TitleWithLink
       {...commonEleProps}
       to={{
-        pathname: `/organizations/${organization.slug}/issues/${props.data.id}/events/${props.event_id}/`,
+        pathname: props.event_id
+          ? `/organizations/${organization.slug}/issues/${props.data.id}/events/${props.event_id}/`
+          : `/organizations/${organization.slug}/issues/${props.data.id}/`,
       }}
     >
       <IssueTitleChildren data={props.data} organization={organization} />
diff --git a/static/app/views/projectInstall/platform.tsx b/static/app/views/projectInstall/platform.tsx
index d25b176b78e30e..aadcbc99f57de5 100644
--- a/static/app/views/projectInstall/platform.tsx
+++ b/static/app/views/projectInstall/platform.tsx
@@ -29,7 +29,6 @@ import {decodeList} from 'sentry/utils/queryString';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
-import {SetupDocsLoader} from 'sentry/views/onboarding/setupDocsLoader';
 import {GettingStartedWithProjectContext} from 'sentry/views/projects/gettingStartedWithProjectContext';
 
 import {OtherPlatformsInfo} from './otherPlatformsInfo';
@@ -58,7 +57,6 @@ export function ProjectInstallPlatform({
   const gettingStartedWithProjectContext = useContext(GettingStartedWithProjectContext);
 
   const isSelfHosted = ConfigStore.get('isSelfHosted');
-  const showLoaderOnboarding = location.query.showLoader === 'true';
 
   const products = useMemo(
     () => decodeList(location.query.product ?? []) as ProductSolution[],
@@ -172,13 +170,6 @@ export function ProjectInstallPlatform({
           projectSlug={project.slug}
           platform={platform.name ?? 'other'}
         />
-      ) : showLoaderOnboarding ? (
-        <SetupDocsLoader
-          organization={organization}
-          project={project}
-          location={location}
-          platform={currentPlatform.id}
-        />
       ) : (
         <SdkDocumentation
           platform={currentPlatform}
diff --git a/static/app/views/routeNotFound.tsx b/static/app/views/routeNotFound.tsx
index e02dde44fbc034..c92f7ca4aecc62 100644
--- a/static/app/views/routeNotFound.tsx
+++ b/static/app/views/routeNotFound.tsx
@@ -8,11 +8,13 @@ import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
 import Sidebar from 'sentry/components/sidebar';
 import {t} from 'sentry/locale';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
+import {useLastKnownRoute} from 'sentry/views/lastKnownRouteContextProvider';
 
 type Props = RouteComponentProps<{}, {}>;
 
 function RouteNotFound({router, location}: Props) {
   const {pathname, search, hash} = location;
+  const lastKnownRoute = useLastKnownRoute();
 
   const isMissingSlash = pathname[pathname.length - 1] !== '/';
 
@@ -27,13 +29,14 @@ function RouteNotFound({router, location}: Props) {
       scope.setFingerprint(['RouteNotFound']);
       scope.setTag('isMissingSlash', isMissingSlash);
       scope.setTag('pathname', pathname);
+      scope.setTag('lastKnownRoute', lastKnownRoute);
       scope.setTag(
         'reactRouterVersion',
         window.__SENTRY_USING_REACT_ROUTER_SIX ? '6' : '3'
       );
       Sentry.captureException(new Error('Route not found'));
     });
-  }, [pathname, search, hash, isMissingSlash, router]);
+  }, [pathname, search, hash, isMissingSlash, router, lastKnownRoute]);
 
   if (isMissingSlash) {
     return null;
diff --git a/static/app/views/settings/projectUserFeedback/index.tsx b/static/app/views/settings/projectUserFeedback/index.tsx
index 590216c060cbef..260ff067b0c293 100644
--- a/static/app/views/settings/projectUserFeedback/index.tsx
+++ b/static/app/views/settings/projectUserFeedback/index.tsx
@@ -60,7 +60,7 @@ function ProjectUserFeedback({organization, project, params: {projectId}}: Props
         title={t('User Feedback')}
         action={
           <ButtonList>
-            <LinkButton href="https://docs.sentry.io/product/user-feedback/">
+            <LinkButton href="https://docs.sentry.io/product/user-feedback/" external>
               {t('Read the Docs')}
             </LinkButton>
             <Button priority="primary" onClick={handleClick}>
diff --git a/tests/acceptance/test_project_servicehooks.py b/tests/acceptance/test_project_servicehooks.py
index 19ceca945b641f..e7ecd169c3d6cf 100644
--- a/tests/acceptance/test_project_servicehooks.py
+++ b/tests/acceptance/test_project_servicehooks.py
@@ -1,4 +1,4 @@
-from sentry.models.servicehook import ServiceHook
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.testutils.cases import AcceptanceTestCase
 from sentry.testutils.silo import no_silo_test
 
diff --git a/tests/js/sentry-test/onboarding/renderWithOnboardingLayout.tsx b/tests/js/sentry-test/onboarding/renderWithOnboardingLayout.tsx
index c22d74cae858e6..7ef07e1070e69e 100644
--- a/tests/js/sentry-test/onboarding/renderWithOnboardingLayout.tsx
+++ b/tests/js/sentry-test/onboarding/renderWithOnboardingLayout.tsx
@@ -1,3 +1,5 @@
+import {ProjectKeysFixture} from 'sentry-fixture/projectKeys';
+
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render} from 'sentry-test/reactTestingLibrary';
 
@@ -30,7 +32,7 @@ export function renderWithOnboardingLayout<
     selectedOptions = {},
   } = options;
 
-  const {organization, router} = initializeOrg({
+  const {organization, project, router} = initializeOrg({
     router: {
       location: {
         query: selectedOptions,
@@ -38,15 +40,23 @@ export function renderWithOnboardingLayout<
     },
   });
 
+  const projectKey = 'test-project-key-id';
+
   MockApiClient.addMockResponse({
     url: `/organizations/${organization.slug}/sdks/`,
     body: releaseRegistry,
   });
 
+  MockApiClient.addMockResponse({
+    url: `/projects/${organization.slug}/${project.slug}/keys/${projectKey}/`,
+    method: 'PUT',
+    body: [ProjectKeysFixture()[0]],
+  });
+
   render(
     <OnboardingLayout
       docsConfig={docsConfig}
-      projectSlug="test-project-slug"
+      projectSlug={project.slug}
       dsn={{
         public: 'test-dsn',
         secret: 'test-secret',
@@ -60,7 +70,7 @@ export function renderWithOnboardingLayout<
       platformKey="java-spring-boot"
       projectId="test-project-id"
       activeProductSelection={selectedProducts}
-      projectKeyId="test-project-key-id"
+      projectKeyId={projectKey}
     />,
     {
       organization,
diff --git a/tests/sentry/api/endpoints/test_organization_historical_anomalies.py b/tests/sentry/api/endpoints/test_organization_historical_anomalies.py
new file mode 100644
index 00000000000000..b4a66cbfcb599b
--- /dev/null
+++ b/tests/sentry/api/endpoints/test_organization_historical_anomalies.py
@@ -0,0 +1,54 @@
+import orjson
+
+from sentry.incidents.models.alert_rule import (
+    AlertRuleSeasonality,
+    AlertRuleSensitivity,
+    AlertRuleThresholdType,
+)
+from sentry.seer.anomaly_detection.types import AnomalyDetectionConfig
+from sentry.seer.anomaly_detection.utils import translate_direction
+from sentry.testutils.cases import APITestCase
+from sentry.testutils.helpers.features import with_feature
+from sentry.testutils.outbox import outbox_runner
+
+
+class OrganizationEventsAnomaliesEndpointTest(APITestCase):
+    endpoint = "sentry-api-0-organization-events-anomalies"
+
+    method = "post"
+
+    @with_feature("organizations:anomaly-detection-alerts")
+    @with_feature("organizations:incidents")
+    def test_simple(self):
+        self.create_team(organization=self.organization, members=[self.user])
+        self.login_as(self.user)
+        config = AnomalyDetectionConfig(
+            time_period=60,
+            sensitivity=AlertRuleSensitivity.LOW,
+            direction=translate_direction(AlertRuleThresholdType.ABOVE.value),
+            expected_seasonality=AlertRuleSeasonality.AUTO,
+        )
+        data = {
+            "project_id": 1,
+            "config": config,
+            "current_data": [[1, {"count": 0.077881957}], [2, {"count": 0.075652768}]],
+            "historical_data": [[169, {"count": 0.048480431}], [170, {"count": 0.047910238}]],
+        }
+
+        with outbox_runner():
+            resp = self.get_success_response(
+                self.organization.slug, status_code=200, raw_data=orjson.dumps(data)
+            )
+
+        assert resp.data == [
+            {
+                "anomaly": {"anomaly_score": -0.38810767243044786, "anomaly_type": "none"},
+                "timestamp": 169,
+                "value": 0.048480431,
+            },
+            {
+                "anomaly": {"anomaly_score": -0.3890542800124323, "anomaly_type": "none"},
+                "timestamp": 170,
+                "value": 0.047910238,
+            },
+        ]
diff --git a/tests/sentry/api/endpoints/test_project_servicehook_details.py b/tests/sentry/api/endpoints/test_project_servicehook_details.py
index cab2dc54ad6a2f..3dcdbe7f9a9309 100644
--- a/tests/sentry/api/endpoints/test_project_servicehook_details.py
+++ b/tests/sentry/api/endpoints/test_project_servicehook_details.py
@@ -1,4 +1,4 @@
-from sentry.models.servicehook import ServiceHook
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.testutils.cases import APITestCase
 
 
diff --git a/tests/sentry/api/endpoints/test_project_servicehook_stats.py b/tests/sentry/api/endpoints/test_project_servicehook_stats.py
index 10c7a77ecdaf12..5265d6c750020b 100644
--- a/tests/sentry/api/endpoints/test_project_servicehook_stats.py
+++ b/tests/sentry/api/endpoints/test_project_servicehook_stats.py
@@ -1,5 +1,5 @@
 from sentry import tsdb
-from sentry.models.servicehook import ServiceHook
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.testutils.cases import APITestCase
 from sentry.tsdb.base import TSDBModel
 
diff --git a/tests/sentry/api/endpoints/test_project_servicehooks.py b/tests/sentry/api/endpoints/test_project_servicehooks.py
index 77632a4682b921..29c75a6f376bc2 100644
--- a/tests/sentry/api/endpoints/test_project_servicehooks.py
+++ b/tests/sentry/api/endpoints/test_project_servicehooks.py
@@ -1,4 +1,4 @@
-from sentry.models.servicehook import ServiceHook, ServiceHookProject
+from sentry.sentry_apps.models.servicehook import ServiceHook, ServiceHookProject
 from sentry.testutils.cases import APITestCase
 
 
diff --git a/tests/sentry/api/endpoints/test_sentry_app_details.py b/tests/sentry/api/endpoints/test_sentry_app_details.py
index e64340bc1de9e1..f12855ac8844a3 100644
--- a/tests/sentry/api/endpoints/test_sentry_app_details.py
+++ b/tests/sentry/api/endpoints/test_sentry_app_details.py
@@ -9,9 +9,9 @@
 from sentry.constants import SentryAppStatus
 from sentry.models.auditlogentry import AuditLogEntry
 from sentry.models.organizationmember import OrganizationMember
-from sentry.models.servicehook import ServiceHook
 from sentry.sentry_apps.models.sentry_app import SentryApp
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.helpers import with_feature
diff --git a/tests/sentry/deletions/test_apiapplication.py b/tests/sentry/deletions/test_apiapplication.py
index 131d9d07bcd9c6..ebfc6ebaad7624 100644
--- a/tests/sentry/deletions/test_apiapplication.py
+++ b/tests/sentry/deletions/test_apiapplication.py
@@ -4,7 +4,7 @@
 from sentry.models.apigrant import ApiGrant
 from sentry.models.apitoken import ApiToken
 from sentry.models.scheduledeletion import ScheduledDeletion
-from sentry.models.servicehook import ServiceHook
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TransactionTestCase
 from sentry.testutils.hybrid_cloud import HybridCloudTestMixin
diff --git a/tests/sentry/deletions/test_project.py b/tests/sentry/deletions/test_project.py
index f1690ab293c503..4f12dfca3d5619 100644
--- a/tests/sentry/deletions/test_project.py
+++ b/tests/sentry/deletions/test_project.py
@@ -18,7 +18,6 @@
 from sentry.models.releasecommit import ReleaseCommit
 from sentry.models.repository import Repository
 from sentry.models.rulesnooze import RuleSnooze
-from sentry.models.servicehook import ServiceHook
 from sentry.monitors.models import (
     CheckInStatus,
     Monitor,
@@ -27,6 +26,7 @@
     MonitorType,
     ScheduleType,
 )
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.snuba.models import QuerySubscription, SnubaQuery
 from sentry.testutils.cases import APITestCase, TransactionTestCase
 from sentry.testutils.helpers.datetime import before_now, iso_format
diff --git a/tests/sentry/deletions/test_sentry_app_installations.py b/tests/sentry/deletions/test_sentry_app_installations.py
index b81e492f46113e..419e574b6e368b 100644
--- a/tests/sentry/deletions/test_sentry_app_installations.py
+++ b/tests/sentry/deletions/test_sentry_app_installations.py
@@ -6,12 +6,12 @@
 from sentry.deletions.tasks.hybrid_cloud import schedule_hybrid_cloud_foreign_key_jobs
 from sentry.models.apigrant import ApiGrant
 from sentry.models.apitoken import ApiToken
-from sentry.models.integrations.sentry_app_installation_for_provider import (
-    SentryAppInstallationForProvider,
-)
-from sentry.models.servicehook import ServiceHook
 from sentry.sentry_apps.installations import SentryAppInstallationCreator
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
+from sentry.sentry_apps.models.sentry_app_installation_for_provider import (
+    SentryAppInstallationForProvider,
+)
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.silo.base import SiloMode
 from sentry.silo.safety import unguarded_write
 from sentry.testutils.cases import TestCase
diff --git a/tests/sentry/integrations/vercel/test_integration.py b/tests/sentry/integrations/vercel/test_integration.py
index 133e6b7c769d81..1d27e061128ee7 100644
--- a/tests/sentry/integrations/vercel/test_integration.py
+++ b/tests/sentry/integrations/vercel/test_integration.py
@@ -10,13 +10,13 @@
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.integrations.vercel import VercelClient, VercelIntegrationProvider
-from sentry.models.integrations.sentry_app_installation_for_provider import (
-    SentryAppInstallationForProvider,
-)
 from sentry.models.project import Project
 from sentry.models.projectkey import ProjectKey, ProjectKeyStatus
 from sentry.models.scheduledeletion import ScheduledDeletion
 from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
+from sentry.sentry_apps.models.sentry_app_installation_for_provider import (
+    SentryAppInstallationForProvider,
+)
 from sentry.sentry_apps.models.sentry_app_installation_token import SentryAppInstallationToken
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import IntegrationTestCase
diff --git a/tests/sentry/integrations/vsts/test_integration.py b/tests/sentry/integrations/vsts/test_integration.py
index 4059c5545d188e..415e3af1b6a4fc 100644
--- a/tests/sentry/integrations/vsts/test_integration.py
+++ b/tests/sentry/integrations/vsts/test_integration.py
@@ -8,13 +8,16 @@
 import responses
 
 from fixtures.vsts import CREATE_SUBSCRIPTION, VstsIntegrationTestCase
+from sentry.identity.vsts.provider import VSTSNewIdentityProvider
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.integration_external_project import IntegrationExternalProject
 from sentry.integrations.models.organization_integration import OrganizationIntegration
+from sentry.integrations.pipeline import ensure_integration
 from sentry.integrations.vsts import VstsIntegration, VstsIntegrationProvider
 from sentry.models.repository import Repository
 from sentry.shared_integrations.exceptions import IntegrationError, IntegrationProviderError
 from sentry.silo.base import SiloMode
+from sentry.testutils.helpers import with_feature
 from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
 from sentry.users.models.identity import Identity
 
@@ -22,6 +25,96 @@
 LIMITED_SCOPES = ["vso.graph", "vso.serviceendpoint_manage", "vso.work_write"]
 
 
+@control_silo_test
+class VstsIntegrationMigrationTest(VstsIntegrationTestCase):
+
+    # Test regular install still works
+    @with_feature("organizations:migrate-azure-devops-integration")
+    @patch(
+        "sentry.integrations.vsts.VstsIntegrationProvider.get_scopes",
+        return_value=VstsIntegrationProvider.NEW_SCOPES,
+    )
+    @patch(
+        "sentry.identity.pipeline.IdentityProviderPipeline.get_provider",
+        return_value=VSTSNewIdentityProvider(),
+    )
+    def test_original_installation_still_works(self, mock_get_scopes, mock_get_provider):
+        self.pipeline = Mock()
+        self.pipeline.organization = self.organization
+        self.assert_installation(new=True)
+        integration = Integration.objects.get(provider="vsts")
+        assert integration.external_id == self.vsts_account_id
+        assert integration.name == self.vsts_account_name
+
+        metadata = integration.metadata
+        assert set(metadata["scopes"]) == set(VstsIntegrationProvider.NEW_SCOPES)
+        assert metadata["subscription"]["id"] == CREATE_SUBSCRIPTION["id"]
+        assert metadata["domain_name"] == self.vsts_base_url
+
+    # Test that install second time doesn't have the metadata and updates the integration object
+    # Assert that the Integration object now has the migrated metadata
+    @with_feature("organizations:migrate-azure-devops-integration")
+    @patch(
+        "sentry.integrations.vsts.VstsIntegrationProvider.get_scopes",
+        return_value=VstsIntegrationProvider.NEW_SCOPES,
+    )
+    def test_migration(self, mock_get_scopes):
+        state = {
+            "account": {"accountName": self.vsts_account_name, "accountId": self.vsts_account_id},
+            "base_url": self.vsts_base_url,
+            "identity": {
+                "data": {
+                    "access_token": self.access_token,
+                    "expires_in": "3600",
+                    "refresh_token": self.refresh_token,
+                    "token_type": "jwt-bearer",
+                }
+            },
+        }
+
+        external_id = self.vsts_account_id
+        # Create the integration with old integration metadata
+        old_integraton_obj = self.create_provider_integration(
+            metadata=state, provider="vsts", external_id=external_id
+        )
+        assert old_integraton_obj.metadata.get("subscription", None) is None
+
+        provider = VstsIntegrationProvider()
+        pipeline = Mock()
+        pipeline.organization = self.organization
+        provider.set_pipeline(pipeline)
+
+        data = provider.build_integration(
+            {
+                "account": {"accountName": self.vsts_account_name, "accountId": external_id},
+                "base_url": self.vsts_base_url,
+                "identity": {
+                    "data": {
+                        "access_token": "new_access_token",
+                        "expires_in": "3600",
+                        "refresh_token": "new_refresh_token",
+                        "token_type": "bearer",
+                    }
+                },
+            }
+        )
+        assert external_id == data["external_id"]
+        subscription = data["metadata"]["subscription"]
+        assert subscription["id"] is not None and subscription["secret"] is not None
+        metadata = data.get("metadata")
+        assert metadata is not None
+        assert set(metadata["scopes"]) == set(VstsIntegrationProvider.NEW_SCOPES)
+        assert metadata["integration_migration_version"] == 1
+
+        # Make sure the integration object is updated
+        # ensure_integration will be called in _finish_pipeline
+        new_integration_obj = ensure_integration("vsts", data)
+        assert new_integration_obj.metadata["integration_migration_version"] == 1
+        assert set(new_integration_obj.metadata["scopes"]) == set(
+            VstsIntegrationProvider.NEW_SCOPES
+        )
+
+
 @control_silo_test
 class VstsIntegrationProviderTest(VstsIntegrationTestCase):
     # Test data setup in ``VstsIntegrationTestCase``
@@ -125,7 +218,11 @@ def test_webhook_subscription_created_once(self, mock_get_scopes):
     def test_fix_subscription(self, mock_get_scopes):
         external_id = self.vsts_account_id
         self.create_provider_integration(metadata={}, provider="vsts", external_id=external_id)
-        data = VstsIntegrationProvider().build_integration(
+        provider = VstsIntegrationProvider()
+        pipeline = Mock()
+        pipeline.organization = self.organization
+        provider.set_pipeline(pipeline)
+        data = provider.build_integration(
             {
                 "account": {"accountName": self.vsts_account_name, "accountId": external_id},
                 "base_url": self.vsts_base_url,
diff --git a/tests/sentry/migrations/test_0764_migrate_bad_status_substatus_rows.py b/tests/sentry/migrations/test_0764_migrate_bad_status_substatus_rows.py
new file mode 100644
index 00000000000000..06d0a6cf457299
--- /dev/null
+++ b/tests/sentry/migrations/test_0764_migrate_bad_status_substatus_rows.py
@@ -0,0 +1,159 @@
+from datetime import timedelta
+
+from django.utils import timezone
+
+from sentry.models.activity import Activity
+from sentry.models.group import Group, GroupStatus
+from sentry.models.grouphistory import GroupHistory, GroupHistoryStatus
+from sentry.models.groupsnooze import GroupSnooze
+from sentry.models.organization import Organization
+from sentry.testutils.cases import TestMigrations
+from sentry.types.activity import ActivityType
+from sentry.types.group import GroupSubStatus
+
+
+class BackfillMissingUnresolvedSubstatusTest(TestMigrations):
+    migrate_from = "0763_add_created_by_to_broadcasts"
+    migrate_to = "0764_migrate_bad_status_substatus_rows"
+
+    def setup_before_migration(self, app):
+        self.organization = Organization.objects.create(name="test", slug="test")
+        self.project = self.create_project(organization=self.organization)
+        self.do_not_update = Group.objects.create(
+            project=self.project,
+            status=GroupStatus.UNRESOLVED,
+            substatus=GroupSubStatus.NEW,
+        )
+
+        self.ongoing_group = Group.objects.create(
+            project=self.project,
+            status=GroupStatus.UNRESOLVED,
+        )
+        # .update() skips calling the pre_save checks which add a substatus
+        self.ongoing_group.update(
+            substatus=GroupSubStatus.UNTIL_ESCALATING,
+            first_seen=timezone.now() - timedelta(days=8),
+        )
+
+        self.regressed_group = Group.objects.create(
+            project=self.project,
+            status=GroupStatus.UNRESOLVED,
+            first_seen=timezone.now() - timedelta(days=8),
+        )
+        self.regressed_group.update(substatus=GroupSubStatus.FOREVER)
+        GroupHistory.objects.create(
+            group=self.regressed_group,
+            date_added=timezone.now() - timedelta(days=1),
+            organization_id=self.organization.id,
+            project_id=self.project.id,
+            status=GroupHistoryStatus.REGRESSED,
+        )
+
+        self.new_group = Group.objects.create(
+            project=self.project,
+            status=GroupStatus.UNRESOLVED,
+            first_seen=timezone.now(),
+        )
+        self.new_group.update(substatus=GroupSubStatus.UNTIL_CONDITION_MET)
+
+        self.do_not_update_2 = Group.objects.create(
+            project=self.project,
+            status=GroupStatus.IGNORED,
+            substatus=GroupSubStatus.UNTIL_ESCALATING,
+        )
+
+        self.ignored_until_condition_met = Group.objects.create(
+            project=self.project,
+            status=GroupStatus.IGNORED,
+        )
+        # .update() skips calling the pre_save checks which requires a substatus
+        self.ignored_until_condition_met.update(substatus=GroupSubStatus.ONGOING)
+        Activity.objects.create(
+            group=self.ignored_until_condition_met,
+            project=self.project,
+            type=ActivityType.SET_IGNORED.value,
+            data={"ignoreCount": 10},
+        )
+
+        self.ignored_until_condition_met_no_activity = Group.objects.create(
+            project=self.project,
+            status=GroupStatus.IGNORED,
+        )
+        self.ignored_until_condition_met_no_activity.update(substatus=GroupSubStatus.REGRESSED)
+        Activity.objects.create(
+            group=self.ignored_until_condition_met_no_activity,
+            project=self.project,
+            type=ActivityType.SET_IGNORED.value,
+            data={
+                "ignoreCount": None,
+                "ignoreDuration": None,
+                "ignoreUntil": None,
+                "ignoreUserCount": None,
+                "ignoreUserWindow": None,
+                "ignoreWindow": None,
+                "ignoreUntilEscalating": None,
+            },
+        )
+        GroupSnooze.objects.create(
+            group=self.ignored_until_condition_met_no_activity,
+            count=10,
+        )
+
+        self.ignored_until_escalating = Group.objects.create(
+            project=self.project,
+            status=GroupStatus.IGNORED,
+        )
+        # .update() skips calling the pre_save checks which requires a substatus
+        self.ignored_until_escalating.update(substatus=GroupSubStatus.NEW)
+        Activity.objects.create(
+            group=self.ignored_until_escalating,
+            project=self.project,
+            type=ActivityType.SET_IGNORED.value,
+            data={"ignoreUntilEscalating": True},
+        )
+
+        self.ignored_forever = Group.objects.create(
+            project=self.project,
+            status=GroupStatus.IGNORED,
+        )
+        self.ignored_forever.update(substatus=GroupSubStatus.ONGOING)
+
+        self.pending_merge = Group.objects.create(
+            project=self.project,
+            status=GroupStatus.PENDING_MERGE,
+        )
+        self.pending_merge.update(substatus=GroupSubStatus.NEW)
+
+    def test(self):
+        self.do_not_update.refresh_from_db()
+        assert self.do_not_update.substatus == GroupSubStatus.NEW
+
+        self.ongoing_group.refresh_from_db()
+        assert self.ongoing_group.substatus == GroupSubStatus.ONGOING
+
+        self.regressed_group.refresh_from_db()
+        assert self.regressed_group.substatus == GroupSubStatus.REGRESSED
+
+        self.new_group.refresh_from_db()
+        assert self.new_group.substatus == GroupSubStatus.NEW
+
+        self.do_not_update_2.refresh_from_db()
+        assert self.do_not_update_2.substatus == GroupSubStatus.UNTIL_ESCALATING
+
+        self.ignored_until_condition_met.refresh_from_db()
+        assert self.ignored_until_condition_met.substatus == GroupSubStatus.UNTIL_CONDITION_MET
+
+        self.ignored_until_condition_met_no_activity.refresh_from_db()
+        assert (
+            self.ignored_until_condition_met_no_activity.substatus
+            == GroupSubStatus.UNTIL_CONDITION_MET
+        )
+
+        self.ignored_until_escalating.refresh_from_db()
+        assert self.ignored_until_escalating.substatus == GroupSubStatus.UNTIL_ESCALATING
+
+        self.ignored_forever.refresh_from_db()
+        assert self.ignored_forever.substatus == GroupSubStatus.FOREVER
+
+        self.pending_merge.refresh_from_db()
+        assert self.pending_merge.substatus is None
diff --git a/tests/sentry/receivers/outbox/test_control.py b/tests/sentry/receivers/outbox/test_control.py
index a4ba6862d7ab8d..0c653d100b2704 100644
--- a/tests/sentry/receivers/outbox/test_control.py
+++ b/tests/sentry/receivers/outbox/test_control.py
@@ -19,7 +19,7 @@ class ProcessControlOutboxTest(TestCase):
     identifier = 1
 
     @patch("sentry.receivers.outbox.control.maybe_process_tombstone")
-    def test_process_integration_updatess(self, mock_maybe_process):
+    def test_process_integration_updates(self, mock_maybe_process):
         process_integration_updates(
             object_identifier=self.identifier, region_name=_TEST_REGION.name
         )
@@ -36,7 +36,7 @@ def test_process_api_application_updates(self, mock_maybe_process):
             ApiApplication, self.identifier, region_name=_TEST_REGION.name
         )
 
-    @patch("sentry.receivers.outbox.control.region_caching_service")
+    @patch("sentry.tasks.sentry_apps.region_caching_service")
     def test_process_sentry_app_updates(self, mock_caching):
         org = self.create_organization()
         sentry_app = self.create_sentry_app()
@@ -48,7 +48,10 @@ def test_process_sentry_app_updates(self, mock_caching):
             slug=sentry_app.slug, organization=org_two
         )
 
-        process_sentry_app_updates(object_identifier=sentry_app.id, region_name=_TEST_REGION.name)
+        with self.tasks():
+            process_sentry_app_updates(
+                object_identifier=sentry_app.id, region_name=_TEST_REGION.name
+            )
         mock_caching.clear_key.assert_any_call(
             key=f"app_service.get_installation:{install.id}", region_name=_TEST_REGION.name
         )
diff --git a/tests/sentry/replays/test_organization_replay_index.py b/tests/sentry/replays/test_organization_replay_index.py
index 9300426f027b22..65eff73a5c08db 100644
--- a/tests/sentry/replays/test_organization_replay_index.py
+++ b/tests/sentry/replays/test_organization_replay_index.py
@@ -1762,6 +1762,52 @@ def test_query_scalar_optimization_multiple_varying(self):
             response_data = response.json()
             assert len(response_data["data"]) == 1
 
+    def test_query_scalar_optimization_varying_with_tags(self):
+        project = self.create_project(teams=[self.team])
+
+        replay1_id = uuid.uuid4().hex
+        seq1_timestamp = datetime.datetime.now() - datetime.timedelta(seconds=22)
+        seq2_timestamp = datetime.datetime.now() - datetime.timedelta(seconds=5)
+
+        self.store_replays(
+            mock_replay(seq1_timestamp, project.id, replay1_id, tags={"something": "else"})
+        )
+        self.store_replays(mock_replay(seq2_timestamp, project.id, replay1_id))
+
+        with self.feature(self.features):
+            # EQ and IN supported.
+            response = self.client.get(self.url + "?field=id&query=something:else&statsPeriod=1d")
+            assert response.status_code == 200
+            assert response.headers["X-Data-Source"] == "scalar-subquery"
+
+            response = self.client.get(
+                self.url + "?field=id&query=something:else,other&statsPeriod=1d"
+            )
+            assert response.status_code == 200
+            assert response.headers["X-Data-Source"] == "scalar-subquery"
+
+            # Not operators are not supported.
+            response = self.client.get(self.url + "?field=id&query=!something:else&statsPeriod=1d")
+            assert response.status_code == 200
+            assert response.headers["X-Data-Source"] == "aggregated-subquery"
+
+            response = self.client.get(
+                self.url + "?field=id&query=!something:else,other&statsPeriod=1d"
+            )
+            assert response.status_code == 200
+            assert response.headers["X-Data-Source"] == "aggregated-subquery"
+
+            # Match not supported.
+            response = self.client.get(self.url + "?field=id&query=something:*else*&statsPeriod=1d")
+            assert response.status_code == 200
+            assert response.headers["X-Data-Source"] == "aggregated-subquery"
+
+            response = self.client.get(
+                self.url + "?field=id&query=!something:*else*&statsPeriod=1d"
+            )
+            assert response.status_code == 200
+            assert response.headers["X-Data-Source"] == "aggregated-subquery"
+
     def test_get_replays_missing_segment_0(self):
         """Test fetching replays when the 0th segment is missing."""
         project = self.create_project(teams=[self.team])
diff --git a/tests/sentry/replays/unit/test_ingest_dom_index.py b/tests/sentry/replays/unit/test_ingest_dom_index.py
index f93d57e566a892..34eaa548fafb32 100644
--- a/tests/sentry/replays/unit/test_ingest_dom_index.py
+++ b/tests/sentry/replays/unit/test_ingest_dom_index.py
@@ -3,9 +3,11 @@
 import uuid
 from typing import Any
 from unittest import mock
+from unittest.mock import Mock
 
 import pytest
 
+from sentry.models.project import Project
 from sentry.replays.testutils import mock_replay_event
 from sentry.replays.usecases.ingest.dom_index import (
     _get_testid,
@@ -27,7 +29,15 @@ def patch_rage_click_issue_with_replay_event():
         yield m
 
 
-def test_get_user_actions():
+@pytest.fixture(autouse=True)
+def mock_project() -> Project:
+    """Has id=1. Use for unit tests so we can skip @django_db"""
+    proj = Mock(spec=Project)
+    proj.id = 1
+    return proj
+
+
+def test_get_user_actions(mock_project):
     """Test "get_user_actions" function."""
     events = [
         {
@@ -63,7 +73,7 @@ def test_get_user_actions():
         }
     ]
 
-    user_actions = get_user_actions(1, uuid.uuid4().hex, events, None)
+    user_actions = get_user_actions(mock_project, uuid.uuid4().hex, events, None)
     assert len(user_actions) == 1
     assert user_actions[0]["node_id"] == 1
     assert user_actions[0]["tag"] == "div"
@@ -82,7 +92,7 @@ def test_get_user_actions():
     assert len(user_actions[0]["event_hash"]) == 36
 
 
-def test_get_user_actions_str_payload():
+def test_get_user_actions_str_payload(mock_project):
     """Test "get_user_actions" function."""
     events = [
         {
@@ -95,11 +105,11 @@ def test_get_user_actions_str_payload():
         }
     ]
 
-    user_actions = get_user_actions(1, uuid.uuid4().hex, events, None)
+    user_actions = get_user_actions(mock_project, uuid.uuid4().hex, events, None)
     assert len(user_actions) == 0
 
 
-def test_get_user_actions_missing_node():
+def test_get_user_actions_missing_node(mock_project):
     """Test "get_user_actions" function."""
     events = [
         {
@@ -117,11 +127,11 @@ def test_get_user_actions_missing_node():
         }
     ]
 
-    user_actions = get_user_actions(1, uuid.uuid4().hex, events, None)
+    user_actions = get_user_actions(mock_project, uuid.uuid4().hex, events, None)
     assert len(user_actions) == 0
 
 
-def test_get_user_actions_performance_spans():
+def test_get_user_actions_performance_spans(mock_project):
     """Test that "get_user_actions" doesn't error when collecting rsrc metrics, on various formats of performanceSpan"""
     # payloads are not realistic examples - only include the fields necessary for testing
     # TODO: does not test if metrics.distribution() is called downstream, with correct param types.
@@ -193,10 +203,10 @@ def test_get_user_actions_performance_spans():
             },
         },
     ]
-    get_user_actions(1, uuid.uuid4().hex, events, None)
+    get_user_actions(mock_project, uuid.uuid4().hex, events, None)
 
 
-def test_parse_replay_actions():
+def test_parse_replay_actions(mock_project):
     events = [
         {
             "type": 5,
@@ -231,7 +241,7 @@ def test_parse_replay_actions():
             },
         }
     ]
-    replay_actions = parse_replay_actions(1, "1", 30, events, None)
+    replay_actions = parse_replay_actions(mock_project, "1", 30, events, None)
 
     assert replay_actions is not None
     assert replay_actions["type"] == "replay_event"
@@ -375,7 +385,7 @@ def test_parse_replay_dead_click_actions(patch_rage_click_issue_with_replay_even
     ]
 
     default_project.update_option("sentry:replay_rage_click_issues", True)
-    replay_actions = parse_replay_actions(default_project.id, "1", 30, events, mock_replay_event())
+    replay_actions = parse_replay_actions(default_project, "1", 30, events, mock_replay_event())
     assert patch_rage_click_issue_with_replay_event.call_count == 2
     assert replay_actions is not None
     assert replay_actions["type"] == "replay_event"
@@ -528,7 +538,7 @@ def test_rage_click_issue_creation_no_component_name(
     ]
 
     default_project.update_option("sentry:replay_rage_click_issues", True)
-    parse_replay_actions(default_project.id, "1", 30, events, mock_replay_event())
+    parse_replay_actions(default_project, "1", 30, events, mock_replay_event())
 
     # test that 2 rage click issues are still created
     assert patch_rage_click_issue_with_replay_event.call_count == 2
@@ -575,7 +585,7 @@ def test_parse_replay_click_actions_not_dead(
         }
     ]
 
-    replay_actions = parse_replay_actions(default_project.id, "1", 30, events, None)
+    replay_actions = parse_replay_actions(default_project, "1", 30, events, None)
     assert patch_rage_click_issue_with_replay_event.delay.call_count == 0
     assert replay_actions is None
 
@@ -619,7 +629,7 @@ def test_parse_replay_rage_click_actions(default_project):
             },
         }
     ]
-    replay_actions = parse_replay_actions(default_project.id, "1", 30, events, None)
+    replay_actions = parse_replay_actions(default_project, "1", 30, events, None)
 
     assert replay_actions is not None
     assert replay_actions["type"] == "replay_event"
@@ -659,7 +669,7 @@ def test_encode_as_uuid():
     assert isinstance(uuid.UUID(a), uuid.UUID)
 
 
-def test_parse_request_response_latest():
+def test_parse_request_response_latest(mock_project):
     events = [
         {
             "type": 5,
@@ -698,14 +708,14 @@ def test_parse_request_response_latest():
         }
     ]
     with mock.patch("sentry.utils.metrics.distribution") as timing:
-        parse_replay_actions(1, "1", 30, events, None)
+        parse_replay_actions(mock_project, "1", 30, events, None)
         assert timing.call_args_list == [
             mock.call("replays.usecases.ingest.request_body_size", 2949, unit="byte"),
             mock.call("replays.usecases.ingest.response_body_size", 94, unit="byte"),
         ]
 
 
-def test_parse_request_response_no_info():
+def test_parse_request_response_no_info(mock_project):
     events = [
         {
             "type": 5,
@@ -726,11 +736,11 @@ def test_parse_request_response_no_info():
             },
         },
     ]
-    parse_replay_actions(1, "1", 30, events, None)
+    parse_replay_actions(mock_project, "1", 30, events, None)
     # just make sure we don't raise
 
 
-def test_parse_request_response_old_format_request_only():
+def test_parse_request_response_old_format_request_only(mock_project):
     events = [
         {
             "type": 5,
@@ -753,13 +763,13 @@ def test_parse_request_response_old_format_request_only():
         },
     ]
     with mock.patch("sentry.utils.metrics.distribution") as timing:
-        parse_replay_actions(1, "1", 30, events, None)
+        parse_replay_actions(mock_project, "1", 30, events, None)
         assert timing.call_args_list == [
             mock.call("replays.usecases.ingest.request_body_size", 1002, unit="byte"),
         ]
 
 
-def test_parse_request_response_old_format_response_only():
+def test_parse_request_response_old_format_response_only(mock_project):
     events = [
         {
             "type": 5,
@@ -781,13 +791,13 @@ def test_parse_request_response_old_format_response_only():
         },
     ]
     with mock.patch("sentry.utils.metrics.distribution") as timing:
-        parse_replay_actions(1, "1", 30, events, None)
+        parse_replay_actions(mock_project, "1", 30, events, None)
         assert timing.call_args_list == [
             mock.call("replays.usecases.ingest.response_body_size", 1002, unit="byte"),
         ]
 
 
-def test_parse_request_response_old_format_request_and_response():
+def test_parse_request_response_old_format_request_and_response(mock_project):
     events = [
         {
             "type": 5,
@@ -810,7 +820,7 @@ def test_parse_request_response_old_format_request_and_response():
         },
     ]
     with mock.patch("sentry.utils.metrics.distribution") as timing:
-        parse_replay_actions(1, "1", 30, events, None)
+        parse_replay_actions(mock_project, "1", 30, events, None)
         assert timing.call_args_list == [
             mock.call("replays.usecases.ingest.request_body_size", 1002, unit="byte"),
             mock.call("replays.usecases.ingest.response_body_size", 8001, unit="byte"),
@@ -930,7 +940,7 @@ def test_parse_replay_rage_clicks_with_replay_event(
     ]
 
     default_project.update_option("sentry:replay_rage_click_issues", True)
-    replay_actions = parse_replay_actions(default_project.id, "1", 30, events, mock_replay_event())
+    replay_actions = parse_replay_actions(default_project, "1", 30, events, mock_replay_event())
     assert patch_rage_click_issue_with_replay_event.call_count == 2
     assert replay_actions is not None
     assert replay_actions["type"] == "replay_event"
@@ -941,7 +951,7 @@ def test_parse_replay_rage_clicks_with_replay_event(
     assert isinstance(replay_actions["payload"], list)
 
 
-def test_log_sdk_options():
+def test_log_sdk_options(mock_project):
     events: list[dict[str, Any]] = [
         {
             "data": {
@@ -973,11 +983,11 @@ def test_log_sdk_options():
         mock.patch("random.randint") as randint,
     ):
         randint.return_value = 0
-        parse_replay_actions(1, "1", 30, events, None)
+        parse_replay_actions(mock_project, "1", 30, events, None)
         assert logger.info.call_args_list == [mock.call("sentry.replays.slow_click", extra=log)]
 
 
-def test_log_large_dom_mutations():
+def test_log_large_dom_mutations(mock_project):
     events: list[dict[str, Any]] = [
         {
             "type": 5,
@@ -1003,7 +1013,7 @@ def test_log_large_dom_mutations():
         mock.patch("random.randint") as randint,
     ):
         randint.return_value = 0
-        parse_replay_actions(1, "1", 30, events, None)
+        parse_replay_actions(mock_project, "1", 30, events, None)
         assert logger.info.call_args_list == [mock.call("Large DOM Mutations List:", extra=log)]
 
 
@@ -1080,7 +1090,7 @@ def test_log_canvas_size():
     log_canvas_size(1, 1, "a", [])
 
 
-def test_emit_click_negative_node_id():
+def test_emit_click_negative_node_id(mock_project):
     """Test "get_user_actions" function."""
     events = [
         {
@@ -1116,5 +1126,5 @@ def test_emit_click_negative_node_id():
         }
     ]
 
-    user_actions = get_user_actions(1, uuid.uuid4().hex, events, None)
+    user_actions = get_user_actions(mock_project, uuid.uuid4().hex, events, None)
     assert len(user_actions) == 0
diff --git a/tests/sentry/sentry_apps/models/test_sentryappinstallationtoken.py b/tests/sentry/sentry_apps/models/test_sentryappinstallationtoken.py
index 9c22242552be7b..b4481fa5b7ca0f 100644
--- a/tests/sentry/sentry_apps/models/test_sentryappinstallationtoken.py
+++ b/tests/sentry/sentry_apps/models/test_sentryappinstallationtoken.py
@@ -1,9 +1,9 @@
 from sentry.models.apiapplication import ApiApplication
 from sentry.models.apitoken import ApiToken
-from sentry.models.integrations.sentry_app_installation_for_provider import (
+from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
+from sentry.sentry_apps.models.sentry_app_installation_for_provider import (
     SentryAppInstallationForProvider,
 )
-from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
 from sentry.sentry_apps.models.sentry_app_installation_token import SentryAppInstallationToken
 from sentry.testutils.cases import TestCase
 from sentry.testutils.silo import control_silo_test
diff --git a/tests/sentry/sentry_apps/services/test_hook_service.py b/tests/sentry/sentry_apps/services/test_hook_service.py
index f6653a10422778..3930a04096f8d9 100644
--- a/tests/sentry/sentry_apps/services/test_hook_service.py
+++ b/tests/sentry/sentry_apps/services/test_hook_service.py
@@ -1,6 +1,6 @@
-from sentry.models.servicehook import ServiceHook
 from sentry.sentry_apps.logic import consolidate_events, expand_events
 from sentry.sentry_apps.models.sentry_app import EVENT_EXPANSION
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.sentry_apps.services.hook import RpcServiceHook, hook_service
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
diff --git a/tests/sentry/sentry_apps/test_sentry_app_installation_creator.py b/tests/sentry/sentry_apps/test_sentry_app_installation_creator.py
index 1ec19a7a8426a0..4df4b1c03dd641 100644
--- a/tests/sentry/sentry_apps/test_sentry_app_installation_creator.py
+++ b/tests/sentry/sentry_apps/test_sentry_app_installation_creator.py
@@ -6,8 +6,8 @@
 from sentry.constants import SentryAppInstallationStatus
 from sentry.models.apigrant import ApiGrant
 from sentry.models.auditlogentry import AuditLogEntry
-from sentry.models.servicehook import ServiceHook, ServiceHookProject
 from sentry.sentry_apps.installations import SentryAppInstallationCreator
+from sentry.sentry_apps.models.servicehook import ServiceHook, ServiceHookProject
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
diff --git a/tests/sentry/sentry_apps/test_sentry_app_updater.py b/tests/sentry/sentry_apps/test_sentry_app_updater.py
index 5269f20ea45ab1..141e2ef1a3419d 100644
--- a/tests/sentry/sentry_apps/test_sentry_app_updater.py
+++ b/tests/sentry/sentry_apps/test_sentry_app_updater.py
@@ -6,10 +6,10 @@
 from sentry.constants import SentryAppStatus
 from sentry.coreapi import APIError
 from sentry.models.apitoken import ApiToken
-from sentry.models.servicehook import ServiceHook
 from sentry.sentry_apps.logic import SentryAppUpdater, expand_events
 from sentry.sentry_apps.models.sentry_app import SentryApp
 from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
+from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
 from sentry.testutils.silo import assume_test_silo_mode, control_silo_test
diff --git a/tests/sentry/tasks/test_backfill_seer_grouping_records.py b/tests/sentry/tasks/test_backfill_seer_grouping_records.py
index 69220c247f9fd5..9d7af966ff19ea 100644
--- a/tests/sentry/tasks/test_backfill_seer_grouping_records.py
+++ b/tests/sentry/tasks/test_backfill_seer_grouping_records.py
@@ -18,6 +18,8 @@
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.conf.server import SEER_SIMILARITY_MODEL_VERSION
 from sentry.eventstore.models import Event
+from sentry.grouping.api import GroupingConfigNotFound
+from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
 from sentry.issues.occurrence_consumer import EventLookupError
 from sentry.models.group import Group, GroupStatus
 from sentry.models.grouphash import GroupHash
@@ -1500,23 +1502,26 @@ def test_backfill_seer_grouping_records_nodestore_grouping_config_not_found(
         mock_lookup_group_data_stacktrace_bulk,
         mock_logger,
     ):
-        mock_lookup_group_data_stacktrace_bulk.side_effect = ResourceDoesNotExist()
+        exceptions = (GroupingConfigNotFound(), ResourceDoesNotExist(), InvalidEnhancerConfig())
 
-        with TaskRunner():
-            backfill_seer_grouping_records_for_project(self.project.id, None)
+        for exception in exceptions:
+            mock_lookup_group_data_stacktrace_bulk.side_effect = exception
 
-        groups = Group.objects.all()
-        group_ids_sorted = sorted([group.id for group in groups], reverse=True)
-        mock_call_next_backfill.assert_called_with(
-            last_processed_group_id=group_ids_sorted[-1],
-            project_id=self.project.id,
-            last_processed_project_index=0,
-            cohort=None,
-            enable_ingestion=False,
-            skip_processed_projects=False,
-            skip_project_ids=None,
-            worker_number=None,
-        )
+            with TaskRunner():
+                backfill_seer_grouping_records_for_project(self.project.id, None)
+
+            groups = Group.objects.all()
+            group_ids_sorted = sorted([group.id for group in groups], reverse=True)
+            mock_call_next_backfill.assert_called_with(
+                last_processed_group_id=group_ids_sorted[-1],
+                project_id=self.project.id,
+                last_processed_project_index=0,
+                cohort=None,
+                enable_ingestion=False,
+                skip_processed_projects=False,
+                skip_project_ids=None,
+                worker_number=None,
+            )
 
     @with_feature("projects:similarity-embeddings-backfill")
     @patch("sentry.tasks.embeddings_grouping.utils.logger")
diff --git a/tests/sentry/uptime/endpoints/test_project_uptime_alert_details.py b/tests/sentry/uptime/endpoints/test_project_uptime_alert_details.py
index 125b8d0a82e956..a8d09fc0ebcffe 100644
--- a/tests/sentry/uptime/endpoints/test_project_uptime_alert_details.py
+++ b/tests/sentry/uptime/endpoints/test_project_uptime_alert_details.py
@@ -1,3 +1,5 @@
+from unittest import mock
+
 import pytest
 from rest_framework.exceptions import ErrorDetail
 
@@ -92,6 +94,32 @@ def test_not_found(self):
         resp = self.get_error_response(self.organization.slug, self.project.slug, 3)
         assert resp.status_code == 404
 
+    @mock.patch("sentry.uptime.endpoints.validators.MAX_MONITORS_PER_DOMAIN", 1)
+    def test_domain_limit(self):
+        # First monitor is for test-one.example.com
+        self.create_project_uptime_subscription(
+            uptime_subscription=self.create_uptime_subscription(
+                url="test-one.example.com",
+                url_domain="example",
+                url_domain_suffix="com",
+            )
+        )
+
+        # Update second monitor to use the same domain. This will fail with a
+        # validation error
+        uptime_subscription = self.create_project_uptime_subscription()
+        resp = self.get_error_response(
+            self.organization.slug,
+            uptime_subscription.project.slug,
+            uptime_subscription.id,
+            status_code=400,
+            url="https://test-two.example.com",
+        )
+        assert (
+            resp.data["url"][0]
+            == "The domain *.example.com has already been used in 1 uptime monitoring alerts, which is the limit. You cannot create any additional alerts for this domain."
+        )
+
 
 class ProjectUptimeAlertDetailsDeleteEndpointTest(ProjectUptimeAlertDetailsBaseEndpointTest):
     method = "delete"
diff --git a/tests/sentry/web/frontend/test_organization_auth_settings.py b/tests/sentry/web/frontend/test_organization_auth_settings.py
index ea6a3e1622607f..ec8b382d25e77e 100644
--- a/tests/sentry/web/frontend/test_organization_auth_settings.py
+++ b/tests/sentry/web/frontend/test_organization_auth_settings.py
@@ -20,13 +20,13 @@
 from sentry.models.authidentity import AuthIdentity
 from sentry.models.authprovider import AuthProvider
 from sentry.models.authproviderreplica import AuthProviderReplica
-from sentry.models.integrations.sentry_app_installation_for_provider import (
-    SentryAppInstallationForProvider,
-)
 from sentry.models.organization import Organization
 from sentry.models.organizationmember import OrganizationMember
 from sentry.models.team import Team
 from sentry.organizations.services.organization import organization_service
+from sentry.sentry_apps.models.sentry_app_installation_for_provider import (
+    SentryAppInstallationForProvider,
+)
 from sentry.signals import receivers_raise_on_send
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import AuthProviderTestCase, PermissionTestCase
diff --git a/tests/snuba/api/endpoints/test_organization_events_span_indexed.py b/tests/snuba/api/endpoints/test_organization_events_span_indexed.py
index 15f9cbf8655433..5aad5dafb58f94 100644
--- a/tests/snuba/api/endpoints/test_organization_events_span_indexed.py
+++ b/tests/snuba/api/endpoints/test_organization_events_span_indexed.py
@@ -643,3 +643,150 @@ def test_extrapolation_smoke(self):
             )
 
             assert response.status_code == 200, f"error: {response.content}\naggregate: {function}"
+
+    def test_numeric_attr_without_space(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"status": "success", "foo": "five"}},
+                    measurements={"foo": {"value": 5}},
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+
+        response = self.do_request(
+            {
+                "field": ["description", "tags[foo,number]", "tags[foo,string]", "tags[foo]"],
+                "query": "",
+                "orderby": "description",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+
+        assert response.status_code == 200, response.content
+        assert len(response.data["data"]) == 1
+        data = response.data["data"]
+        assert data[0]["tags[foo,number]"] == 5
+        assert data[0]["tags[foo,string]"] == "five"
+        assert data[0]["tags[foo]"] == "five"
+
+    def test_numeric_attr_with_spaces(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"status": "success", "foo": "five"}},
+                    measurements={"foo": {"value": 5}},
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+
+        response = self.do_request(
+            {
+                "field": ["description", "tags[foo,    number]", "tags[foo, string]", "tags[foo]"],
+                "query": "",
+                "orderby": "description",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+
+        assert response.status_code == 200, response.content
+        assert len(response.data["data"]) == 1
+        data = response.data["data"]
+        assert data[0]["tags[foo,    number]"] == 5
+        assert data[0]["tags[foo, string]"] == "five"
+        assert data[0]["tags[foo]"] == "five"
+
+    def test_numeric_attr_filtering(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"status": "success", "foo": "five"}},
+                    measurements={"foo": {"value": 5}},
+                    start_ts=self.ten_mins_ago,
+                ),
+                self.create_span(
+                    {"description": "bar", "sentry_tags": {"status": "success", "foo": "five"}},
+                    measurements={"foo": {"value": 8}},
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+
+        response = self.do_request(
+            {
+                "field": ["description", "tags[foo,number]"],
+                "query": "tags[foo,number]:5",
+                "orderby": "description",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+
+        assert response.status_code == 200, response.content
+        assert len(response.data["data"]) == 1
+        data = response.data["data"]
+        assert data[0]["tags[foo,number]"] == 5
+        assert data[0]["description"] == "foo"
+
+    def test_long_attr_name(self):
+        response = self.do_request(
+            {
+                "field": ["description", "z" * 201],
+                "query": "",
+                "orderby": "description",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+
+        assert response.status_code == 400, response.content
+        assert "Is Too Long" in response.data["detail"].title()
+
+    def test_numeric_attr_orderby(self):
+        self.store_spans(
+            [
+                self.create_span(
+                    {"description": "baz", "sentry_tags": {"status": "success", "foo": "five"}},
+                    measurements={"foo": {"value": 71}},
+                    start_ts=self.ten_mins_ago,
+                ),
+                self.create_span(
+                    {"description": "foo", "sentry_tags": {"status": "success", "foo": "five"}},
+                    measurements={"foo": {"value": 5}},
+                    start_ts=self.ten_mins_ago,
+                ),
+                self.create_span(
+                    {"description": "bar", "sentry_tags": {"status": "success", "foo": "five"}},
+                    measurements={"foo": {"value": 8}},
+                    start_ts=self.ten_mins_ago,
+                ),
+            ],
+            is_eap=self.is_eap,
+        )
+
+        response = self.do_request(
+            {
+                "field": ["description", "tags[foo,number]"],
+                "query": "",
+                "orderby": ["tags[foo,number]"],
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+
+        assert response.status_code == 200, response.content
+        assert len(response.data["data"]) == 3
+        data = response.data["data"]
+        assert data[0]["tags[foo,number]"] == 5
+        assert data[0]["description"] == "foo"
+        assert data[1]["tags[foo,number]"] == 8
+        assert data[1]["description"] == "bar"
+        assert data[2]["tags[foo,number]"] == 71
+        assert data[2]["description"] == "baz"