diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index e2256f32bd5..fc959af5aae 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -2726,6 +2726,11 @@ components:
         xray_services:
           $ref: '#/components/schemas/XRayServicesList'
       type: object
+    AcceptRecommendedEntitiesRequest:
+      description: Request to accept recommended entities.
+      items:
+        $ref: '#/components/schemas/RecommendedEntityWithSchema'
+      type: array
     AccountFilteringConfig:
       description: The account filtering configuration.
       properties:
@@ -14048,6 +14053,10 @@ components:
       - IDENTITY
       - GZIP
       - DEFLATE
+    ConvertCatalogEntityResponse:
+      description: Response containing converted entities.
+      example: "apiVersion: v3\nkind: service\nmetadata:\n  name: myservice"
+      type: string
     ConvertJobResultsToSignalsAttributes:
       description: Attributes for converting threat hunting job results to signals.
       properties:
@@ -19981,6 +19990,11 @@ components:
       example: 1722439510282
       format: int64
       type: integer
+    DeclineRecommendedEntitiesRequest:
+      description: Request to decline recommended entities.
+      items:
+        $ref: '#/components/schemas/RecommendedEntityID'
+      type: array
     Degradation:
       properties:
         data:
@@ -22234,6 +22248,20 @@ components:
           format: int64
           type: integer
       type: object
+    EntitySchemaVersion:
+      description: Entity schema version for conversion.
+      enum:
+      - v2
+      - v2.1
+      - v2.2
+      - v3
+      example: v3
+      type: string
+      x-enum-varnames:
+      - V2
+      - V2_1
+      - V2_2
+      - V3
     EntityToIncidents:
       description: Entity to incidents relationship.
       properties:
@@ -29517,6 +29545,89 @@ components:
       description: The ID of a notification rule.
       example: aaa-bbb-ccc
       type: string
+    IDPConfigAttributes:
+      description: IDP configuration attributes.
+      properties:
+        value:
+          description: Configuration value (can be object, array, or primitive).
+          example:
+          - displayName: My Dashboard
+            id: dashboard-1
+          items:
+            $ref: '#/components/schemas/IDPConfigValueItem'
+          type: array
+      required:
+      - value
+      type: object
+    IDPConfigData:
+      description: IDP configuration data.
+      properties:
+        attributes:
+          $ref: '#/components/schemas/IDPConfigAttributes'
+        id:
+          description: Configuration identifier.
+          example: idp_pinned_dashboards
+          type: string
+        type:
+          $ref: '#/components/schemas/IDPConfigType'
+      required:
+      - id
+      - type
+      - attributes
+      type: object
+    IDPConfigRequest:
+      description: Request to set IDP configuration value.
+      properties:
+        data:
+          $ref: '#/components/schemas/IDPConfigRequestData'
+      required:
+      - data
+      type: object
+    IDPConfigRequestAttributes:
+      description: IDP configuration request attributes.
+      properties:
+        value:
+          description: Configuration value to set (can be object, array, or primitive).
+          example:
+          - displayName: My Dashboard
+            id: dashboard-1
+          items:
+            $ref: '#/components/schemas/IDPConfigValueItem'
+          type: array
+      required:
+      - value
+      type: object
+    IDPConfigRequestData:
+      description: IDP configuration request data.
+      properties:
+        attributes:
+          $ref: '#/components/schemas/IDPConfigRequestAttributes'
+        type:
+          $ref: '#/components/schemas/IDPConfigType'
+      required:
+      - type
+      - attributes
+      type: object
+    IDPConfigResponse:
+      description: Response containing IDP configuration value.
+      properties:
+        data:
+          $ref: '#/components/schemas/IDPConfigData'
+      required:
+      - data
+      type: object
+    IDPConfigType:
+      description: Resource type.
+      enum:
+      - idp_config
+      example: idp_config
+      type: string
+      x-enum-varnames:
+      - IDP_CONFIG
+    IDPConfigValueItem:
+      additionalProperties: {}
+      description: An item in the IDP configuration value array.
+      type: object
     IPAllowlistAttributes:
       description: Attributes of the IP allowlist.
       properties:
@@ -50336,6 +50447,29 @@ components:
       type: string
       x-enum-varnames:
       - RECOMMENDATION
+    RecommendedEntityID:
+      description: A recommended entity identifier.
+      properties:
+        id:
+          description: Unique identifier for the recommended entity.
+          example: 123abcdef
+          type: string
+      required:
+      - id
+      type: object
+    RecommendedEntityWithSchema:
+      description: A recommended entity with its schema definition.
+      properties:
+        id:
+          description: Unique identifier for the recommended entity.
+          example: 123abc456def
+          type: string
+        schema:
+          $ref: '#/components/schemas/EntityV3'
+      required:
+      - id
+      - schema
+      type: object
     ReferenceTableCreateSourceType:
       description: The source type for creating reference table data. Only these source
         types can be created through this API.
@@ -76722,6 +76856,53 @@ paths:
       tags:
       - Software Catalog
       x-codegen-request-body-name: body
+  /api/v2/catalog/entity/convert:
+    post:
+      description: Convert entities from one schema version to another in Software
+        Catalog.
+      operationId: ConvertCatalogEntities
+      parameters:
+      - description: The target schema version to convert entities to.
+        in: query
+        name: target_version
+        required: true
+        schema:
+          $ref: '#/components/schemas/EntitySchemaVersion'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/UpsertCatalogEntityRequest'
+        description: Entity YAML or JSON to convert.
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ConvertCatalogEntityResponse'
+          description: OK
+        '400':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Bad Request
+        '403':
+          $ref: '#/components/responses/ForbiddenResponse'
+        '429':
+          $ref: '#/components/responses/TooManyRequestsResponse'
+      security:
+      - apiKeyAuth: []
+        appKeyAuth: []
+      - AuthZ:
+        - apm_service_catalog_read
+      summary: Convert entities between schema versions
+      tags:
+      - Software Catalog
+      x-unstable: '**Note**: This endpoint is in public beta and is subject to change.
+
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
   /api/v2/catalog/entity/preview:
     post:
       operationId: PreviewCatalogEntities
@@ -76866,6 +77047,117 @@ paths:
       summary: Delete a single kind
       tags:
       - Software Catalog
+  /api/v2/catalog/recommended_entity/bulk_accept:
+    post:
+      description: Accept multiple recommended entities in Software Catalog in a single
+        request.
+      operationId: AcceptRecommendedEntities
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/AcceptRecommendedEntitiesRequest'
+        description: List of recommended entities to accept with their schemas.
+        required: true
+      responses:
+        '202':
+          description: Accepted
+        '400':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Bad Request
+        '403':
+          $ref: '#/components/responses/ForbiddenResponse'
+        '429':
+          $ref: '#/components/responses/TooManyRequestsResponse'
+      security:
+      - apiKeyAuth: []
+        appKeyAuth: []
+      - AuthZ:
+        - apm_service_catalog_write
+      summary: Accept recommended entities in bulk
+      tags:
+      - Software Catalog
+      x-unstable: '**Note**: This endpoint is in public beta and is subject to change.
+
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
+  /api/v2/catalog/recommended_entity/bulk_decline:
+    post:
+      description: Decline multiple recommended entities in Software Catalog in a
+        single request.
+      operationId: DeclineRecommendedEntities
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/DeclineRecommendedEntitiesRequest'
+        description: List of recommended entity IDs to decline.
+        required: true
+      responses:
+        '204':
+          description: No Content
+        '400':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Bad Request
+        '403':
+          $ref: '#/components/responses/ForbiddenResponse'
+        '429':
+          $ref: '#/components/responses/TooManyRequestsResponse'
+      security:
+      - apiKeyAuth: []
+        appKeyAuth: []
+      - AuthZ:
+        - apm_service_catalog_write
+      summary: Decline recommended entities in bulk
+      tags:
+      - Software Catalog
+      x-unstable: '**Note**: This endpoint is in public beta and is subject to change.
+
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
+  /api/v2/catalog/recommended_entity/trigger:
+    post:
+      description: Trigger the discovery of recommended entities in Software Catalog.
+      operationId: TriggerRecommendedEntities
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+        description: Optional request body for triggering recommended entity discovery.
+        required: false
+      responses:
+        '202':
+          content:
+            application/json:
+              schema:
+                type: object
+          description: Accepted
+        '400':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Bad Request
+        '403':
+          $ref: '#/components/responses/ForbiddenResponse'
+        '429':
+          $ref: '#/components/responses/TooManyRequestsResponse'
+      security:
+      - apiKeyAuth: []
+        appKeyAuth: []
+      - AuthZ:
+        - apm_service_catalog_write
+      summary: Trigger recommended entity discovery
+      tags:
+      - Software Catalog
+      x-unstable: '**Note**: This endpoint is in public beta and is subject to change.
+
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
   /api/v2/catalog/relation:
     get:
       description: Get a list of entity relations from Software Catalog.
@@ -82197,6 +82489,103 @@ paths:
       x-unstable: '**Note**: This endpoint is in public beta and is subject to change.
 
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
+  /api/v2/idp/config/{config_name}:
+    get:
+      description: Get a configuration value for the Internal Developer Portal (IDP).
+      operationId: GetIDPConfigValue
+      parameters:
+      - description: The configuration key to retrieve.
+        in: path
+        name: config_name
+        required: true
+        schema:
+          example: idp_pinned_dashboards
+          type: string
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/IDPConfigResponse'
+          description: OK
+        '400':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Bad Request
+        '403':
+          $ref: '#/components/responses/ForbiddenResponse'
+        '404':
+          $ref: '#/components/responses/NotFoundResponse'
+        '429':
+          $ref: '#/components/responses/TooManyRequestsResponse'
+        '500':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Internal Server Error
+      security:
+      - apiKeyAuth: []
+        appKeyAuth: []
+      - AuthZ:
+        - apm_service_catalog_read
+      summary: Get Internal Developer Portal configuration
+      tags:
+      - Software Catalog
+      x-unstable: '**Note**: This endpoint is in public beta and is subject to change.
+
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
+    post:
+      description: Create or update a configuration value for the Internal Developer
+        Portal (IDP).
+      operationId: UpsertIDPConfigValue
+      parameters:
+      - description: The configuration key to create or update.
+        in: path
+        name: config_name
+        required: true
+        schema:
+          example: idp_pinned_dashboards
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/IDPConfigRequest'
+        description: Configuration value to set.
+        required: true
+      responses:
+        '204':
+          description: No Content
+        '400':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Bad Request
+        '403':
+          $ref: '#/components/responses/ForbiddenResponse'
+        '429':
+          $ref: '#/components/responses/TooManyRequestsResponse'
+        '500':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/JSONAPIErrorResponse'
+          description: Internal Server Error
+      security:
+      - apiKeyAuth: []
+        appKeyAuth: []
+      - AuthZ:
+        - apm_service_catalog_write
+      summary: Create or update IDP configuration
+      tags:
+      - Software Catalog
+      x-unstable: '**Note**: This endpoint is in public beta and is subject to change.
+
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).'
   /api/v2/incidents:
     get:
       description: Get all incidents for the user's organization.
