From 4d2735bb76f0ea5ab5c6685db7722ee4dc75478d Mon Sep 17 00:00:00 2001
From: "ci.datadog-api-spec" <packages@datadoghq.com>
Date: Fri, 14 Aug 2026 09:21:06 +0000
Subject: [PATCH] Regenerate client from commit aee24e7 of spec repo

---
 .generator/schemas/v2/openapi.yaml            | 204 -----------
 .../llm-observability/DeleteLLMObsData.java   |  42 ---
 .../com/datadog/api/client/ApiClient.java     |   1 -
 .../client/v2/api/LlmObservabilityApi.java    | 154 ---------
 .../v2/model/LLMObsDataDeletionRequest.java   | 150 ---------
 .../LLMObsDataDeletionRequestAttributes.java  | 236 -------------
 .../model/LLMObsDataDeletionRequestData.java  | 186 ----------
 .../model/LLMObsDataDeletionRequestType.java  |  57 ----
 .../v2/model/LLMObsDataDeletionResponse.java  | 150 ---------
 .../LLMObsDataDeletionResponseAttributes.java | 317 ------------------
 .../model/LLMObsDataDeletionResponseData.java | 216 ------------
 .../model/LLMObsDataDeletionResponseType.java |  58 ----
 ...th_metadata_deserializes_successfully.json |   2 +-
 ...your_organization_returns_OK_response.json |   2 +-
 ...te_API_key_returns_Forbidden_response.json |   2 +-
 .../Validate_API_key_returns_OK_response.json |   2 +-
 ...ount_config_returns_Conflict_response.json |   2 +-
 ...t_config_returns_Bad_Request_response.json |   2 +-
 ...nt_config_returns_No_Content_response.json |   2 +-
 ...unt_config_returns_Not_Found_response.json |   4 +-
 ...turns_AWS_External_ID_object_response.json |   2 +-
 ...g_returns_AWS_Account_object_response.json |   2 +-
 ...t_config_returns_Bad_Request_response.json |   2 +-
 ...s_AWS_Namespaces_List_object_response.json |   2 +-
 ...s_AWS_Namespaces_List_object_response.json |   2 +-
 ...g_returns_AWS_Account_object_response.json |   2 +-
 ...t_config_returns_Bad_Request_response.json |   2 +-
 ...ive_case_returns_Bad_Request_response.json |   2 +-
 .../v2/Archive_case_returns_OK_response.json  |   2 +-
 ...ign_case_returns_Bad_Request_response.json |   2 +-
 .../v2/Assign_case_returns_OK_response.json   |   2 +-
 ...re_items_returns_Bad_Request_response.json |   2 +-
 ...e_datastore_items_returns_OK_response.json |   2 +-
 ...re_items_returns_Bad_Request_response.json |   2 +-
 ...e_datastore_items_returns_OK_response.json |   2 +-
 ..._a_historical_job_returns_OK_response.json |   2 +-
 ...ent_case_returns_Bad_Request_response.json |   2 +-
 .../v2/Comment_case_returns_OK_response.json  |   2 +-
 ...eturns_AWS_CCM_Config_object_response.json |   2 +-
 ..._CCM_config_returns_Conflict_response.json |   4 +-
 ...options_enabled_successfully_response.json |   2 +-
 ..._Connection_returns_Conflict_response.json |   4 +-
 ...te_Org_Connection_returns_OK_response.json |   2 +-
 ...ate_Scanning_Rule_returns_OK_response.json |   4 +-
 ...should_save_match_returns_OK_response.json |   4 +-
 ...Workflow_returns_Bad_request_response.json |   2 +-
 ...Workflow_returns_Bad_request_response.json |   2 +-
 ...m_framework_returns_Conflict_response.json |   6 +-
 ..._custom_framework_returns_OK_response.json |   4 +-
 ...e_a_dataset_returns_Conflict_response.json |   4 +-
 .../Create_a_dataset_returns_OK_response.json |   2 +-
 ...restriction_query_returns_OK_response.json |   2 +-
 ...ncident_type_returns_CREATED_response.json |   2 +-
 ...ase_type_returns_Bad_Request_response.json |   2 +-
 ..._a_case_type_returns_CREATED_response.json |   2 +-
 ...ication_rule_returns_Created_response.json |   2 +-
 ...ion_template_returns_Created_response.json |   2 +-
 ...with_a_permission_returns_OK_response.json |   2 +-
 .../v2/Delete_App_returns_OK_response.json    |   2 +-
 ...ete_Multiple_Apps_returns_OK_response.json |   2 +-
 ...te_Org_Connection_returns_OK_response.json |   2 +-
 ...te_Scanning_Group_returns_OK_response.json |   4 +-
 ...ete_Scanning_Rule_returns_OK_response.json |   4 +-
 ..._exclusion_filter_returns_OK_response.json |   2 +-
 ...case_type_returns_NotContent_response.json |   2 +-
 ...elete_a_case_type_returns_OK_response.json |   2 +-
 ..._a_critical_asset_returns_OK_response.json |   2 +-
 ..._custom_framework_returns_OK_response.json |   6 +-
 ...a_dataset_returns_No_Content_response.json |   2 +-
 ...Delete_a_pipeline_returns_OK_response.json |   2 +-
 ...restriction_query_returns_OK_response.json |   2 +-
 ..._retention_filter_returns_OK_response.json |   2 +-
 ...egration_returns_Bad_Request_response.json |   2 +-
 ...tegration_returns_No_Content_response.json |   2 +-
 ...ntegration_returns_Not_Found_response.json |   2 +-
 ...nnotation_returns_No_Content_response.json |   2 +-
 ...cessfully_deleted_a_workflow_response.json |   2 +-
 ..._an_incident_type_returns_OK_response.json |   2 +-
 ..._comment_returns_Bad_Request_response.json |   2 +-
 ...e_comment_returns_No_Content_response.json |   2 +-
 ...se_comment_returns_Not_Found_response.json |   2 +-
 ..._from_case_returns_Not_Found_response.json |   2 +-
 ...tribute_from_case_returns_OK_response.json |   2 +-
 ...s_config_returns_Bad_Request_response.json |   2 +-
 ...es_config_returns_No_Content_response.json |   2 +-
 ...te_datastore_item_returns_OK_response.json |   2 +-
 .../Delete_datastore_returns_OK_response.json |   2 +-
 ..._template_returns_No_Content_response.json |   2 +-
 .../Edit_a_dataset_returns_OK_response.json   |   2 +-
 ...turns_AWS_External_ID_object_response.json |   2 +-
 ...sk_by_id_returns_Bad_Request_response.json |   2 +-
 ...S_On_Demand_tasks_returns_OK_response.json |   2 +-
 ...and_task_returns_Bad_Request_response.json |   2 +-
 .../v2/Get_App_returns_Gone_response.json     |   2 +-
 .../v2/Get_App_returns_OK_response.json       |   2 +-
 ..._GCP_scan_options_returns_OK_response.json |   2 +-
 ..._exclusion_filter_returns_OK_response.json |   2 +-
 ..._a_critical_asset_returns_OK_response.json |   2 +-
 ..._custom_framework_returns_OK_response.json |   4 +-
 ..._retention_filter_returns_OK_response.json |   2 +-
 ...t_a_job_s_details_returns_OK_response.json |   2 +-
 ...restriction_query_returns_OK_response.json |   2 +-
 ...gle_dataset_by_ID_returns_OK_response.json |   2 +-
 ...specific_pipeline_returns_OK_response.json |   2 +-
 ...nfig_of_case_type_returns_OK_response.json |   2 +-
 .../Get_all_datasets_returns_OK_response.json |   2 +-
 ...D_returns_AWS_Account_object_response.json |   2 +-
 ...onfig_ID_returns_Bad_Request_response.json |   2 +-
 ..._Successfully_got_a_workflow_response.json |   2 +-
 ...ations_for_a_page_returns_OK_response.json |   2 +-
 .../v2/Get_datastore_returns_OK_response.json |   2 +-
 ...notification_rule_returns_OK_response.json |   2 +-
 ...fication_template_returns_OK_response.json |   2 +-
 ...details_of_a_case_returns_OK_response.json |   2 +-
 ...king_issue_returns_Not_Found_response.json |   2 +-
 ...or_tracking_issue_returns_OK_response.json |   2 +-
 ...mission_to_a_role_returns_OK_response.json |   2 +-
 ...restriction_query_returns_OK_response.json |   2 +-
 ...S_on_demand_tasks_returns_OK_response.json |   2 +-
 ...List_App_Versions_returns_OK_response.json |   2 +-
 ..._GCP_scan_options_returns_OK_response.json |   2 +-
 ...t_Scanning_Groups_returns_OK_response.json |   6 +-
 .../List_annotations_returns_OK_response.json |   2 +-
 ...s_AWS_Namespaces_List_object_response.json |   2 +-
 ...otification_rules_returns_OK_response.json |   2 +-
 ...s_AWS_Namespaces_List_object_response.json |   2 +-
 ...ssions_for_a_role_returns_OK_response.json |   2 +-
 .../List_pipelines_returns_OK_response.json   |   2 +-
 ...restriction_query_returns_OK_response.json |   2 +-
 .../List_workflows_returns_OK_response.json   |   2 +-
 ...p_Version_returns_No_Content_response.json |   2 +-
 ...ptions_returns_Bad_Request_response_2.json |   2 +-
 ...n_Options_returns_No_Content_response.json |   2 +-
 ...an_Options_returns_Not_Found_response.json |   2 +-
 ..._Options_returns_Bad_Request_response.json |   2 +-
 ...l_Lab_run_returns_No_Content_response.json |   2 +-
 ...options_enabled_successfully_response.json |   2 +-
 ..._AWS_Scan_Options_returns_OK_response.json |   2 +-
 ...options_enabled_successfully_response.json |   2 +-
 .../Publish_App_returns_Created_response.json |   2 +-
 ...r_Groups_returns_Bad_Request_response.json |   4 +-
 .../Reorder_Groups_returns_OK_response.json   |   6 +-
 ...Revoke_permission_returns_OK_response.json |   2 +-
 ...ive_case_returns_Bad_Request_response.json |   2 +-
 .../Unarchive_case_returns_OK_response.json   |   2 +-
 ...ign_case_returns_Bad_Request_response.json |   2 +-
 .../v2/Unassign_case_returns_OK_response.json |   2 +-
 ...l_Lab_run_returns_No_Content_response.json |   2 +-
 .../v2/Unpublish_App_returns_OK_response.json |   2 +-
 ...ptions_returns_Bad_Request_response_2.json |   2 +-
 ...n_options_returns_No_Content_response.json |   2 +-
 ...an_options_returns_Not_Found_response.json |   2 +-
 ...te_Status_returns_No_Content_response.json |   2 +-
 ..._Protection_Level_returns_OK_response.json |   2 +-
 ...ce_Status_returns_No_Content_response.json |   2 +-
 ...date_App_returns_Bad_Request_response.json |   2 +-
 .../v2/Update_App_returns_OK_response.json    |   2 +-
 ..._options_returns_Bad_Request_response.json |   2 +-
 ...nnection_returns_Bad_Request_response.json |   2 +-
 ...te_Scanning_Group_returns_OK_response.json |   4 +-
 ...ing_Rule_returns_Bad_Request_response.json |   4 +-
 ...ate_Scanning_Rule_returns_OK_response.json |   4 +-
 ...tom_Rule_returns_Bad_Request_response.json |   2 +-
 ...a_WAF_Custom_Rule_returns_OK_response.json |   2 +-
 ..._custom_framework_returns_OK_response.json |   4 +-
 ...n_filter_returns_Bad_Request_response.json |   2 +-
 ...pipeline_returns_Bad_Request_response.json |   2 +-
 ...Update_a_pipeline_returns_OK_response.json |   2 +-
 ...n_filter_returns_Bad_Request_response.json |   2 +-
 ...ion_filter_returns_Not_Found_response.json |   2 +-
 ..._retention_filter_returns_OK_response.json |   2 +-
 ...r_with_trace_rate_returns_OK_response.json |   2 +-
 ..._filters_returns_Bad_Request_response.json |   2 +-
 ...on_filters_returns_Not_Found_response.json |   2 +-
 ...e_a_role_returns_Bad_Request_response.json |   2 +-
 ...ate_a_role_returns_Not_found_response.json |   2 +-
 .../v2/Update_a_role_returns_OK_response.json |   2 +-
 ...n_returns_AWS_Account_object_response.json |   2 +-
 ...egration_returns_Bad_Request_response.json |   2 +-
 ...ate_an_annotation_returns_OK_response.json |   2 +-
 ...Workflow_returns_Bad_request_response.json |   2 +-
 ...cessfully_updated_a_workflow_response.json |   2 +-
 ..._an_incident_type_returns_OK_response.json |   2 +-
 ...e_case_attributes_returns_OK_response.json |   2 +-
 ...ttribute_returns_Bad_Request_response.json |   2 +-
 ..._custom_attribute_returns_OK_response.json |   2 +-
 ...priority_returns_Bad_Request_response.json |   2 +-
 ...ate_case_priority_returns_OK_response.json |   2 +-
 ...e_status_returns_Bad_Request_response.json |   2 +-
 ...pdate_case_status_returns_OK_response.json |   2 +-
 ...se_title_returns_Bad_Request_response.json |   2 +-
 ...Update_case_title_returns_OK_response.json |   2 +-
 ...te_datastore_item_returns_OK_response.json |   2 +-
 ...notification_rule_returns_OK_response.json |   2 +-
 ...fication_template_returns_OK_response.json |   2 +-
 .../client/v2/api/llm_observability.feature   |  16 -
 .../com/datadog/api/client/v2/api/undo.json   |   8 -
 197 files changed, 206 insertions(+), 2001 deletions(-)
 delete mode 100644 examples/v2/llm-observability/DeleteLLMObsData.java
 delete mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequest.java
 delete mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequestAttributes.java
 delete mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequestData.java
 delete mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequestType.java
 delete mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponse.java
 delete mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponseAttributes.java
 delete mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponseData.java
 delete mode 100644 src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponseType.java

diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index fcf5fd48e2c..d7216f4e28c 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -56412,139 +56412,6 @@ components:
           example: "my-gcp-project"
           type: string
       type: object
-    LLMObsDataDeletionRequest:
-      description: Request to delete LLM Observability data.
-      properties:
-        data:
-          $ref: "#/components/schemas/LLMObsDataDeletionRequestData"
-      required:
-        - data
-      type: object
-    LLMObsDataDeletionRequestAttributes:
-      description: Attributes for an LLM Observability data deletion request.
-      properties:
-        delay:
-          description: Optional delay in seconds before the deletion is executed.
-          example: 0
-          format: int64
-          type: integer
-        from:
-          description: Start of the deletion time range in milliseconds since Unix epoch.
-          example: 1705314600000
-          format: int64
-          type: integer
-        query:
-          additionalProperties:
-            type: string
-          description: Query filters selecting the data to delete. Must include a `query` key with an `@trace_id` filter.
-          example:
-            query: "@trace_id:abc123def456"
-          type: object
-        to:
-          description: End of the deletion time range in milliseconds since Unix epoch.
-          example: 1705315200000
-          format: int64
-          type: integer
-      required:
-        - query
-        - from
-        - to
-      type: object
-    LLMObsDataDeletionRequestData:
-      description: Data object for an LLM Observability data deletion request.
-      properties:
-        attributes:
-          $ref: "#/components/schemas/LLMObsDataDeletionRequestAttributes"
-        type:
-          $ref: "#/components/schemas/LLMObsDataDeletionRequestType"
-      required:
-        - type
-        - attributes
-      type: object
-    LLMObsDataDeletionRequestType:
-      description: Resource type for an LLM Observability data deletion request.
-      enum:
-        - create_deletion_req
-      example: create_deletion_req
-      type: string
-      x-enum-varnames:
-        - CREATE_DELETION_REQ
-    LLMObsDataDeletionResponse:
-      description: Response containing details of a submitted LLM Observability data deletion request.
-      properties:
-        data:
-          $ref: "#/components/schemas/LLMObsDataDeletionResponseData"
-      required:
-        - data
-      type: object
-    LLMObsDataDeletionResponseAttributes:
-      description: Attributes of a submitted LLM Observability data deletion request.
-      properties:
-        created_at:
-          description: Timestamp when the deletion request was created.
-          example: "2024-01-15T10:30:00Z"
-          format: date-time
-          type: string
-        created_by:
-          description: UUID of the user who created the deletion request.
-          example: "user-uuid-1234"
-          type: string
-        from_time:
-          description: Start of the deletion time range in milliseconds since Unix epoch.
-          example: 1705314600000
-          format: int64
-          type: integer
-        org_id:
-          description: ID of the organization that submitted the deletion request.
-          example: 12345
-          format: int64
-          type: integer
-        product:
-          description: Product name for the deletion request.
-          example: "llmobs"
-          type: string
-        query:
-          description: The query string used to select data for deletion.
-          example: "@trace_id:abc123def456"
-          type: string
-        to_time:
-          description: End of the deletion time range in milliseconds since Unix epoch.
-          example: 1705315200000
-          format: int64
-          type: integer
-      required:
-        - org_id
-        - product
-        - created_at
-        - created_by
-        - from_time
-        - to_time
-        - query
-      type: object
-    LLMObsDataDeletionResponseData:
-      description: Data object for an LLM Observability data deletion response.
-      properties:
-        attributes:
-          $ref: "#/components/schemas/LLMObsDataDeletionResponseAttributes"
-        id:
-          description: Unique identifier of the deletion request.
-          example: "msg-abc123"
-          type: string
-        type:
-          $ref: "#/components/schemas/LLMObsDataDeletionResponseType"
-      required:
-        - id
-        - type
-        - attributes
-      type: object
-    LLMObsDataDeletionResponseType:
-      description: Resource type for an LLM Observability data deletion response.
-      enum:
-        - deletion_request
-      example: deletion_request
-      type: string
-      x-enum-varnames:
-        - DELETION_REQUEST
     LLMObsDatasetBatchUpdateDataAttributesRequest:
       description: Attributes for batch-updating records in an LLM Observability dataset.
       properties:
@@ -158593,77 +158460,6 @@ paths:
         operator: OR
         permissions:
           - org_management
-  /api/v2/llm-obs/deletion/data/llmobs:
-    post:
-      description: Submit a request to delete LLM Observability span data matching a trace ID filter within a specified time range.
-      operationId: DeleteLLMObsData
-      requestBody:
-        content:
-          application/json:
-            examples:
-              default:
-                value:
-                  data:
-                    attributes:
-                      from: 1705314600000
-                      query:
-                        query: "@trace_id:abc123def456"
-                      to: 1705315200000
-                    type: create_deletion_req
-            schema:
-              $ref: "#/components/schemas/LLMObsDataDeletionRequest"
-        description: Data deletion request payload.
-        required: true
-      responses:
-        "202":
-          content:
-            application/json:
-              examples:
-                default:
-                  value:
-                    data:
-                      attributes:
-                        created_at: "2024-01-15T10:30:00Z"
-                        created_by: "user-uuid-1234"
-                        from_time: 1705314600000
-                        org_id: 12345
-                        product: llmobs
-                        query: "@trace_id:abc123def456"
-                        to_time: 1705315200000
-                      id: msg-abc123
-                      type: deletion_request
-              schema:
-                $ref: "#/components/schemas/LLMObsDataDeletionResponse"
-          description: Accepted
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/JSONAPIErrorResponse"
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/JSONAPIErrorResponse"
-          description: Unauthorized
-        "403":
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/JSONAPIErrorResponse"
-          description: Forbidden
-        "429":
-          $ref: "#/components/responses/TooManyRequestsResponse"
-      security:
-        - apiKeyAuth: []
-          appKeyAuth: []
-      summary: Delete LLM Observability data
-      tags:
-        - LLM Observability
-      x-unstable: |-
-        **Note**: This endpoint is in preview and is subject to change.
-        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/annotated-interactions:
     get:
       description: |-
