From 4f9c1076f99b1c641560b5b57e1c64017d790fa8 Mon Sep 17 00:00:00 2001
From: "ci.datadog-api-spec" <packages@datadoghq.com>
Date: Wed, 27 May 2026 16:49:17 +0000
Subject: [PATCH] Regenerate client from commit 622be32 of spec repo

---
 .generator/schemas/v2/openapi.yaml            | 101 ++++++++++
 .../ListCostTagMetadataMonths.java            |  25 +++
 .../com/datadog/api/client/ApiClient.java     |   1 +
 .../client/v2/api/CloudCostManagementApi.java | 180 ++++++++++++++++++
 .../client/v2/model/CostTagMetadataMonth.java | 175 +++++++++++++++++
 .../v2/model/CostTagMetadataMonthType.java    |  57 ++++++
 .../model/CostTagMetadataMonthsResponse.java  | 158 +++++++++++++++
 ...er_returns_User_created_response_test.json |   2 +-
 ...reate_a_user_returns_null_access_role.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 |   2 +-
 ...g_returns_AWS_Account_object_response.json |   2 +-
 ...unt_config_returns_Not_Found_response.json |   2 +-
 ...rns_AWS_Accounts_List_object_response.json |   2 +-
 ...s_AWS_Namespaces_List_object_response.json |   2 +-
 ...WS_Logs_Services_List_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 +-
 .../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 +-
 ..._deletion_request_returns_OK_response.json |   2 +-
 ...ent_case_returns_Bad_Request_response.json |   2 +-
 ...eturns_AWS_CCM_Config_object_response.json |   2 +-
 ..._CCM_config_returns_Conflict_response.json |   4 +-
 ...and_task_returns_Bad_Request_response.json |   2 +-
 .../Create_App_returns_Created_response.json  |   2 +-
 ...options_enabled_successfully_response.json |   4 +-
 ..._options_returns_Bad_Request_response.json |   2 +-
 ..._Connection_returns_Conflict_response.json |   4 +-
 ...te_Scanning_Group_returns_OK_response.json |   2 +-
 ...ate_Scanning_Rule_returns_OK_response.json |   4 +-
 ...should_save_match_returns_OK_response.json |   4 +-
 ...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 +-
 ...integration_returns_Conflict_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 +-
 ..._deletion_request_returns_OK_response.json |   2 +-
 .../v2/Delete_App_returns_OK_response.json    |   2 +-
 ...ete_Multiple_Apps_returns_OK_response.json |   2 +-
 ...te_Scanning_Group_returns_OK_response.json |   4 +-
 ...ete_Scanning_Rule_returns_OK_response.json |   2 +-
 ..._exclusion_filter_returns_OK_response.json |   2 +-
 ...case_type_returns_NotContent_response.json |   2 +-
 ...elete_a_case_type_returns_OK_response.json |   2 +-
 ..._custom_framework_returns_OK_response.json |   6 +-
 ...a_dataset_returns_No_Content_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 +-
 ...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 +-
 ...s_config_returns_Bad_Request_response.json |   2 +-
 ...te_datastore_item_returns_OK_response.json |   2 +-
 .../Delete_datastore_returns_OK_response.json |   2 +-
 ...tion_rule_returns_No_Content_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 +-
 ...turns_AWS_External_ID_object_response.json |   2 +-
 ...sk_by_id_returns_Bad_Request_response.json |   2 +-
 ...and_task_returns_Bad_Request_response.json |   2 +-
 .../v2/Get_App_returns_Gone_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 +-
 ...gle_dataset_by_ID_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 +-
 ..._config_ID_returns_Not_Found_response.json |   2 +-
 ..._Successfully_got_a_workflow_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 +-
 ...WS_Logs_Services_List_object_response.json |   2 +-
 ...details_of_a_case_returns_OK_response.json |   2 +-
 ...deletion_requests_returns_OK_response.json |   2 +-
 ...mission_to_a_role_returns_OK_response.json |   2 +-
 ...List_App_Versions_returns_OK_response.json |   2 +-
 ...t_Scanning_Groups_returns_OK_response.json |   6 +-
 ...retention_filters_returns_OK_response.json |   2 +-
 ...rns_AWS_Accounts_List_object_response.json |   2 +-
 ...s_AWS_Namespaces_List_object_response.json |   2 +-
 ...t_datastore_items_returns_OK_response.json |   2 +-
 ...otification_rules_returns_OK_response.json |   2 +-
 ...WS_Logs_Services_List_object_response.json |   2 +-
 ...ssions_for_a_role_returns_OK_response.json |   2 +-
 .../List_permissions_returns_OK_response.json |   2 +-
 .../List_pipelines_returns_OK_response.json   |   2 +-
 ...p_Version_returns_No_Content_response.json |   2 +-
 ...ptions_returns_Bad_Request_response_2.json |   2 +-
 ..._AWS_Scan_Options_returns_OK_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 |   4 +-
 ..._Options_returns_Bad_Request_response.json |   2 +-
 ...and_task_returns_Bad_Request_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 +-
 ...permission_returns_Not_found_response.json |   2 +-
 ...Revoke_permission_returns_OK_response.json |   2 +-
 ...l_job_returns_Status_created_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 +-
 ...te_Status_returns_No_Content_response.json |   2 +-
 ..._Protection_Level_returns_OK_response.json |   2 +-
 ...ce_Status_returns_No_Content_response.json |   2 +-
 ..._App_Tags_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 +-
 ...Connection_returns_Not_Found_response.json |   2 +-
 ...te_Org_Connection_returns_OK_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 +-
 ..._exclusion_filter_returns_OK_response.json |   2 +-
 ..._a_critical_asset_returns_OK_response.json |   2 +-
 ..._custom_framework_returns_OK_response.json |   4 +-
 ...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 +-
 ...retention_filters_returns_OK_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 +-
 ...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 +-
 ..._attribute_returns_Not_Found_response.json |   2 +-
 ..._custom_attribute_returns_OK_response.json |   2 +-
 ..._case_description_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 +-
 .../Update_datastore_returns_OK_response.json |   2 +-
 ...fication_template_returns_OK_response.json |   2 +-
 ...an_issue_returns_Bad_Request_response.json |   2 +-
 ...state_of_an_issue_returns_OK_response.json |   2 +-
 .../v2/api/cloud_cost_management.feature      |  16 ++
 .../com/datadog/api/client/v2/api/undo.json   |   6 +
 182 files changed, 915 insertions(+), 196 deletions(-)
 create mode 100644 examples/v2/cloud-cost-management/ListCostTagMetadataMonths.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/CostTagMetadataMonth.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/CostTagMetadataMonthType.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/CostTagMetadataMonthsResponse.java

diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index c1ed2925666..795f35ac355 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -19897,6 +19897,45 @@ components:
       x-enum-varnames:
         - "TRUE"
         - "FALSE"
+    CostTagMetadataMonth:
+      description: A month that has Cloud Cost Management tag metadata available for a given provider.
+      properties:
+        id:
+          description: The month, in `YYYY-MM` format.
+          example: "2026-04"
+          type: string
+        type:
+          $ref: "#/components/schemas/CostTagMetadataMonthType"
+      required:
+        - id
+        - type
+      type: object
+    CostTagMetadataMonthType:
+      default: cost_tag_metadata_month
+      description: Type of the Cloud Cost Management tag metadata month resource.
+      enum:
+        - cost_tag_metadata_month
+      example: cost_tag_metadata_month
+      type: string
+      x-enum-varnames:
+        - COST_TAG_METADATA_MONTH
+    CostTagMetadataMonthsResponse:
+      description: List of months that have Cloud Cost Management tag metadata for the requested provider, ordered most-recent first and capped at 36 months.
+      example:
+        data:
+          - id: "2026-04"
+            type: cost_tag_metadata_month
+          - id: "2026-03"
+            type: cost_tag_metadata_month
+      properties:
+        data:
+          description: List of months that have tag metadata available.
+          items:
+            $ref: "#/components/schemas/CostTagMetadataMonth"
+          type: array
+      required:
+        - data
+      type: object
     CostTagType:
       default: cost_tag
       description: Type of the Cloud Cost Management tag resource.
@@ -111135,6 +111174,68 @@ paths:
       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/cost/tag_metadata/months:
+    get:
+      description: |-
+        List months that have Cloud Cost Management tag metadata for a given provider,
+        ordered most-recent first. The response is capped at 36 months.
+      operationId: ListCostTagMetadataMonths
+      parameters:
+        - description: |-
+            Provider to scope the query to. Use the value of the `providername` tag in CCM
+            (for example, `aws`, `azure`, `gcp`, `Oracle`, `Confluent Cloud`, `Snowflake`).
+            For costs uploaded through the Custom Costs API, use `custom`.
+            Values are case-sensitive.
+          example: aws
+          in: query
+          name: filter[provider]
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          content:
+            application/json:
+              examples:
+                default:
+                  value:
+                    data:
+                      - id: "2026-04"
+                        type: cost_tag_metadata_month
+                      - id: "2026-03"
+                        type: cost_tag_metadata_month
+              schema:
+                $ref: "#/components/schemas/CostTagMetadataMonthsResponse"
+          description: OK
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/APIErrorResponse"
+          description: Bad Request
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/APIErrorResponse"
+          description: Forbidden
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+        - AuthZ:
+            - cloud_cost_management_read
+      summary: List Cloud Cost Management tag metadata months
+      tags:
+        - Cloud Cost Management
+      "x-permission":
+        operator: OR
+        permissions:
+          - cloud_cost_management_read
+      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/cost/tag_metadata/orchestrators:
     get:
       description: List container orchestrators (for example, `kubernetes`, `ecs`) detected in Cloud Cost Management data for the requested period.