diff --git a/examples/v2/software-catalog/AcceptRecommendedEntities.java b/examples/v2/software-catalog/AcceptRecommendedEntities.java
new file mode 100644
index 00000000000..7ac42ebc76f
--- /dev/null
+++ b/examples/v2/software-catalog/AcceptRecommendedEntities.java
@@ -0,0 +1,97 @@
+// Accept recommended entities in bulk returns "Accepted" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.SoftwareCatalogApi;
+import com.datadog.api.client.v2.model.EntityV3;
+import com.datadog.api.client.v2.model.EntityV3APIVersion;
+import com.datadog.api.client.v2.model.EntityV3DatadogCodeLocationItem;
+import com.datadog.api.client.v2.model.EntityV3DatadogEventItem;
+import com.datadog.api.client.v2.model.EntityV3DatadogIntegrationOpsgenie;
+import com.datadog.api.client.v2.model.EntityV3DatadogIntegrationPagerduty;
+import com.datadog.api.client.v2.model.EntityV3DatadogLogItem;
+import com.datadog.api.client.v2.model.EntityV3DatadogPerformance;
+import com.datadog.api.client.v2.model.EntityV3DatadogPipelines;
+import com.datadog.api.client.v2.model.EntityV3Integrations;
+import com.datadog.api.client.v2.model.EntityV3Metadata;
+import com.datadog.api.client.v2.model.EntityV3MetadataAdditionalOwnersItems;
+import com.datadog.api.client.v2.model.EntityV3MetadataContactsItems;
+import com.datadog.api.client.v2.model.EntityV3MetadataLinksItems;
+import com.datadog.api.client.v2.model.EntityV3Service;
+import com.datadog.api.client.v2.model.EntityV3ServiceDatadog;
+import com.datadog.api.client.v2.model.EntityV3ServiceKind;
+import com.datadog.api.client.v2.model.EntityV3ServiceSpec;
+import com.datadog.api.client.v2.model.RecommendedEntityWithSchema;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.acceptRecommendedEntities", true);
+    SoftwareCatalogApi apiInstance = new SoftwareCatalogApi(defaultClient);
+
+    List<RecommendedEntityWithSchema> body =
+        Collections.singletonList(
+            new RecommendedEntityWithSchema()
+                .id("123abc456def")
+                .schema(
+                    new EntityV3(
+                        new EntityV3Service()
+                            .apiVersion(EntityV3APIVersion.V3)
+                            .datadog(
+                                new EntityV3ServiceDatadog()
+                                    .codeLocations(
+                                        Collections.singletonList(
+                                            new EntityV3DatadogCodeLocationItem()))
+                                    .events(
+                                        Collections.singletonList(new EntityV3DatadogEventItem()))
+                                    .logs(Collections.singletonList(new EntityV3DatadogLogItem()))
+                                    .performanceData(new EntityV3DatadogPerformance())
+                                    .pipelines(new EntityV3DatadogPipelines()))
+                            .integrations(
+                                new EntityV3Integrations()
+                                    .opsgenie(
+                                        new EntityV3DatadogIntegrationOpsgenie()
+                                            .serviceUrl(
+                                                "https://www.opsgenie.com/service/shopping-cart"))
+                                    .pagerduty(
+                                        new EntityV3DatadogIntegrationPagerduty()
+                                            .serviceUrl(
+                                                "https://www.pagerduty.com/service-directory/Pshopping-cart")))
+                            .kind(EntityV3ServiceKind.SERVICE)
+                            .metadata(
+                                new EntityV3Metadata()
+                                    .additionalOwners(
+                                        Collections.singletonList(
+                                            new EntityV3MetadataAdditionalOwnersItems().name("")))
+                                    .contacts(
+                                        Collections.singletonList(
+                                            new EntityV3MetadataContactsItems()
+                                                .contact("https://slack/")
+                                                .type("slack")))
+                                    .id("4b163705-23c0-4573-b2fb-f6cea2163fcb")
+                                    .inheritFrom("application:default/myapp")
+                                    .links(
+                                        Collections.singletonList(
+                                            new EntityV3MetadataLinksItems()
+                                                .name("mylink")
+                                                .type("link")
+                                                .url("https://mylink")))
+                                    .name("myService")
+                                    .namespace("default")
+                                    .tags(Arrays.asList("this:tag", "that:tag")))
+                            .spec(new EntityV3ServiceSpec()))));
+
+    try {
+      apiInstance.acceptRecommendedEntities(body);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling SoftwareCatalogApi#acceptRecommendedEntities");
+      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/examples/v2/software-catalog/ConvertCatalogEntities.java b/examples/v2/software-catalog/ConvertCatalogEntities.java
new file mode 100644
index 00000000000..8f7e6a9840c
--- /dev/null
+++ b/examples/v2/software-catalog/ConvertCatalogEntities.java
@@ -0,0 +1,94 @@
+// Convert entities between schema versions returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.SoftwareCatalogApi;
+import com.datadog.api.client.v2.model.ConvertCatalogEntityResponse;
+import com.datadog.api.client.v2.model.EntitySchemaVersion;
+import com.datadog.api.client.v2.model.EntityV3;
+import com.datadog.api.client.v2.model.EntityV3APIVersion;
+import com.datadog.api.client.v2.model.EntityV3DatadogCodeLocationItem;
+import com.datadog.api.client.v2.model.EntityV3DatadogEventItem;
+import com.datadog.api.client.v2.model.EntityV3DatadogIntegrationOpsgenie;
+import com.datadog.api.client.v2.model.EntityV3DatadogIntegrationPagerduty;
+import com.datadog.api.client.v2.model.EntityV3DatadogLogItem;
+import com.datadog.api.client.v2.model.EntityV3DatadogPerformance;
+import com.datadog.api.client.v2.model.EntityV3DatadogPipelines;
+import com.datadog.api.client.v2.model.EntityV3Integrations;
+import com.datadog.api.client.v2.model.EntityV3Metadata;
+import com.datadog.api.client.v2.model.EntityV3MetadataAdditionalOwnersItems;
+import com.datadog.api.client.v2.model.EntityV3MetadataContactsItems;
+import com.datadog.api.client.v2.model.EntityV3MetadataLinksItems;
+import com.datadog.api.client.v2.model.EntityV3Service;
+import com.datadog.api.client.v2.model.EntityV3ServiceDatadog;
+import com.datadog.api.client.v2.model.EntityV3ServiceKind;
+import com.datadog.api.client.v2.model.EntityV3ServiceSpec;
+import com.datadog.api.client.v2.model.UpsertCatalogEntityRequest;
+import java.util.Arrays;
+import java.util.Collections;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.convertCatalogEntities", true);
+    SoftwareCatalogApi apiInstance = new SoftwareCatalogApi(defaultClient);
+
+    UpsertCatalogEntityRequest body =
+        new UpsertCatalogEntityRequest(
+            new EntityV3(
+                new EntityV3Service()
+                    .apiVersion(EntityV3APIVersion.V3)
+                    .datadog(
+                        new EntityV3ServiceDatadog()
+                            .codeLocations(
+                                Collections.singletonList(new EntityV3DatadogCodeLocationItem()))
+                            .events(Collections.singletonList(new EntityV3DatadogEventItem()))
+                            .logs(Collections.singletonList(new EntityV3DatadogLogItem()))
+                            .performanceData(new EntityV3DatadogPerformance())
+                            .pipelines(new EntityV3DatadogPipelines()))
+                    .integrations(
+                        new EntityV3Integrations()
+                            .opsgenie(
+                                new EntityV3DatadogIntegrationOpsgenie()
+                                    .serviceUrl("https://www.opsgenie.com/service/shopping-cart"))
+                            .pagerduty(
+                                new EntityV3DatadogIntegrationPagerduty()
+                                    .serviceUrl(
+                                        "https://www.pagerduty.com/service-directory/Pshopping-cart")))
+                    .kind(EntityV3ServiceKind.SERVICE)
+                    .metadata(
+                        new EntityV3Metadata()
+                            .additionalOwners(
+                                Collections.singletonList(
+                                    new EntityV3MetadataAdditionalOwnersItems().name("")))
+                            .contacts(
+                                Collections.singletonList(
+                                    new EntityV3MetadataContactsItems()
+                                        .contact("https://slack/")
+                                        .type("slack")))
+                            .id("4b163705-23c0-4573-b2fb-f6cea2163fcb")
+                            .inheritFrom("application:default/myapp")
+                            .links(
+                                Collections.singletonList(
+                                    new EntityV3MetadataLinksItems()
+                                        .name("mylink")
+                                        .type("link")
+                                        .url("https://mylink")))
+                            .name("myService")
+                            .namespace("default")
+                            .tags(Arrays.asList("this:tag", "that:tag")))
+                    .spec(new EntityV3ServiceSpec())));
+
+    try {
+      ConvertCatalogEntityResponse result =
+          apiInstance.convertCatalogEntities(EntitySchemaVersion.V3, body);
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling SoftwareCatalogApi#convertCatalogEntities");
+      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/examples/v2/software-catalog/DeclineRecommendedEntities.java b/examples/v2/software-catalog/DeclineRecommendedEntities.java
new file mode 100644
index 00000000000..9c3eba1757b
--- /dev/null
+++ b/examples/v2/software-catalog/DeclineRecommendedEntities.java
@@ -0,0 +1,29 @@
+// Decline recommended entities in bulk returns "No Content" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.SoftwareCatalogApi;
+import com.datadog.api.client.v2.model.RecommendedEntityID;
+import java.util.Collections;
+import java.util.List;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.declineRecommendedEntities", true);
+    SoftwareCatalogApi apiInstance = new SoftwareCatalogApi(defaultClient);
+
+    List<RecommendedEntityID> body =
+        Collections.singletonList(new RecommendedEntityID().id("123abcdef"));
+
+    try {
+      apiInstance.declineRecommendedEntities(body);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling SoftwareCatalogApi#declineRecommendedEntities");
+      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/examples/v2/software-catalog/GetIDPConfigValue.java b/examples/v2/software-catalog/GetIDPConfigValue.java
new file mode 100644
index 00000000000..c1eb1adbb2c
--- /dev/null
+++ b/examples/v2/software-catalog/GetIDPConfigValue.java
@@ -0,0 +1,25 @@
+// Get Internal Developer Portal configuration returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.SoftwareCatalogApi;
+import com.datadog.api.client.v2.model.IDPConfigResponse;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.getIDPConfigValue", true);
+    SoftwareCatalogApi apiInstance = new SoftwareCatalogApi(defaultClient);
+
+    try {
+      IDPConfigResponse result = apiInstance.getIDPConfigValue("idp_pinned_dashboards");
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling SoftwareCatalogApi#getIDPConfigValue");
+      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/examples/v2/software-catalog/TriggerRecommendedEntities.java b/examples/v2/software-catalog/TriggerRecommendedEntities.java
new file mode 100644
index 00000000000..5446e5e8760
--- /dev/null
+++ b/examples/v2/software-catalog/TriggerRecommendedEntities.java
@@ -0,0 +1,23 @@
+// Trigger recommended entity discovery returns "Accepted" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.SoftwareCatalogApi;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.triggerRecommendedEntities", true);
+    SoftwareCatalogApi apiInstance = new SoftwareCatalogApi(defaultClient);
+
+    try {
+      apiInstance.triggerRecommendedEntities();
+    } catch (ApiException e) {
+      System.err.println("Exception when calling SoftwareCatalogApi#triggerRecommendedEntities");
+      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/examples/v2/software-catalog/UpsertIDPConfigValue.java b/examples/v2/software-catalog/UpsertIDPConfigValue.java
new file mode 100644
index 00000000000..f4e25208526
--- /dev/null
+++ b/examples/v2/software-catalog/UpsertIDPConfigValue.java
@@ -0,0 +1,42 @@
+// Create or update IDP configuration returns "No Content" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.SoftwareCatalogApi;
+import com.datadog.api.client.v2.model.IDPConfigRequest;
+import com.datadog.api.client.v2.model.IDPConfigRequestAttributes;
+import com.datadog.api.client.v2.model.IDPConfigRequestData;
+import com.datadog.api.client.v2.model.IDPConfigType;
+import java.util.Collections;
+import java.util.Map;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.upsertIDPConfigValue", true);
+    SoftwareCatalogApi apiInstance = new SoftwareCatalogApi(defaultClient);
+
+    IDPConfigRequest body =
+        new IDPConfigRequest()
+            .data(
+                new IDPConfigRequestData()
+                    .attributes(
+                        new IDPConfigRequestAttributes()
+                            .value(
+                                Collections.singletonList(
+                                    Map.ofEntries(
+                                        Map.entry("displayName", "My Dashboard"),
+                                        Map.entry("id", "dashboard-1")))))
+                    .type(IDPConfigType.IDP_CONFIG));
+
+    try {
+      apiInstance.upsertIDPConfigValue("idp_pinned_dashboards", body);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling SoftwareCatalogApi#upsertIDPConfigValue");
+      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 e5a488f9638..0a2e96d2faf 100644
--- a/src/main/java/com/datadog/api/client/ApiClient.java
+++ b/src/main/java/com/datadog/api/client/ApiClient.java
@@ -782,6 +782,12 @@ public class ApiClient {
           put("v2.linkJiraIssueToCase", false);
           put("v2.moveCaseToProject", false);
           put("v2.unlinkJiraIssue", false);
+          put("v2.acceptRecommendedEntities", false);
+          put("v2.convertCatalogEntities", false);
+          put("v2.declineRecommendedEntities", false);
+          put("v2.getIDPConfigValue", false);
+          put("v2.triggerRecommendedEntities", false);
+          put("v2.upsertIDPConfigValue", false);
           put("v2.createChangeRequest", false);
           put("v2.createChangeRequestBranch", false);
           put("v2.deleteChangeRequestDecision", false);
diff --git a/src/main/java/com/datadog/api/client/v2/api/SoftwareCatalogApi.java b/src/main/java/com/datadog/api/client/v2/api/SoftwareCatalogApi.java
index e8595724a63..a2753576680 100644
--- a/src/main/java/com/datadog/api/client/v2/api/SoftwareCatalogApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/SoftwareCatalogApi.java
@@ -7,11 +7,16 @@
 import com.datadog.api.client.Pair;
 import com.datadog.api.client.v2.model.EntityData;
 import com.datadog.api.client.v2.model.EntityResponseArray;
+import com.datadog.api.client.v2.model.EntitySchemaVersion;
+import com.datadog.api.client.v2.model.IDPConfigRequest;
+import com.datadog.api.client.v2.model.IDPConfigResponse;
 import com.datadog.api.client.v2.model.IncludeType;
 import com.datadog.api.client.v2.model.KindData;
 import com.datadog.api.client.v2.model.ListEntityCatalogResponse;
 import com.datadog.api.client.v2.model.ListKindCatalogResponse;
 import com.datadog.api.client.v2.model.ListRelationCatalogResponse;
+import com.datadog.api.client.v2.model.RecommendedEntityID;
+import com.datadog.api.client.v2.model.RecommendedEntityWithSchema;
 import com.datadog.api.client.v2.model.RelationIncludeType;
 import com.datadog.api.client.v2.model.RelationResponse;
 import com.datadog.api.client.v2.model.RelationType;
@@ -59,6 +64,481 @@ public void setApiClient(ApiClient apiClient) {
     this.apiClient = apiClient;
   }
 
+  /**
+   * Accept recommended entities in bulk.
+   *
+   * <p>See {@link #acceptRecommendedEntitiesWithHttpInfo}.
+   *
+   * @param body List of recommended entities to accept with their schemas. (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void acceptRecommendedEntities(List<RecommendedEntityWithSchema> body)
+      throws ApiException {
+    acceptRecommendedEntitiesWithHttpInfo(body);
+  }
+
+  /**
+   * Accept recommended entities in bulk.
+   *
+   * <p>See {@link #acceptRecommendedEntitiesWithHttpInfoAsync}.
+   *
+   * @param body List of recommended entities to accept with their schemas. (required)
+   * @return CompletableFuture
+   */
+  public CompletableFuture<Void> acceptRecommendedEntitiesAsync(
+      List<RecommendedEntityWithSchema> body) {
+    return acceptRecommendedEntitiesWithHttpInfoAsync(body)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Accept multiple recommended entities in Software Catalog in a single request.
+   *
+   * @param body List of recommended entities to accept with their schemas. (required)
+   * @return ApiResponse&lt;Void&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 202 </td><td> Accepted </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<Void> acceptRecommendedEntitiesWithHttpInfo(
+      List<RecommendedEntityWithSchema> body) throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "acceptRecommendedEntities";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'body' when calling acceptRecommendedEntities");
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/catalog/recommended_entity/bulk_accept";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.SoftwareCatalogApi.acceptRecommendedEntities",
+            localVarPath,
+            new ArrayList<Pair>(),
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"*/*"},
+            new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    return apiClient.invokeAPI(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        null);
+  }
+
+  /**
+   * Accept recommended entities in bulk.
+   *
+   * <p>See {@link #acceptRecommendedEntitiesWithHttpInfo}.
+   *
+   * @param body List of recommended entities to accept with their schemas. (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;Void&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<Void>> acceptRecommendedEntitiesWithHttpInfoAsync(
+      List<RecommendedEntityWithSchema> body) {
+    // Check if unstable operation is enabled
+    String operationId = "acceptRecommendedEntities";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400, "Missing the required parameter 'body' when calling acceptRecommendedEntities"));
+      return result;
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/catalog/recommended_entity/bulk_accept";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.SoftwareCatalogApi.acceptRecommendedEntities",
+              localVarPath,
+              new ArrayList<Pair>(),
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"*/*"},
+              new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        null);
+  }
+
+  /**
+   * Convert entities between schema versions.
+   *
+   * <p>See {@link #convertCatalogEntitiesWithHttpInfo}.
+   *
+   * @param targetVersion The target schema version to convert entities to. (required)
+   * @param body Entity YAML or JSON to convert. (required)
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public String convertCatalogEntities(
+      EntitySchemaVersion targetVersion, UpsertCatalogEntityRequest body) throws ApiException {
+    return convertCatalogEntitiesWithHttpInfo(targetVersion, body).getData();
+  }
+
+  /**
+   * Convert entities between schema versions.
+   *
+   * <p>See {@link #convertCatalogEntitiesWithHttpInfoAsync}.
+   *
+   * @param targetVersion The target schema version to convert entities to. (required)
+   * @param body Entity YAML or JSON to convert. (required)
+   * @return CompletableFuture&lt;String&gt;
+   */
+  public CompletableFuture<String> convertCatalogEntitiesAsync(
+      EntitySchemaVersion targetVersion, UpsertCatalogEntityRequest body) {
+    return convertCatalogEntitiesWithHttpInfoAsync(targetVersion, body)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Convert entities from one schema version to another in Software Catalog.
+   *
+   * @param targetVersion The target schema version to convert entities to. (required)
+   * @param body Entity YAML or JSON to convert. (required)
+   * @return ApiResponse&lt;String&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<String> convertCatalogEntitiesWithHttpInfo(
+      EntitySchemaVersion targetVersion, UpsertCatalogEntityRequest body) throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "convertCatalogEntities";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'targetVersion' is set
+    if (targetVersion == null) {
+      throw new ApiException(
+          400,
+          "Missing the required parameter 'targetVersion' when calling convertCatalogEntities");
+    }
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'body' when calling convertCatalogEntities");
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/catalog/entity/convert";
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "target_version", targetVersion));
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.SoftwareCatalogApi.convertCatalogEntities",
+            localVarPath,
+            localVarQueryParams,
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"application/json"},
+            new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    return apiClient.invokeAPI(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<String>() {});
+  }
+
+  /**
+   * Convert entities between schema versions.
+   *
+   * <p>See {@link #convertCatalogEntitiesWithHttpInfo}.
+   *
+   * @param targetVersion The target schema version to convert entities to. (required)
+   * @param body Entity YAML or JSON to convert. (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;String&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<String>> convertCatalogEntitiesWithHttpInfoAsync(
+      EntitySchemaVersion targetVersion, UpsertCatalogEntityRequest body) {
+    // Check if unstable operation is enabled
+    String operationId = "convertCatalogEntities";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<String>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'targetVersion' is set
+    if (targetVersion == null) {
+      CompletableFuture<ApiResponse<String>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'targetVersion' when calling"
+                  + " convertCatalogEntities"));
+      return result;
+    }
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      CompletableFuture<ApiResponse<String>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400, "Missing the required parameter 'body' when calling convertCatalogEntities"));
+      return result;
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/catalog/entity/convert";
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "target_version", targetVersion));
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.SoftwareCatalogApi.convertCatalogEntities",
+              localVarPath,
+              localVarQueryParams,
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"application/json"},
+              new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<String>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<String>() {});
+  }
+
+  /**
+   * Decline recommended entities in bulk.
+   *
+   * <p>See {@link #declineRecommendedEntitiesWithHttpInfo}.
+   *
+   * @param body List of recommended entity IDs to decline. (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void declineRecommendedEntities(List<RecommendedEntityID> body) throws ApiException {
+    declineRecommendedEntitiesWithHttpInfo(body);
+  }
+
+  /**
+   * Decline recommended entities in bulk.
+   *
+   * <p>See {@link #declineRecommendedEntitiesWithHttpInfoAsync}.
+   *
+   * @param body List of recommended entity IDs to decline. (required)
+   * @return CompletableFuture
+   */
+  public CompletableFuture<Void> declineRecommendedEntitiesAsync(List<RecommendedEntityID> body) {
+    return declineRecommendedEntitiesWithHttpInfoAsync(body)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Decline multiple recommended entities in Software Catalog in a single request.
+   *
+   * @param body List of recommended entity IDs to decline. (required)
+   * @return ApiResponse&lt;Void&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> 204 </td><td> No Content </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<Void> declineRecommendedEntitiesWithHttpInfo(List<RecommendedEntityID> body)
+      throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "declineRecommendedEntities";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'body' when calling declineRecommendedEntities");
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/catalog/recommended_entity/bulk_decline";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.SoftwareCatalogApi.declineRecommendedEntities",
+            localVarPath,
+            new ArrayList<Pair>(),
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"*/*"},
+            new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    return apiClient.invokeAPI(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        null);
+  }
+
+  /**
+   * Decline recommended entities in bulk.
+   *
+   * <p>See {@link #declineRecommendedEntitiesWithHttpInfo}.
+   *
+   * @param body List of recommended entity IDs to decline. (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;Void&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<Void>> declineRecommendedEntitiesWithHttpInfoAsync(
+      List<RecommendedEntityID> body) {
+    // Check if unstable operation is enabled
+    String operationId = "declineRecommendedEntities";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'body' when calling declineRecommendedEntities"));
+      return result;
+    }
+    // create path and map variables
+    String localVarPath = "/api/v2/catalog/recommended_entity/bulk_decline";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.SoftwareCatalogApi.declineRecommendedEntities",
+              localVarPath,
+              new ArrayList<Pair>(),
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"*/*"},
+              new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        null);
+  }
+
   /**
    * Delete a single entity.
    *
@@ -284,18 +764,174 @@ public ApiResponse<Void> deleteCatalogKindWithHttpInfo(String kindId) throws Api
   public CompletableFuture<ApiResponse<Void>> deleteCatalogKindWithHttpInfoAsync(String kindId) {
     Object localVarPostBody = null;
 
-    // verify the required parameter 'kindId' is set
-    if (kindId == null) {
-      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+    // verify the required parameter 'kindId' is set
+    if (kindId == null) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400, "Missing the required parameter 'kindId' when calling deleteCatalogKind"));
+      return result;
+    }
+    // create path and map variables
+    String localVarPath =
+        "/api/v2/catalog/kind/{kind_id}"
+            .replaceAll("\\{" + "kind_id" + "\\}", apiClient.escapeString(kindId.toString()));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.SoftwareCatalogApi.deleteCatalogKind",
+              localVarPath,
+              new ArrayList<Pair>(),
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"*/*"},
+              new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "DELETE",
+        builder,
+        localVarHeaderParams,
+        new String[] {},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        null);
+  }
+
+  /**
+   * Get Internal Developer Portal configuration.
+   *
+   * <p>See {@link #getIDPConfigValueWithHttpInfo}.
+   *
+   * @param configName The configuration key to retrieve. (required)
+   * @return IDPConfigResponse
+   * @throws ApiException if fails to make API call
+   */
+  public IDPConfigResponse getIDPConfigValue(String configName) throws ApiException {
+    return getIDPConfigValueWithHttpInfo(configName).getData();
+  }
+
+  /**
+   * Get Internal Developer Portal configuration.
+   *
+   * <p>See {@link #getIDPConfigValueWithHttpInfoAsync}.
+   *
+   * @param configName The configuration key to retrieve. (required)
+   * @return CompletableFuture&lt;IDPConfigResponse&gt;
+   */
+  public CompletableFuture<IDPConfigResponse> getIDPConfigValueAsync(String configName) {
+    return getIDPConfigValueWithHttpInfoAsync(configName)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Get a configuration value for the Internal Developer Portal (IDP).
+   *
+   * @param configName The configuration key to retrieve. (required)
+   * @return ApiResponse&lt;IDPConfigResponse&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> 404 </td><td> Not Found </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *       <tr><td> 500 </td><td> Internal Server Error </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<IDPConfigResponse> getIDPConfigValueWithHttpInfo(String configName)
+      throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "getIDPConfigValue";
+    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 'configName' is set
+    if (configName == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'configName' when calling getIDPConfigValue");
+    }
+    // create path and map variables
+    String localVarPath =
+        "/api/v2/idp/config/{config_name}"
+            .replaceAll(
+                "\\{" + "config_name" + "\\}", apiClient.escapeString(configName.toString()));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.SoftwareCatalogApi.getIDPConfigValue",
+            localVarPath,
+            new ArrayList<Pair>(),
+            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<IDPConfigResponse>() {});
+  }
+
+  /**
+   * Get Internal Developer Portal configuration.
+   *
+   * <p>See {@link #getIDPConfigValueWithHttpInfo}.
+   *
+   * @param configName The configuration key to retrieve. (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;IDPConfigResponse&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<IDPConfigResponse>> getIDPConfigValueWithHttpInfoAsync(
+      String configName) {
+    // Check if unstable operation is enabled
+    String operationId = "getIDPConfigValue";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<IDPConfigResponse>> 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 'configName' is set
+    if (configName == null) {
+      CompletableFuture<ApiResponse<IDPConfigResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
-              400, "Missing the required parameter 'kindId' when calling deleteCatalogKind"));
+              400, "Missing the required parameter 'configName' when calling getIDPConfigValue"));
       return result;
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/catalog/kind/{kind_id}"
-            .replaceAll("\\{" + "kind_id" + "\\}", apiClient.escapeString(kindId.toString()));
+        "/api/v2/idp/config/{config_name}"
+            .replaceAll(
+                "\\{" + "config_name" + "\\}", apiClient.escapeString(configName.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
@@ -303,27 +939,27 @@ public CompletableFuture<ApiResponse<Void>> deleteCatalogKindWithHttpInfoAsync(S
     try {
       builder =
           apiClient.createBuilder(
-              "v2.SoftwareCatalogApi.deleteCatalogKind",
+              "v2.SoftwareCatalogApi.getIDPConfigValue",
               localVarPath,
               new ArrayList<Pair>(),
               localVarHeaderParams,
               new HashMap<String, String>(),
-              new String[] {"*/*"},
+              new String[] {"application/json"},
               new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
     } catch (ApiException ex) {
-      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<IDPConfigResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(ex);
       return result;
     }
     return apiClient.invokeAPIAsync(
-        "DELETE",
+        "GET",
         builder,
         localVarHeaderParams,
         new String[] {},
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        null);
+        new GenericType<IDPConfigResponse>() {});
   }
 
   /** Manage optional parameters to listCatalogEntity. */