diff --git a/examples/v2/llm-observability/DeleteLLMObsData.java b/examples/v2/llm-observability/DeleteLLMObsData.java
deleted file mode 100644
index 6f4296cc038..00000000000
--- a/examples/v2/llm-observability/DeleteLLMObsData.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Delete LLM Observability data returns "Accepted" response
-
-import com.datadog.api.client.ApiClient;
-import com.datadog.api.client.ApiException;
-import com.datadog.api.client.v2.api.LlmObservabilityApi;
-import com.datadog.api.client.v2.model.LLMObsDataDeletionRequest;
-import com.datadog.api.client.v2.model.LLMObsDataDeletionRequestAttributes;
-import com.datadog.api.client.v2.model.LLMObsDataDeletionRequestData;
-import com.datadog.api.client.v2.model.LLMObsDataDeletionRequestType;
-import com.datadog.api.client.v2.model.LLMObsDataDeletionResponse;
-import java.util.Map;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.deleteLLMObsData", true);
-    LlmObservabilityApi apiInstance = new LlmObservabilityApi(defaultClient);
-
-    LLMObsDataDeletionRequest body =
-        new LLMObsDataDeletionRequest()
-            .data(
-                new LLMObsDataDeletionRequestData()
-                    .attributes(
-                        new LLMObsDataDeletionRequestAttributes()
-                            .delay(0L)
-                            .from(1705314600000L)
-                            .query(Map.ofEntries(Map.entry("query", "@trace_id:abc123def456")))
-                            .to(1705315200000L))
-                    .type(LLMObsDataDeletionRequestType.CREATE_DELETION_REQ));
-
-    try {
-      LLMObsDataDeletionResponse result = apiInstance.deleteLLMObsData(body);
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling LlmObservabilityApi#deleteLLMObsData");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
diff --git a/src/main/java/com/datadog/api/client/ApiClient.java b/src/main/java/com/datadog/api/client/ApiClient.java
index 0d8443e0d1a..9e3a24c69e4 100644
--- a/src/main/java/com/datadog/api/client/ApiClient.java
+++ b/src/main/java/com/datadog/api/client/ApiClient.java
@@ -860,7 +860,6 @@ public class ApiClient {
           put("v2.deleteLLMObsAnnotationQueueInteractions", false);
           put("v2.deleteLLMObsAnnotations", false);
           put("v2.deleteLLMObsCustomEvalConfig", false);
-          put("v2.deleteLLMObsData", false);
           put("v2.deleteLLMObsDatasetRecords", false);
           put("v2.deleteLLMObsDatasets", false);
           put("v2.deleteLLMObsExperiments", false);
diff --git a/src/main/java/com/datadog/api/client/v2/api/LlmObservabilityApi.java b/src/main/java/com/datadog/api/client/v2/api/LlmObservabilityApi.java
index e30851d31ca..d3020ac8b20 100644
--- a/src/main/java/com/datadog/api/client/v2/api/LlmObservabilityApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/LlmObservabilityApi.java
@@ -21,8 +21,6 @@
 import com.datadog.api.client.v2.model.LLMObsCustomEvalConfigListResponse;
 import com.datadog.api.client.v2.model.LLMObsCustomEvalConfigResponse;
 import com.datadog.api.client.v2.model.LLMObsCustomEvalConfigUpdateRequest;
-import com.datadog.api.client.v2.model.LLMObsDataDeletionRequest;
-import com.datadog.api.client.v2.model.LLMObsDataDeletionResponse;
 import com.datadog.api.client.v2.model.LLMObsDatasetBatchUpdateRequest;
 import com.datadog.api.client.v2.model.LLMObsDatasetCloneRequest;
 import com.datadog.api.client.v2.model.LLMObsDatasetDraftStateResponse;
@@ -3154,158 +3152,6 @@ public CompletableFuture<ApiResponse<Void>> deleteLLMObsCustomEvalConfigWithHttp
         null);
   }
 