diff --git a/examples/v2/cloud-cost-management/ListCostTagMetadataMonths.java b/examples/v2/cloud-cost-management/ListCostTagMetadataMonths.java
new file mode 100644
index 00000000000..aeb96ecbd3b
--- /dev/null
+++ b/examples/v2/cloud-cost-management/ListCostTagMetadataMonths.java
@@ -0,0 +1,25 @@
+// List Cloud Cost Management tag metadata months returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.CloudCostManagementApi;
+import com.datadog.api.client.v2.model.CostTagMetadataMonthsResponse;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.listCostTagMetadataMonths", true);
+    CloudCostManagementApi apiInstance = new CloudCostManagementApi(defaultClient);
+
+    try {
+      CostTagMetadataMonthsResponse result = apiInstance.listCostTagMetadataMonths("aws");
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling CloudCostManagementApi#listCostTagMetadataMonths");
+      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 68d8583171e..c172f090b44 100644
--- a/src/main/java/com/datadog/api/client/ApiClient.java
+++ b/src/main/java/com/datadog/api/client/ApiClient.java
@@ -953,6 +953,7 @@ public class ApiClient {
           put("v2.listCostTagKeySources", false);
           put("v2.listCostTagMetadata", false);
           put("v2.listCostTagMetadataMetrics", false);
+          put("v2.listCostTagMetadataMonths", false);
           put("v2.listCostTagMetadataOrchestrators", false);
           put("v2.searchCostRecommendations", false);
           put("v2.createDashboardSecureEmbed", false);
diff --git a/src/main/java/com/datadog/api/client/v2/api/CloudCostManagementApi.java b/src/main/java/com/datadog/api/client/v2/api/CloudCostManagementApi.java
index 482720c505b..940a2bbaac5 100644
--- a/src/main/java/com/datadog/api/client/v2/api/CloudCostManagementApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/CloudCostManagementApi.java
@@ -42,6 +42,7 @@
 import com.datadog.api.client.v2.model.CostTagKeySourcesResponse;
 import com.datadog.api.client.v2.model.CostTagKeysResponse;
 import com.datadog.api.client.v2.model.CostTagMetadataDailyFilter;
+import com.datadog.api.client.v2.model.CostTagMetadataMonthsResponse;
 import com.datadog.api.client.v2.model.CostTagsResponse;
 import com.datadog.api.client.v2.model.CreateRulesetRequest;
 import com.datadog.api.client.v2.model.CustomCostsFileGetResponse;
@@ -7919,6 +7920,185 @@ public ApiResponse<CostMetricsResponse> listCostTagMetadataMetricsWithHttpInfo(
         new GenericType<CostMetricsResponse>() {});
   }
 
+  /**
+   * List Cloud Cost Management tag metadata months.
+   *
+   * <p>See {@link #listCostTagMetadataMonthsWithHttpInfo}.
+   *
+   * @param filterProvider Provider to scope the query to. Use the value of the <code>providername
+   *     </code> tag in CCM (for example, <code>aws</code>, <code>azure</code>, <code>gcp</code>,
+   *     <code>Oracle</code>, <code>Confluent Cloud</code>, <code>Snowflake</code>). For costs
+   *     uploaded through the Custom Costs API, use <code>custom</code>. Values are case-sensitive.
+   *     (required)
+   * @return CostTagMetadataMonthsResponse
+   * @throws ApiException if fails to make API call
+   */
+  public CostTagMetadataMonthsResponse listCostTagMetadataMonths(String filterProvider)
+      throws ApiException {
+    return listCostTagMetadataMonthsWithHttpInfo(filterProvider).getData();
+  }
+
+  /**
+   * List Cloud Cost Management tag metadata months.
+   *
+   * <p>See {@link #listCostTagMetadataMonthsWithHttpInfoAsync}.
+   *
+   * @param filterProvider Provider to scope the query to. Use the value of the <code>providername
+   *     </code> tag in CCM (for example, <code>aws</code>, <code>azure</code>, <code>gcp</code>,
+   *     <code>Oracle</code>, <code>Confluent Cloud</code>, <code>Snowflake</code>). For costs
+   *     uploaded through the Custom Costs API, use <code>custom</code>. Values are case-sensitive.
+   *     (required)
+   * @return CompletableFuture&lt;CostTagMetadataMonthsResponse&gt;
+   */
+  public CompletableFuture<CostTagMetadataMonthsResponse> listCostTagMetadataMonthsAsync(
+      String filterProvider) {
+    return listCostTagMetadataMonthsWithHttpInfoAsync(filterProvider)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * List months that have Cloud Cost Management tag metadata for a given provider, ordered
+   * most-recent first. The response is capped at 36 months.
+   *
+   * @param filterProvider Provider to scope the query to. Use the value of the <code>providername
+   *     </code> tag in CCM (for example, <code>aws</code>, <code>azure</code>, <code>gcp</code>,
+   *     <code>Oracle</code>, <code>Confluent Cloud</code>, <code>Snowflake</code>). For costs
+   *     uploaded through the Custom Costs API, use <code>custom</code>. Values are case-sensitive.
+   *     (required)
+   * @return ApiResponse&lt;CostTagMetadataMonthsResponse&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> 200 </td><td> OK </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </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<CostTagMetadataMonthsResponse> listCostTagMetadataMonthsWithHttpInfo(
+      String filterProvider) throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "listCostTagMetadataMonths";
+    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 = null;
+
+    // verify the required parameter 'filterProvider' is set
+    if (filterProvider == null) {
+      throw new ApiException(
+          400,
+          "Missing the required parameter 'filterProvider' when calling listCostTagMetadataMonths");
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/cost/tag_metadata/months";
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter[provider]", filterProvider));
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.CloudCostManagementApi.listCostTagMetadataMonths",
+            localVarPath,
+            localVarQueryParams,
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"application/json"},
+            new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    return apiClient.invokeAPI(
+        "GET",
+        builder,
+        localVarHeaderParams,
+        new String[] {},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<CostTagMetadataMonthsResponse>() {});
+  }
+
+  /**
+   * List Cloud Cost Management tag metadata months.
+   *
+   * <p>See {@link #listCostTagMetadataMonthsWithHttpInfo}.
+   *
+   * @param filterProvider Provider to scope the query to. Use the value of the <code>providername
+   *     </code> tag in CCM (for example, <code>aws</code>, <code>azure</code>, <code>gcp</code>,
+   *     <code>Oracle</code>, <code>Confluent Cloud</code>, <code>Snowflake</code>). For costs
+   *     uploaded through the Custom Costs API, use <code>custom</code>. Values are case-sensitive.
+   *     (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;CostTagMetadataMonthsResponse&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<CostTagMetadataMonthsResponse>>
+      listCostTagMetadataMonthsWithHttpInfoAsync(String filterProvider) {
+    // Check if unstable operation is enabled
+    String operationId = "listCostTagMetadataMonths";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<CostTagMetadataMonthsResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = null;
+
+    // verify the required parameter 'filterProvider' is set
+    if (filterProvider == null) {
+      CompletableFuture<ApiResponse<CostTagMetadataMonthsResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'filterProvider' when calling"
+                  + " listCostTagMetadataMonths"));
+      return result;
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/cost/tag_metadata/months";
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter[provider]", filterProvider));
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.CloudCostManagementApi.listCostTagMetadataMonths",
+              localVarPath,
+              localVarQueryParams,
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"application/json"},
+              new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<CostTagMetadataMonthsResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "GET",
+        builder,
+        localVarHeaderParams,
+        new String[] {},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<CostTagMetadataMonthsResponse>() {});
+  }
+
   /** Manage optional parameters to listCostTagMetadataOrchestrators. */
   public static class ListCostTagMetadataOrchestratorsOptionalParameters {
     private String filterProvider;
diff --git a/src/main/java/com/datadog/api/client/v2/model/CostTagMetadataMonth.java b/src/main/java/com/datadog/api/client/v2/model/CostTagMetadataMonth.java
new file mode 100644
index 00000000000..59b82384051
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/CostTagMetadataMonth.java
@@ -0,0 +1,175 @@
+/*
+ * 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;
+
+/** A month that has Cloud Cost Management tag metadata available for a given provider. */
+@JsonPropertyOrder({CostTagMetadataMonth.JSON_PROPERTY_ID, CostTagMetadataMonth.JSON_PROPERTY_TYPE})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class CostTagMetadataMonth {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private CostTagMetadataMonthType type = CostTagMetadataMonthType.COST_TAG_METADATA_MONTH;
+
+  public CostTagMetadataMonth() {}
+
+  @JsonCreator
+  public CostTagMetadataMonth(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) CostTagMetadataMonthType type) {
+    this.id = id;
+    this.type = type;
+    this.unparsed |= !type.isValid();
+  }
+
+  public CostTagMetadataMonth id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * The month, in <code>YYYY-MM</code> format.
+   *
+   * @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 CostTagMetadataMonth type(CostTagMetadataMonthType type) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
+    return this;
+  }
+
+  /**
+   * Type of the Cloud Cost Management tag metadata month resource.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public CostTagMetadataMonthType getType() {
+    return type;
+  }
+
+  public void setType(CostTagMetadataMonthType 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 CostTagMetadataMonth
+   */
+  @JsonAnySetter
+  public CostTagMetadataMonth 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 CostTagMetadataMonth object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CostTagMetadataMonth costTagMetadataMonth = (CostTagMetadataMonth) o;
+    return Objects.equals(this.id, costTagMetadataMonth.id)
+        && Objects.equals(this.type, costTagMetadataMonth.type)
+        && Objects.equals(this.additionalProperties, costTagMetadataMonth.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CostTagMetadataMonth {\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/CostTagMetadataMonthType.java b/src/main/java/com/datadog/api/client/v2/model/CostTagMetadataMonthType.java
new file mode 100644
index 00000000000..94cd58a5cf0
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/CostTagMetadataMonthType.java
@@ -0,0 +1,57 @@
+/*
+ * 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;
+
+/** Type of the Cloud Cost Management tag metadata month resource. */
+@JsonSerialize(using = CostTagMetadataMonthType.CostTagMetadataMonthTypeSerializer.class)
+public class CostTagMetadataMonthType extends ModelEnum<String> {
+
+  private static final Set<String> allowedValues =
+      new HashSet<String>(Arrays.asList("cost_tag_metadata_month"));
+
+  public static final CostTagMetadataMonthType COST_TAG_METADATA_MONTH =
+      new CostTagMetadataMonthType("cost_tag_metadata_month");
+
+  CostTagMetadataMonthType(String value) {
+    super(value, allowedValues);
+  }
+
+  public static class CostTagMetadataMonthTypeSerializer
+      extends StdSerializer<CostTagMetadataMonthType> {
+    public CostTagMetadataMonthTypeSerializer(Class<CostTagMetadataMonthType> t) {
+      super(t);
+    }
+
+    public CostTagMetadataMonthTypeSerializer() {
+      this(null);
+    }
+
+    @Override
+    public void serialize(
+        CostTagMetadataMonthType value, JsonGenerator jgen, SerializerProvider provider)
+        throws IOException, JsonProcessingException {
+      jgen.writeObject(value.value);
+    }
+  }
+
+  @JsonCreator
+  public static CostTagMetadataMonthType fromValue(String value) {
+    return new CostTagMetadataMonthType(value);
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/CostTagMetadataMonthsResponse.java b/src/main/java/com/datadog/api/client/v2/model/CostTagMetadataMonthsResponse.java
new file mode 100644
index 00000000000..e42a485bcee
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/CostTagMetadataMonthsResponse.java
@@ -0,0 +1,158 @@
+/*
+ * 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.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * List of months that have Cloud Cost Management tag metadata for the requested provider, ordered
+ * most-recent first and capped at 36 months.
+ */
+@JsonPropertyOrder({CostTagMetadataMonthsResponse.JSON_PROPERTY_DATA})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class CostTagMetadataMonthsResponse {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private List<CostTagMetadataMonth> data = new ArrayList<>();
+
+  public CostTagMetadataMonthsResponse() {}
+
+  @JsonCreator
+  public CostTagMetadataMonthsResponse(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) List<CostTagMetadataMonth> data) {
+    this.data = data;
+  }
+
+  public CostTagMetadataMonthsResponse data(List<CostTagMetadataMonth> data) {
+    this.data = data;
+    for (CostTagMetadataMonth item : data) {
+      this.unparsed |= item.unparsed;
+    }
+    return this;
+  }
+
+  public CostTagMetadataMonthsResponse addDataItem(CostTagMetadataMonth dataItem) {
+    this.data.add(dataItem);
+    this.unparsed |= dataItem.unparsed;
+    return this;
+  }
+
+  /**
+   * List of months that have tag metadata available.
+   *
+   * @return data
+   */
+  @JsonProperty(JSON_PROPERTY_DATA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public List<CostTagMetadataMonth> getData() {
+    return data;
+  }
+
+  public void setData(List<CostTagMetadataMonth> data) {
+    this.data = data;
+  }
+
+  /**
+   * 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 CostTagMetadataMonthsResponse
+   */
+  @JsonAnySetter
+  public CostTagMetadataMonthsResponse 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 CostTagMetadataMonthsResponse object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CostTagMetadataMonthsResponse costTagMetadataMonthsResponse = (CostTagMetadataMonthsResponse) o;
+    return Objects.equals(this.data, costTagMetadataMonthsResponse.data)
+        && Objects.equals(
+            this.additionalProperties, costTagMetadataMonthsResponse.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CostTagMetadataMonthsResponse {\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/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json b/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
index b676df880e6..42def371a51 100644
--- a/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
+++ b/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "af617072-2860-ba27-e045-b00c8baf0188"
+    "id": "af617072-2860-ba27-e045-b00c8baf0187"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json b/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
index e5b3fe6bcf6..5a17eb5f03a 100644
--- a/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
+++ b/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "af617072-2860-ba27-e045-b00c8baf0187"
+    "id": "af617072-2860-ba27-e045-b00c8baf0188"
   }
 ]
\ No newline at end of file
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 aa5b0a6e9b8..89c80bd879e 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-0daa19dc9eed"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
   },
   {
     "httpRequest": {
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 f02f71207af..f2248371931 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-0daa19dc9eeb"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
index 7e5c7b1234d..55368f4ae1c 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d3"
+    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d4"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
index e1e0b004585..cb1a6e0b10f 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d10"
+    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d11"
   }
 ]
\ 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 7711ea26b7b..994e56ed9eb 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-4a5c3a301d0e"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
index 266b281e690..f469a5cda1f 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7a"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d79"
   }
 ]
\ No newline at end of file
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 f2b714e3f34..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-0daa19dc9eee"
+    "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 a8c4aa7a929..e271cf945b0 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-73b0e7014600"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
   },
   {
     "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 b65d84821ea..3c9bf8d6267 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-73b0e70145ff"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
   },
   {
     "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 8e9d7338d0d..2831c66a09c 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-73b0e70145ec"
+    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
   },
   {
     "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 633105f0f85..25ab575ed0d 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-b92f9fa74d30"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
   },
   {
     "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 c794e78463c..d39fee8a337 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-b92f9fa74d2f"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
   },
   {
     "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 eb6915eead6..b22410fa4ef 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-b92f9fa74d32"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d30"
   },
   {
     "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 b7e39e620cf..21ee8cc402d 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-b92f9fa74d2e"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d32"
   },
   {
     "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 2dd306813ac..9645e2b41cc 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-e1e3f1d80ffe"
+    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80fff"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json
index cfae7af1511..0b99dd1bd72 100644
--- a/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32f"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32e"
   },
   {
     "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 8c97b2392b3..415e80ea1fb 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-73b0e70145f6"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
   },
   {
     "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 7c726903cc8..5ba8e36023e 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_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json
index ea94cd9866e..91451dfea49 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2e"
+    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
index 149f4ec2ee3..12d11a05f48 100644
--- a/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
   },
   {
     "httpRequest": {
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 848565e096f..25b85370788 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
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "95d55fc8-65c9-599d-fc62-5922c3357590"
+    "id": "95d55fc8-65c9-599d-fc62-5922c335758f"
   },
   {
     "httpRequest": {
@@ -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_GCP_scan_options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Bad_Request_response.json
index f2582dd2e15..1b79699f31c 100644
--- a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "88bc6eec-07d7-cb8c-599b-ab5a96b05cc7"
+    "id": "88bc6eec-07d7-cb8c-599b-ab5a96b05cc6"
   }
 ]
\ 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_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
index c7581f314f6..c4618fa2695 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
   },
   {
     "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 27a0366d605..7cd225c46c7 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-f707c3b51e7d"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e83"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa6"
   },
   {
     "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 724c6d79189..1fec75541c7 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-f707c3b51e7a"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
   },
   {
     "httpRequest": {
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 0f7572f4ef5..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-2d093bd78b3e"
+    "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..28abb6f8e76 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-4499a9e71c74"
   },
   {
     "httpRequest": {
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3e"
   }
 ]
\ 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 df7ec302f17..98400c9266c 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-ab94000addca"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addce"
   },
   {
     "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 fba8b2ccd41..e735e8a6ac5 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-ab94000addcd"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
   },
   {
     "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 fef955ebbee..2cb19c254b0 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-dd7718f5185e"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
index d5488cdba66..19dc53b7c6a 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce4"
   },
   {
     "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 4e0d708d5b5..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-e4d7e0833bd6"
+    "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 c312b3face8..127207e03a2 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-eaf799af6466"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
   },
   {
     "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 1a120b75ae8..9fe6ad431e0 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-eaf799af6463"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
   },
   {
     "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 4032fbdc8fc..b794f34e580 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-e4d7e0833bdc"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
   },
   {
     "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 6b69cce1630..91af4088c4a 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-e4d7e0833bdb"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
   },
   {
     "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 226202c4126..036e7ac60ea 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-d650bb892173"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
index 8155c3aeded..c12abc0c362 100644
--- a/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32e"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b330"
   },
   {
     "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 a03b13eebf8..813ef8386df 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-12e51226c510"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
   },
   {
     "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 7ed67796512..a3cb24b8701 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-12e51226c50d"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
   },
   {
     "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 f6f0ad2102c..1077273c329 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-f707c3b51e7f"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
   },
   {
     "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 703a137e1f9..b25f9a30e79 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
@@ -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/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 e17e659929e..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-1be9e301b3e9"
+    "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..d49ca03fd7c 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-eaf799af6466"
   },
   {
     "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..7a28290d6ae 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-eaf799af6467"
   },
   {
     "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 ab18e4a92c4..ebf1f92f4a9 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-4499a9e71c73"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
   },
   {
     "httpRequest": {
@@ -79,6 +79,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3d"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
   }
 ]
\ 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 21f390e6ce1..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-ab94000addce"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
   },
   {
     "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 85885d0581b..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-dd7718f51861"
+    "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..48b483cd7a4 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-03a7fdff069b"
   },
   {
     "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 10fbac85dbb..0847900878e 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-4a71849b3ce5"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
   },
   {
     "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..797500d67cb 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
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce6"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
   },
   {
     "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 a86b5756b5e..0d2738de1a3 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-0d8c01ffa21c"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
   },
   {
     "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 8b898cb6a9d..74fcc0a0c5e 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-e4d7e0833bda"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd8"
   },
   {
     "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 18d5998a22a..355262a1b02 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-73b0e70145ea"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
   },
   {
     "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 021bac611d3..3c7a22d087a 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-73b0e70145f2"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ea"
   },
   {
     "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 f1c8d39365e..f352512410e 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-73b0e70145f4"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
   },
   {
     "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 7747f8db345..d85b4091fcb 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-73b0e70145f7"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
   },
   {
     "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 2dc635d3a78..32e889b68d6 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-eaf799af6467"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
   },
   {
     "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 14ecd66b8a4..02c557b492b 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-b92f9fa74d2c"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
   },
   {
     "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 89a12a585b3..0f4bd1ebaf2 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-b92f9fa74d31"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
index 6e8b7d7b0b1..edd6a6da9bf 100644
--- a/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_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/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 3770b9b0a09..53b4917f2bb 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-e4d7e0833bd5"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
   },
   {
     "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 75a40d06c1c..f868434d6ac 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-ab94000addc9"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
index 6ef442b0c31..c2491988476 100644
--- a/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2ce"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
   }
 ]
