diff --git a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/UserEventServiceStubSettings.java b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/UserEventServiceStubSettings.java
index 996d8d05..40de2fd5 100644
--- a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/UserEventServiceStubSettings.java
+++ b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/UserEventServiceStubSettings.java
@@ -280,7 +280,7 @@ public static class Builder extends StubSettings.Builder<UserEventServiceStubSet
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
       definitions.put(
-          "retry_policy_2_codes",
+          "retry_policy_3_codes",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
@@ -319,12 +319,12 @@ public static class Builder extends StubSettings.Builder<UserEventServiceStubSet
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(300000L))
-              .setInitialRpcTimeout(Duration.ofMillis(300000L))
+              .setInitialRpcTimeout(Duration.ofMillis(600000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(300000L))
-              .setTotalTimeout(Duration.ofMillis(300000L))
+              .setMaxRpcTimeout(Duration.ofMillis(600000L))
+              .setTotalTimeout(Duration.ofMillis(600000L))
               .build();
-      definitions.put("retry_policy_2_params", settings);
+      definitions.put("retry_policy_3_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -406,8 +406,8 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .importUserEventsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_3_params"));
 
       builder
           .rejoinUserEventsSettings()
@@ -443,8 +443,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<ImportUserEventsRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_3_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_3_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(ImportUserEventsResponse.class))
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductLevelConfig.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductLevelConfig.java
index c516fd53..9101ec6b 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductLevelConfig.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductLevelConfig.java
@@ -128,12 +128,12 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * <pre>
    * The type of [Product][google.cloud.retail.v2.Product]s allowed to be
    * ingested into the catalog. Acceptable values are:
-   * * `primary` (default): You can only ingest
-   * [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY]
-   *   [Product][google.cloud.retail.v2.Product]s. This means
-   *   [Product.primary_product_id][google.cloud.retail.v2.Product.primary_product_id]
-   *   can only be empty or set to the same value as
-   *   [Product.id][google.cloud.retail.v2.Product.id].
+   * * `primary` (default): You can ingest
+   * [Product][google.cloud.retail.v2.Product]s of all types. When
+   *   ingesting a [Product][google.cloud.retail.v2.Product], its type will
+   *   default to
+   *   [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY] if
+   *   unset.
    * * `variant`: You can only ingest
    * [Product.Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT]
    * [Product][google.cloud.retail.v2.Product]s.