-  /**
-   * Delete LLM Observability data.
-   *
-   * <p>See {@link #deleteLLMObsDataWithHttpInfo}.
-   *
-   * @param body Data deletion request payload. (required)
-   * @return LLMObsDataDeletionResponse
-   * @throws ApiException if fails to make API call
-   */
-  public LLMObsDataDeletionResponse deleteLLMObsData(LLMObsDataDeletionRequest body)
-      throws ApiException {
-    return deleteLLMObsDataWithHttpInfo(body).getData();
-  }
-
-  /**
-   * Delete LLM Observability data.
-   *
-   * <p>See {@link #deleteLLMObsDataWithHttpInfoAsync}.
-   *
-   * @param body Data deletion request payload. (required)
-   * @return CompletableFuture&lt;LLMObsDataDeletionResponse&gt;
-   */
-  public CompletableFuture<LLMObsDataDeletionResponse> deleteLLMObsDataAsync(
-      LLMObsDataDeletionRequest body) {
-    return deleteLLMObsDataWithHttpInfoAsync(body)
-        .thenApply(
-            response -> {
-              return response.getData();
-            });
-  }
-
-  /**
-   * Submit a request to delete LLM Observability span data matching a trace ID filter within a
-   * specified time range.
-   *
-   * @param body Data deletion request payload. (required)
-   * @return ApiResponse&lt;LLMObsDataDeletionResponse&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-   *     <table border="1">
-   *    <caption>Response details</caption>
-   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-   *       <tr><td> 202 </td><td> Accepted </td><td>  -  </td></tr>
-   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
-   *       <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
-   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
-   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
-   *     </table>
-   */
-  public ApiResponse<LLMObsDataDeletionResponse> deleteLLMObsDataWithHttpInfo(
-      LLMObsDataDeletionRequest body) throws ApiException {
-    // Check if unstable operation is enabled
-    String operationId = "deleteLLMObsData";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
-    }
-    Object localVarPostBody = body;
-
-    // verify the required parameter 'body' is set
-    if (body == null) {
-      throw new ApiException(
-          400, "Missing the required parameter 'body' when calling deleteLLMObsData");
-    }
-    // create path and map variables
-    String localVarPath = "/api/v2/llm-obs/deletion/data/llmobs";
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Invocation.Builder builder =
-        apiClient.createBuilder(
-            "v2.LlmObservabilityApi.deleteLLMObsData",
-            localVarPath,
-            new ArrayList<Pair>(),
-            localVarHeaderParams,
-            new HashMap<String, String>(),
-            new String[] {"application/json"},
-            new String[] {"apiKeyAuth", "appKeyAuth"});
-    return apiClient.invokeAPI(
-        "POST",
-        builder,
-        localVarHeaderParams,
-        new String[] {"application/json"},
-        localVarPostBody,
-        new HashMap<String, Object>(),
-        false,
-        new GenericType<LLMObsDataDeletionResponse>() {});
-  }
-
-  /**
-   * Delete LLM Observability data.
-   *
-   * <p>See {@link #deleteLLMObsDataWithHttpInfo}.
-   *
-   * @param body Data deletion request payload. (required)
-   * @return CompletableFuture&lt;ApiResponse&lt;LLMObsDataDeletionResponse&gt;&gt;
-   */
-  public CompletableFuture<ApiResponse<LLMObsDataDeletionResponse>>
-      deleteLLMObsDataWithHttpInfoAsync(LLMObsDataDeletionRequest body) {
-    // Check if unstable operation is enabled
-    String operationId = "deleteLLMObsData";
-    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
-      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
-    } else {
-      CompletableFuture<ApiResponse<LLMObsDataDeletionResponse>> result = new CompletableFuture<>();
-      result.completeExceptionally(
-          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
-      return result;
-    }
-    Object localVarPostBody = body;
-
-    // verify the required parameter 'body' is set
-    if (body == null) {
-      CompletableFuture<ApiResponse<LLMObsDataDeletionResponse>> result = new CompletableFuture<>();
-      result.completeExceptionally(
-          new ApiException(
-              400, "Missing the required parameter 'body' when calling deleteLLMObsData"));
-      return result;
-    }
-    // create path and map variables
-    String localVarPath = "/api/v2/llm-obs/deletion/data/llmobs";
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Invocation.Builder builder;
-    try {
-      builder =
-          apiClient.createBuilder(
-              "v2.LlmObservabilityApi.deleteLLMObsData",
-              localVarPath,
-              new ArrayList<Pair>(),
-              localVarHeaderParams,
-              new HashMap<String, String>(),
-              new String[] {"application/json"},
-              new String[] {"apiKeyAuth", "appKeyAuth"});
-    } catch (ApiException ex) {
-      CompletableFuture<ApiResponse<LLMObsDataDeletionResponse>> result = new CompletableFuture<>();
-      result.completeExceptionally(ex);
-      return result;
-    }
-    return apiClient.invokeAPIAsync(
-        "POST",
-        builder,
-        localVarHeaderParams,
-        new String[] {"application/json"},
-        localVarPostBody,
-        new HashMap<String, Object>(),
-        false,
-        new GenericType<LLMObsDataDeletionResponse>() {});
-  }
-
   /**
    * Delete LLM Observability dataset records.
    *
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequest.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequest.java
deleted file mode 100644
index 3fb362c30f9..00000000000
--- a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2019-Present Datadog, Inc.
- */
-
-package com.datadog.api.client.v2.model;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/** Request to delete LLM Observability data. */
-@JsonPropertyOrder({LLMObsDataDeletionRequest.JSON_PROPERTY_DATA})
-@jakarta.annotation.Generated(
-    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class LLMObsDataDeletionRequest {
-  @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_DATA = "data";
-  private LLMObsDataDeletionRequestData data;
-
-  public LLMObsDataDeletionRequest() {}
-
-  @JsonCreator
-  public LLMObsDataDeletionRequest(
-      @JsonProperty(required = true, value = JSON_PROPERTY_DATA)
-          LLMObsDataDeletionRequestData data) {
-    this.data = data;
-    this.unparsed |= data.unparsed;
-  }
-
-  public LLMObsDataDeletionRequest data(LLMObsDataDeletionRequestData data) {
-    this.data = data;
-    this.unparsed |= data.unparsed;
-    return this;
-  }
-
-  /**
-   * Data object for an LLM Observability data deletion request.
-   *
-   * @return data
-   */
-  @JsonProperty(JSON_PROPERTY_DATA)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public LLMObsDataDeletionRequestData getData() {
-    return data;
-  }
-
-  public void setData(LLMObsDataDeletionRequestData data) {
-    this.data = data;
-    if (data != null) {
-      this.unparsed |= data.unparsed;
-    }
-  }
-
-  /**
-   * A container for additional, undeclared properties. This is a holder for any undeclared
-   * properties as specified with the 'additionalProperties' keyword in the OAS document.
-   */
-  private Map<String, Object> additionalProperties;
-
-  /**
-   * Set the additional (undeclared) property with the specified name and value. If the property
-   * does not already exist, create it otherwise replace it.
-   *
-   * @param key The arbitrary key to set
-   * @param value The associated value
-   * @return LLMObsDataDeletionRequest
-   */
-  @JsonAnySetter
-  public LLMObsDataDeletionRequest putAdditionalProperty(String key, Object value) {
-    if (this.additionalProperties == null) {
-      this.additionalProperties = new HashMap<String, Object>();
-    }
-    this.additionalProperties.put(key, value);
-    return this;
-  }
-
-  /**
-   * Return the additional (undeclared) property.
-   *
-   * @return The additional properties
-   */
-  @JsonAnyGetter
-  public Map<String, Object> getAdditionalProperties() {
-    return additionalProperties;
-  }
-
-  /**
-   * Return the additional (undeclared) property with the specified name.
-   *
-   * @param key The arbitrary key to get
-   * @return The specific additional property for the given key
-   */
-  public Object getAdditionalProperty(String key) {
-    if (this.additionalProperties == null) {
-      return null;
-    }
-    return this.additionalProperties.get(key);
-  }
-
-  /** Return true if this LLMObsDataDeletionRequest object is equal to o. */
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    LLMObsDataDeletionRequest llmObsDataDeletionRequest = (LLMObsDataDeletionRequest) o;
-    return Objects.equals(this.data, llmObsDataDeletionRequest.data)
-        && Objects.equals(
-            this.additionalProperties, llmObsDataDeletionRequest.additionalProperties);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(data, additionalProperties);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class LLMObsDataDeletionRequest {\n");
-    sb.append("    data: ").append(toIndentedString(data)).append("\n");
-    sb.append("    additionalProperties: ")
-        .append(toIndentedString(additionalProperties))
-        .append("\n");
-    sb.append('}');
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequestAttributes.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequestAttributes.java
deleted file mode 100644
index 136983f82de..00000000000
--- a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequestAttributes.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2019-Present Datadog, Inc.
- */
-
-package com.datadog.api.client.v2.model;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/** Attributes for an LLM Observability data deletion request. */
-@JsonPropertyOrder({
-  LLMObsDataDeletionRequestAttributes.JSON_PROPERTY_DELAY,
-  LLMObsDataDeletionRequestAttributes.JSON_PROPERTY_FROM,
-  LLMObsDataDeletionRequestAttributes.JSON_PROPERTY_QUERY,
-  LLMObsDataDeletionRequestAttributes.JSON_PROPERTY_TO
-})
-@jakarta.annotation.Generated(
-    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class LLMObsDataDeletionRequestAttributes {
-  @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_DELAY = "delay";
-  private Long delay;
-
-  public static final String JSON_PROPERTY_FROM = "from";
-  private Long from;
-
-  public static final String JSON_PROPERTY_QUERY = "query";
-  private Map<String, String> query = new HashMap<String, String>();
-
-  public static final String JSON_PROPERTY_TO = "to";
-  private Long to;
-
-  public LLMObsDataDeletionRequestAttributes() {}
-
-  @JsonCreator
-  public LLMObsDataDeletionRequestAttributes(
-      @JsonProperty(required = true, value = JSON_PROPERTY_FROM) Long from,
-      @JsonProperty(required = true, value = JSON_PROPERTY_QUERY) Map<String, String> query,
-      @JsonProperty(required = true, value = JSON_PROPERTY_TO) Long to) {
-    this.from = from;
-    this.query = query;
-    this.to = to;
-  }
-
-  public LLMObsDataDeletionRequestAttributes delay(Long delay) {
-    this.delay = delay;
-    return this;
-  }
-
-  /**
-   * Optional delay in seconds before the deletion is executed.
-   *
-   * @return delay
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_DELAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public Long getDelay() {
-    return delay;
-  }
-
-  public void setDelay(Long delay) {
-    this.delay = delay;
-  }
-
-  public LLMObsDataDeletionRequestAttributes from(Long from) {
-    this.from = from;
-    return this;
-  }
-
-  /**
-   * Start of the deletion time range in milliseconds since Unix epoch.
-   *
-   * @return from
-   */
-  @JsonProperty(JSON_PROPERTY_FROM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public Long getFrom() {
-    return from;
-  }
-
-  public void setFrom(Long from) {
-    this.from = from;
-  }
-
-  public LLMObsDataDeletionRequestAttributes query(Map<String, String> query) {
-    this.query = query;
-    return this;
-  }
-
-  public LLMObsDataDeletionRequestAttributes putQueryItem(String key, String queryItem) {
-    this.query.put(key, queryItem);
-    return this;
-  }
-
-  /**
-   * Query filters selecting the data to delete. Must include a <code>query</code> key with an
-   * <code>@trace_id</code> filter.
-   *
-   * @return query
-   */
-  @JsonProperty(JSON_PROPERTY_QUERY)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public Map<String, String> getQuery() {
-    return query;
-  }
-
-  public void setQuery(Map<String, String> query) {
-    this.query = query;
-  }
-
-  public LLMObsDataDeletionRequestAttributes to(Long to) {
-    this.to = to;
-    return this;
-  }
-
-  /**
-   * End of the deletion time range in milliseconds since Unix epoch.
-   *
-   * @return to
-   */
-  @JsonProperty(JSON_PROPERTY_TO)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public Long getTo() {
-    return to;
-  }
-
-  public void setTo(Long to) {
-    this.to = to;
-  }
-
-  /**
-   * A container for additional, undeclared properties. This is a holder for any undeclared
-   * properties as specified with the 'additionalProperties' keyword in the OAS document.
-   */
-  private Map<String, Object> additionalProperties;
-
-  /**
-   * Set the additional (undeclared) property with the specified name and value. If the property
-   * does not already exist, create it otherwise replace it.
-   *
-   * @param key The arbitrary key to set
-   * @param value The associated value
-   * @return LLMObsDataDeletionRequestAttributes
-   */
-  @JsonAnySetter
-  public LLMObsDataDeletionRequestAttributes putAdditionalProperty(String key, Object value) {
-    if (this.additionalProperties == null) {
-      this.additionalProperties = new HashMap<String, Object>();
-    }
-    this.additionalProperties.put(key, value);
-    return this;
-  }
-
-  /**
-   * Return the additional (undeclared) property.
-   *
-   * @return The additional properties
-   */
-  @JsonAnyGetter
-  public Map<String, Object> getAdditionalProperties() {
-    return additionalProperties;
-  }
-
-  /**
-   * Return the additional (undeclared) property with the specified name.
-   *
-   * @param key The arbitrary key to get
-   * @return The specific additional property for the given key
-   */
-  public Object getAdditionalProperty(String key) {
-    if (this.additionalProperties == null) {
-      return null;
-    }
-    return this.additionalProperties.get(key);
-  }
-
-  /** Return true if this LLMObsDataDeletionRequestAttributes object is equal to o. */
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    LLMObsDataDeletionRequestAttributes llmObsDataDeletionRequestAttributes =
-        (LLMObsDataDeletionRequestAttributes) o;
-    return Objects.equals(this.delay, llmObsDataDeletionRequestAttributes.delay)
-        && Objects.equals(this.from, llmObsDataDeletionRequestAttributes.from)
-        && Objects.equals(this.query, llmObsDataDeletionRequestAttributes.query)
-        && Objects.equals(this.to, llmObsDataDeletionRequestAttributes.to)
-        && Objects.equals(
-            this.additionalProperties, llmObsDataDeletionRequestAttributes.additionalProperties);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(delay, from, query, to, additionalProperties);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class LLMObsDataDeletionRequestAttributes {\n");
-    sb.append("    delay: ").append(toIndentedString(delay)).append("\n");
-    sb.append("    from: ").append(toIndentedString(from)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("    to: ").append(toIndentedString(to)).append("\n");
-    sb.append("    additionalProperties: ")
-        .append(toIndentedString(additionalProperties))
-        .append("\n");
-    sb.append('}');
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequestData.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequestData.java
deleted file mode 100644
index 2702b8e32f8..00000000000
--- a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequestData.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2019-Present Datadog, Inc.
- */
-
-package com.datadog.api.client.v2.model;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/** Data object for an LLM Observability data deletion request. */
-@JsonPropertyOrder({
-  LLMObsDataDeletionRequestData.JSON_PROPERTY_ATTRIBUTES,
-  LLMObsDataDeletionRequestData.JSON_PROPERTY_TYPE
-})
-@jakarta.annotation.Generated(
-    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class LLMObsDataDeletionRequestData {
-  @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
-  private LLMObsDataDeletionRequestAttributes attributes;
-
-  public static final String JSON_PROPERTY_TYPE = "type";
-  private LLMObsDataDeletionRequestType type;
-
-  public LLMObsDataDeletionRequestData() {}
-
-  @JsonCreator
-  public LLMObsDataDeletionRequestData(
-      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
-          LLMObsDataDeletionRequestAttributes attributes,
-      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE)
-          LLMObsDataDeletionRequestType type) {
-    this.attributes = attributes;
-    this.unparsed |= attributes.unparsed;
-    this.type = type;
-    this.unparsed |= !type.isValid();
-  }
-
-  public LLMObsDataDeletionRequestData attributes(LLMObsDataDeletionRequestAttributes attributes) {
-    this.attributes = attributes;
-    this.unparsed |= attributes.unparsed;
-    return this;
-  }
-
-  /**
-   * Attributes for an LLM Observability data deletion request.
-   *
-   * @return attributes
-   */
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public LLMObsDataDeletionRequestAttributes getAttributes() {
-    return attributes;
-  }
-
-  public void setAttributes(LLMObsDataDeletionRequestAttributes attributes) {
-    this.attributes = attributes;
-    if (attributes != null) {
-      this.unparsed |= attributes.unparsed;
-    }
-  }
-
-  public LLMObsDataDeletionRequestData type(LLMObsDataDeletionRequestType type) {
-    this.type = type;
-    this.unparsed |= !type.isValid();
-    return this;
-  }
-
-  /**
-   * Resource type for an LLM Observability data deletion request.
-   *
-   * @return type
-   */
-  @JsonProperty(JSON_PROPERTY_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public LLMObsDataDeletionRequestType getType() {
-    return type;
-  }
-
-  public void setType(LLMObsDataDeletionRequestType type) {
-    if (!type.isValid()) {
-      this.unparsed = true;
-    }
-    this.type = type;
-  }
-
-  /**
-   * A container for additional, undeclared properties. This is a holder for any undeclared
-   * properties as specified with the 'additionalProperties' keyword in the OAS document.
-   */
-  private Map<String, Object> additionalProperties;
-
-  /**
-   * Set the additional (undeclared) property with the specified name and value. If the property
-   * does not already exist, create it otherwise replace it.
-   *
-   * @param key The arbitrary key to set
-   * @param value The associated value
-   * @return LLMObsDataDeletionRequestData
-   */
-  @JsonAnySetter
-  public LLMObsDataDeletionRequestData putAdditionalProperty(String key, Object value) {
-    if (this.additionalProperties == null) {
-      this.additionalProperties = new HashMap<String, Object>();
-    }
-    this.additionalProperties.put(key, value);
-    return this;
-  }
-
-  /**
-   * Return the additional (undeclared) property.
-   *
-   * @return The additional properties
-   */
-  @JsonAnyGetter
-  public Map<String, Object> getAdditionalProperties() {
-    return additionalProperties;
-  }
-
-  /**
-   * Return the additional (undeclared) property with the specified name.
-   *
-   * @param key The arbitrary key to get
-   * @return The specific additional property for the given key
-   */
-  public Object getAdditionalProperty(String key) {
-    if (this.additionalProperties == null) {
-      return null;
-    }
-    return this.additionalProperties.get(key);
-  }
-
-  /** Return true if this LLMObsDataDeletionRequestData object is equal to o. */
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    LLMObsDataDeletionRequestData llmObsDataDeletionRequestData = (LLMObsDataDeletionRequestData) o;
-    return Objects.equals(this.attributes, llmObsDataDeletionRequestData.attributes)
-        && Objects.equals(this.type, llmObsDataDeletionRequestData.type)
-        && Objects.equals(
-            this.additionalProperties, llmObsDataDeletionRequestData.additionalProperties);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(attributes, type, additionalProperties);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class LLMObsDataDeletionRequestData {\n");
-    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    additionalProperties: ")
-        .append(toIndentedString(additionalProperties))
-        .append("\n");
-    sb.append('}');
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequestType.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequestType.java
deleted file mode 100644
index 4361c8c3d2c..00000000000
--- a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionRequestType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2019-Present Datadog, Inc.
- */
-
-package com.datadog.api.client.v2.model;
-
-import com.datadog.api.client.ModelEnum;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/** Resource type for an LLM Observability data deletion request. */
-@JsonSerialize(using = LLMObsDataDeletionRequestType.LLMObsDataDeletionRequestTypeSerializer.class)
-public class LLMObsDataDeletionRequestType extends ModelEnum<String> {
-
-  private static final Set<String> allowedValues =
-      new HashSet<String>(Arrays.asList("create_deletion_req"));
-
-  public static final LLMObsDataDeletionRequestType CREATE_DELETION_REQ =
-      new LLMObsDataDeletionRequestType("create_deletion_req");
-
-  LLMObsDataDeletionRequestType(String value) {
-    super(value, allowedValues);
-  }
-
-  public static class LLMObsDataDeletionRequestTypeSerializer
-      extends StdSerializer<LLMObsDataDeletionRequestType> {
-    public LLMObsDataDeletionRequestTypeSerializer(Class<LLMObsDataDeletionRequestType> t) {
-      super(t);
-    }
-
-    public LLMObsDataDeletionRequestTypeSerializer() {
-      this(null);
-    }
-
-    @Override
-    public void serialize(
-        LLMObsDataDeletionRequestType value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonProcessingException {
-      jgen.writeObject(value.value);
-    }
-  }
-
-  @JsonCreator
-  public static LLMObsDataDeletionRequestType fromValue(String value) {
-    return new LLMObsDataDeletionRequestType(value);
-  }
-}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponse.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponse.java
deleted file mode 100644
index 75e2082e1fb..00000000000
--- a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponse.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2019-Present Datadog, Inc.
- */
-
-package com.datadog.api.client.v2.model;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/** Response containing details of a submitted LLM Observability data deletion request. */
-@JsonPropertyOrder({LLMObsDataDeletionResponse.JSON_PROPERTY_DATA})
-@jakarta.annotation.Generated(
-    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class LLMObsDataDeletionResponse {
-  @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_DATA = "data";
-  private LLMObsDataDeletionResponseData data;
-
-  public LLMObsDataDeletionResponse() {}
-
-  @JsonCreator
-  public LLMObsDataDeletionResponse(
-      @JsonProperty(required = true, value = JSON_PROPERTY_DATA)
-          LLMObsDataDeletionResponseData data) {
-    this.data = data;
-    this.unparsed |= data.unparsed;
-  }
-
-  public LLMObsDataDeletionResponse data(LLMObsDataDeletionResponseData data) {
-    this.data = data;
-    this.unparsed |= data.unparsed;
-    return this;
-  }
-
-  /**
-   * Data object for an LLM Observability data deletion response.
-   *
-   * @return data
-   */
-  @JsonProperty(JSON_PROPERTY_DATA)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public LLMObsDataDeletionResponseData getData() {
-    return data;
-  }
-
-  public void setData(LLMObsDataDeletionResponseData data) {
-    this.data = data;
-    if (data != null) {
-      this.unparsed |= data.unparsed;
-    }
-  }
-
-  /**
-   * A container for additional, undeclared properties. This is a holder for any undeclared
-   * properties as specified with the 'additionalProperties' keyword in the OAS document.
-   */
-  private Map<String, Object> additionalProperties;
-
-  /**
-   * Set the additional (undeclared) property with the specified name and value. If the property
-   * does not already exist, create it otherwise replace it.
-   *
-   * @param key The arbitrary key to set
-   * @param value The associated value
-   * @return LLMObsDataDeletionResponse
-   */
-  @JsonAnySetter
-  public LLMObsDataDeletionResponse putAdditionalProperty(String key, Object value) {
-    if (this.additionalProperties == null) {
-      this.additionalProperties = new HashMap<String, Object>();
-    }
-    this.additionalProperties.put(key, value);
-    return this;
-  }
-
-  /**
-   * Return the additional (undeclared) property.
-   *
-   * @return The additional properties
-   */
-  @JsonAnyGetter
-  public Map<String, Object> getAdditionalProperties() {
-    return additionalProperties;
-  }
-
-  /**
-   * Return the additional (undeclared) property with the specified name.
-   *
-   * @param key The arbitrary key to get
-   * @return The specific additional property for the given key
-   */
-  public Object getAdditionalProperty(String key) {
-    if (this.additionalProperties == null) {
-      return null;
-    }
-    return this.additionalProperties.get(key);
-  }
-
-  /** Return true if this LLMObsDataDeletionResponse object is equal to o. */
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    LLMObsDataDeletionResponse llmObsDataDeletionResponse = (LLMObsDataDeletionResponse) o;
-    return Objects.equals(this.data, llmObsDataDeletionResponse.data)
-        && Objects.equals(
-            this.additionalProperties, llmObsDataDeletionResponse.additionalProperties);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(data, additionalProperties);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class LLMObsDataDeletionResponse {\n");
-    sb.append("    data: ").append(toIndentedString(data)).append("\n");
-    sb.append("    additionalProperties: ")
-        .append(toIndentedString(additionalProperties))
-        .append("\n");
-    sb.append('}');
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponseAttributes.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponseAttributes.java
deleted file mode 100644
index 17b02a36bb4..00000000000
--- a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponseAttributes.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2019-Present Datadog, Inc.
- */
-
-package com.datadog.api.client.v2.model;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import java.time.OffsetDateTime;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/** Attributes of a submitted LLM Observability data deletion request. */
-@JsonPropertyOrder({
-  LLMObsDataDeletionResponseAttributes.JSON_PROPERTY_CREATED_AT,
-  LLMObsDataDeletionResponseAttributes.JSON_PROPERTY_CREATED_BY,
-  LLMObsDataDeletionResponseAttributes.JSON_PROPERTY_FROM_TIME,
-  LLMObsDataDeletionResponseAttributes.JSON_PROPERTY_ORG_ID,
-  LLMObsDataDeletionResponseAttributes.JSON_PROPERTY_PRODUCT,
-  LLMObsDataDeletionResponseAttributes.JSON_PROPERTY_QUERY,
-  LLMObsDataDeletionResponseAttributes.JSON_PROPERTY_TO_TIME
-})
-@jakarta.annotation.Generated(
-    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class LLMObsDataDeletionResponseAttributes {
-  @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_CREATED_AT = "created_at";
-  private OffsetDateTime createdAt;
-
-  public static final String JSON_PROPERTY_CREATED_BY = "created_by";
-  private String createdBy;
-
-  public static final String JSON_PROPERTY_FROM_TIME = "from_time";
-  private Long fromTime;
-
-  public static final String JSON_PROPERTY_ORG_ID = "org_id";
-  private Long orgId;
-
-  public static final String JSON_PROPERTY_PRODUCT = "product";
-  private String product;
-
-  public static final String JSON_PROPERTY_QUERY = "query";
-  private String query;
-
-  public static final String JSON_PROPERTY_TO_TIME = "to_time";
-  private Long toTime;
-
-  public LLMObsDataDeletionResponseAttributes() {}
-
-  @JsonCreator
-  public LLMObsDataDeletionResponseAttributes(
-      @JsonProperty(required = true, value = JSON_PROPERTY_CREATED_AT) OffsetDateTime createdAt,
-      @JsonProperty(required = true, value = JSON_PROPERTY_CREATED_BY) String createdBy,
-      @JsonProperty(required = true, value = JSON_PROPERTY_FROM_TIME) Long fromTime,
-      @JsonProperty(required = true, value = JSON_PROPERTY_ORG_ID) Long orgId,
-      @JsonProperty(required = true, value = JSON_PROPERTY_PRODUCT) String product,
-      @JsonProperty(required = true, value = JSON_PROPERTY_QUERY) String query,
-      @JsonProperty(required = true, value = JSON_PROPERTY_TO_TIME) Long toTime) {
-    this.createdAt = createdAt;
-    this.createdBy = createdBy;
-    this.fromTime = fromTime;
-    this.orgId = orgId;
-    this.product = product;
-    this.query = query;
-    this.toTime = toTime;
-  }
-
-  public LLMObsDataDeletionResponseAttributes createdAt(OffsetDateTime createdAt) {
-    this.createdAt = createdAt;
-    return this;
-  }
-
-  /**
-   * Timestamp when the deletion request was created.
-   *
-   * @return createdAt
-   */
-  @JsonProperty(JSON_PROPERTY_CREATED_AT)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public OffsetDateTime getCreatedAt() {
-    return createdAt;
-  }
-
-  public void setCreatedAt(OffsetDateTime createdAt) {
-    this.createdAt = createdAt;
-  }
-
-  public LLMObsDataDeletionResponseAttributes createdBy(String createdBy) {
-    this.createdBy = createdBy;
-    return this;
-  }
-
-  /**
-   * UUID of the user who created the deletion request.
-   *
-   * @return createdBy
-   */
-  @JsonProperty(JSON_PROPERTY_CREATED_BY)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public String getCreatedBy() {
-    return createdBy;
-  }
-
-  public void setCreatedBy(String createdBy) {
-    this.createdBy = createdBy;
-  }
-
-  public LLMObsDataDeletionResponseAttributes fromTime(Long fromTime) {
-    this.fromTime = fromTime;
-    return this;
-  }
-
-  /**
-   * Start of the deletion time range in milliseconds since Unix epoch.
-   *
-   * @return fromTime
-   */
-  @JsonProperty(JSON_PROPERTY_FROM_TIME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public Long getFromTime() {
-    return fromTime;
-  }
-
-  public void setFromTime(Long fromTime) {
-    this.fromTime = fromTime;
-  }
-
-  public LLMObsDataDeletionResponseAttributes orgId(Long orgId) {
-    this.orgId = orgId;
-    return this;
-  }
-
-  /**
-   * ID of the organization that submitted the deletion request.
-   *
-   * @return orgId
-   */
-  @JsonProperty(JSON_PROPERTY_ORG_ID)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public Long getOrgId() {
-    return orgId;
-  }
-
-  public void setOrgId(Long orgId) {
-    this.orgId = orgId;
-  }
-
-  public LLMObsDataDeletionResponseAttributes product(String product) {
-    this.product = product;
-    return this;
-  }
-
-  /**
-   * Product name for the deletion request.
-   *
-   * @return product
-   */
-  @JsonProperty(JSON_PROPERTY_PRODUCT)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public String getProduct() {
-    return product;
-  }
-
-  public void setProduct(String product) {
-    this.product = product;
-  }
-
-  public LLMObsDataDeletionResponseAttributes query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * The query string used to select data for deletion.
-   *
-   * @return query
-   */
-  @JsonProperty(JSON_PROPERTY_QUERY)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-  public LLMObsDataDeletionResponseAttributes toTime(Long toTime) {
-    this.toTime = toTime;
-    return this;
-  }
-
-  /**
-   * End of the deletion time range in milliseconds since Unix epoch.
-   *
-   * @return toTime
-   */
-  @JsonProperty(JSON_PROPERTY_TO_TIME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public Long getToTime() {
-    return toTime;
-  }
-
-  public void setToTime(Long toTime) {
-    this.toTime = toTime;
-  }
-
-  /**
-   * A container for additional, undeclared properties. This is a holder for any undeclared
-   * properties as specified with the 'additionalProperties' keyword in the OAS document.
-   */
-  private Map<String, Object> additionalProperties;
-
-  /**
-   * Set the additional (undeclared) property with the specified name and value. If the property
-   * does not already exist, create it otherwise replace it.
-   *
-   * @param key The arbitrary key to set
-   * @param value The associated value
-   * @return LLMObsDataDeletionResponseAttributes
-   */
-  @JsonAnySetter
-  public LLMObsDataDeletionResponseAttributes putAdditionalProperty(String key, Object value) {
-    if (this.additionalProperties == null) {
-      this.additionalProperties = new HashMap<String, Object>();
-    }
-    this.additionalProperties.put(key, value);
-    return this;
-  }
-
-  /**
-   * Return the additional (undeclared) property.
-   *
-   * @return The additional properties
-   */
-  @JsonAnyGetter
-  public Map<String, Object> getAdditionalProperties() {
-    return additionalProperties;
-  }
-
-  /**
-   * Return the additional (undeclared) property with the specified name.
-   *
-   * @param key The arbitrary key to get
-   * @return The specific additional property for the given key
-   */
-  public Object getAdditionalProperty(String key) {
-    if (this.additionalProperties == null) {
-      return null;
-    }
-    return this.additionalProperties.get(key);
-  }
-
-  /** Return true if this LLMObsDataDeletionResponseAttributes object is equal to o. */
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    LLMObsDataDeletionResponseAttributes llmObsDataDeletionResponseAttributes =
-        (LLMObsDataDeletionResponseAttributes) o;
-    return Objects.equals(this.createdAt, llmObsDataDeletionResponseAttributes.createdAt)
-        && Objects.equals(this.createdBy, llmObsDataDeletionResponseAttributes.createdBy)
-        && Objects.equals(this.fromTime, llmObsDataDeletionResponseAttributes.fromTime)
-        && Objects.equals(this.orgId, llmObsDataDeletionResponseAttributes.orgId)
-        && Objects.equals(this.product, llmObsDataDeletionResponseAttributes.product)
-        && Objects.equals(this.query, llmObsDataDeletionResponseAttributes.query)
-        && Objects.equals(this.toTime, llmObsDataDeletionResponseAttributes.toTime)
-        && Objects.equals(
-            this.additionalProperties, llmObsDataDeletionResponseAttributes.additionalProperties);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(
-        createdAt, createdBy, fromTime, orgId, product, query, toTime, additionalProperties);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class LLMObsDataDeletionResponseAttributes {\n");
-    sb.append("    createdAt: ").append(toIndentedString(createdAt)).append("\n");
-    sb.append("    createdBy: ").append(toIndentedString(createdBy)).append("\n");
-    sb.append("    fromTime: ").append(toIndentedString(fromTime)).append("\n");
-    sb.append("    orgId: ").append(toIndentedString(orgId)).append("\n");
-    sb.append("    product: ").append(toIndentedString(product)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("    toTime: ").append(toIndentedString(toTime)).append("\n");
-    sb.append("    additionalProperties: ")
-        .append(toIndentedString(additionalProperties))
-        .append("\n");
-    sb.append('}');
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponseData.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponseData.java
deleted file mode 100644
index e278f4168bd..00000000000
--- a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponseData.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2019-Present Datadog, Inc.
- */
-
-package com.datadog.api.client.v2.model;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/** Data object for an LLM Observability data deletion response. */
-@JsonPropertyOrder({
-  LLMObsDataDeletionResponseData.JSON_PROPERTY_ATTRIBUTES,
-  LLMObsDataDeletionResponseData.JSON_PROPERTY_ID,
-  LLMObsDataDeletionResponseData.JSON_PROPERTY_TYPE
-})
-@jakarta.annotation.Generated(
-    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class LLMObsDataDeletionResponseData {
-  @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
-  private LLMObsDataDeletionResponseAttributes attributes;
-
-  public static final String JSON_PROPERTY_ID = "id";
-  private String id;
-
-  public static final String JSON_PROPERTY_TYPE = "type";
-  private LLMObsDataDeletionResponseType type;
-
-  public LLMObsDataDeletionResponseData() {}
-
-  @JsonCreator
-  public LLMObsDataDeletionResponseData(
-      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
-          LLMObsDataDeletionResponseAttributes attributes,
-      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
-      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE)
-          LLMObsDataDeletionResponseType type) {
-    this.attributes = attributes;
-    this.unparsed |= attributes.unparsed;
-    this.id = id;
-    this.type = type;
-    this.unparsed |= !type.isValid();
-  }
-
-  public LLMObsDataDeletionResponseData attributes(
-      LLMObsDataDeletionResponseAttributes attributes) {
-    this.attributes = attributes;
-    this.unparsed |= attributes.unparsed;
-    return this;
-  }
-
-  /**
-   * Attributes of a submitted LLM Observability data deletion request.
-   *
-   * @return attributes
-   */
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public LLMObsDataDeletionResponseAttributes getAttributes() {
-    return attributes;
-  }
-
-  public void setAttributes(LLMObsDataDeletionResponseAttributes attributes) {
-    this.attributes = attributes;
-    if (attributes != null) {
-      this.unparsed |= attributes.unparsed;
-    }
-  }
-
-  public LLMObsDataDeletionResponseData id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the deletion request.
-   *
-   * @return id
-   */
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public LLMObsDataDeletionResponseData type(LLMObsDataDeletionResponseType type) {
-    this.type = type;
-    this.unparsed |= !type.isValid();
-    return this;
-  }
-
-  /**
-   * Resource type for an LLM Observability data deletion response.
-   *
-   * @return type
-   */
-  @JsonProperty(JSON_PROPERTY_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public LLMObsDataDeletionResponseType getType() {
-    return type;
-  }
-
-  public void setType(LLMObsDataDeletionResponseType type) {
-    if (!type.isValid()) {
-      this.unparsed = true;
-    }
-    this.type = type;
-  }
-
-  /**
-   * A container for additional, undeclared properties. This is a holder for any undeclared
-   * properties as specified with the 'additionalProperties' keyword in the OAS document.
-   */
-  private Map<String, Object> additionalProperties;
-
-  /**
-   * Set the additional (undeclared) property with the specified name and value. If the property
-   * does not already exist, create it otherwise replace it.
-   *
-   * @param key The arbitrary key to set
-   * @param value The associated value
-   * @return LLMObsDataDeletionResponseData
-   */
-  @JsonAnySetter
-  public LLMObsDataDeletionResponseData putAdditionalProperty(String key, Object value) {
-    if (this.additionalProperties == null) {
-      this.additionalProperties = new HashMap<String, Object>();
-    }
-    this.additionalProperties.put(key, value);
-    return this;
-  }
-
-  /**
-   * Return the additional (undeclared) property.
-   *
-   * @return The additional properties
-   */
-  @JsonAnyGetter
-  public Map<String, Object> getAdditionalProperties() {
-    return additionalProperties;
-  }
-
-  /**
-   * Return the additional (undeclared) property with the specified name.
-   *
-   * @param key The arbitrary key to get
-   * @return The specific additional property for the given key
-   */
-  public Object getAdditionalProperty(String key) {
-    if (this.additionalProperties == null) {
-      return null;
-    }
-    return this.additionalProperties.get(key);
-  }
-
-  /** Return true if this LLMObsDataDeletionResponseData object is equal to o. */
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    LLMObsDataDeletionResponseData llmObsDataDeletionResponseData =
-        (LLMObsDataDeletionResponseData) o;
-    return Objects.equals(this.attributes, llmObsDataDeletionResponseData.attributes)
-        && Objects.equals(this.id, llmObsDataDeletionResponseData.id)
-        && Objects.equals(this.type, llmObsDataDeletionResponseData.type)
-        && Objects.equals(
-            this.additionalProperties, llmObsDataDeletionResponseData.additionalProperties);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(attributes, id, type, additionalProperties);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class LLMObsDataDeletionResponseData {\n");
-    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    additionalProperties: ")
-        .append(toIndentedString(additionalProperties))
-        .append("\n");
-    sb.append('}');
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponseType.java b/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponseType.java
deleted file mode 100644
index ceb862c768e..00000000000
--- a/src/main/java/com/datadog/api/client/v2/model/LLMObsDataDeletionResponseType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2019-Present Datadog, Inc.
- */
-
-package com.datadog.api.client.v2.model;
-
-import com.datadog.api.client.ModelEnum;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/** Resource type for an LLM Observability data deletion response. */
-@JsonSerialize(
-    using = LLMObsDataDeletionResponseType.LLMObsDataDeletionResponseTypeSerializer.class)
-public class LLMObsDataDeletionResponseType extends ModelEnum<String> {
-
-  private static final Set<String> allowedValues =
-      new HashSet<String>(Arrays.asList("deletion_request"));
-
-  public static final LLMObsDataDeletionResponseType DELETION_REQUEST =
-      new LLMObsDataDeletionResponseType("deletion_request");
-
-  LLMObsDataDeletionResponseType(String value) {
-    super(value, allowedValues);
-  }
-
-  public static class LLMObsDataDeletionResponseTypeSerializer
-      extends StdSerializer<LLMObsDataDeletionResponseType> {
-    public LLMObsDataDeletionResponseTypeSerializer(Class<LLMObsDataDeletionResponseType> t) {
-      super(t);
-    }
-
-    public LLMObsDataDeletionResponseTypeSerializer() {
-      this(null);
-    }
-
-    @Override
-    public void serialize(
-        LLMObsDataDeletionResponseType value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonProcessingException {
-      jgen.writeObject(value.value);
-    }
-  }
-
-  @JsonCreator
-  public static LLMObsDataDeletionResponseType fromValue(String value) {
-    return new LLMObsDataDeletionResponseType(value);
-  }
-}
diff --git a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
index 0b1cdf6a6a8..dbf89c929d7 100644
--- a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
+++ b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
@@ -28,6 +28,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
+    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
index 91c8275f382..e94edfb7099 100644
--- a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
@@ -28,6 +28,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
+    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json b/src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json
index 1489fb9e00e..907a2641363 100644
--- a/src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json
+++ b/src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
+    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json b/src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json
index 45e484f0b48..d03bf9ca97e 100644
--- a/src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
+    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
index 30af2a53cea..bb3f69aef75 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
index a42ef29bfae..c82b6c27f29 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
index cf63593c8d1..0d38d7d0a6a 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
index 6c0150b2bed..490992cbf88 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eea"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2123e3-6fb5-0f90-fe98-365e086c9c6e"
+    "id": "ab2123e3-6fb5-0f90-fe98-365e086c9c6f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
index efb480e06b4..a0731b5ad4a 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cd"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
index f2248371931..70fc4d3589b 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
index 87cb96a7640..6352d5f0102 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef690"
+    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef691"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
index 96ea2f1d661..7711ea26b7b 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0f"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
index 7711ea26b7b..2e4479a46a7 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d10"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
index 5be48f564e3..1080a831ec7 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
index a1e750ca5ae..8fcc5731aee 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
index c68fcf2371e..a66b20aa83c 100644
--- a/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
index 51e1a4871f0..4462748bb01 100644
--- a/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145eb"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
index dbfac8750db..4323550909c 100644
--- a/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fd"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
index 010793a6efb..c4e56d41481 100644
--- a/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
index 3e6caee50a0..dfe4106a826 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
index 05049df035d..acd1873b7ae 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2c"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
index 834de428629..46d0a91eab5 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
index 58847da9a80..c4e83f2e617 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d30"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
index bb3b7dd9f12..31297caa9cd 100644
--- a/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffd"
+    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffe"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
index 15036e8ce43..713ac84fbc4 100644
--- a/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
index e13bca72aa7..8e5c491f456 100644
--- a/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
index 7e70b6729df..60476d2ec8b 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
@@ -48,7 +48,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f847921f"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479221"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
index 563401356dc..a885ab105be 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479220"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f847921f"
   },
   {
     "httpRequest": {
@@ -57,6 +57,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479221"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479220"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json
index 381c17cef09..064222b84ee 100644
--- a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -48,6 +48,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f83"
+    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f82"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
index 95cb4a17509..223e245f710 100644
--- a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae48"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
index 086d866ea4d..213894420af 100644
--- a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae48"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae44"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
index 29e21b2f628..8602832ff15 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
index ef83201b336..6e1acd1d8ab 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Workflow_returns_Bad_request_response.json b/src/test/resources/cassettes/features/v2/Create_Workflow_returns_Bad_request_response.json
index 18bfaac3c98..95a9b514916 100644
--- a/src/test/resources/cassettes/features/v2/Create_Workflow_returns_Bad_request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Workflow_returns_Bad_request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9dbbb4fe-ff77-d906-2de1-752f55e537f5"
+    "id": "9dbbb4fe-ff77-d906-2de1-752f55e537f6"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_Workflow_returns_Bad_request_response.json b/src/test/resources/cassettes/features/v2/Create_a_Workflow_returns_Bad_request_response.json
index 4db34a7a497..c995fd8ce46 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_Workflow_returns_Bad_request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_Workflow_returns_Bad_request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9dbbb4fe-ff77-d906-2de1-752f55e537f6"
+    "id": "9dbbb4fe-ff77-d906-2de1-752f55e537f5"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
index 7e392b663eb..3af6b797aec 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3d"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
index 09067379e94..75bec16cf03 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
   },
   {
     "httpRequest": {
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
index 98400c9266c..df7ec302f17 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addce"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
index b8a271f0acf..94ec04c070e 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
index 955d0fd03c0..992baa6ee80 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185f"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51862"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json b/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
index 6c180fc18ec..ae1a3ad8373 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd8"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
index 2afada8e889..f572c9f4255 100644
--- a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6465"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6468"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
index 76a037f2ed4..68588d244c4 100644
--- a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6467"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
index e471a481201..92627d59122 100644
--- a/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
index d00a7c6b966..210fa549f1e 100644
--- a/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
index 3fbaa0291c3..0dd05116b3f 100644
--- a/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
index 876d6dad1a0..5e755022579 100644
--- a/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c517"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c515"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
index a3cb24b8701..7ed67796512 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
index d0572cd8b5b..34fc7000a36 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae44"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
index 608c25497f7..7ede3bf7a7e 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e78"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
index b3b5e533234..493d5b58ad3 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
index 9ad725b454a..d14b87aa29b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e8"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3ea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
index 1511b4f762f..c11337e4efa 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6465"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
index 7919b99b4ff..247c561af22 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_critical_asset_returns_OK_response.json
index d13c9cb48d8..7201a9b1026 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e7"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
index bf3d084fa30..7905b307aab 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3e"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
   },
   {
     "httpRequest": {
@@ -79,6 +79,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
index 0c5ca290f7a..92c10c6b507 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_pipeline_returns_OK_response.json
index 91769fdcab4..f01c5129808 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7f"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
index 4b854b5aeea..b4f342c7c6b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51862"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
index 381d1b90a1b..aeb041f1a43 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
index c82b6c27f29..a42ef29bfae 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
index e3bc0c0f6f4..10fbac85dbb 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
index a5021c6aada..57e4353994c 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2123e3-6fb5-0f90-fe98-365e086c9c6f"
+    "id": "ab2123e3-6fb5-0f90-fe98-365e086c9c6e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_annotation_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_an_annotation_returns_No_Content_response.json
index 1e8a250a6c6..41d1a8a374c 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_annotation_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_annotation_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5e"
+    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json
index eebc7eb0437..84afb232908 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_existing_Workflow_returns_Successfully_deleted_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21f"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa220"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
index f83358c4381..366642e3cf7 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd4"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
index 81032449c02..495b2087065 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
index 9df478e5a8c..0f0ba817425 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
index f09a21c5347..205a02a07fb 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
index 763ae62b2fb..3018095ac5f 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
index 98d4f2e89be..ff29c917fe1 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
index e6d802099c3..2dc635d3a78 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6467"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
index a265db54be7..8d1ac6d8c33 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6466"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
index 9906d02abaf..e1f6cfcce7c 100644
--- a/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d30"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
index ccc4c95513a..3ffceed3185 100644
--- a/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
index f07d61ea8c9..8871ce2f11d 100644
--- a/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd9"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
index f868434d6ac..679ed1419fe 100644
--- a/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
index e9a88c424e6..dbcf089d3c7 100644
--- a/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cd"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
index fe4cf251d57..6b2882ea815 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json
index 774e33bf524..5fe868f6988 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7442c701-c89c-a74b-3de9-6b4cff876179"
+    "id": "7442c701-c89c-a74b-3de9-6b4cff876178"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
index 6b2882ea815..fe4cf251d57 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json b/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
index b495f3e998e..b5a3dd39c4e 100644
--- a/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json
index cbbfed66ca6..0d312e2da5f 100644
--- a/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c517"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json
index 018b1504a4a..cab40f18769 100644
--- a/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fac"
+    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fab"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_WAF_exclusion_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_WAF_exclusion_filter_returns_OK_response.json
index 90da01d5656..54bbc61f4be 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_WAF_exclusion_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_WAF_exclusion_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e9"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
index 2c9746bfe25..4e428dff41a 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
index 313475eb8cc..f414d99275e 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
   },
   {
     "httpRequest": {
@@ -79,6 +79,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
index 4c1dc3043b8..b3366690d8d 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json
index 3b4b16a42ec..466d807e187 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffe"
+    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffd"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
index f6628e0a51d..f19f9fbffe4 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51860"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
index bf2af7a3b6a..d3568a82564 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addce"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
index c6e40d9ebaf..ac29f8cf42e 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7c"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
index 758e4fb66ad..8135aeb994f 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6466"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
index f6443799769..bd35bd59ea6 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
index 83cf7035f14..88ec4190fd7 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
index 6352d5f0102..87cb96a7640 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef691"
+    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef690"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
index 0ad821e051f..c859297de35 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21c"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_annotations_for_a_page_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_annotations_for_a_page_returns_OK_response.json
index dd3dbb8ccdc..402da65263b 100644
--- a/src/test/resources/cassettes/features/v2/Get_annotations_for_a_page_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_annotations_for_a_page_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5c"
+    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5b"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
index 7f112b2283d..f392f13fc4c 100644
--- a/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
index f1ad8103cc5..7b054104c3f 100644
--- a/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
index 06a6f28a5dd..39e1970bef7 100644
--- a/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
index de8812f83fc..73c41def8f7 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json
index e9ddbf352f7..cc6c1703e9a 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "16438026-1168-3bfa-3763-949697b01fea"
+    "id": "16438026-1168-3bfa-3763-949697b01fe9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json
index 6b6dc7ffeef..c0406058bb1 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "16438026-1168-3bfa-3763-949697b01fe9"
+    "id": "16438026-1168-3bfa-3763-949697b01fea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
index 6204578cebd..d89770a1ae1 100644
--- a/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json
index 1d634f061da..bbb7fb5acd3 100644
--- a/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51860"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json
index 61e60b91801..f5543674faa 100644
--- a/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7442c701-c89c-a74b-3de9-6b4cff876178"
+    "id": "7442c701-c89c-a74b-3de9-6b4cff876179"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json
index e20ba54d830..d205019fe46 100644
--- a/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_App_Versions_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c51a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json
index c09bb52e54b..e200ee772e9 100644
--- a/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fab"
+    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fac"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
index 481b1a30e15..6b3b2a6c838 100644
--- a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_annotations_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_annotations_returns_OK_response.json
index 3c5be670c7a..319d097fb29 100644
--- a/src/test/resources/cassettes/features/v2/List_annotations_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_annotations_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5d"
+    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
index 25a1f8a4ae0..4e2a1b8a39b 100644
--- a/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d10"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
index dd7ac63f41c..6bdfa4f2dd4 100644
--- a/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json
index 4e2a1b8a39b..f0011c849a4 100644
--- a/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
index cfd81d2cd53..4796b7798ef 100644
--- a/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
index 7f8215348d1..be0c8e1fc69 100644
--- a/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
index 76dcecf2554..5311db1d440 100644
--- a/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185e"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_workflows_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_workflows_returns_OK_response.json
index ce000bd1275..07e1115fd6e 100644
--- a/src/test/resources/cassettes/features/v2/List_workflows_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_workflows_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa220"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json
index 2f8d470d96f..00545442e9b 100644
--- a/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Name_App_Version_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
index c48e77cce48..2ebfbdcfa75 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb78"
+    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb77"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
index 974c53ce63d..1b2ef6880a2 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9458"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Not_Found_response.json
index f5b653cadfe..dd398a6ce01 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "5b9334b2-8fb1-87b5-4ca9-1a0b54abb8b2"
+    "id": "5b9334b2-8fb1-87b5-4ca9-1a0b54abb8b3"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
index fee9f74e00a..d4bcf1ca8ac 100644
--- a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c2c329a8-5875-126a-1858-e7c00b5af114"
+    "id": "c2c329a8-5875-126a-1858-e7c00b5af113"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json
index 9c853b6672d..3292c6ddbd0 100644
--- a/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Pin_a_Model_Lab_run_returns_No_Content_response.json
@@ -39,6 +39,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517cce"
+    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517ccd"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
index 858d36f9769..ead796b159c 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -52,6 +52,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02055"
+    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02054"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
index 08f556111f9..199c7919faf 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
@@ -52,6 +52,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02054"
+    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02055"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
index 25b85370788..1006c4a1b05 100644
--- a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -48,6 +48,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f82"
+    "id": "7e1fd6df-f1a0-70b4-90c2-13c11f689f83"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
index 65827d6fe17..a14340af032 100644
--- a/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c51a"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
index 082683417bd..4800a22b262 100644
--- a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e78"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9d"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
index 36212d4ccd2..1350682e4be 100644
--- a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
index 12d7b1413c9..ce5f8f54754 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
index 16fe02f0e3b..532d9797705 100644
--- a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
+    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
index 43bd12d9e6f..17ba6301b30 100644
--- a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
index 9db02a24e96..d51ad920076 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
index 25c50b5140f..00e0a12ca8e 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json
index 3af8cd28dc9..f9fb078423e 100644
--- a/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Unpin_a_Model_Lab_run_returns_No_Content_response.json
@@ -18,6 +18,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517ccd"
+    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517cce"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
index 5aa2107af10..f9c3486386c 100644
--- a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
index 2ebfbdcfa75..c48e77cce48 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb77"
+    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb78"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
index 1b2ef6880a2..974c53ce63d 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9458"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Not_Found_response.json
index dd398a6ce01..f5b653cadfe 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "5b9334b2-8fb1-87b5-4ca9-1a0b54abb8b3"
+    "id": "5b9334b2-8fb1-87b5-4ca9-1a0b54abb8b2"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json
index 0dc68979e43..c88181217f7 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Favorite_Status_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50e"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json
index 1bce83b22aa..0ebe7b69e0c 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Protection_Level_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c515"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json
index 8ca9f7aa49b..074f57f01e1 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Self_Service_Status_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c516"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
index 2f5527dcba5..fc4262bb582 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c516"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
index 385920ba074..561057ced5c 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
index bd889c4d7e5..e0d488678ae 100644
--- a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c2c329a8-5875-126a-1858-e7c00b5af113"
+    "id": "c2c329a8-5875-126a-1858-e7c00b5af114"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
index 970a0b596df..fb4c1dc2d43 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
index 6eb2cd0ff45..eeceb81999e 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
index 4166beafba3..b7c00ffb4b3 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
index 7a985fbb55d..deabdcc756c 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json
index ffe3aefae73..36d9e528f82 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9443"
+    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9441"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json
index 72e65a80efe..7b5287a216a 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9441"
+    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9443"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
index cf8ae047cfb..08144afbd3b 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3d"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
index 3d963f1eb76..c3918bef3d9 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3ea"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json
index 7ecba1161be..5c938dd3d90 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7d"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
index 7ee7239080c..5486c5522b1 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7e"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
index f86ae381a6a..e93ced0b7aa 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
index f8e2615c3f8..170166752c7 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62fea"
+    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62feb"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
index 3e2885f919c..cd4b267d68f 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069a"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
index b10dcca96b8..a39d900e784 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
index 9e6921507b6..f7ba5a0c135 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
index 170166752c7..f8e2615c3f8 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62feb"
+    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62fea"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
index 32c22376aa7..a0d5f9cc2e9 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216e"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
index 3f8fd3d4235..ae720284ecf 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
index 44d8b94bc74..d401147456f 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
index e47e6cdfe12..6f8a3b3ff88 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce3"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
index b3d0c2aebe2..833d5ca5043 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_annotation_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_an_annotation_returns_OK_response.json
index 33dc2f3e857..40507e5e527 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_annotation_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_annotation_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5b"
+    "id": "78d2d116-1962-0348-cab7-4b6ac6482f5e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json
index 817f25be2e6..59be0a3c587 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21d"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
index 46a869f107a..54863c2d61a 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
index 7bd770826d4..108754699d0 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd6"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
index 871a3a0a358..88be588dd3c 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
index 0587c45a38b..71dda223fa7 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6468"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
index c2b2cab762b..ecd3802ebc2 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
index dcfef467346..e5adeb7069b 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fd"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
index 6350054ba83..97fe7113a03 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145eb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
index 93248ee0fac..73fbdd658a2 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
index f5efb75d9f2..4d0529dbc46 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
index 373bfe7f04c..40f7af7c478 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
index 6a26767c151..1463cb0e2aa 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
index a293ad3ef40..1336c15aee4 100644
--- a/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json
index dccf8c5d8b8..4b4aaa2bc5d 100644
--- a/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
index 0589d7fba5e..92e2e3d0445 100644
--- a/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdc"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/com/datadog/api/client/v2/api/llm_observability.feature b/src/test/resources/com/datadog/api/client/v2/api/llm_observability.feature
index b1897f532b9..8cb53cdc5a9 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/llm_observability.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/llm_observability.feature
@@ -420,22 +420,6 @@ Feature: LLM Observability
     When the request is sent
     Then the response status is 200 OK — annotations created or updated. Per-item errors are listed in `errors`.
 
-  @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete LLM Observability data returns "Accepted" response
-    Given operation "DeleteLLMObsData" enabled
-    And new "DeleteLLMObsData" request
-    And body with value {"data": {"attributes": {"delay": 0, "from": 1705314600000, "query": {"query": "@trace_id:abc123def456"}, "to": 1705315200000}, "type": "create_deletion_req"}}
-    When the request is sent
-    Then the response status is 202 Accepted
-
-  @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete LLM Observability data returns "Bad Request" response
-    Given operation "DeleteLLMObsData" enabled
-    And new "DeleteLLMObsData" request
-    And body with value {"data": {"attributes": {"delay": 0, "from": 1705314600000, "query": {"query": "@trace_id:abc123def456"}, "to": 1705315200000}, "type": "create_deletion_req"}}
-    When the request is sent
-    Then the response status is 400 Bad Request
-
   @generated @skip @team:DataDog/ml-observability
   Scenario: Delete LLM Observability dataset records returns "Bad Request" response
     Given operation "DeleteLLMObsDatasetRecords" enabled
diff --git a/src/test/resources/com/datadog/api/client/v2/api/undo.json b/src/test/resources/com/datadog/api/client/v2/api/undo.json
index df961ee10c8..ad49f8ac47c 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/undo.json
+++ b/src/test/resources/com/datadog/api/client/v2/api/undo.json
@@ -4439,14 +4439,6 @@
       "type": "idempotent"
     }
   },
-  "DeleteLLMObsData": {
-    "tag": "LLM Observability",
-    "undo": {
-      "operationId": "TODO",
-      "parameters": [],
-      "type": "unsafe"
-    }
-  },
   "GetLLMObsAnnotatedInteractionsByTraceIDs": {
     "tag": "LLM Observability",
     "undo": {