@@ -1414,6 +2050,187 @@ public ApiResponse<EntityResponseArray> previewCatalogEntitiesWithHttpInfo() thr
         new GenericType<EntityResponseArray>() {});
   }
 
+  /** Manage optional parameters to triggerRecommendedEntities. */
+  public static class TriggerRecommendedEntitiesOptionalParameters {
+    private Object body;
+
+    /**
+     * Set body.
+     *
+     * @param body Optional request body for triggering recommended entity discovery. (optional)
+     * @return TriggerRecommendedEntitiesOptionalParameters
+     */
+    public TriggerRecommendedEntitiesOptionalParameters body(Object body) {
+      this.body = body;
+      return this;
+    }
+  }
+
+  /**
+   * Trigger recommended entity discovery.
+   *
+   * <p>See {@link #triggerRecommendedEntitiesWithHttpInfo}.
+   *
+   * @return Object
+   * @throws ApiException if fails to make API call
+   */
+  public Object triggerRecommendedEntities() throws ApiException {
+    return triggerRecommendedEntitiesWithHttpInfo(
+            new TriggerRecommendedEntitiesOptionalParameters())
+        .getData();
+  }
+
+  /**
+   * Trigger recommended entity discovery.
+   *
+   * <p>See {@link #triggerRecommendedEntitiesWithHttpInfoAsync}.
+   *
+   * @return CompletableFuture&lt;Object&gt;
+   */
+  public CompletableFuture<Object> triggerRecommendedEntitiesAsync() {
+    return triggerRecommendedEntitiesWithHttpInfoAsync(
+            new TriggerRecommendedEntitiesOptionalParameters())
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Trigger recommended entity discovery.
+   *
+   * <p>See {@link #triggerRecommendedEntitiesWithHttpInfo}.
+   *
+   * @param parameters Optional parameters for the request.
+   * @return Object
+   * @throws ApiException if fails to make API call
+   */
+  public Object triggerRecommendedEntities(TriggerRecommendedEntitiesOptionalParameters parameters)
+      throws ApiException {
+    return triggerRecommendedEntitiesWithHttpInfo(parameters).getData();
+  }
+
+  /**
+   * Trigger recommended entity discovery.
+   *
+   * <p>See {@link #triggerRecommendedEntitiesWithHttpInfoAsync}.
+   *
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;Object&gt;
+   */
+  public CompletableFuture<Object> triggerRecommendedEntitiesAsync(
+      TriggerRecommendedEntitiesOptionalParameters parameters) {
+    return triggerRecommendedEntitiesWithHttpInfoAsync(parameters)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Trigger the discovery of recommended entities in Software Catalog.
+   *
+   * @param parameters Optional parameters for the request.
+   * @return ApiResponse&lt;Object&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 202 </td><td> Accepted </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<Object> triggerRecommendedEntitiesWithHttpInfo(
+      TriggerRecommendedEntitiesOptionalParameters parameters) throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "triggerRecommendedEntities";
+    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 = parameters.body;
+    // create path and map variables
+    String localVarPath = "/api/v2/catalog/recommended_entity/trigger";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.SoftwareCatalogApi.triggerRecommendedEntities",
+            localVarPath,
+            new ArrayList<Pair>(),
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"application/json"},
+            new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    return apiClient.invokeAPI(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<Object>() {});
+  }
+
+  /**
+   * Trigger recommended entity discovery.
+   *
+   * <p>See {@link #triggerRecommendedEntitiesWithHttpInfo}.
+   *
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;ApiResponse&lt;Object&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<Object>> triggerRecommendedEntitiesWithHttpInfoAsync(
+      TriggerRecommendedEntitiesOptionalParameters parameters) {
+    // Check if unstable operation is enabled
+    String operationId = "triggerRecommendedEntities";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<Object>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = parameters.body;
+    // create path and map variables
+    String localVarPath = "/api/v2/catalog/recommended_entity/trigger";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.SoftwareCatalogApi.triggerRecommendedEntities",
+              localVarPath,
+              new ArrayList<Pair>(),
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"application/json"},
+              new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<Object>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<Object>() {});
+  }
+
   /**
    * Create or update entities.
    *
@@ -1681,4 +2498,179 @@ public ApiResponse<UpsertCatalogKindResponse> upsertCatalogKindWithHttpInfo(
         false,
         new GenericType<UpsertCatalogKindResponse>() {});
   }
+
+  /**
+   * Create or update IDP configuration.
+   *
+   * <p>See {@link #upsertIDPConfigValueWithHttpInfo}.
+   *
+   * @param configName The configuration key to create or update. (required)
+   * @param body Configuration value to set. (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void upsertIDPConfigValue(String configName, IDPConfigRequest body) throws ApiException {
+    upsertIDPConfigValueWithHttpInfo(configName, body);
+  }
+
+  /**
+   * Create or update IDP configuration.
+   *
+   * <p>See {@link #upsertIDPConfigValueWithHttpInfoAsync}.
+   *
+   * @param configName The configuration key to create or update. (required)
+   * @param body Configuration value to set. (required)
+   * @return CompletableFuture
+   */
+  public CompletableFuture<Void> upsertIDPConfigValueAsync(
+      String configName, IDPConfigRequest body) {
+    return upsertIDPConfigValueWithHttpInfoAsync(configName, body)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Create or update a configuration value for the Internal Developer Portal (IDP).
+   *
+   * @param configName The configuration key to create or update. (required)
+   * @param body Configuration value to set. (required)
+   * @return ApiResponse&lt;Void&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> 204 </td><td> No Content </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>
+   *       <tr><td> 500 </td><td> Internal Server Error </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<Void> upsertIDPConfigValueWithHttpInfo(
+      String configName, IDPConfigRequest body) throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "upsertIDPConfigValue";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'configName' is set
+    if (configName == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'configName' when calling upsertIDPConfigValue");
+    }
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'body' when calling upsertIDPConfigValue");
+    }
+    // create path and map variables
+    String localVarPath =
+        "/api/v2/idp/config/{config_name}"
+            .replaceAll(
+                "\\{" + "config_name" + "\\}", apiClient.escapeString(configName.toString()));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.SoftwareCatalogApi.upsertIDPConfigValue",
+            localVarPath,
+            new ArrayList<Pair>(),
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"*/*"},
+            new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    return apiClient.invokeAPI(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        null);
+  }
+
+  /**
+   * Create or update IDP configuration.
+   *
+   * <p>See {@link #upsertIDPConfigValueWithHttpInfo}.
+   *
+   * @param configName The configuration key to create or update. (required)
+   * @param body Configuration value to set. (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;Void&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<Void>> upsertIDPConfigValueWithHttpInfoAsync(
+      String configName, IDPConfigRequest body) {
+    // Check if unstable operation is enabled
+    String operationId = "upsertIDPConfigValue";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = body;
+
+    // verify the required parameter 'configName' is set
+    if (configName == null) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'configName' when calling upsertIDPConfigValue"));
+      return result;
+    }
+
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400, "Missing the required parameter 'body' when calling upsertIDPConfigValue"));
+      return result;
+    }
+    // create path and map variables
+    String localVarPath =
+        "/api/v2/idp/config/{config_name}"
+            .replaceAll(
+                "\\{" + "config_name" + "\\}", apiClient.escapeString(configName.toString()));
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.SoftwareCatalogApi.upsertIDPConfigValue",
+              localVarPath,
+              new ArrayList<Pair>(),
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"*/*"},
+              new String[] {"apiKeyAuth", "appKeyAuth", "AuthZ"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "POST",
+        builder,
+        localVarHeaderParams,
+        new String[] {"application/json"},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        null);
+  }
 }