\ No newline at end of file
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 dbcf089d3c7..1e23eb77688 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-ff3630e3a2cc"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2ce"
   }
 ]
\ 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_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 e633be95098..bd34150cae6 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-12e51226c511"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c515"
   },
   {
     "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 0baec6032c5..eccc4031f16 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-e0464f43c9e5"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
   },
   {
     "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 009fff14323..5661edabb7b 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-4499a9e71c72"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
   },
   {
     "httpRequest": {
@@ -79,6 +79,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/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 1519dba55ca..108cf352bd9 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-03a7fdff069c"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
   },
   {
     "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 59a863c261f..4d88f30cac5 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-ab94000addcf"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
   },
   {
     "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 3286dbce5dc..07da3e25a95 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-eaf799af6464"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
   },
   {
     "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 bd35bd59ea6..7b4fa0f864b 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-ab94000addcc"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
   },
   {
     "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 88ec4190fd7..9933d6258ad 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-4a71849b3ce3"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json
index 55368f4ae1c..7e5c7b1234d 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d4"
+    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d3"
   }
 ]
\ 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 c859297de35..0ad821e051f 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-0d8c01ffa21d"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21c"
   },
   {
     "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 b79df729351..4aba2dd2af0 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-b92f9fa74d34"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
   },
   {
     "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 7b054104c3f..00f0e4bc8fd 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-e4d7e0833bd7"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdc"
   },
   {
     "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..8af5e0e1230 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-e4d7e0833bdb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
index f469a5cda1f..e05cab1201f 100644
--- a/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d79"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7b"
   }
 ]
