diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index f4b9ba788f1..fdfee387d48 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -19060,11 +19060,11 @@ components:
             type: string
           type: array
         hasOptionalGroupByFields:
+          default: false
           description: When false, events without a group-by value are ignored by
             the query. When true, events with missing group-by fields are processed
             with `N/A`, replacing the missing values.
           example: false
-          readOnly: true
           type: boolean
         metrics:
           description: Group of target fields to aggregate over when using the sum,
@@ -39603,11 +39603,11 @@ components:
             type: string
           type: array
         hasOptionalGroupByFields:
+          default: false
           description: When false, events without a group-by value are ignored by
             the rule. When true, events with missing group-by fields are processed
             with `N/A`, replacing the missing values.
           example: false
-          readOnly: true
           type: boolean
         index:
           description: '**This field is currently unstable and might be removed in
diff --git a/src/main/java/com/datadog/api/client/v2/model/HistoricalJobQuery.java b/src/main/java/com/datadog/api/client/v2/model/HistoricalJobQuery.java
index 86c440d9e68..9a683e0996b 100644
--- a/src/main/java/com/datadog/api/client/v2/model/HistoricalJobQuery.java
+++ b/src/main/java/com/datadog/api/client/v2/model/HistoricalJobQuery.java
@@ -48,7 +48,7 @@ public class HistoricalJobQuery {
 
   public static final String JSON_PROPERTY_HAS_OPTIONAL_GROUP_BY_FIELDS =
       "hasOptionalGroupByFields";
-  private Boolean hasOptionalGroupByFields;
+  private Boolean hasOptionalGroupByFields = false;
 
   public static final String JSON_PROPERTY_METRICS = "metrics";
   private List<String> metrics = null;
@@ -167,6 +167,11 @@ public void setGroupByFields(List<String> groupByFields) {
     this.groupByFields = groupByFields;
   }
 
+  public HistoricalJobQuery hasOptionalGroupByFields(Boolean hasOptionalGroupByFields) {
+    this.hasOptionalGroupByFields = hasOptionalGroupByFields;
+    return this;
+  }
+
   /**
    * When false, events without a group-by value are ignored by the query. When true, events with
    * missing group-by fields are processed with <code>N/A</code>, replacing the missing values.
@@ -180,6 +185,10 @@ public Boolean getHasOptionalGroupByFields() {
     return hasOptionalGroupByFields;
   }
 
+  public void setHasOptionalGroupByFields(Boolean hasOptionalGroupByFields) {
+    this.hasOptionalGroupByFields = hasOptionalGroupByFields;
+  }
+
   public HistoricalJobQuery metrics(List<String> metrics) {
     this.metrics = metrics;
     return this;
diff --git a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRuleQuery.java b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRuleQuery.java
index 7b4504b31f7..ef91a86c0a3 100644
--- a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRuleQuery.java
+++ b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringStandardRuleQuery.java
@@ -54,7 +54,7 @@ public class SecurityMonitoringStandardRuleQuery {
 
   public static final String JSON_PROPERTY_HAS_OPTIONAL_GROUP_BY_FIELDS =
       "hasOptionalGroupByFields";
-  private Boolean hasOptionalGroupByFields;
+  private Boolean hasOptionalGroupByFields = false;
 
   public static final String JSON_PROPERTY_INDEX = "index";
   private String index;
@@ -202,6 +202,12 @@ public void setGroupByFields(List<String> groupByFields) {
     this.groupByFields = groupByFields;
   }
 
+  public SecurityMonitoringStandardRuleQuery hasOptionalGroupByFields(
+      Boolean hasOptionalGroupByFields) {
+    this.hasOptionalGroupByFields = hasOptionalGroupByFields;
+    return this;
+  }
+
   /**
    * When false, events without a group-by value are ignored by the rule. When true, events with
    * missing group-by fields are processed with <code>N/A</code>, replacing the missing values.
@@ -215,6 +221,10 @@ public Boolean getHasOptionalGroupByFields() {
     return hasOptionalGroupByFields;
   }
 
+  public void setHasOptionalGroupByFields(Boolean hasOptionalGroupByFields) {
+    this.hasOptionalGroupByFields = hasOptionalGroupByFields;
+  }
+
   public SecurityMonitoringStandardRuleQuery index(String index) {
     this.index = index;
     return this;