diff --git a/src/main/java/com/datadog/api/client/v2/model/EntitySchemaVersion.java b/src/main/java/com/datadog/api/client/v2/model/EntitySchemaVersion.java
new file mode 100644
index 00000000000..b94b741b200
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/EntitySchemaVersion.java
@@ -0,0 +1,58 @@
+/*
+ * 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;
+
+/** Entity schema version for conversion. */
+@JsonSerialize(using = EntitySchemaVersion.EntitySchemaVersionSerializer.class)
+public class EntitySchemaVersion extends ModelEnum<String> {
+
+  private static final Set<String> allowedValues =
+      new HashSet<String>(Arrays.asList("v2", "v2.1", "v2.2", "v3"));
+
+  public static final EntitySchemaVersion V2 = new EntitySchemaVersion("v2");
+  public static final EntitySchemaVersion V2_1 = new EntitySchemaVersion("v2.1");
+  public static final EntitySchemaVersion V2_2 = new EntitySchemaVersion("v2.2");
+  public static final EntitySchemaVersion V3 = new EntitySchemaVersion("v3");
+
+  EntitySchemaVersion(String value) {
+    super(value, allowedValues);
+  }
+
+  public static class EntitySchemaVersionSerializer extends StdSerializer<EntitySchemaVersion> {
+    public EntitySchemaVersionSerializer(Class<EntitySchemaVersion> t) {
+      super(t);
+    }
+
+    public EntitySchemaVersionSerializer() {
+      this(null);
+    }
+
+    @Override
+    public void serialize(
+        EntitySchemaVersion value, JsonGenerator jgen, SerializerProvider provider)
+        throws IOException, JsonProcessingException {
+      jgen.writeObject(value.value);
+    }
+  }
+
+  @JsonCreator
+  public static EntitySchemaVersion fromValue(String value) {
+    return new EntitySchemaVersion(value);
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/IDPConfigAttributes.java b/src/main/java/com/datadog/api/client/v2/model/IDPConfigAttributes.java
new file mode 100644
index 00000000000..bfb53d64b6c
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/IDPConfigAttributes.java
@@ -0,0 +1,150 @@
+/*
+ * 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;
+
+/** IDP configuration attributes. */
+@JsonPropertyOrder({IDPConfigAttributes.JSON_PROPERTY_VALUE})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class IDPConfigAttributes {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_VALUE = "value";
+  private List<Map<String, Object>> value = new ArrayList<>();
+
+  public IDPConfigAttributes() {}
+
+  @JsonCreator
+  public IDPConfigAttributes(
+      @JsonProperty(required = true, value = JSON_PROPERTY_VALUE) List<Map<String, Object>> value) {
+    this.value = value;
+  }
+
+  public IDPConfigAttributes value(List<Map<String, Object>> value) {
+    this.value = value;
+    return this;
+  }
+
+  public IDPConfigAttributes addValueItem(Map<String, Object> valueItem) {
+    this.value.add(valueItem);
+    return this;
+  }
+
+  /**
+   * Configuration value (can be object, array, or primitive).
+   *
+   * @return value
+   */
+  @JsonProperty(JSON_PROPERTY_VALUE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public List<Map<String, Object>> getValue() {
+    return value;
+  }
+
+  public void setValue(List<Map<String, Object>> value) {
+    this.value = value;
+  }
+
+  /**
+   * 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 IDPConfigAttributes
+   */
+  @JsonAnySetter
+  public IDPConfigAttributes 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 IDPConfigAttributes object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    IDPConfigAttributes idpConfigAttributes = (IDPConfigAttributes) o;
+    return Objects.equals(this.value, idpConfigAttributes.value)
+        && Objects.equals(this.additionalProperties, idpConfigAttributes.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(value, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class IDPConfigAttributes {\n");
+    sb.append("    value: ").append(toIndentedString(value)).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/IDPConfigData.java b/src/main/java/com/datadog/api/client/v2/model/IDPConfigData.java
new file mode 100644
index 00000000000..589bccd20e6
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/IDPConfigData.java
@@ -0,0 +1,209 @@
+/*
+ * 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;
+
+/** IDP configuration data. */
+@JsonPropertyOrder({
+  IDPConfigData.JSON_PROPERTY_ATTRIBUTES,
+  IDPConfigData.JSON_PROPERTY_ID,
+  IDPConfigData.JSON_PROPERTY_TYPE
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class IDPConfigData {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
+  private IDPConfigAttributes attributes;
+
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private IDPConfigType type;
+
+  public IDPConfigData() {}
+
+  @JsonCreator
+  public IDPConfigData(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
+          IDPConfigAttributes attributes,
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) IDPConfigType type) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    this.id = id;
+    this.type = type;
+    this.unparsed |= !type.isValid();
+  }
+
+  public IDPConfigData attributes(IDPConfigAttributes attributes) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    return this;
+  }
+
+  /**
+   * IDP configuration attributes.
+   *
+   * @return attributes
+   */
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public IDPConfigAttributes getAttributes() {
+    return attributes;
+  }
+
+  public void setAttributes(IDPConfigAttributes attributes) {
+    this.attributes = attributes;
+  }
+
+  public IDPConfigData id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * Configuration identifier.
+   *
+   * @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 IDPConfigData type(IDPConfigType type) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
+    return this;
+  }
+
+  /**
+   * Resource type.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public IDPConfigType getType() {
+    return type;
+  }
+
+  public void setType(IDPConfigType 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 IDPConfigData
+   */
+  @JsonAnySetter
+  public IDPConfigData 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 IDPConfigData object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    IDPConfigData idpConfigData = (IDPConfigData) o;
+    return Objects.equals(this.attributes, idpConfigData.attributes)
+        && Objects.equals(this.id, idpConfigData.id)
+        && Objects.equals(this.type, idpConfigData.type)
+        && Objects.equals(this.additionalProperties, idpConfigData.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributes, id, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class IDPConfigData {\n");
+    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/IDPConfigRequest.java b/src/main/java/com/datadog/api/client/v2/model/IDPConfigRequest.java
new file mode 100644
index 00000000000..4befb30b21c
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/IDPConfigRequest.java
@@ -0,0 +1,145 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Request to set IDP configuration value. */
+@JsonPropertyOrder({IDPConfigRequest.JSON_PROPERTY_DATA})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class IDPConfigRequest {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private IDPConfigRequestData data;
+
+  public IDPConfigRequest() {}
+
+  @JsonCreator
+  public IDPConfigRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) IDPConfigRequestData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+  }
+
+  public IDPConfigRequest data(IDPConfigRequestData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+    return this;
+  }
+
+  /**
+   * IDP configuration request data.
+   *
+   * @return data
+   */
+  @JsonProperty(JSON_PROPERTY_DATA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public IDPConfigRequestData getData() {
+    return data;
+  }
+
+  public void setData(IDPConfigRequestData 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 IDPConfigRequest
+   */
+  @JsonAnySetter
+  public IDPConfigRequest 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 IDPConfigRequest object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    IDPConfigRequest idpConfigRequest = (IDPConfigRequest) o;
+    return Objects.equals(this.data, idpConfigRequest.data)
+        && Objects.equals(this.additionalProperties, idpConfigRequest.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class IDPConfigRequest {\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/IDPConfigRequestAttributes.java b/src/main/java/com/datadog/api/client/v2/model/IDPConfigRequestAttributes.java
new file mode 100644
index 00000000000..36ad6333490
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/IDPConfigRequestAttributes.java
@@ -0,0 +1,151 @@
+/*
+ * 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;
+
+/** IDP configuration request attributes. */
+@JsonPropertyOrder({IDPConfigRequestAttributes.JSON_PROPERTY_VALUE})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class IDPConfigRequestAttributes {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_VALUE = "value";
+  private List<Map<String, Object>> value = new ArrayList<>();
+
+  public IDPConfigRequestAttributes() {}
+
+  @JsonCreator
+  public IDPConfigRequestAttributes(
+      @JsonProperty(required = true, value = JSON_PROPERTY_VALUE) List<Map<String, Object>> value) {
+    this.value = value;
+  }
+
+  public IDPConfigRequestAttributes value(List<Map<String, Object>> value) {
+    this.value = value;
+    return this;
+  }
+
+  public IDPConfigRequestAttributes addValueItem(Map<String, Object> valueItem) {
+    this.value.add(valueItem);
+    return this;
+  }
+
+  /**
+   * Configuration value to set (can be object, array, or primitive).
+   *
+   * @return value
+   */
+  @JsonProperty(JSON_PROPERTY_VALUE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public List<Map<String, Object>> getValue() {
+    return value;
+  }
+
+  public void setValue(List<Map<String, Object>> value) {
+    this.value = value;
+  }
+
+  /**
+   * 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 IDPConfigRequestAttributes
+   */
+  @JsonAnySetter
+  public IDPConfigRequestAttributes 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 IDPConfigRequestAttributes object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    IDPConfigRequestAttributes idpConfigRequestAttributes = (IDPConfigRequestAttributes) o;
+    return Objects.equals(this.value, idpConfigRequestAttributes.value)
+        && Objects.equals(
+            this.additionalProperties, idpConfigRequestAttributes.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(value, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class IDPConfigRequestAttributes {\n");
+    sb.append("    value: ").append(toIndentedString(value)).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/IDPConfigRequestData.java b/src/main/java/com/datadog/api/client/v2/model/IDPConfigRequestData.java
new file mode 100644
index 00000000000..9cc30ab6112
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/IDPConfigRequestData.java
@@ -0,0 +1,181 @@
+/*
+ * 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;
+
+/** IDP configuration request data. */
+@JsonPropertyOrder({
+  IDPConfigRequestData.JSON_PROPERTY_ATTRIBUTES,
+  IDPConfigRequestData.JSON_PROPERTY_TYPE
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class IDPConfigRequestData {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
+  private IDPConfigRequestAttributes attributes;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private IDPConfigType type;
+
+  public IDPConfigRequestData() {}
+
+  @JsonCreator
+  public IDPConfigRequestData(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
+          IDPConfigRequestAttributes attributes,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) IDPConfigType type) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    this.type = type;
+    this.unparsed |= !type.isValid();
+  }
+
+  public IDPConfigRequestData attributes(IDPConfigRequestAttributes attributes) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    return this;
+  }
+
+  /**
+   * IDP configuration request attributes.
+   *
+   * @return attributes
+   */
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public IDPConfigRequestAttributes getAttributes() {
+    return attributes;
+  }
+
+  public void setAttributes(IDPConfigRequestAttributes attributes) {
+    this.attributes = attributes;
+  }
+
+  public IDPConfigRequestData type(IDPConfigType type) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
+    return this;
+  }
+
+  /**
+   * Resource type.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public IDPConfigType getType() {
+    return type;
+  }
+
+  public void setType(IDPConfigType 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 IDPConfigRequestData
+   */
+  @JsonAnySetter
+  public IDPConfigRequestData 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 IDPConfigRequestData object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    IDPConfigRequestData idpConfigRequestData = (IDPConfigRequestData) o;
+    return Objects.equals(this.attributes, idpConfigRequestData.attributes)
+        && Objects.equals(this.type, idpConfigRequestData.type)
+        && Objects.equals(this.additionalProperties, idpConfigRequestData.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributes, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class IDPConfigRequestData {\n");
+    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/IDPConfigResponse.java b/src/main/java/com/datadog/api/client/v2/model/IDPConfigResponse.java
new file mode 100644
index 00000000000..1b86d4edc73
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/IDPConfigResponse.java
@@ -0,0 +1,145 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Response containing IDP configuration value. */
+@JsonPropertyOrder({IDPConfigResponse.JSON_PROPERTY_DATA})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class IDPConfigResponse {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private IDPConfigData data;
+
+  public IDPConfigResponse() {}
+
+  @JsonCreator
+  public IDPConfigResponse(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) IDPConfigData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+  }
+
+  public IDPConfigResponse data(IDPConfigData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+    return this;
+  }
+
+  /**
+   * IDP configuration data.
+   *
+   * @return data
+   */
+  @JsonProperty(JSON_PROPERTY_DATA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public IDPConfigData getData() {
+    return data;
+  }
+
+  public void setData(IDPConfigData 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 IDPConfigResponse
+   */
+  @JsonAnySetter
+  public IDPConfigResponse 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 IDPConfigResponse object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    IDPConfigResponse idpConfigResponse = (IDPConfigResponse) o;
+    return Objects.equals(this.data, idpConfigResponse.data)
+        && Objects.equals(this.additionalProperties, idpConfigResponse.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class IDPConfigResponse {\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/IDPConfigType.java b/src/main/java/com/datadog/api/client/v2/model/IDPConfigType.java
new file mode 100644
index 00000000000..f943d16daa3
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/IDPConfigType.java
@@ -0,0 +1,53 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.datadog.api.client.ModelEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/** Resource type. */
+@JsonSerialize(using = IDPConfigType.IDPConfigTypeSerializer.class)
+public class IDPConfigType extends ModelEnum<String> {
+
+  private static final Set<String> allowedValues = new HashSet<String>(Arrays.asList("idp_config"));
+
+  public static final IDPConfigType IDP_CONFIG = new IDPConfigType("idp_config");
+
+  IDPConfigType(String value) {
+    super(value, allowedValues);
+  }
+
+  public static class IDPConfigTypeSerializer extends StdSerializer<IDPConfigType> {
+    public IDPConfigTypeSerializer(Class<IDPConfigType> t) {
+      super(t);
+    }
+
+    public IDPConfigTypeSerializer() {
+      this(null);
+    }
+
+    @Override
+    public void serialize(IDPConfigType value, JsonGenerator jgen, SerializerProvider provider)
+        throws IOException, JsonProcessingException {
+      jgen.writeObject(value.value);
+    }
+  }
+
+  @JsonCreator
+  public static IDPConfigType fromValue(String value) {
+    return new IDPConfigType(value);
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/RecommendedEntityID.java b/src/main/java/com/datadog/api/client/v2/model/RecommendedEntityID.java
new file mode 100644
index 00000000000..4b8cdd6d7d1
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/RecommendedEntityID.java
@@ -0,0 +1,142 @@
+/*
+ * 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 recommended entity identifier. */
+@JsonPropertyOrder({RecommendedEntityID.JSON_PROPERTY_ID})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class RecommendedEntityID {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public RecommendedEntityID() {}
+
+  @JsonCreator
+  public RecommendedEntityID(@JsonProperty(required = true, value = JSON_PROPERTY_ID) String id) {
+    this.id = id;
+  }
+
+  public RecommendedEntityID id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * Unique identifier for the recommended entity.
+   *
+   * @return id
+   */
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  /**
+   * 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 RecommendedEntityID
+   */
+  @JsonAnySetter
+  public RecommendedEntityID 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 RecommendedEntityID object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    RecommendedEntityID recommendedEntityId = (RecommendedEntityID) o;
+    return Objects.equals(this.id, recommendedEntityId.id)
+        && Objects.equals(this.additionalProperties, recommendedEntityId.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class RecommendedEntityID {\n");
+    sb.append("    id: ").append(toIndentedString(id)).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/RecommendedEntityWithSchema.java b/src/main/java/com/datadog/api/client/v2/model/RecommendedEntityWithSchema.java
new file mode 100644
index 00000000000..0ff4d30570e
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/RecommendedEntityWithSchema.java
@@ -0,0 +1,176 @@
+/*
+ * 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 recommended entity with its schema definition. */
+@JsonPropertyOrder({
+  RecommendedEntityWithSchema.JSON_PROPERTY_ID,
+  RecommendedEntityWithSchema.JSON_PROPERTY_SCHEMA
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class RecommendedEntityWithSchema {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_SCHEMA = "schema";
+  private EntityV3 schema;
+
+  public RecommendedEntityWithSchema() {}
+
+  @JsonCreator
+  public RecommendedEntityWithSchema(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
+      @JsonProperty(required = true, value = JSON_PROPERTY_SCHEMA) EntityV3 schema) {
+    this.id = id;
+    this.schema = schema;
+    this.unparsed |= schema.unparsed;
+  }
+
+  public RecommendedEntityWithSchema id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * Unique identifier for the recommended entity.
+   *
+   * @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 RecommendedEntityWithSchema schema(EntityV3 schema) {
+    this.schema = schema;
+    this.unparsed |= schema.unparsed;
+    return this;
+  }
+
+  /**
+   * Entity schema v3.
+   *
+   * @return schema
+   */
+  @JsonProperty(JSON_PROPERTY_SCHEMA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public EntityV3 getSchema() {
+    return schema;
+  }
+
+  public void setSchema(EntityV3 schema) {
+    this.schema = schema;
+  }
+
+  /**
+   * 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 RecommendedEntityWithSchema
+   */
+  @JsonAnySetter
+  public RecommendedEntityWithSchema 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 RecommendedEntityWithSchema object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    RecommendedEntityWithSchema recommendedEntityWithSchema = (RecommendedEntityWithSchema) o;
+    return Objects.equals(this.id, recommendedEntityWithSchema.id)
+        && Objects.equals(this.schema, recommendedEntityWithSchema.schema)
+        && Objects.equals(
+            this.additionalProperties, recommendedEntityWithSchema.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, schema, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class RecommendedEntityWithSchema {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    schema: ").append(toIndentedString(schema)).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/Get_all_hosts_with_metadata_deserializes_successfully.json b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
index 0b1cdf6a6a8..dbf89c929d7 100644
--- a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
+++ b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
@@ -28,6 +28,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
+    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
index 91c8275f382..e94edfb7099 100644
--- a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
@@ -28,6 +28,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
+    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json b/src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json
index 1489fb9e00e..907a2641363 100644
--- a/src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json
+++ b/src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
+    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json b/src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json
index 45e484f0b48..d03bf9ca97e 100644
--- a/src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
+    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_AWS_Account_object_response.json
index bc99e6e9183..97e4959085e 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c206b9cd-771e-14f0-5d18-42a3a48556cf"
+    "id": "c206b9cd-771e-14f0-5d18-42a3a48556ce"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
index af01fdb67c5..1be13c1c8f8 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c206b9cd-771e-14f0-5d18-42a3a48556ce"
+    "id": "c206b9cd-771e-14f0-5d18-42a3a48556cf"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
index c82b6c27f29..a42ef29bfae 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-83f2c499e8a9"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
   }
 ]
\ 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..20187b03f7f 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-0daa19dc9eea"
   },
   {
     "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_Generate_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
index efb480e06b4..7bf88c684fb 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2ce"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
index b06edb7febf..f02f71207af 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-0daa19dc9eea"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
index 87cb96a7640..6352d5f0102 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef690"
+    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef691"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_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 55368f4ae1c..7e5c7b1234d 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-33ab2f3af9d4"
+    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d3"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
index 96ea2f1d661..7711ea26b7b 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0f"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
index 5be48f564e3..520c88368e3 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
   },
   {
     "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 73ccee50ec7..ff390c55dd3 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-73b0e70145ea"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
   },
   {
     "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 4462748bb01..95a63801c5f 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-73b0e70145f0"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
index 97d2e012fb0..1009eda9cb4 100644
--- a/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
   },
   {
     "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 c791186e6fd..72decbcf558 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-73b0e70145fd"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
index 3e6caee50a0..33f481ce3be 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2c"
   },
   {
     "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 b8c9cddb379..3bf5cd3a7c1 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-b92f9fa74d2e"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d30"
   },
   {
     "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 65e125afa4a..d2aaa4405eb 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-b92f9fa74d33"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
   },
   {
     "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 8df6e835fb8..f5cf418e965 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": "4c138fa0-d834-5972-8bd7-894a659525ac"
+    "id": "4c138fa0-d834-5972-8bd7-894a659525ae"
   },
   {
     "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 ad9498044cf..8c97b2392b3 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-73b0e70145f3"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
index 7a1d8329345..58c1764cc21 100644
--- a/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
   },
   {
     "httpRequest": {
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 12d11a05f48..d78d4e863c8 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-12e51226c50c"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
   },
   {
     "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 25b85370788..848565e096f 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-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/Create_Org_Connection_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
index 579f9d82f26..0f1fb58adbb 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-bd11c0a4ae46"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae44"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
index c6e2a2c6b52..2e9b172f720 100644
--- a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae49"
   },
   {
     "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 0735776ab7d..052e9a267e7 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-f707c3b51e7f"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json
index dfbeb4c7e2f..335179625bd 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e83"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
   },
   {
     "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 1c04e0309ee..f545b0e20ae 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-f707c3b51e81"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
index ef83201b336..e84757a0280 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
index ad63cd81994..09067379e94 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-4499a9e71c72"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
   },
   {
     "httpRequest": {
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
   }
 ]
\ No newline at end of file
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 94ec04c070e..fba8b2ccd41 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-ab94000addcf"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
   },
   {
     "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 7753c1c20c2..992baa6ee80 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51860"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51862"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_test_suite_returns_OK_response.freeze b/src/test/resources/cassettes/features/v2/Create_a_test_suite_returns_OK_response.freeze
index 957e037f23c..62723cd8d29 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_test_suite_returns_OK_response.freeze
+++ b/src/test/resources/cassettes/features/v2/Create_a_test_suite_returns_OK_response.freeze
@@ -1 +1 @@
-2026-02-18T16:57:05.121Z
\ No newline at end of file
+2026-01-07T12:38:45.716Z
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_test_suite_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_test_suite_returns_OK_response.json
index fd483847e68..170f3322e1a 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_test_suite_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_test_suite_returns_OK_response.json
@@ -12,7 +12,7 @@
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"type\":\"suites\",\"attributes\":{\"type\":\"suite\",\"monitor_id\":259845717,\"name\":\"Example suite name\",\"options\":{},\"tests\":[],\"tags\":[\"env:production\"],\"public_id\":\"hik-xp5-9q6\",\"created_at\":\"2026-02-18T16:57:05.583051+00:00\",\"modified_at\":\"2026-02-18T16:57:05.583051+00:00\",\"created_by\":{\"name\":\"Corentin Girard\",\"email\":\"corentin.girard@datadoghq.com\",\"handle\":\"corentin.girard@datadoghq.com\"},\"message\":\"Notification message\",\"org_id\":321813,\"modified_by\":{\"name\":\"Corentin Girard\",\"email\":\"corentin.girard@datadoghq.com\",\"handle\":\"corentin.girard@datadoghq.com\"}},\"id\":\"hik-xp5-9q6\"}}\n",
+      "body": "{\"data\":{\"type\":\"suites\",\"id\":\"36n-bb6-njj\",\"attributes\":{\"tags\":[\"env:production\"],\"type\":\"suite\",\"created_by\":{\"email\":\"team-intg-tools-libs-spam@datadoghq.com\",\"handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"created_at\":\"2026-01-07T12:38:46.109472+00:00\",\"modified_at\":\"2026-01-07T12:38:46.109472+00:00\",\"message\":\"Notification message\",\"public_id\":\"36n-bb6-njj\",\"options\":{},\"modified_by\":{\"email\":\"team-intg-tools-libs-spam@datadoghq.com\",\"handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"tests\":[],\"name\":\"Example suite name\",\"org_id\":321813,\"monitor_id\":249141773}}}\n",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -33,7 +33,7 @@
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"public_ids\":[\"hik-xp5-9q6\"]},\"type\":\"delete_suites_request\"}}"
+        "json": "{\"data\":{\"attributes\":{\"public_ids\":[\"36n-bb6-njj\"]},\"type\":\"delete_suites_request\"}}"
       },
       "headers": {},
       "method": "POST",
@@ -42,7 +42,7 @@
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":[{\"type\":\"suites\",\"attributes\":{\"deleted_at\":\"2026-02-18 16:57:06.420679\",\"public_id\":\"hik-xp5-9q6\"},\"id\":\"hik-xp5-9q6\"}]}\n",
+      "body": "{\"data\":[{\"type\":\"suites\",\"attributes\":{\"public_id\":\"36n-bb6-njj\",\"deleted_at\":\"2026-01-07 12:38:46.679914\"},\"id\":\"36n-bb6-njj\"}]}\n",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -57,6 +57,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79a4484e-b99a-993b-e9f8-04bc2937a220"
+    "id": "1bd5428b-eb45-1f07-ea8a-b3d0bc71b1e8"
   }
 ]
\ No newline at end of file
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 c7a019ef829..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-4a71849b3ce5"
+    "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 62d6001c9d0..5fdb5139b99 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-e4d7e0833bd7"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_case_for_security_finding_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_case_for_security_finding_returns_Created_response.json
index 7eed52fb390..3186336472d 100644
--- a/src/test/resources/cassettes/features/v2/Create_case_for_security_finding_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_case_for_security_finding_returns_Created_response.json
@@ -52,6 +52,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4e58c44b-f265-fde4-198b-af61fd50c0a7"
+    "id": "4e58c44b-f265-fde4-198b-af61fd50c0a6"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_cases_for_security_findings_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_cases_for_security_findings_returns_Created_response.json
index 7b6e009c016..ce5258eed5e 100644
--- a/src/test/resources/cassettes/features/v2/Create_cases_for_security_findings_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_cases_for_security_findings_returns_Created_response.json
@@ -52,6 +52,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4e58c44b-f265-fde4-198b-af61fd50c0a6"
+    "id": "4e58c44b-f265-fde4-198b-af61fd50c0a7"
   }
 ]
\ No newline at end of file
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..e7858392bb2 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-eaf799af6464"
   },
   {
     "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 2ce378fae66..76a037f2ed4 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-eaf799af646a"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6467"
   },
   {
     "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 31333da4750..4032fbdc8fc 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-e4d7e0833bd6"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdc"
   },
   {
     "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 c4359207f23..6b69cce1630 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-e4d7e0833bd9"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_or_update_entities_returns_ACCEPTED_response.freeze b/src/test/resources/cassettes/features/v2/Create_or_update_entities_returns_ACCEPTED_response.freeze
new file mode 100644
index 00000000000..40e9b4d35da
--- /dev/null
+++ b/src/test/resources/cassettes/features/v2/Create_or_update_entities_returns_ACCEPTED_response.freeze
@@ -0,0 +1 @@
+2026-02-16T10:02:11.178Z
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_or_update_entities_returns_ACCEPTED_response.json b/src/test/resources/cassettes/features/v2/Create_or_update_entities_returns_ACCEPTED_response.json
new file mode 100644
index 00000000000..e18d56eb8b4
--- /dev/null
+++ b/src/test/resources/cassettes/features/v2/Create_or_update_entities_returns_ACCEPTED_response.json
@@ -0,0 +1,53 @@
+[
+  {
+    "httpRequest": {
+      "body": {
+        "type": "JSON",
+        "json": "{\"apiVersion\":\"v3\",\"datadog\":{\"codeLocations\":[{\"paths\":[]}],\"events\":[{}],\"logs\":[{}],\"performanceData\":{\"tags\":[]},\"pipelines\":{\"fingerprints\":[]}},\"integrations\":{\"opsgenie\":{\"serviceURL\":\"https://www.opsgenie.com/service/shopping-cart\"},\"pagerduty\":{\"serviceURL\":\"https://www.pagerduty.com/service-directory/Pshopping-cart\"}},\"kind\":\"service\",\"metadata\":{\"additionalOwners\":[{\"name\":\"\"}],\"contacts\":[{\"contact\":\"https://slack/\",\"type\":\"slack\"}],\"id\":\"4b163705-23c0-4573-b2fb-f6cea2163fcb\",\"inheritFrom\":\"application:default/myapp\",\"links\":[{\"name\":\"mylink\",\"type\":\"link\",\"url\":\"https://mylink\"}],\"name\":\"myService\",\"namespace\":\"default\",\"tags\":[\"this:tag\",\"that:tag\"]},\"spec\":{\"componentOf\":[],\"dependsOn\":[],\"languages\":[]}}"
+      },
+      "headers": {},
+      "method": "POST",
+      "path": "/api/v2/catalog/entity",
+      "keepAlive": false,
+      "secure": true
+    },
+    "httpResponse": {
+      "body": "{\"data\":[{\"id\":\"a3ad0180-7ec0-40fa-98fd-b34f27ef4afc\",\"type\":\"entity\",\"attributes\":{\"apiVersion\":\"v3\",\"kind\":\"service\",\"name\":\"myService\",\"namespace\":\"default\",\"tags\":[\"this:tag\",\"that:tag\"]},\"relationships\":{\"schema\":{\"data\":{\"id\":\"a3ad0180-7ec0-40fa-98fd-b34f27ef4afc\",\"type\":\"schema\"}}},\"meta\":{\"createdAt\":\"2026-02-16T10:02:12.338681256Z\",\"modifiedAt\":\"2026-02-16T10:02:12.338681157Z\",\"ingestionSource\":\"api\"}}],\"meta\":{\"count\":1,\"includeCount\":1},\"included\":[{\"id\":\"a3ad0180-7ec0-40fa-98fd-b34f27ef4afc\",\"type\":\"schema\",\"attributes\":{\"schema\":{\"apiVersion\":\"v3\",\"kind\":\"service\",\"metadata\":{\"name\":\"myService\",\"namespace\":\"default\",\"inheritFrom\":\"application:default/myapp\",\"tags\":[\"this:tag\",\"that:tag\"],\"links\":[{\"name\":\"mylink\",\"type\":\"link\",\"url\":\"https://mylink\"}],\"contacts\":[{\"type\":\"slack\",\"contact\":\"https://slack/\"}],\"additionalOwners\":[{}],\"managed\":{\"ingestionSource\":\"api\",\"createdAt\":\"2026-02-16T10:02:12.338681256Z\",\"modifiedAt\":\"2026-02-16T10:02:12.338681157Z\",\"status\":{\"warnings\":[{\"keyword_location\":\"/allOf/0/$ref/properties/metadata/$ref/additionalProperties\",\"instance_location\":\"/metadata\",\"message\":\"additionalProperties 'namespace' not allowed\"}]}}},\"integrations\":{\"pagerduty\":{\"serviceURL\":\"https://www.pagerduty.com/service-directory/Pshopping-cart\"},\"opsgenie\":{\"serviceURL\":\"https://www.opsgenie.com/service/shopping-cart\"}},\"datadog\":{\"performanceData\":{\"tags\":[]},\"events\":[{\"name\":\"\",\"query\":\"\"}],\"logs\":[{\"name\":\"\",\"query\":\"\"}],\"pipelines\":{\"fingerprints\":[]},\"codeLocations\":[{}]},\"spec\":{}}}}]}",
+      "headers": {
+        "Content-Type": [
+          "application/vnd.api+json"
+        ]
+      },
+      "statusCode": 202,
+      "reasonPhrase": "Accepted"
+    },
+    "times": {
+      "remainingTimes": 1
+    },
+    "timeToLive": {
+      "unlimited": true
+    },
+    "id": "3d7039ee-64d2-7ff4-f8c0-ef155076369f"
+  },
+  {
+    "httpRequest": {
+      "headers": {},
+      "method": "DELETE",
+      "path": "/api/v2/catalog/entity/a3ad0180-7ec0-40fa-98fd-b34f27ef4afc",
+      "keepAlive": false,
+      "secure": true
+    },
+    "httpResponse": {
+      "headers": {},
+      "statusCode": 204,
+      "reasonPhrase": "No Content"
+    },
+    "times": {
+      "remainingTimes": 1
+    },
+    "timeToLive": {
+      "unlimited": true
+    },
+    "id": "fd76d990-7dca-5a0b-7d5a-31c1a9c7a629"
+  }
+]
\ No newline at end of file
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 036e7ac60ea..3fbaa0291c3 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-d650bb892172"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
   },
   {
     "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 c12abc0c362..626d104be82 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-1da22948b330"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32f"
   },
   {
     "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 e3c687db896..ac61cefff94 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-12e51226c513"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
   },
   {
     "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 3c087b157b3..17f6987468c 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-12e51226c50e"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
index bb02652c1ea..c63dd04ca65 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae43"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae48"
   },
   {
     "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 5a542ece674..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-f707c3b51e79"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
   },
   {
     "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 d14b87aa29b..e17e659929e 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-1be9e301b3ea"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e9"
   },
   {
     "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 423beb9380f..1511b4f762f 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-eaf799af6461"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
   },
   {
     "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 d44f28ca671..7919b99b4ff 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-eaf799af6462"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_critical_asset_returns_OK_response.json
index 44970e3b2b4..4fe7616f61c 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e7"
   },
   {
     "httpRequest": {
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 c7ce15f6147..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-ab94000addcd"
+    "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 9d5fec45de3..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-dd7718f5185f"
+    "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 245c33ef97b..a0473dce8a1 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-03a7fdff0698"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
   },
   {
     "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 a42ef29bfae..c82b6c27f29 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-83f2c499e8a8"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
   }
 ]
\ No newline at end of file
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 5a5f85e9e24..27a3b2378c8 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-4a71849b3ce4"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
   },
   {
     "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 ee9ff41cc5e..10d1b44602d 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-e4d7e0833bd1"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
   },
   {
     "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 a9b1b0a59f2..01ab24ad981 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-73b0e70145ff"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
   },
   {
     "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 329ab257b1d..d5073efc8b6 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-73b0e70145f6"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
   },
   {
     "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 4a4af70d4d6..9f67c161366 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-73b0e70145f5"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
   },
   {
     "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 4d6f43f87bf..8d2bf345763 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-73b0e70145eb"
+    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
index 63612794c7f..98d4f2e89be 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
   },
   {
     "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..87794c5dcab 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-eaf799af6466"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
index c787f38d63d..89e714c46e3 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6465"
   },
   {
     "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 e1f6cfcce7c..9906d02abaf 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-b92f9fa74d30"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
   },
   {
     "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 3ffceed3185..ccc4c95513a 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-b92f9fa74d2c"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
   },
   {
     "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 e4a05802f28..ecbf48088cd 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-e4d7e0833bd2"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
   },
   {
     "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 e668325311c..e315b0658c4 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-e4d7e0833bd4"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
   },
   {
     "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..12a959775bd 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-ab94000addce"
   },
   {
     "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/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
index fe4cf251d57..6b2882ea815 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json
index 5fe868f6988..774e33bf524 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7442c701-c89c-a74b-3de9-6b4cff876178"
+    "id": "7442c701-c89c-a74b-3de9-6b4cff876179"
   }
 ]
\ 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 ca6f6eb76a9..f2e8ebc7ed1 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-12e51226c514"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json
index cdbd8c2d803..b461aa9101d 100644
--- a/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json
index cab40f18769..018b1504a4a 100644
--- a/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fab"
+    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fac"
   },
   {
     "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 9190a1a8019..0baec6032c5 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-e0464f43c9e7"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e5"
   },
   {
     "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 2249ad7f8b8..009fff14323 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-4499a9e71c71"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
   },
   {
     "httpRequest": {
@@ -79,6 +79,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
   }
 ]
\ 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 3a14fe62055..99e1be2e6b8 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-03a7fdff069a"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069b"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json
index 4b177525577..082ad2fe876 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4c138fa0-d834-5972-8bd7-894a659525af"
+    "id": "4c138fa0-d834-5972-8bd7-894a659525ad"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
index d76b3217ed0..0c7c6a0abc1 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51862"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185f"
   },
   {
     "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 d3568a82564..59a863c261f 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-ab94000addce"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
index 40f41bf5c71..c6e40d9ebaf 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7d"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7c"
   },
   {
     "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 7fb128d6529..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-eaf799af6468"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_rules_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_rules_returns_OK_response.json
index e1d7d6dfa5f..6e336f005de 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_rules_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_rules_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7e2e839d-ac73-21dc-b480-36e366ae09da"
+    "id": "7e2e839d-ac73-21dc-b480-36e366ae09d9"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
index 6352d5f0102..87cb96a7640 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef691"
+    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef690"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_an_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 7e5c7b1234d..55368f4ae1c 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-33ab2f3af9d3"
+    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d4"
   }
 ]
\ 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 79b249db928..c859297de35 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_existing_Workflow_returns_Successfully_got_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21f"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21d"
   },
   {
     "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 4aba2dd2af0..b79df729351 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-b92f9fa74d35"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
   },
   {
     "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 00f0e4bc8fd..cb29d3d82c6 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-e4d7e0833bdc"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
   },
   {
     "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 8af5e0e1230..9e4125a5f12 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-e4d7e0833bdb"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
index 5b5d81e7265..0731ce00dfd 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-73b0e70145ef"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json
index cc6c1703e9a..e9ddbf352f7 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "16438026-1168-3bfa-3763-949697b01fe9"
+    "id": "16438026-1168-3bfa-3763-949697b01fea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json
index c0406058bb1..6b6dc7ffeef 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "16438026-1168-3bfa-3763-949697b01fea"
+    "id": "16438026-1168-3bfa-3763-949697b01fe9"
   },
   {
     "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 1eccad92176..6ab71e5cb0b 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-1da22948b32f"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b330"
   },
   {
     "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 efc1f126be5..ce9579ed86c 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-d650bb89216e"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json
index 1d634f061da..bbb7fb5acd3 100644
--- a/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51860"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json
index f5543674faa..61e60b91801 100644
--- a/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7442c701-c89c-a74b-3de9-6b4cff876179"
+    "id": "7442c701-c89c-a74b-3de9-6b4cff876178"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json
index e200ee772e9..c09bb52e54b 100644
--- a/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fac"
+    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fab"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
index 386d8e0e05a..b5c65afa164 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-f707c3b51e7b"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
   },
   {
     "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 83f01f32714..2964c9bb0a0 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-03a7fdff069e"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_all_rules_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_all_rules_returns_OK_response.json
index 80e2da9ecca..2cd151adcdb 100644
--- a/src/test/resources/cassettes/features/v2/List_all_rules_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_all_rules_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7e2e839d-ac73-21dc-b480-36e366ae09d9"
+    "id": "7e2e839d-ac73-21dc-b480-36e366ae09da"
   }
 ]
\ 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 1ec023c7a3f..0251f9fdc84 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-b92f9fa74d34"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_historical_jobs_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_historical_jobs_returns_OK_response.json
index 496fbb6e65d..c59d5f476eb 100644
--- a/src/test/resources/cassettes/features/v2/List_historical_jobs_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_historical_jobs_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4c138fa0-d834-5972-8bd7-894a659525ad"
+    "id": "4c138fa0-d834-5972-8bd7-894a659525af"
   },
   {
     "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 dd7ac63f41c..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-e4d7e0833bda"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json
index b4ab43f6993..f0011c849a4 100644
--- a/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
index e0386327470..a48da463a36 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-d650bb89216f"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216e"
   },
   {
     "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 8b5185d00c4..72d39aac15b 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-d650bb89216d"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892170"
   }
 ]
\ 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..be0c8e1fc69 100644
--- a/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
index 76dcecf2554..cd78d0c8aac 100644
--- a/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185e"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
index 0a176ee003e..1b2ef6880a2 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9457"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9458"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
index 974c53ce63d..0a176ee003e 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-545f90bc9456"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9457"
   }
 ]
\ 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 848565e096f..25b85370788 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-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/Publish_App_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
index 435d359240b..2a83223836d 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-12e51226c50d"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
   },
   {
     "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 2925d76e394..8aabfa4bb3c 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-f707c3b51e80"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e84"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa6"
   },
   {
     "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 391ac6f5a82..30c90f2c7a1 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-f707c3b51e82"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e83"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
   },
   {
     "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 7ddd5351e8b..965c63575d1 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-d650bb892171"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
   },
   {
     "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 c412cfe00ae..988f4ea02fd 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-d650bb892173"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Run_a_threat_hunting_job_returns_Status_created_response.json b/src/test/resources/cassettes/features/v2/Run_a_threat_hunting_job_returns_Status_created_response.json
index de52f958b01..b0ab0c61ed8 100644
--- a/src/test/resources/cassettes/features/v2/Run_a_threat_hunting_job_returns_Status_created_response.json
+++ b/src/test/resources/cassettes/features/v2/Run_a_threat_hunting_job_returns_Status_created_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4c138fa0-d834-5972-8bd7-894a659525ae"
+    "id": "4c138fa0-d834-5972-8bd7-894a659525ac"
   }
 ]
\ 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 5e1eff89d33..1f92d5f8ee0 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-73b0e70145fb"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
   },
   {
     "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..c5a5a493747 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-73b0e70145fe"
   },
   {
     "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 30ea1068d6c..75b686bdbbe 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-73b0e70145fe"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
   },
   {
     "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 49fb8cc064c..00e0a12ca8e 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
   },
   {
     "httpRequest": {
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 102c77a74fe..f9c3486386c 100644
--- a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
index 1b2ef6880a2..974c53ce63d 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9458"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
index 691c38c81f5..3ad98fd9666 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-12e51226c510"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
   },
   {
     "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 1d4cdc5d72d..385920ba074 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-12e51226c512"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
   },
   {
     "httpRequest": {
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 f6a98d32dfc..970a0b596df 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-bd11c0a4ae49"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
   },
   {
     "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 b372a39399d..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-bd11c0a4ae44"
+    "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 4f2914f13a5..085c2a10ee9 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-bd11c0a4ae48"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae43"
   },
   {
     "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 949fd15a46e..31624316407 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-f707c3b51e78"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9d"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
   },
   {
     "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 62066321bb4..8c7573a6b24 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-f707c3b51e7e"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e78"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9d"
   },
   {
     "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 2a7586fcda9..18d3e95b847 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-f707c3b51e84"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa6"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json
index c7a6553a4f2..ffe3aefae73 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9442"
+    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9443"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json
index 7b5287a216a..72e65a80efe 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9443"
+    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9441"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_Bad_Request_response.json
index f24b50ca13f..402e0d483a0 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9441"
+    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9442"
   },
   {
     "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 6b10b1f99cb..3f634cdfdc4 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-e0464f43c9e5"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
index c3918bef3d9..3d963f1eb76 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e9"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3ea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json
index 7507a4ec463..3f6cb5725eb 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7e"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
index 5486c5522b1..7ee7239080c 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-046e57b87c7e"
   },
   {
     "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 e8a192ca3ed..f86ae381a6a 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-03a7fdff0699"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
   },
   {
     "httpRequest": {
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 19bafda234f..a69a6922bcb 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-03a7fdff0697"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
   },
   {
     "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..8ec3516aa37 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-03a7fdff0699"
   },
   {
     "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 889d546c6ee..4e5ca79a29d 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-03a7fdff069b"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0698"
   },
   {
     "httpRequest": {
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 19d4cf1a034..4dbd4d81382 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-03a7fdff069c"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069a"
   },
   {
     "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 a0d5f9cc2e9..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-d650bb892175"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Role_ID_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Role_ID_response.json
index 1f8f591d76e..cd124c0cca2 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Role_ID_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Role_ID_response.json
@@ -53,7 +53,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 3e8008f2657..a6258c72557 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-d650bb89216c"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892171"
   },
   {
     "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 e25ebe1df98..6f8a3b3ff88 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
index 5e43645a6a4..b3d0c2aebe2 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-4a71849b3ce5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json
index 3fff6d70d3c..59be0a3c587 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
index ab514e51ba2..be6cf1cbadf 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-0d8c01ffa21d"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
   },
   {
     "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 d8cb401f985..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-e4d7e0833bd8"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_Bad_Request_response.json
index c403571c4ea..743bfbc7078 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0a6534d0-42f2-5075-64f8-7ab28f449a8d"
+    "id": "0a6534d0-42f2-5075-64f8-7ab28f449a8e"
   },
   {
     "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 d2688342500..07e56a25e8a 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-73b0e70145f9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fd"
   },
   {
     "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 0fb05ef1dd5..0587c45a38b 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-eaf799af6465"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6468"
   },
   {
     "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 87c697b97a9..8630f955ca7 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-73b0e70145f8"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145eb"
   },
   {
     "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 ee590d62b00..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-eaf799af6464"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_description_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_description_returns_Bad_Request_response.json
index 431f560d206..d1c977728b3 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_description_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_description_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0a6534d0-42f2-5075-64f8-7ab28f449a8e"
+    "id": "0a6534d0-42f2-5075-64f8-7ab28f449a8d"
   },
   {
     "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 0facddc7bca..61fbae645d9 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-73b0e7014600"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
   },
   {
     "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 f17e853b338..dcfef467346 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-73b0e70145f7"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
   },
   {
     "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 f58f1fcd76c..5ccc5cd5b49 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-73b0e70145ee"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ff"
   },
   {
     "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 9843435430c..6be14122c9a 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-73b0e70145f4"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
   },
   {
     "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 eb21dfe7899..7bcb7dbadb9 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-73b0e70145fa"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
   },
   {
     "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 b0f714f21ea..1403550dfe7 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-73b0e70145f1"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
   },
   {
     "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..9f3ed984b69 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-b92f9fa74d2e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json
index 0d7f3383d17..4b4aaa2bc5d 100644
--- a/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/com/datadog/api/client/v2/api/software_catalog.feature b/src/test/resources/com/datadog/api/client/v2/api/software_catalog.feature
index 34e9f95314d..5ca74dedb25 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/software_catalog.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/software_catalog.feature
@@ -8,6 +8,58 @@ Feature: Software Catalog
     And an instance of "SoftwareCatalog" API
 
   @generated @skip @team:DataDog/service-catalog
+  Scenario: Accept recommended entities in bulk returns "Accepted" response
+    Given operation "AcceptRecommendedEntities" enabled
+    And new "AcceptRecommendedEntities" request
+    And body with value [{"id": "123abc456def", "schema": {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"componentOf": [], "dependsOn": [], "languages": []}}}]
+    When the request is sent
+    Then the response status is 202 Accepted
+
+  @generated @skip @team:DataDog/service-catalog
+  Scenario: Accept recommended entities in bulk returns "Bad Request" response
+    Given operation "AcceptRecommendedEntities" enabled
+    And new "AcceptRecommendedEntities" request
+    And body with value [{"id": "123abc456def", "schema": {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"componentOf": [], "dependsOn": [], "languages": []}}}]
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/service-catalog
+  Scenario: Convert entities between schema versions returns "Bad Request" response
+    Given operation "ConvertCatalogEntities" enabled
+    And new "ConvertCatalogEntities" request
+    And request contains "target_version" parameter from "REPLACE.ME"
+    And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"componentOf": [], "dependsOn": [], "languages": []}}
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/service-catalog
+  Scenario: Convert entities between schema versions returns "OK" response
+    Given operation "ConvertCatalogEntities" enabled
+    And new "ConvertCatalogEntities" request
+    And request contains "target_version" parameter from "REPLACE.ME"
+    And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"componentOf": [], "dependsOn": [], "languages": []}}
+    When the request is sent
+    Then the response status is 200 OK
+
+  @generated @skip @team:DataDog/service-catalog
+  Scenario: Create or update IDP configuration returns "Bad Request" response
+    Given operation "UpsertIDPConfigValue" enabled
+    And new "UpsertIDPConfigValue" request
+    And request contains "config_name" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"value": [{"displayName": "My Dashboard", "id": "dashboard-1"}]}, "type": "idp_config"}}
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/service-catalog
+  Scenario: Create or update IDP configuration returns "No Content" response
+    Given operation "UpsertIDPConfigValue" enabled
+    And new "UpsertIDPConfigValue" request
+    And request contains "config_name" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"value": [{"displayName": "My Dashboard", "id": "dashboard-1"}]}, "type": "idp_config"}}
+    When the request is sent
+    Then the response status is 204 No Content
+
+  @team:DataDog/service-catalog
   Scenario: Create or update entities returns "ACCEPTED" response
     Given new "UpsertCatalogEntity" request
     And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"componentOf": [], "dependsOn": [], "languages": []}}
@@ -52,6 +104,22 @@ Feature: Software Catalog
     And the response "data[0].attributes.kind" is equal to "service"
     And the response "data[0].attributes.name" is equal to "service-{{ unique_lower_alnum }}"
 
+  @generated @skip @team:DataDog/service-catalog
+  Scenario: Decline recommended entities in bulk returns "Bad Request" response
+    Given operation "DeclineRecommendedEntities" enabled
+    And new "DeclineRecommendedEntities" request
+    And body with value [{"id": "123abcdef"}]
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/service-catalog
+  Scenario: Decline recommended entities in bulk returns "No Content" response
+    Given operation "DeclineRecommendedEntities" enabled
+    And new "DeclineRecommendedEntities" request
+    And body with value [{"id": "123abcdef"}]
+    When the request is sent
+    Then the response status is 204 No Content
+
   @generated @skip @team:DataDog/service-catalog
   Scenario: Delete a single entity returns "Bad Request" response
     Given new "DeleteCatalogEntity" request
@@ -102,6 +170,30 @@ Feature: Software Catalog
     Then the response status is 404 Not Found
     And the response "errors[0]" is equal to "Not Found"
 
+  @generated @skip @team:DataDog/service-catalog
+  Scenario: Get Internal Developer Portal configuration returns "Bad Request" response
+    Given operation "GetIDPConfigValue" enabled
+    And new "GetIDPConfigValue" request
+    And request contains "config_name" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/service-catalog
+  Scenario: Get Internal Developer Portal configuration returns "Not Found" response
+    Given operation "GetIDPConfigValue" enabled
+    And new "GetIDPConfigValue" request
+    And request contains "config_name" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/service-catalog
+  Scenario: Get Internal Developer Portal configuration returns "OK" response
+    Given operation "GetIDPConfigValue" enabled
+    And new "GetIDPConfigValue" request
+    And request contains "config_name" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 200 OK
+
   @team:DataDog/service-catalog
   Scenario: Get a list of entities returns "OK" response
     Given new "ListCatalogEntity" request
@@ -150,3 +242,17 @@ Feature: Software Catalog
     Given new "PreviewCatalogEntities" request
     When the request is sent
     Then the response status is 202 Accepted
+
+  @generated @skip @team:DataDog/service-catalog
+  Scenario: Trigger recommended entity discovery returns "Accepted" response
+    Given operation "TriggerRecommendedEntities" enabled
+    And new "TriggerRecommendedEntities" request
+    When the request is sent
+    Then the response status is 202 Accepted
+
+  @generated @skip @team:DataDog/service-catalog
+  Scenario: Trigger recommended entity discovery returns "Bad Request" response
+    Given operation "TriggerRecommendedEntities" enabled
+    And new "TriggerRecommendedEntities" request
+    When the request is sent
+    Then the response status is 400 Bad Request
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 09186eef673..10f1521919b 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
@@ -929,6 +929,12 @@
       "type": "unsafe"
     }
   },