\ No newline at end of file
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 832db589a6a..aa8f9bb249e 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-73b0e70145fa"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
index 6ab71e5cb0b..1eccad92176 100644
--- a/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b330"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32f"
   },
   {
     "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 c185341f0ba..7c863a23483 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-d650bb892175"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
   },
   {
     "httpRequest": {
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 47c8d6237a9..45cfbd41d64 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-12e51226c50e"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c518"
   },
   {
     "httpRequest": {
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 601160992e8..debb94ef652 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-f707c3b51e84"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json
index 3ea25dce874..0a42d776a20 100644
--- a/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069b"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json b/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json
index bd48720dd5f..4ddbbbf6380 100644
--- a/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d11"
+    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d10"
   }
 ]
\ No newline at end of file
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 4e2a1b8a39b..b4ab43f6993 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-4a5c3a301d11"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
index 3ec5cb41a21..1796631327a 100644
--- a/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2c"
   },
   {
     "httpRequest": {
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 658cc27abad..3b4c609f8c5 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-e4d7e0833bd1"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
index e05cab1201f..266b281e690 100644
--- a/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7b"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7a"
   }
 ]
\ 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..068dfdc41d2 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-d650bb892170"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
index 15f40344bd7..af216062061 100644
--- a/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
   }
 ]