@@ -172,12 +172,12 @@ public java.lang.String getIngestionProductType() {
    * <pre>
    * The type of [Product][google.cloud.retail.v2.Product]s allowed to be
    * ingested into the catalog. Acceptable values are:
-   * * `primary` (default): You can only ingest
-   * [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY]
-   *   [Product][google.cloud.retail.v2.Product]s. This means
-   *   [Product.primary_product_id][google.cloud.retail.v2.Product.primary_product_id]
-   *   can only be empty or set to the same value as
-   *   [Product.id][google.cloud.retail.v2.Product.id].
+   * * `primary` (default): You can ingest
+   * [Product][google.cloud.retail.v2.Product]s of all types. When
+   *   ingesting a [Product][google.cloud.retail.v2.Product], its type will
+   *   default to
+   *   [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY] if
+   *   unset.
    * * `variant`: You can only ingest
    * [Product.Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT]
    * [Product][google.cloud.retail.v2.Product]s.
@@ -633,12 +633,12 @@ public Builder mergeFrom(
      * <pre>
      * The type of [Product][google.cloud.retail.v2.Product]s allowed to be
      * ingested into the catalog. Acceptable values are:
-     * * `primary` (default): You can only ingest
-     * [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY]
-     *   [Product][google.cloud.retail.v2.Product]s. This means
-     *   [Product.primary_product_id][google.cloud.retail.v2.Product.primary_product_id]
-     *   can only be empty or set to the same value as
-     *   [Product.id][google.cloud.retail.v2.Product.id].
+     * * `primary` (default): You can ingest
+     * [Product][google.cloud.retail.v2.Product]s of all types. When
+     *   ingesting a [Product][google.cloud.retail.v2.Product], its type will
+     *   default to
+     *   [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY] if
+     *   unset.
      * * `variant`: You can only ingest
      * [Product.Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s.
@@ -676,12 +676,12 @@ public java.lang.String getIngestionProductType() {
      * <pre>
      * The type of [Product][google.cloud.retail.v2.Product]s allowed to be
      * ingested into the catalog. Acceptable values are:
-     * * `primary` (default): You can only ingest
-     * [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY]
-     *   [Product][google.cloud.retail.v2.Product]s. This means
-     *   [Product.primary_product_id][google.cloud.retail.v2.Product.primary_product_id]
-     *   can only be empty or set to the same value as
-     *   [Product.id][google.cloud.retail.v2.Product.id].
+     * * `primary` (default): You can ingest
+     * [Product][google.cloud.retail.v2.Product]s of all types. When
+     *   ingesting a [Product][google.cloud.retail.v2.Product], its type will
+     *   default to
+     *   [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY] if
+     *   unset.
      * * `variant`: You can only ingest
      * [Product.Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s.
@@ -719,12 +719,12 @@ public com.google.protobuf.ByteString getIngestionProductTypeBytes() {
      * <pre>
      * The type of [Product][google.cloud.retail.v2.Product]s allowed to be
      * ingested into the catalog. Acceptable values are:
-     * * `primary` (default): You can only ingest
-     * [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY]
-     *   [Product][google.cloud.retail.v2.Product]s. This means
-     *   [Product.primary_product_id][google.cloud.retail.v2.Product.primary_product_id]
-     *   can only be empty or set to the same value as
-     *   [Product.id][google.cloud.retail.v2.Product.id].
+     * * `primary` (default): You can ingest
+     * [Product][google.cloud.retail.v2.Product]s of all types. When
+     *   ingesting a [Product][google.cloud.retail.v2.Product], its type will
+     *   default to
+     *   [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY] if
+     *   unset.
      * * `variant`: You can only ingest
      * [Product.Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s.
@@ -761,12 +761,12 @@ public Builder setIngestionProductType(java.lang.String value) {
      * <pre>
      * The type of [Product][google.cloud.retail.v2.Product]s allowed to be
      * ingested into the catalog. Acceptable values are:
-     * * `primary` (default): You can only ingest
-     * [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY]
-     *   [Product][google.cloud.retail.v2.Product]s. This means
-     *   [Product.primary_product_id][google.cloud.retail.v2.Product.primary_product_id]
-     *   can only be empty or set to the same value as
-     *   [Product.id][google.cloud.retail.v2.Product.id].
+     * * `primary` (default): You can ingest
+     * [Product][google.cloud.retail.v2.Product]s of all types. When
+     *   ingesting a [Product][google.cloud.retail.v2.Product], its type will
+     *   default to
+     *   [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY] if
+     *   unset.
      * * `variant`: You can only ingest
      * [Product.Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s.
@@ -799,12 +799,12 @@ public Builder clearIngestionProductType() {
      * <pre>
      * The type of [Product][google.cloud.retail.v2.Product]s allowed to be
      * ingested into the catalog. Acceptable values are:
-     * * `primary` (default): You can only ingest
-     * [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY]
-     *   [Product][google.cloud.retail.v2.Product]s. This means
-     *   [Product.primary_product_id][google.cloud.retail.v2.Product.primary_product_id]
-     *   can only be empty or set to the same value as
-     *   [Product.id][google.cloud.retail.v2.Product.id].
+     * * `primary` (default): You can ingest
+     * [Product][google.cloud.retail.v2.Product]s of all types. When
+     *   ingesting a [Product][google.cloud.retail.v2.Product], its type will
+     *   default to
+     *   [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY] if
+     *   unset.
      * * `variant`: You can only ingest
      * [Product.Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s.
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductLevelConfigOrBuilder.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductLevelConfigOrBuilder.java
index 069cb235..7bed5e87 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductLevelConfigOrBuilder.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductLevelConfigOrBuilder.java
@@ -29,12 +29,12 @@ public interface ProductLevelConfigOrBuilder
    * <pre>
    * The type of [Product][google.cloud.retail.v2.Product]s allowed to be
    * ingested into the catalog. Acceptable values are:
-   * * `primary` (default): You can only ingest
-   * [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY]
-   *   [Product][google.cloud.retail.v2.Product]s. This means
-   *   [Product.primary_product_id][google.cloud.retail.v2.Product.primary_product_id]
-   *   can only be empty or set to the same value as
-   *   [Product.id][google.cloud.retail.v2.Product.id].
+   * * `primary` (default): You can ingest
+   * [Product][google.cloud.retail.v2.Product]s of all types. When
+   *   ingesting a [Product][google.cloud.retail.v2.Product], its type will
+   *   default to
+   *   [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY] if
+   *   unset.
    * * `variant`: You can only ingest
    * [Product.Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT]
    * [Product][google.cloud.retail.v2.Product]s.
@@ -62,12 +62,12 @@ public interface ProductLevelConfigOrBuilder
    * <pre>
    * The type of [Product][google.cloud.retail.v2.Product]s allowed to be
    * ingested into the catalog. Acceptable values are:
-   * * `primary` (default): You can only ingest
-   * [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY]
-   *   [Product][google.cloud.retail.v2.Product]s. This means
-   *   [Product.primary_product_id][google.cloud.retail.v2.Product.primary_product_id]
-   *   can only be empty or set to the same value as
-   *   [Product.id][google.cloud.retail.v2.Product.id].
+   * * `primary` (default): You can ingest
+   * [Product][google.cloud.retail.v2.Product]s of all types. When
+   *   ingesting a [Product][google.cloud.retail.v2.Product], its type will
+   *   default to
+   *   [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY] if
+   *   unset.
    * * `variant`: You can only ingest
    * [Product.Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT]
    * [Product][google.cloud.retail.v2.Product]s.
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequest.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequest.java
index eae86f58..8629a73f 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequest.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequest.java
@@ -850,6 +850,7 @@ public interface FacetKeyOrBuilder
        *     * "customFulfillment3"
        *     * "customFulfillment4"
        *     * "customFulfillment5"
+       *     * "inventory(place_id,attributes.key)"
        * * numerical_field =
        *     * "price"
        *     * "discount"
@@ -857,6 +858,7 @@ public interface FacetKeyOrBuilder
        *     * "ratingCount"
        *     * "attributes.key"
        *     * "inventory(place_id,price)"
+       *     * "inventory(place_id,attributes.key)"
        * </pre>
        *
        * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -896,6 +898,7 @@ public interface FacetKeyOrBuilder
        *     * "customFulfillment3"
        *     * "customFulfillment4"
        *     * "customFulfillment5"
+       *     * "inventory(place_id,attributes.key)"
        * * numerical_field =
        *     * "price"
        *     * "discount"
@@ -903,6 +906,7 @@ public interface FacetKeyOrBuilder
        *     * "ratingCount"
        *     * "attributes.key"
        *     * "inventory(place_id,price)"
+       *     * "inventory(place_id,attributes.key)"
        * </pre>
        *
        * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1526,6 +1530,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
        *     * "customFulfillment3"
        *     * "customFulfillment4"
        *     * "customFulfillment5"
+       *     * "inventory(place_id,attributes.key)"
        * * numerical_field =
        *     * "price"
        *     * "discount"
@@ -1533,6 +1538,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
        *     * "ratingCount"
        *     * "attributes.key"
        *     * "inventory(place_id,price)"
+       *     * "inventory(place_id,attributes.key)"
        * </pre>
        *
        * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1583,6 +1589,7 @@ public java.lang.String getKey() {
        *     * "customFulfillment3"
        *     * "customFulfillment4"
        *     * "customFulfillment5"
+       *     * "inventory(place_id,attributes.key)"
        * * numerical_field =
        *     * "price"
        *     * "discount"
@@ -1590,6 +1597,7 @@ public java.lang.String getKey() {
        *     * "ratingCount"
        *     * "attributes.key"
        *     * "inventory(place_id,price)"
+       *     * "inventory(place_id,attributes.key)"
        * </pre>
        *
        * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -2667,6 +2675,7 @@ public Builder mergeFrom(
          *     * "customFulfillment3"
          *     * "customFulfillment4"
          *     * "customFulfillment5"
+         *     * "inventory(place_id,attributes.key)"
          * * numerical_field =
          *     * "price"
          *     * "discount"
@@ -2674,6 +2683,7 @@ public Builder mergeFrom(
          *     * "ratingCount"
          *     * "attributes.key"
          *     * "inventory(place_id,price)"
+         *     * "inventory(place_id,attributes.key)"
          * </pre>
          *
          * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -2723,6 +2733,7 @@ public java.lang.String getKey() {
          *     * "customFulfillment3"
          *     * "customFulfillment4"
          *     * "customFulfillment5"
+         *     * "inventory(place_id,attributes.key)"
          * * numerical_field =
          *     * "price"
          *     * "discount"
@@ -2730,6 +2741,7 @@ public java.lang.String getKey() {
          *     * "ratingCount"
          *     * "attributes.key"
          *     * "inventory(place_id,price)"
+         *     * "inventory(place_id,attributes.key)"
          * </pre>
          *
          * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -2779,6 +2791,7 @@ public com.google.protobuf.ByteString getKeyBytes() {
          *     * "customFulfillment3"
          *     * "customFulfillment4"
          *     * "customFulfillment5"
+         *     * "inventory(place_id,attributes.key)"
          * * numerical_field =
          *     * "price"
          *     * "discount"
@@ -2786,6 +2799,7 @@ public com.google.protobuf.ByteString getKeyBytes() {
          *     * "ratingCount"
          *     * "attributes.key"
          *     * "inventory(place_id,price)"
+         *     * "inventory(place_id,attributes.key)"
          * </pre>
          *
          * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -2834,6 +2848,7 @@ public Builder setKey(java.lang.String value) {
          *     * "customFulfillment3"
          *     * "customFulfillment4"
          *     * "customFulfillment5"
+         *     * "inventory(place_id,attributes.key)"
          * * numerical_field =
          *     * "price"
          *     * "discount"
@@ -2841,6 +2856,7 @@ public Builder setKey(java.lang.String value) {
          *     * "ratingCount"
          *     * "attributes.key"
          *     * "inventory(place_id,price)"
+         *     * "inventory(place_id,attributes.key)"
          * </pre>
          *
          * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -2885,6 +2901,7 @@ public Builder clearKey() {
          *     * "customFulfillment3"
          *     * "customFulfillment4"
          *     * "customFulfillment5"
+         *     * "inventory(place_id,attributes.key)"
          * * numerical_field =
          *     * "price"
          *     * "discount"
@@ -2892,6 +2909,7 @@ public Builder clearKey() {
          *     * "ratingCount"
          *     * "attributes.key"
          *     * "inventory(place_id,price)"
+         *     * "inventory(place_id,attributes.key)"
          * </pre>
          *
          * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -10464,7 +10482,10 @@ public com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec getQueryExpan
    * * price
    * * originalPrice
    * * discount
+   * * variantId
    * * inventory(place_id,price)
+   * * inventory(place_id,attributes.key), where key is any key in the
+   *   [Product.inventories.attributes][] map.
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
    * * pickupInStore.id, where id is any
@@ -10535,7 +10556,10 @@ public com.google.protobuf.ProtocolStringList getVariantRollupKeysList() {
    * * price
    * * originalPrice
    * * discount
+   * * variantId
    * * inventory(place_id,price)
+   * * inventory(place_id,attributes.key), where key is any key in the
+   *   [Product.inventories.attributes][] map.
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
    * * pickupInStore.id, where id is any
@@ -10606,7 +10630,10 @@ public int getVariantRollupKeysCount() {
    * * price
    * * originalPrice
    * * discount
+   * * variantId
    * * inventory(place_id,price)
+   * * inventory(place_id,attributes.key), where key is any key in the
+   *   [Product.inventories.attributes][] map.
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
    * * pickupInStore.id, where id is any
@@ -10678,7 +10705,10 @@ public java.lang.String getVariantRollupKeys(int index) {
    * * price
    * * originalPrice
    * * discount
+   * * variantId
    * * inventory(place_id,price)
+   * * inventory(place_id,attributes.key), where key is any key in the
+   *   [Product.inventories.attributes][] map.
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
    * * pickupInStore.id, where id is any
@@ -14016,7 +14046,10 @@ private void ensureVariantRollupKeysIsMutable() {
      * * price
      * * originalPrice
      * * discount
+     * * variantId
      * * inventory(place_id,price)
+     * * inventory(place_id,attributes.key), where key is any key in the
+     *   [Product.inventories.attributes][] map.
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
      * * pickupInStore.id, where id is any
@@ -14087,7 +14120,10 @@ public com.google.protobuf.ProtocolStringList getVariantRollupKeysList() {
      * * price
      * * originalPrice
      * * discount
+     * * variantId
      * * inventory(place_id,price)
+     * * inventory(place_id,attributes.key), where key is any key in the
+     *   [Product.inventories.attributes][] map.
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
      * * pickupInStore.id, where id is any
@@ -14158,7 +14194,10 @@ public int getVariantRollupKeysCount() {
      * * price
      * * originalPrice
      * * discount
+     * * variantId
      * * inventory(place_id,price)
+     * * inventory(place_id,attributes.key), where key is any key in the
+     *   [Product.inventories.attributes][] map.
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
      * * pickupInStore.id, where id is any
@@ -14230,7 +14269,10 @@ public java.lang.String getVariantRollupKeys(int index) {
      * * price
      * * originalPrice
      * * discount
+     * * variantId
      * * inventory(place_id,price)
+     * * inventory(place_id,attributes.key), where key is any key in the
+     *   [Product.inventories.attributes][] map.
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
      * * pickupInStore.id, where id is any
@@ -14302,7 +14344,10 @@ public com.google.protobuf.ByteString getVariantRollupKeysBytes(int index) {
      * * price
      * * originalPrice
      * * discount
+     * * variantId
      * * inventory(place_id,price)
+     * * inventory(place_id,attributes.key), where key is any key in the
+     *   [Product.inventories.attributes][] map.
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
      * * pickupInStore.id, where id is any
@@ -14381,7 +14426,10 @@ public Builder setVariantRollupKeys(int index, java.lang.String value) {
      * * price
      * * originalPrice
      * * discount
+     * * variantId
      * * inventory(place_id,price)
+     * * inventory(place_id,attributes.key), where key is any key in the
+     *   [Product.inventories.attributes][] map.
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
      * * pickupInStore.id, where id is any
@@ -14459,7 +14507,10 @@ public Builder addVariantRollupKeys(java.lang.String value) {
      * * price
      * * originalPrice
      * * discount
+     * * variantId
      * * inventory(place_id,price)
+     * * inventory(place_id,attributes.key), where key is any key in the
+     *   [Product.inventories.attributes][] map.
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
      * * pickupInStore.id, where id is any
@@ -14534,7 +14585,10 @@ public Builder addAllVariantRollupKeys(java.lang.Iterable<java.lang.String> valu
      * * price
      * * originalPrice
      * * discount
+     * * variantId
      * * inventory(place_id,price)
+     * * inventory(place_id,attributes.key), where key is any key in the
+     *   [Product.inventories.attributes][] map.
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
      * * pickupInStore.id, where id is any
@@ -14608,7 +14662,10 @@ public Builder clearVariantRollupKeys() {
      * * price
      * * originalPrice
      * * discount
+     * * variantId
      * * inventory(place_id,price)
+     * * inventory(place_id,attributes.key), where key is any key in the
+     *   [Product.inventories.attributes][] map.
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
      * * pickupInStore.id, where id is any
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequestOrBuilder.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequestOrBuilder.java
index 8338f808..13340a0b 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequestOrBuilder.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequestOrBuilder.java
@@ -587,7 +587,10 @@ public interface SearchRequestOrBuilder
    * * price
    * * originalPrice
    * * discount
+   * * variantId
    * * inventory(place_id,price)
+   * * inventory(place_id,attributes.key), where key is any key in the
+   *   [Product.inventories.attributes][] map.
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
    * * pickupInStore.id, where id is any
@@ -656,7 +659,10 @@ public interface SearchRequestOrBuilder
    * * price
    * * originalPrice
    * * discount
+   * * variantId
    * * inventory(place_id,price)
+   * * inventory(place_id,attributes.key), where key is any key in the
+   *   [Product.inventories.attributes][] map.
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
    * * pickupInStore.id, where id is any
@@ -725,7 +731,10 @@ public interface SearchRequestOrBuilder
    * * price
    * * originalPrice
    * * discount
+   * * variantId
    * * inventory(place_id,price)
+   * * inventory(place_id,attributes.key), where key is any key in the
+   *   [Product.inventories.attributes][] map.
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
    * * pickupInStore.id, where id is any
@@ -795,7 +804,10 @@ public interface SearchRequestOrBuilder
    * * price
    * * originalPrice
    * * discount
+   * * variantId
    * * inventory(place_id,price)
+   * * inventory(place_id,attributes.key), where key is any key in the
+   *   [Product.inventories.attributes][] map.
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
    * * pickupInStore.id, where id is any
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/catalog.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/catalog.proto
index f449e901..e9405807 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/catalog.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/catalog.proto
@@ -37,12 +37,12 @@ message ProductLevelConfig {
   // The type of [Product][google.cloud.retail.v2.Product]s allowed to be
   // ingested into the catalog. Acceptable values are:
   //
-  // * `primary` (default): You can only ingest
-  // [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY]
-  //   [Product][google.cloud.retail.v2.Product]s. This means
-  //   [Product.primary_product_id][google.cloud.retail.v2.Product.primary_product_id]
-  //   can only be empty or set to the same value as
-  //   [Product.id][google.cloud.retail.v2.Product.id].
+  // * `primary` (default): You can ingest
+  // [Product][google.cloud.retail.v2.Product]s of all types. When
+  //   ingesting a [Product][google.cloud.retail.v2.Product], its type will
+  //   default to
+  //   [Product.Type.PRIMARY][google.cloud.retail.v2.Product.Type.PRIMARY] if
+  //   unset.
   // * `variant`: You can only ingest
   // [Product.Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT]
   // [Product][google.cloud.retail.v2.Product]s.
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/search_service.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/search_service.proto
index bf32f607..5e5135f1 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/search_service.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/search_service.proto
@@ -96,6 +96,7 @@ message SearchRequest {
       //     * "customFulfillment3"
       //     * "customFulfillment4"
       //     * "customFulfillment5"
+      //     * "inventory(place_id,attributes.key)"
       //
       // * numerical_field =
       //     * "price"
@@ -104,6 +105,7 @@ message SearchRequest {
       //     * "ratingCount"
       //     * "attributes.key"
       //     * "inventory(place_id,price)"
+      //     * "inventory(place_id,attributes.key)"
       string key = 1 [(google.api.field_behavior) = REQUIRED];
 
       // Set only if values should be bucketized into intervals. Must be set
@@ -513,7 +515,10 @@ message SearchRequest {
   // * price
   // * originalPrice
   // * discount
+  // * variantId
   // * inventory(place_id,price)
+  // * inventory(place_id,attributes.key), where key is any key in the
+  //   [Product.inventories.attributes][] map.
   // * attributes.key, where key is any key in the
   //   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
   // * pickupInStore.id, where id is any