+  "ConvertCatalogEntities": {
+    "tag": "Software Catalog",
+    "undo": {
+      "type": "safe"
+    }
+  },
   "PreviewCatalogEntities": {
     "tag": "Software Catalog",
     "undo": {
@@ -966,6 +972,24 @@
       "type": "idempotent"
     }
   },
+  "AcceptRecommendedEntities": {
+    "tag": "Software Catalog",
+    "undo": {
+      "type": "unsafe"
+    }
+  },
+  "DeclineRecommendedEntities": {
+    "tag": "Software Catalog",
+    "undo": {
+      "type": "unsafe"
+    }
+  },
+  "TriggerRecommendedEntities": {
+    "tag": "Software Catalog",
+    "undo": {
+      "type": "safe"
+    }
+  },
   "ListCatalogRelation": {
     "tag": "Software Catalog",
     "undo": {
@@ -1763,6 +1787,18 @@
       "type": "unsafe"
     }
   },
+  "GetIDPConfigValue": {
+    "tag": "Software Catalog",
+    "undo": {
+      "type": "safe"
+    }
+  },
+  "UpsertIDPConfigValue": {
+    "tag": "Software Catalog",
+    "undo": {
+      "type": "unsafe"
+    }
+  },
   "ListIncidents": {
     "tag": "Incidents",
     "undo": {