\ No newline at end of file
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..d25ab6492a4 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-046e57b87c7c"
   },
   {
     "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 794b5deb5db..15fabc90492 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-12e51226c50f"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
   },
   {
     "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_OK_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
index 0a176ee003e..974c53ce63d 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9457"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
   }
 ]
\ 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 3292c6ddbd0..9c853b6672d 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-482fba517ccd"
+    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517cce"
   }
 ]
\ 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 ead796b159c..858d36f9769 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-2dbceae02054"
+    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02055"
   }
 ]
\ 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 199c7919faf..08f556111f9 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-2dbceae02055"
+    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02054"
   }
 ]
\ 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..848565e096f 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
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "95d55fc8-65c9-599d-fc62-5922c335758f"
+    "id": "95d55fc8-65c9-599d-fc62-5922c3357590"
   },
   {
     "httpRequest": {
@@ -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/Post_GCP_Scan_Options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Bad_Request_response.json
index 15a68603f06..edd75392e93 100644
--- a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "88bc6eec-07d7-cb8c-599b-ab5a96b05cc6"
+    "id": "88bc6eec-07d7-cb8c-599b-ab5a96b05cc7"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json
index 91451dfea49..ea94cd9866e 100644
--- a/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2f"
+    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2e"
   }
 ]
\ 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 99b5cd75580..007a5928092 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-12e51226c519"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50e"
   },
   {
     "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 db4e9405d0d..e6fd8ed3e42 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-f707c3b51e79"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
   },
   {
     "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 f301ca6f3ce..a825db5ee55 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-f707c3b51e80"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e84"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
index 3ad8271712a..a6d6057cc63 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
   },
   {
     "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 29de68e4b42..524aba86421 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-d650bb892174"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892171"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Run_a_historical_job_returns_Status_created_response.json b/src/test/resources/cassettes/features/v2/Run_a_historical_job_returns_Status_created_response.json
index e5433d704cc..916bccfa080 100644
--- a/src/test/resources/cassettes/features/v2/Run_a_historical_job_returns_Status_created_response.json
+++ b/src/test/resources/cassettes/features/v2/Run_a_historical_job_returns_Status_created_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80fff"
+    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffe"
   }
 ]
