diff --git a/.generator/src/generator/templates/Api.j2 b/.generator/src/generator/templates/Api.j2
index 30219fb2a65..01b6fb678a1 100644
--- a/.generator/src/generator/templates/Api.j2
+++ b/.generator/src/generator/templates/Api.j2
@@ -205,7 +205,7 @@ public class {{ name }} {
   args.put("optionalParams", parameters);
   {%- endif  %}
 
-  PaginationIterable iterator = new PaginationIterable(this, "{{ operationId }}", resultsPath, valueGetterPath, valueSetterPath, valueSetterParamOptional, {% if pagination.pageParam %}false{% else %}true{% endif %}, limit, args, {{ pagination.pageStart | default(0) }});
+  PaginationIterable iterator = new PaginationIterable(this, "{{ operationId }}", resultsPath, valueGetterPath, valueSetterPath, valueSetterParamOptional, {% if pagination.pageParam %}false{% else %}true{% endif %}, {% if pagination.cursorParam %}true{% else %}false{% endif %}, limit, args, {{ pagination.pageStart | default(0) }});
 
   return iterator;
 {%- endmacro %}
diff --git a/.generator/src/generator/templates/PaginationIterable.j2 b/.generator/src/generator/templates/PaginationIterable.j2
index 462ce917a8f..01ef1309f42 100644
--- a/.generator/src/generator/templates/PaginationIterable.j2
+++ b/.generator/src/generator/templates/PaginationIterable.j2
@@ -12,6 +12,7 @@ public class PaginationIterable<T> implements Iterable<T> {
   String[] valueSetterPath;
   Boolean valueSetterParamOptional;
   Boolean offsetPageIncrement;
+  Boolean cursorPagination;
   Object limit;
   LinkedHashMap<String, Object> args;
   int pageStart;
@@ -24,6 +25,7 @@ public class PaginationIterable<T> implements Iterable<T> {
       String valueSetterPath,
       Boolean valueSetterParamOptional,
       Boolean offsetPageIncrement,
+      Boolean cursorPagination,
       Object limit,
       LinkedHashMap<String, Object> args,
       int pageStart) {
@@ -41,6 +43,7 @@ public class PaginationIterable<T> implements Iterable<T> {
     this.valueSetterPath = valueSetterPath.split("\\.");
     this.valueSetterParamOptional = valueSetterParamOptional;
     this.offsetPageIncrement = offsetPageIncrement;
+    this.cursorPagination = cursorPagination;
     this.limit = limit;
     this.args = args;
     this.pageStart = pageStart;
diff --git a/.generator/src/generator/templates/PaginationIterator.j2 b/.generator/src/generator/templates/PaginationIterator.j2
index 791c56fda3b..01a6f5aa4a6 100644
--- a/.generator/src/generator/templates/PaginationIterator.j2
+++ b/.generator/src/generator/templates/PaginationIterator.j2
@@ -142,7 +142,11 @@ public class PaginationIterator<T> implements Iterator<T> {
       return true;
     }
 
-    if (this.data.size() < convertToInt(this.iterable.limit)) {
+    if (this.iterable.cursorPagination) {
+      if (this.data.size() == 0) {
+        return false;
+      }
+    } else if (this.data.size() < convertToInt(this.iterable.limit)) {
       return false;
     }
 
diff --git a/src/main/java/com/datadog/api/client/PaginationIterable.java b/src/main/java/com/datadog/api/client/PaginationIterable.java
index 46e97372660..5035a63ac15 100644
--- a/src/main/java/com/datadog/api/client/PaginationIterable.java
+++ b/src/main/java/com/datadog/api/client/PaginationIterable.java
@@ -16,6 +16,7 @@ public class PaginationIterable<T> implements Iterable<T> {
   String[] valueSetterPath;
   Boolean valueSetterParamOptional;
   Boolean offsetPageIncrement;
+  Boolean cursorPagination;
   Object limit;
   LinkedHashMap<String, Object> args;
   int pageStart;
@@ -28,6 +29,7 @@ public PaginationIterable(
       String valueSetterPath,
       Boolean valueSetterParamOptional,
       Boolean offsetPageIncrement,
+      Boolean cursorPagination,
       Object limit,
       LinkedHashMap<String, Object> args,
       int pageStart) {
@@ -45,6 +47,7 @@ public PaginationIterable(
     this.valueSetterPath = valueSetterPath.split("\\.");
     this.valueSetterParamOptional = valueSetterParamOptional;
     this.offsetPageIncrement = offsetPageIncrement;
+    this.cursorPagination = cursorPagination;
     this.limit = limit;
     this.args = args;
     this.pageStart = pageStart;
diff --git a/src/main/java/com/datadog/api/client/PaginationIterator.java b/src/main/java/com/datadog/api/client/PaginationIterator.java
index 6aaac0f7c3e..29194949d96 100644
--- a/src/main/java/com/datadog/api/client/PaginationIterator.java
+++ b/src/main/java/com/datadog/api/client/PaginationIterator.java
@@ -147,7 +147,11 @@ public boolean hasNext() {
       return true;
     }
 
-    if (this.data.size() < convertToInt(this.iterable.limit)) {
+    if (this.iterable.cursorPagination) {
+      if (this.data.size() == 0) {
+        return false;
+      }
+    } else if (this.data.size() < convertToInt(this.iterable.limit)) {
       return false;
     }
 
diff --git a/src/main/java/com/datadog/api/client/v1/api/DashboardsApi.java b/src/main/java/com/datadog/api/client/v1/api/DashboardsApi.java
index c7c0f2d805f..d2448603103 100644
--- a/src/main/java/com/datadog/api/client/v1/api/DashboardsApi.java
+++ b/src/main/java/com/datadog/api/client/v1/api/DashboardsApi.java
@@ -1543,6 +1543,7 @@ public PaginationIterable<DashboardSummaryDefinition> listDashboardsWithPaginati
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v1/api/MonitorsApi.java b/src/main/java/com/datadog/api/client/v1/api/MonitorsApi.java
index aba7ae81cf3..1d5cc30dc26 100644
--- a/src/main/java/com/datadog/api/client/v1/api/MonitorsApi.java
+++ b/src/main/java/com/datadog/api/client/v1/api/MonitorsApi.java
@@ -1329,6 +1329,7 @@ public PaginationIterable<Monitor> listMonitorsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             false,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v1/api/NotebooksApi.java b/src/main/java/com/datadog/api/client/v1/api/NotebooksApi.java
index 4698f52b9d5..ccd82fee042 100644
--- a/src/main/java/com/datadog/api/client/v1/api/NotebooksApi.java
+++ b/src/main/java/com/datadog/api/client/v1/api/NotebooksApi.java
@@ -690,6 +690,7 @@ public PaginationIterable<NotebooksResponseData> listNotebooksWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v1/api/ServiceLevelObjectiveCorrectionsApi.java b/src/main/java/com/datadog/api/client/v1/api/ServiceLevelObjectiveCorrectionsApi.java
index 5aed573c0a8..a8f0191c017 100644
--- a/src/main/java/com/datadog/api/client/v1/api/ServiceLevelObjectiveCorrectionsApi.java
+++ b/src/main/java/com/datadog/api/client/v1/api/ServiceLevelObjectiveCorrectionsApi.java
@@ -597,6 +597,7 @@ public PaginationIterable<SLOCorrection> listSLOCorrectionWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v1/api/ServiceLevelObjectivesApi.java b/src/main/java/com/datadog/api/client/v1/api/ServiceLevelObjectivesApi.java
index 078b3f88a4d..f352c6bc257 100644
--- a/src/main/java/com/datadog/api/client/v1/api/ServiceLevelObjectivesApi.java
+++ b/src/main/java/com/datadog/api/client/v1/api/ServiceLevelObjectivesApi.java
@@ -1445,6 +1445,7 @@ public PaginationIterable<ServiceLevelObjective> listSLOsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v1/api/SyntheticsApi.java b/src/main/java/com/datadog/api/client/v1/api/SyntheticsApi.java
index 959610ad72d..2153fff9212 100644
--- a/src/main/java/com/datadog/api/client/v1/api/SyntheticsApi.java
+++ b/src/main/java/com/datadog/api/client/v1/api/SyntheticsApi.java
@@ -3654,6 +3654,7 @@ public PaginationIterable<SyntheticsTestDetailsWithoutSteps> listTestsWithPagina
             valueSetterPath,
             valueSetterParamOptional,
             false,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/AuditApi.java b/src/main/java/com/datadog/api/client/v2/api/AuditApi.java
index 028bb0fcc11..5e1a0cefb19 100644
--- a/src/main/java/com/datadog/api/client/v2/api/AuditApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/AuditApi.java
@@ -232,6 +232,7 @@ public PaginationIterable<AuditLogsEvent> listAuditLogsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
@@ -486,6 +487,7 @@ public PaginationIterable<AuditLogsEvent> searchAuditLogsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/BitsAiApi.java b/src/main/java/com/datadog/api/client/v2/api/BitsAiApi.java
index 12af8e44f39..e297022e23e 100644
--- a/src/main/java/com/datadog/api/client/v2/api/BitsAiApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/BitsAiApi.java
@@ -346,6 +346,7 @@ public PaginationIterable<ListInvestigationsResponseData> listInvestigationsWith
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/CaseManagementApi.java b/src/main/java/com/datadog/api/client/v2/api/CaseManagementApi.java
index 0b15564dc6f..73c196b871f 100644
--- a/src/main/java/com/datadog/api/client/v2/api/CaseManagementApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/CaseManagementApi.java
@@ -3330,6 +3330,7 @@ public PaginationIterable<Case> searchCasesWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             false,
+            false,
             limit,
             args,
             1);
diff --git a/src/main/java/com/datadog/api/client/v2/api/CiVisibilityPipelinesApi.java b/src/main/java/com/datadog/api/client/v2/api/CiVisibilityPipelinesApi.java
index 6356a85347a..b42e11fc9bb 100644
--- a/src/main/java/com/datadog/api/client/v2/api/CiVisibilityPipelinesApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/CiVisibilityPipelinesApi.java
@@ -520,6 +520,7 @@ public PaginationIterable<CIAppPipelineEvent> listCIAppPipelineEventsWithPaginat
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
@@ -781,6 +782,7 @@ public PaginationIterable<CIAppPipelineEvent> searchCIAppPipelineEventsWithPagin
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/CiVisibilityTestsApi.java b/src/main/java/com/datadog/api/client/v2/api/CiVisibilityTestsApi.java
index ded0f178a91..de0625ce5ac 100644
--- a/src/main/java/com/datadog/api/client/v2/api/CiVisibilityTestsApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/CiVisibilityTestsApi.java
@@ -370,6 +370,7 @@ public PaginationIterable<CIAppTestEvent> listCIAppTestEventsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
@@ -628,6 +629,7 @@ public PaginationIterable<CIAppTestEvent> searchCIAppTestEventsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/ContainerImagesApi.java b/src/main/java/com/datadog/api/client/v2/api/ContainerImagesApi.java
index 57a74724119..49df22f583a 100644
--- a/src/main/java/com/datadog/api/client/v2/api/ContainerImagesApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/ContainerImagesApi.java
@@ -216,6 +216,7 @@ public PaginationIterable<ContainerImageItem> listContainerImagesWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/ContainersApi.java b/src/main/java/com/datadog/api/client/v2/api/ContainersApi.java
index 0ff066beec9..30d966581d9 100644
--- a/src/main/java/com/datadog/api/client/v2/api/ContainersApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/ContainersApi.java
@@ -216,6 +216,7 @@ public PaginationIterable<ContainerItem> listContainersWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/DowntimesApi.java b/src/main/java/com/datadog/api/client/v2/api/DowntimesApi.java
index 9f736d1df9f..34719e71704 100644
--- a/src/main/java/com/datadog/api/client/v2/api/DowntimesApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/DowntimesApi.java
@@ -679,6 +679,7 @@ public PaginationIterable<DowntimeResponseData> listDowntimesWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
@@ -936,6 +937,7 @@ public PaginationIterable<MonitorDowntimeMatchResponseData> listMonitorDowntimes
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/EventsApi.java b/src/main/java/com/datadog/api/client/v2/api/EventsApi.java
index df4977b4ca2..c66393e4db0 100644
--- a/src/main/java/com/datadog/api/client/v2/api/EventsApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/EventsApi.java
@@ -514,6 +514,7 @@ public PaginationIterable<EventResponse> listEventsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
@@ -768,6 +769,7 @@ public PaginationIterable<EventResponse> searchEventsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/IncidentsApi.java b/src/main/java/com/datadog/api/client/v2/api/IncidentsApi.java
index 0c2cf7647dd..c44e3983ac1 100644
--- a/src/main/java/com/datadog/api/client/v2/api/IncidentsApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/IncidentsApi.java
@@ -7630,6 +7630,7 @@ public PaginationIterable<IncidentResponseData> listIncidentsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
@@ -8554,6 +8555,7 @@ public PaginationIterable<IncidentSearchResponseIncidentsData> searchIncidentsWi
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/LogsApi.java b/src/main/java/com/datadog/api/client/v2/api/LogsApi.java
index d23161a544e..c70238486a0 100644
--- a/src/main/java/com/datadog/api/client/v2/api/LogsApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/LogsApi.java
@@ -312,6 +312,7 @@ public PaginationIterable<Log> listLogsWithPagination(ListLogsOptionalParameters
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
@@ -621,6 +622,7 @@ public PaginationIterable<Log> listLogsGetWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/MetricsApi.java b/src/main/java/com/datadog/api/client/v2/api/MetricsApi.java
index befb8b2cb33..302a3f37aac 100644
--- a/src/main/java/com/datadog/api/client/v2/api/MetricsApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/MetricsApi.java
@@ -1855,6 +1855,7 @@ public PaginationIterable<MetricsAndMetricTagConfigurations> listTagConfiguratio
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/NetworkDeviceMonitoringApi.java b/src/main/java/com/datadog/api/client/v2/api/NetworkDeviceMonitoringApi.java
index f9316af252f..3d89eb01e24 100644
--- a/src/main/java/com/datadog/api/client/v2/api/NetworkDeviceMonitoringApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/NetworkDeviceMonitoringApi.java
@@ -535,6 +535,7 @@ public PaginationIterable<DevicesListData> listDevicesWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             false,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/PowerpackApi.java b/src/main/java/com/datadog/api/client/v2/api/PowerpackApi.java
index c2f8cf50894..3e1203aff26 100644
--- a/src/main/java/com/datadog/api/client/v2/api/PowerpackApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/PowerpackApi.java
@@ -581,6 +581,7 @@ public PaginationIterable<PowerpackData> listPowerpacksWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/ProcessesApi.java b/src/main/java/com/datadog/api/client/v2/api/ProcessesApi.java
index 29894dbae87..170166f9bc6 100644
--- a/src/main/java/com/datadog/api/client/v2/api/ProcessesApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/ProcessesApi.java
@@ -234,6 +234,7 @@ public PaginationIterable<ProcessSummary> listProcessesWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/RumApi.java b/src/main/java/com/datadog/api/client/v2/api/RumApi.java
index aeb60163a35..2e4fe3265e5 100644
--- a/src/main/java/com/datadog/api/client/v2/api/RumApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/RumApi.java
@@ -880,6 +880,7 @@ public PaginationIterable<RUMEvent> listRUMEventsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
@@ -1073,6 +1074,7 @@ public PaginationIterable<RUMEvent> searchRUMEventsWithPagination(RUMSearchEvent
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/ScorecardsApi.java b/src/main/java/com/datadog/api/client/v2/api/ScorecardsApi.java
index 9b8654019e2..bee14a2d6d5 100644
--- a/src/main/java/com/datadog/api/client/v2/api/ScorecardsApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/ScorecardsApi.java
@@ -1448,6 +1448,7 @@ public PaginationIterable<OutcomesResponseDataItem> listScorecardOutcomesWithPag
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
@@ -1826,6 +1827,7 @@ public PaginationIterable<ListRulesResponseDataItem> listScorecardRulesWithPagin
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/SecurityMonitoringApi.java b/src/main/java/com/datadog/api/client/v2/api/SecurityMonitoringApi.java
index 4303ecac93a..1f00e134d92 100644
--- a/src/main/java/com/datadog/api/client/v2/api/SecurityMonitoringApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/SecurityMonitoringApi.java
@@ -10610,6 +10610,7 @@ public PaginationIterable<Finding> listFindingsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
@@ -12111,6 +12112,7 @@ public PaginationIterable<SecurityFindingsData> listSecurityFindingsWithPaginati
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
@@ -13045,6 +13047,7 @@ public PaginationIterable<SecurityMonitoringSignal> listSecurityMonitoringSignal
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
@@ -15936,6 +15939,7 @@ public PaginationIterable<SecurityFindingsData> searchSecurityFindingsWithPagina
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
@@ -16384,6 +16388,7 @@ public PaginationIterable<SecurityMonitoringSignal> searchSecurityMonitoringSign
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/ServiceDefinitionApi.java b/src/main/java/com/datadog/api/client/v2/api/ServiceDefinitionApi.java
index 0c2b9f1ee87..bb7b821643f 100644
--- a/src/main/java/com/datadog/api/client/v2/api/ServiceDefinitionApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/ServiceDefinitionApi.java
@@ -684,6 +684,7 @@ public PaginationIterable<ServiceDefinitionData> listServiceDefinitionsWithPagin
             valueSetterPath,
             valueSetterParamOptional,
             false,
+            false,
             limit,
             args,
             0);
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 cac149729d0..c87f052b1bc 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
@@ -568,6 +568,7 @@ public PaginationIterable<EntityData> listCatalogEntityWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
@@ -872,6 +873,7 @@ public PaginationIterable<KindData> listCatalogKindWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
@@ -1182,6 +1184,7 @@ public PaginationIterable<RelationResponse> listCatalogRelationWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/SpansApi.java b/src/main/java/com/datadog/api/client/v2/api/SpansApi.java
index 46faade2865..acd5fcce65c 100644
--- a/src/main/java/com/datadog/api/client/v2/api/SpansApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/SpansApi.java
@@ -261,6 +261,7 @@ public PaginationIterable<Span> listSpansWithPagination(SpansListRequest body) {
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
@@ -556,6 +557,7 @@ public PaginationIterable<Span> listSpansGetWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/StaticAnalysisApi.java b/src/main/java/com/datadog/api/client/v2/api/StaticAnalysisApi.java
index 73c98b942a3..1f141175f50 100644
--- a/src/main/java/com/datadog/api/client/v2/api/StaticAnalysisApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/StaticAnalysisApi.java
@@ -1743,6 +1743,7 @@ public PaginationIterable<CustomRuleRevision> listCustomRuleRevisionsWithPaginat
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/TeamsApi.java b/src/main/java/com/datadog/api/client/v2/api/TeamsApi.java
index 9cd28fa7759..b84e95d4436 100644
--- a/src/main/java/com/datadog/api/client/v2/api/TeamsApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/TeamsApi.java
@@ -2598,6 +2598,7 @@ public PaginationIterable<UserTeam> getTeamMembershipsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             false,
+            false,
             limit,
             args,
             0);
@@ -3607,6 +3608,7 @@ public PaginationIterable<Team> listMemberTeamsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             false,
+            false,
             limit,
             args,
             0);
@@ -3951,6 +3953,7 @@ public PaginationIterable<TeamConnection> listTeamConnectionsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             false,
+            false,
             limit,
             args,
             0);
@@ -4239,6 +4242,7 @@ public PaginationIterable<TeamHierarchyLink> listTeamHierarchyLinksWithPaginatio
             valueSetterPath,
             valueSetterParamOptional,
             false,
+            false,
             limit,
             args,
             0);
@@ -4547,6 +4551,7 @@ public PaginationIterable<Team> listTeamsWithPagination(ListTeamsOptionalParamet
             valueSetterPath,
             valueSetterParamOptional,
             false,
+            false,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/TestOptimizationApi.java b/src/main/java/com/datadog/api/client/v2/api/TestOptimizationApi.java
index 97e82704ccb..b5fd10c6c40 100644
--- a/src/main/java/com/datadog/api/client/v2/api/TestOptimizationApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/TestOptimizationApi.java
@@ -619,6 +619,7 @@ public PaginationIterable<FlakyTest> searchFlakyTestsWithPagination(
             valueSetterPath,
             valueSetterParamOptional,
             true,
+            true,
             limit,
             args,
             0);
diff --git a/src/main/java/com/datadog/api/client/v2/api/UsersApi.java b/src/main/java/com/datadog/api/client/v2/api/UsersApi.java
index c3bc5a348a9..9440a49fabb 100644
--- a/src/main/java/com/datadog/api/client/v2/api/UsersApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/UsersApi.java
@@ -1329,6 +1329,7 @@ public PaginationIterable<User> listUsersWithPagination(ListUsersOptionalParamet
             valueSetterPath,
             valueSetterParamOptional,
             false,
+            false,
             limit,
             args,
             0);