\ No newline at end of file
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 b0100b1774b..332b85099dd 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-73b0e70145ee"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
   },
   {
     "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 60a873eea23..e2e2a133bc8 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-73b0e70145e9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
   },
   {
     "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 9696ac40e32..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-73b0e70145ef"
+    "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..88b95ace082 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-73b0e70145f1"
   },
   {
     "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 f9fb078423e..3af8cd28dc9 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-482fba517cce"
+    "id": "e9b5da5a-ee96-27b2-f8a0-482fba517ccd"
   }
 ]
\ 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 cf3de41da76..785bd78f8b8 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-12e51226c518"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
   },
   {
     "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 974c53ce63d..0a176ee003e 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-545f90bc9456"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9457"
   }
 ]
\ 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 fb2106e33db..31b69ffd5db 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-12e51226c512"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c516"
   },
   {
     "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 b097c819bce..2e968ee5068 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-12e51226c516"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
   },
   {
     "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 65d3667dc0a..e34cd831da4 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-12e51226c515"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c51a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_Tags_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_App_Tags_returns_No_Content_response.json
index 5f6656d94c1..0d48cfd6420 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_Tags_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_Tags_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c51a"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c519"
   },
   {
     "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 5e1d57e1aff..557872184a5 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-12e51226c50c"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
   },
   {
     "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 561057ced5c..8754c8dd9f3 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-12e51226c513"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
   },
   {
     "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..30f5bc71d9c 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-bd11c0a4ae43"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
index 441a98208d4..1c923bb6635 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae48"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json
index 085c2a10ee9..bc6d33ad1cb 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae43"
+    "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 4fc4e2937a7..b67f3a1d41c 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-f707c3b51e83"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa6"
+    "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 71ae1c8ab0f..7929a88b4e0 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-f707c3b51e82"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
   },
   {
     "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 19819989192..c3bd407a946 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-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-f5528b238aa0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json
index 2d88a0bc75b..fdf05e33c3a 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_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_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
index 3f634cdfdc4..6b10b1f99cb 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_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-e0464f43c9e5"
   },
   {
     "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 c6d6252edc4..4144e776050 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-4499a9e71c76"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
   }
 ]
\ No newline at end of file
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 5486c5522b1..9a05ea21a67 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-046e57b87c7c"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
   },
   {
     "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 c669844b54b..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-03a7fdff0697"
+    "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 170166752c7..f8e2615c3f8 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-1fa5bbd62feb"
+    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62fea"
   }
 ]
\ 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..83f232b7769 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-03a7fdff0698"
   },
   {
     "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 a39d900e784..6b4562c95f9 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-03a7fdff069d"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
   },
   {
     "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 f7ba5a0c135..a8ee0769782 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-03a7fdff069e"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
   },
   {
     "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 f8e2615c3f8..170166752c7 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-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_filters_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json
index 4f3f459c693..4f6a89b85f3 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0698"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
   },
   {
     "httpRequest": {
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 73305cd59ef..2733aa2afce 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-d650bb892171"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
   },
   {
     "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 3523eabfb46..f994b57c57d 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-d650bb892170"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
   },
   {
     "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 ada6cbf8cd4..19ad9312674 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-d650bb892172"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
   },
   {
     "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 2efa53de1ac..e47e6cdfe12 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-4a71849b3ce4"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce3"
   },
   {
     "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 5e43645a6a4..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-4a71849b3ce1"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
   },
   {
     "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 be6cf1cbadf..ab514e51ba2 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-0d8c01ffa21d"
   },
   {
     "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 6309739cc9f..7bd770826d4 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-e4d7e0833bd2"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd6"
   },
   {
     "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 88be588dd3c..44f28b45360 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-73b0e70145f5"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
   },
   {
     "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 876ad2e41fe..c69aaf87654 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-eaf799af6469"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
index edb0c4fa3c7..fe19098a6f3 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ff"
   },
   {
     "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 3e0850132da..c2b2cab762b 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-eaf799af646a"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
index b4cf2323a2d..fef8d736355 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
   },
   {
     "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 266a2b33b31..fc0f56bc1de 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-73b0e70145fe"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
   },
   {
     "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 f462fd4c8dd..2231d87f113 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-73b0e70145f0"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
   },
   {
     "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 6a5f8600d39..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-73b0e70145f3"
+    "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 4d0529dbc46..e39974723b5 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-73b0e70145f8"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
   },
   {
     "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 40f7af7c478..b7f4230cf66 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-73b0e70145f9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
   },
   {
     "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 1463cb0e2aa..6c834d6b77d 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-73b0e70145fc"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
   },
   {
     "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..7e38c35c46e 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-b92f9fa74d2f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
index a5223c853a8..2163486ba0e 100644
--- a/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
   },
   {
     "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 92e2e3d0445..32bf36c65c1 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-e4d7e0833bd8"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json
index e642f719a20..4a27cd1e9d6 100644
--- a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35e"
+    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json
index 0c4d5613d6a..6078cbf29e3 100644
--- a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35f"
+    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/com/datadog/api/client/v2/api/cloud_cost_management.feature b/src/test/resources/com/datadog/api/client/v2/api/cloud_cost_management.feature
index 17779e4599e..b41928f4cb9 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/cloud_cost_management.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/cloud_cost_management.feature
@@ -606,6 +606,22 @@ Feature: Cloud Cost Management
     When the request is sent
     Then the response status is 200 OK
 
+  @generated @skip @team:DataDog/cloud-cost-management
+  Scenario: List Cloud Cost Management tag metadata months returns "Bad Request" response
+    Given operation "ListCostTagMetadataMonths" enabled
+    And new "ListCostTagMetadataMonths" request
+    And request contains "filter[provider]" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/cloud-cost-management
+  Scenario: List Cloud Cost Management tag metadata months returns "OK" response
+    Given operation "ListCostTagMetadataMonths" enabled
+    And new "ListCostTagMetadataMonths" request
+    And request contains "filter[provider]" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 200 OK
+
   @generated @skip @team:DataDog/cloud-cost-management
   Scenario: List Cloud Cost Management tag sources returns "Bad Request" response
     Given operation "ListCostTagKeySources" 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 d86d61c2288..09d6acff288 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
@@ -1898,6 +1898,12 @@
       "type": "safe"
     }
   },
+  "ListCostTagMetadataMonths": {
+    "tag": "Cloud Cost Management",
+    "undo": {
+      "type": "safe"
+    }
+  },
   "ListCostTagMetadataOrchestrators": {
     "tag": "Cloud Cost Management",
     "undo": {