diff --git a/api-specs/Gateway-EE/latest/kong-ee.yaml b/api-specs/Gateway-EE/latest/kong-ee.yaml
index 8dc16a13f1e..2829320fda2 100644
--- a/api-specs/Gateway-EE/latest/kong-ee.yaml
+++ b/api-specs/Gateway-EE/latest/kong-ee.yaml
@@ -12416,6 +12416,32 @@ paths:
                   recovery_private_key: /path/to/generated/<base64-encoded-contents-of-key.pem>
       tags:
         - Keyring
+  /keyring/remove:
+    post:
+      summary: Remove key
+      operationId: post-keyring-remove
+      responses:
+        '204':
+          description: No Content
+        '401': 
+          $ref: '#/components/responses/HTTP401Error'
+      description: Remove a key from the keyring.
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              x-examples:
+                Example 1:
+                  key: 3Rwvk223
+              properties:
+                key:
+                  type: string
+                  description: The key ID
+                  example: 3Rwvk223
+        description: The request body contains a key ID that can be generated from the `/keyring/generate` endpoint.
+      tags:
+        - Keyring
   /keyring/export:
     post:
       summary: Export keyring
diff --git a/api-specs/Konnect/v2/yaml/analytics-requests.yaml b/api-specs/Konnect/v2/yaml/analytics-requests.yaml
index 23cf6c48b4a..58359a95e05 100644
--- a/api-specs/Konnect/v2/yaml/analytics-requests.yaml
+++ b/api-specs/Konnect/v2/yaml/analytics-requests.yaml
@@ -75,6 +75,7 @@ components:
                   - $ref: '#/components/schemas/ControlPlaneFilterByField'
                   - $ref: '#/components/schemas/ControlPlaneGroupFilterByField'
                   - $ref: '#/components/schemas/DataPlaneNodeFilterByField'
+                  - $ref: '#/components/schemas/DataPlaneNodeVersionFilterByField'
                   - $ref: '#/components/schemas/GatewayServiceFilterByField'
                   - $ref: '#/components/schemas/HeaderHostFilterByField'
                   - $ref: '#/components/schemas/HeaderUserAgentFilterByField'
@@ -723,6 +724,23 @@ components:
         - type
         - values
       title: Filter by data_plane_node
+    DataPlaneNodeVersionFilterByField:
+      allOf:
+        - type: object
+          properties:
+            field:
+              description: The field to filter.
+              type: string
+              enum:
+                - data_plane_node_version
+          required:
+            - field
+        - oneOf:
+            - $ref: '#/components/schemas/FilterMultiValueString'
+            - $ref: '#/components/schemas/FilterSingleValueString'
+            - $ref: '#/components/schemas/FilterWildcard'
+            - $ref: '#/components/schemas/FilterEmpty'
+      title: Filter by data_plane_node_version
     GatewayServiceFilterByField:
       allOf:
         - type: object
@@ -1337,6 +1355,9 @@ components:
           data_plane_node:
             description: 'Data Plane Node ID associated with the request. In the format `control_plane_id:data_plane_node_id` if the node belongs to a control plane or `control_plane_group_id:data_plane_node_id` if the node belongs to a control plane group.'
             type: string
+          data_plane_node_version:
+            description: Version used by the Data Plane Node associated with the request.
+            type: string
           gateway_service:
             description: 'Gateway Service ID associated with the request. In the format `control_plane_id:gateway_service_id`.'
             type: string
@@ -1696,6 +1717,7 @@ components:
             control_plane: d5ac5d88-efed-4e10-9dfe-0b0a6646c219
             control_plane_group: cafe2d4f-95ec-458c-8c88-62417018678d
             data_plane_node: 'cafe2d4f-95ec-458c-8c88-62417018678d:122a0f86-029c-4292-82fd-f3b38e1cfa60'
+            data_plane_node_version: 3.8.0.1
             gateway_service: 'd5ac5d88-efed-4e10-9dfe-0b0a6646c219:523468b1-2e74-4b58-b30e-6f904e99e4d0'
             header_host: google.com
             header_user_agent: Mozilla/4.0 (compatible; Flight Explorer)
@@ -1748,6 +1770,7 @@ components:
             control_plane: d5ac5d88-efed-4e10-9dfe-0b0a6646c219
             control_plane_group: null
             data_plane_node: 'd5ac5d88-efed-4e10-9dfe-0b0a6646c219:a3e0692c-2351-4c8e-acbe-e7a5185147de'
+            data_plane_node_version: 3.8.0.1
             gateway_service: 'd5ac5d88-efed-4e10-9dfe-0b0a6646c219:523468b1-2e74-4b58-b30e-6f904e99e4d0'
             header_host: proxy-zyq.com
             header_user_agent: python-works
diff --git a/app/_data/docs_nav_mesh_2.10.x.yml b/app/_data/docs_nav_mesh_2.10.x.yml
new file mode 100644
index 00000000000..bce17636fb3
--- /dev/null
+++ b/app/_data/docs_nav_mesh_2.10.x.yml
@@ -0,0 +1,182 @@
+generate: true
+assume_generated: true
+release: 2.10.x
+max_depth: 3
+inherit:
+  path: /.repos/kuma/app/_src
+  nav: ../_src/.repos/kuma/app/_data/docs_nav_kuma_dev.yml
+  patches:
+    - path: [ Introduction ]
+      action: modify
+      icon: /assets/images/icons/documentation/icn-flag.svg
+    - path: [ Introduction, Overview of Kuma ]
+      text: Overview of Kong Mesh
+      url: /
+      src: null
+      action: modify
+    - path: [ Introduction, How Kuma works ]
+      text: How Kong Mesh works
+      url: /introduction/how-kong-mesh-works
+      action: modify
+      items: []
+    - path: [ Introduction, Kuma requirements ]
+      text: Mesh requirements
+      action: modify
+    - path: [ Introduction ]
+      text: Stages of software availability
+      url: /availability-stages/
+      action: insert
+      index: -3
+    - path: [ Introduction ]
+      text: Version support policy
+      url: /support-policy/
+      action: insert
+      index: -3
+    - path: [ Introduction, Release notes]
+      url: /mesh/changelog
+      src: /mesh/changelog
+      action: modify
+    - path: [ Kuma in Production ]
+      action: modify
+      title: Kong Mesh in Production
+      icon: /assets/images/icons/documentation/icn-deployment-color.svg
+    - path: [ Kong Mesh in Production, Kuma user interface ]
+      action: modify
+      text: Kong Mesh user interface
+    - path: [ Kong Mesh in Production, Use Kuma ]
+      action: modify
+      text: Use Kong Mesh
+    - path: [ Kong Mesh in Production, Control plane deployment ]
+      action: insert
+      index: 0
+      text: Kong Mesh license
+      url: /production/cp-deployment/license
+    - path: [ Kong Mesh in Production, Control plane deployment ]
+      action: insert
+      index: -1
+      text: Deploy Kong Mesh in Production with Helm
+      url: /production/cp-deployment/production-usage-values
+    - path: [ Kong Mesh in Production, Secure your deployment ]
+      action: delete
+      entries: [ Kuma API access control ]
+    - path: [ Kong Mesh in Production, Secure your deployment ]
+      action: insert
+      index: -1
+      text: Kong Mesh RBAC
+      url: /features/rbac
+    - path: [ Kong Mesh in Production, Secure your deployment ]
+      action: insert
+      index: -1
+      text: FIPS support
+      url: /features/fips-support
+    - path: [ Kong Mesh in Production, Data plane configuration, Configure the Kuma CNI ]
+      action: modify
+      text: Configure the Kong Mesh CNI
+    - path: [ Kong Mesh in Production, Upgrades and tuning, Upgrade Kuma ]
+      action: modify
+      text: Upgrade Kong Mesh
+    - path: [ Quickstart ]
+      action: modify
+      icon: /assets/images/icons/documentation/icn-quickstart-color.svg
+    - path: [ Quickstart, Deploy Kuma on Kubernetes ]
+      text: Deploy Kong Mesh on Kubernetes
+      action: modify
+      items: []
+    - path: [ Using Kuma ]
+      title: Using Kong Mesh
+      action: modify
+      icon: /assets/images/icons/documentation/icn-overview-color.svg
+    - path: [ Using Kong Mesh, Route & Traffic shaping, Protocol support in Kuma ]
+      text: Protocol support in Kong Mesh
+      action: modify
+      url: /policies/protocol-support-in-kong-mesh
+      items: []
+    - path: [ Policies ]
+      action: modify
+      icon: /assets/images/icons/documentation/icn-documentation-small.svg
+    - path: [ Policies, Previous Policies, General notes about Kuma policies ]
+      text: General notes about Kong Mesh policies
+      url: /policies/general-notes-about-kong-mesh-policies
+      action: modify
+    - path: [ Policies, Previous Policies, How Kuma chooses the right policy to apply ]
+      text: How Kong Mesh chooses the right policy to apply
+      action: modify
+      url: /policies/how-kong-mesh-chooses-the-right-policy-to-apply
+      items: []
+    - path: [ Policies, Previous Policies ]
+      action: insert
+      index: -1
+      text: OPA policy
+      url: /features/opa
+      generate: false
+    - path: [ Policies ]
+      action: insert
+      index: -2
+      text: MeshOPA 
+      url: /features/meshopa
+      generate: false
+    - path: [ Policies ]
+      action: insert
+      index: -2
+      text: MeshGlobalRateLimit (beta)
+      url: /features/meshglobalratelimit
+      generate: false
+    - path: [ Guides ]
+      action: modify
+      icon: /assets/images/icons/documentation/icn-learning.svg
+    - title: Enterprise Features
+      action: insert
+      index: -3
+      icon: /assets/images/icons/documentation/icn-enterprise-blue.svg
+      items:
+        - text: Overview
+          url: /features/
+        - text: HashiCorp Vault CA
+          url: /features/vault
+        - text: Amazon ACM Private CA
+          url: /features/acmpca
+        - text: cert-manager Private CA
+          url: /features/cert-manager
+        - text: OPA policy support
+          url: /features/opa
+        - text: MeshOPA (beta)
+          url: /features/meshopa
+        - text: Multi-zone authentication
+          url: /features/kds-auth
+        - text: FIPS support
+          url: /features/fips-support
+          generate: false
+        - text: Certificate Authority rotation
+          url: /features/ca-rotation
+        - text: Role-Based Access Control
+          url: /features/rbac
+          generate: false
+        - text: Red Hat
+          items:
+            - text: UBI Images
+              url: /features/ubi-images
+            - text: Red Hat OpenShift Quickstart
+              url: /features/openshift-quickstart
+        - text: ECS Support
+          url: /installation/ecs
+        - text: Auditing
+          url: /features/access-audit
+        - text: MeshGlobalRateLimit (beta)
+          url: /features/meshglobalratelimit
+    - path: [ Reference ]
+      action: modify
+      icon: /assets/images/icons/documentation/icn-references-color.svg
+    - path: [ Community ]
+      action: modify
+      icon: /assets/images/icons/documentation/icn-references-color.svg
+    - path: [ Community ]
+      action: delete
+      entries: [ License ]
+    - path: [ Community, Contribute to Kuma ]
+      action: modify
+      src: null
+      absolute_url: true
+      url: https://kuma.io/community
+unlisted:
+  - url: /install
+    src: /mesh/install
diff --git a/app/_data/kong_versions.yml b/app/_data/kong_versions.yml
index deb85fd9300..2fbf953c51e 100644
--- a/app/_data/kong_versions.yml
+++ b/app/_data/kong_versions.yml
@@ -407,13 +407,15 @@
 - edition: mesh
   version: 2.8.4
   release: 2.8.x
-  latest: true
   releaseDate: "2024-06-24"
   endOfLifeDate: "2025-06-24"
   branch: release-2.8
 - edition: mesh
   version: 2.9.0
   release: 2.9.x
+  latest: true
+  releaseDate: "2024-10-22"
+  endOfLifeDate: "2025-10-22"
   branch: release-2.9
 - edition: mesh
   version: preview
diff --git a/app/_src/gateway/kong-enterprise/db-encryption.md b/app/_src/gateway/kong-enterprise/db-encryption.md
index e1b522b3edf..f9c4b2b655c 100644
--- a/app/_src/gateway/kong-enterprise/db-encryption.md
+++ b/app/_src/gateway/kong-enterprise/db-encryption.md
@@ -42,6 +42,8 @@ export KONG_KEYRING_STRATEGY=cluster
 export KONG_KEYRING_RECOVERY_PUBLIC_KEY=/path/to/generated/cert.pem
 ```
 
+If you are using a hybrid deployment, you only need this configuration on the control planes, since the data planes don't connect to the database.
+
 All nodes in the Kong cluster should share the same `keyring_enabled` and `keyring_strategy` configuration values.
 The generated private key `key.pem` is not required to configure Kong, or to start Kong. Please refer to the [disaster recovery](#disaster-recovery) section for more information on how to use private keys in keyring management.
 
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_circuitbreakers.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_circuitbreakers.yaml
index ea955f2ab21..e5171d33fba 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_circuitbreakers.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_circuitbreakers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: circuitbreakers.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_containerpatches.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_containerpatches.yaml
index 9fc77a96699..403842e0511 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_containerpatches.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_containerpatches.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: containerpatches.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_dataplaneinsights.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_dataplaneinsights.yaml
index 23c4538ea0b..017eddda4f3 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_dataplaneinsights.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_dataplaneinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: dataplaneinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_dataplanes.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_dataplanes.yaml
index ec8f06342ab..013ac3ada55 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_dataplanes.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_dataplanes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: dataplanes.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_externalservices.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_externalservices.yaml
index be37a7b7f16..f81a8246354 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_externalservices.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_externalservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: externalservices.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_faultinjections.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_faultinjections.yaml
index 6fb6366d5a8..42b26f28dc7 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_faultinjections.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_faultinjections.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: faultinjections.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_healthchecks.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_healthchecks.yaml
index 9f2d075b5a2..98627609194 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_healthchecks.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_healthchecks.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: healthchecks.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_hostnamegenerators.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_hostnamegenerators.yaml
index 943421775bb..6be033477d6 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_hostnamegenerators.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_hostnamegenerators.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: hostnamegenerators.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshaccesslogs.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshaccesslogs.yaml
index 16191c5babd..fe5e5e3dfe8 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshaccesslogs.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshaccesslogs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshaccesslogs.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshcircuitbreakers.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshcircuitbreakers.yaml
index bea1fb597fa..7e2c71fcb36 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshcircuitbreakers.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshcircuitbreakers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshcircuitbreakers.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshes.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshes.yaml
index a9fec649c38..5955857cbd7 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshes.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshes.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshexternalservices.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshexternalservices.yaml
index 12f87ab5ae7..3c1166e19c2 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshexternalservices.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshexternalservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshexternalservices.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshfaultinjections.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshfaultinjections.yaml
index 538675b6ea2..830c3d51414 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshfaultinjections.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshfaultinjections.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshfaultinjections.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshgatewayconfigs.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshgatewayconfigs.yaml
index 7960f61f8a9..972298f9e7e 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshgatewayconfigs.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshgatewayconfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshgatewayconfigs.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshgatewayinstances.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshgatewayinstances.yaml
index f68545cf0df..c21203a1672 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshgatewayinstances.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshgatewayinstances.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshgatewayinstances.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshgatewayroutes.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshgatewayroutes.yaml
index ef006e9cbf3..ec892caacb5 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshgatewayroutes.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshgatewayroutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshgatewayroutes.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshgateways.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshgateways.yaml
index 20ff6667761..f78fff3e84e 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshgateways.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshgateways.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshgateways.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshglobalratelimits.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshglobalratelimits.yaml
index f87890f38c1..2ea41e600bf 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshglobalratelimits.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshglobalratelimits.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshglobalratelimits.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshhealthchecks.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshhealthchecks.yaml
index d1a3a49f9db..ca5eaa20f7c 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshhealthchecks.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshhealthchecks.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshhealthchecks.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshhttproutes.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshhttproutes.yaml
index 14f8974b173..ea5bd7d0f68 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshhttproutes.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshhttproutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshhttproutes.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshinsights.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshinsights.yaml
index 93b57004802..c78e8d5840d 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshinsights.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshloadbalancingstrategies.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshloadbalancingstrategies.yaml
index 8fe3d6634e6..d3cf602aec3 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshloadbalancingstrategies.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshloadbalancingstrategies.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshloadbalancingstrategies.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshmetrics.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshmetrics.yaml
index d244c2e0488..776e04f167f 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshmetrics.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshmetrics.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshmetrics.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshmultizoneservices.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshmultizoneservices.yaml
index 4772b0cfb01..cbe0b470bd2 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshmultizoneservices.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshmultizoneservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshmultizoneservices.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshopas.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshopas.yaml
index a76138662a0..1f090e1d3c7 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshopas.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshopas.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshopas.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshpassthroughs.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshpassthroughs.yaml
index 9f5822b5532..311984c0faf 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshpassthroughs.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshpassthroughs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshpassthroughs.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshproxypatches.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshproxypatches.yaml
index bf6342d2546..da8b2665f61 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshproxypatches.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshproxypatches.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshproxypatches.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshratelimits.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshratelimits.yaml
index 52424a985f7..bf9f105ce35 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshratelimits.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshratelimits.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshratelimits.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshretries.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshretries.yaml
index f4337a10538..8a80e8ce303 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshretries.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshretries.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshretries.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshservices.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshservices.yaml
index 5ac9cf40b9d..86214846d97 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshservices.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshservices.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshtcproutes.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshtcproutes.yaml
index 9d1d0ad7ed1..68b9aaf751d 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshtcproutes.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshtcproutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshtcproutes.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshtimeouts.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshtimeouts.yaml
index 330873a9478..a830293d971 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshtimeouts.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshtimeouts.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshtimeouts.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshtlses.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshtlses.yaml
index 4ddbfffcb1e..cad3294f43a 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshtlses.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshtlses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshtlses.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshtraces.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshtraces.yaml
index b16244ce685..df56bf0f8d2 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshtraces.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshtraces.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshtraces.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_meshtrafficpermissions.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_meshtrafficpermissions.yaml
index 3e38acc06be..616b45c7df6 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_meshtrafficpermissions.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_meshtrafficpermissions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: meshtrafficpermissions.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_proxytemplates.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_proxytemplates.yaml
index 78b1d55e483..2778da01489 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_proxytemplates.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_proxytemplates.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: proxytemplates.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_ratelimits.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_ratelimits.yaml
index 85f1876ebb9..e3e1d868742 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_ratelimits.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_ratelimits.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: ratelimits.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_retries.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_retries.yaml
index 10a4843e11a..f2b1689be86 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_retries.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_retries.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: retries.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_serviceinsights.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_serviceinsights.yaml
index 827ea521d09..50853417b7e 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_serviceinsights.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_serviceinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: serviceinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_timeouts.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_timeouts.yaml
index ba78d88c524..72894f48832 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_timeouts.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_timeouts.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: timeouts.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_trafficlogs.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_trafficlogs.yaml
index ece8562e51b..d278115110c 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_trafficlogs.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_trafficlogs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: trafficlogs.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_trafficpermissions.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_trafficpermissions.yaml
index 9c79605afb0..9f84700b2d9 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_trafficpermissions.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_trafficpermissions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: trafficpermissions.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_trafficroutes.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_trafficroutes.yaml
index 5bdd3ac8524..5d4ed2688d4 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_trafficroutes.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_trafficroutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: trafficroutes.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_traffictraces.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_traffictraces.yaml
index c224ea52660..60e1c35c37f 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_traffictraces.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_traffictraces.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: traffictraces.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_virtualoutbounds.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_virtualoutbounds.yaml
index c4372dd0b3c..c2e9c46c912 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_virtualoutbounds.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_virtualoutbounds.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: virtualoutbounds.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_zoneegresses.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_zoneegresses.yaml
index 143aaafdbb2..608de3ca3eb 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_zoneegresses.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_zoneegresses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: zoneegresses.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_zoneegressinsights.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_zoneegressinsights.yaml
index 05746b39a3a..888d7f8b6b4 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_zoneegressinsights.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_zoneegressinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: zoneegressinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_zoneingresses.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_zoneingresses.yaml
index d02c5b35bce..4bfb7e969d0 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_zoneingresses.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_zoneingresses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: zoneingresses.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_zoneingressinsights.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_zoneingressinsights.yaml
index ded86e6c288..8f529df943f 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_zoneingressinsights.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_zoneingressinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: zoneingressinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_zoneinsights.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_zoneinsights.yaml
index aad82d4bebf..e0a459f5934 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_zoneinsights.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_zoneinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: zoneinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/dev/raw/crds/kuma.io_zones.yaml b/app/assets/mesh/dev/raw/crds/kuma.io_zones.yaml
index 12022fce91e..d0817f9269f 100644
--- a/app/assets/mesh/dev/raw/crds/kuma.io_zones.yaml
+++ b/app/assets/mesh/dev/raw/crds/kuma.io_zones.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
   name: zones.kuma.io
 spec:
   group: kuma.io
diff --git a/app/assets/mesh/raw/CHANGELOG.md b/app/assets/mesh/raw/CHANGELOG.md
index 488df273e17..65e876c87f0 100644
--- a/app/assets/mesh/raw/CHANGELOG.md
+++ b/app/assets/mesh/raw/CHANGELOG.md
@@ -1,6 +1,40 @@
 # Changelog
 <!-- Autogenerated with (github.com/kumahq/ci-tools) release-tool changelog.md -->
 
+## 2.9.0
+> Released on 2024/10/21
+
+* chore(deps): bump Kong/public-shared-actions from 2.3.0 to 2.7.3 [#6492](https://github.com/Kong/kong-mesh/pull/6492) [#6535](https://github.com/Kong/kong-mesh/pull/6535) [#6574](https://github.com/Kong/kong-mesh/pull/6574) [#6672](https://github.com/Kong/kong-mesh/pull/6672) [#6714](https://github.com/Kong/kong-mesh/pull/6714) @dependabot
+* chore(deps): bump actions/create-github-app-token from 1.10.1 to 1.11.0 [#6204](https://github.com/Kong/kong-mesh/pull/6204) [#6252](https://github.com/Kong/kong-mesh/pull/6252) [#6572](https://github.com/Kong/kong-mesh/pull/6572) [#6636](https://github.com/Kong/kong-mesh/pull/6636) @dependabot
+* chore(deps): bump envoy for windows from 1.28.4 to 1.28.5 [#6235](https://github.com/Kong/kong-mesh/pull/6235) @lukidzi
+* chore(deps): bump envoy for windows from 1.28.5 to 1.28.7 [#6646](https://github.com/Kong/kong-mesh/pull/6646) @lukidzi
+* chore(deps): bump github.com/Kong/kauth-api from 1.142.0 to 1.149.0 [#6614](https://github.com/Kong/kong-mesh/pull/6614) [#6721](https://github.com/Kong/kong-mesh/pull/6721) [#6788](https://github.com/Kong/kong-mesh/pull/6788) @dependabot
+* chore(deps): bump github.com/Kong/shared-go/identity from 0.6.2 to 1.4.0 [#6203](https://github.com/Kong/kong-mesh/pull/6203) [#6259](https://github.com/Kong/kong-mesh/pull/6259) [#6305](https://github.com/Kong/kong-mesh/pull/6305) [#6331](https://github.com/Kong/kong-mesh/pull/6331) [#6362](https://github.com/Kong/kong-mesh/pull/6362) [#6409](https://github.com/Kong/kong-mesh/pull/6409) [#6456](https://github.com/Kong/kong-mesh/pull/6456) [#6494](https://github.com/Kong/kong-mesh/pull/6494) [#6537](https://github.com/Kong/kong-mesh/pull/6537) [#6570](https://github.com/Kong/kong-mesh/pull/6570) [#6613](https://github.com/Kong/kong-mesh/pull/6613) [#6633](https://github.com/Kong/kong-mesh/pull/6633) [#6682](https://github.com/Kong/kong-mesh/pull/6682) [#6719](https://github.com/Kong/kong-mesh/pull/6719) [#6786](https://github.com/Kong/kong-mesh/pull/6786) @dependabot
+* chore(deps): bump github.com/Kong/shared-go/rest from 1.13.18 to 1.15.2 [#6201](https://github.com/Kong/kong-mesh/pull/6201) [#6258](https://github.com/Kong/kong-mesh/pull/6258) [#6306](https://github.com/Kong/kong-mesh/pull/6306) [#6332](https://github.com/Kong/kong-mesh/pull/6332) [#6436](https://github.com/Kong/kong-mesh/pull/6436) [#6465](https://github.com/Kong/kong-mesh/pull/6465) [#6497](https://github.com/Kong/kong-mesh/pull/6497) @dependabot
+* chore(deps): bump github.com/aws/aws-sdk-go from 1.54.4 to 1.55.5 [#6200](https://github.com/Kong/kong-mesh/pull/6200) [#6257](https://github.com/Kong/kong-mesh/pull/6257) [#6282](https://github.com/Kong/kong-mesh/pull/6282) [#6307](https://github.com/Kong/kong-mesh/pull/6307) [#6333](https://github.com/Kong/kong-mesh/pull/6333) [#6363](https://github.com/Kong/kong-mesh/pull/6363) [#6373](https://github.com/Kong/kong-mesh/pull/6373) [#6412](https://github.com/Kong/kong-mesh/pull/6412) @dependabot
+* chore(deps): bump github.com/cert-manager/cert-manager from 1.14.5 to 1.16.1 [#6260](https://github.com/Kong/kong-mesh/pull/6260) [#6411](https://github.com/Kong/kong-mesh/pull/6411) [#6496](https://github.com/Kong/kong-mesh/pull/6496) [#6787](https://github.com/Kong/kong-mesh/pull/6787) [#6795](https://github.com/Kong/kong-mesh/pull/6795) @dependabot
+* chore(deps): bump github.com/docker/docker from 27.0.3+incompatible to 27.3.1+incompatible [#6364](https://github.com/Kong/kong-mesh/pull/6364) [#6464](https://github.com/Kong/kong-mesh/pull/6464) [#6538](https://github.com/Kong/kong-mesh/pull/6538) [#6611](https://github.com/Kong/kong-mesh/pull/6611) [#6674](https://github.com/Kong/kong-mesh/pull/6674) @dependabot
+* chore(deps): bump github.com/gruntwork-io/terratest from 0.47.1 to 0.47.2 [#6720](https://github.com/Kong/kong-mesh/pull/6720) @dependabot
+* chore(deps): bump github.com/hashicorp/vault/api from 1.14.0 to 1.15.0 [#6608](https://github.com/Kong/kong-mesh/pull/6608) @dependabot
+* chore(deps): bump github.com/hashicorp/vault/api/auth/aws from 0.7.0 to 0.8.0 [#6609](https://github.com/Kong/kong-mesh/pull/6609) @dependabot
+* chore(deps): bump github.com/hashicorp/vault/sdk from 0.13.0 to 0.14.0 [#6610](https://github.com/Kong/kong-mesh/pull/6610) @dependabot
+* chore(deps): bump github.com/open-policy-agent/opa-envoy-plugin from 0.67.1-envoy to 0.68.0-envoy-4 [#6692](https://github.com/Kong/kong-mesh/pull/6692) @dependabot
+* chore(deps): bump github.com/prometheus/client_golang from 1.20.3 to 1.20.4 [#6632](https://github.com/Kong/kong-mesh/pull/6632) @dependabot
+* chore(deps): bump go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp from 0.52.0 to 0.54.0 [#6304](https://github.com/Kong/kong-mesh/pull/6304) [#6536](https://github.com/Kong/kong-mesh/pull/6536) @dependabot
+* chore(deps): bump google.golang.org/grpc from 1.66.1 to 1.67.1 [#6675](https://github.com/Kong/kong-mesh/pull/6675) [#6722](https://github.com/Kong/kong-mesh/pull/6722) @dependabot
+* chore(deps): bump kumahq/kuma from 62e96b4b8a90 to 2.9.0 [#6179](https://github.com/Kong/kong-mesh/pull/6179) [#6188](https://github.com/Kong/kong-mesh/pull/6188) [#6191](https://github.com/Kong/kong-mesh/pull/6191) [#6192](https://github.com/Kong/kong-mesh/pull/6192) [#6205](https://github.com/Kong/kong-mesh/pull/6205) [#6213](https://github.com/Kong/kong-mesh/pull/6213) [#6220](https://github.com/Kong/kong-mesh/pull/6220) [#6225](https://github.com/Kong/kong-mesh/pull/6225) [#6237](https://github.com/Kong/kong-mesh/pull/6237) [#6242](https://github.com/Kong/kong-mesh/pull/6242) [#6253](https://github.com/Kong/kong-mesh/pull/6253) [#6266](https://github.com/Kong/kong-mesh/pull/6266) [#6268](https://github.com/Kong/kong-mesh/pull/6268) [#6279](https://github.com/Kong/kong-mesh/pull/6279) [#6287](https://github.com/Kong/kong-mesh/pull/6287) [#6290](https://github.com/Kong/kong-mesh/pull/6290) [#6296](https://github.com/Kong/kong-mesh/pull/6296) [#6297](https://github.com/Kong/kong-mesh/pull/6297) [#6298](https://github.com/Kong/kong-mesh/pull/6298) [#6300](https://github.com/Kong/kong-mesh/pull/6300) [#6302](https://github.com/Kong/kong-mesh/pull/6302) [#6303](https://github.com/Kong/kong-mesh/pull/6303) [#6308](https://github.com/Kong/kong-mesh/pull/6308) [#6311](https://github.com/Kong/kong-mesh/pull/6311) [#6314](https://github.com/Kong/kong-mesh/pull/6314) [#6316](https://github.com/Kong/kong-mesh/pull/6316) [#6319](https://github.com/Kong/kong-mesh/pull/6319) [#6324](https://github.com/Kong/kong-mesh/pull/6324) [#6328](https://github.com/Kong/kong-mesh/pull/6328) [#6329](https://github.com/Kong/kong-mesh/pull/6329) [#6335](https://github.com/Kong/kong-mesh/pull/6335) [#6336](https://github.com/Kong/kong-mesh/pull/6336) [#6338](https://github.com/Kong/kong-mesh/pull/6338) [#6340](https://github.com/Kong/kong-mesh/pull/6340) [#6341](https://github.com/Kong/kong-mesh/pull/6341) [#6348](https://github.com/Kong/kong-mesh/pull/6348) [#6351](https://github.com/Kong/kong-mesh/pull/6351) [#6354](https://github.com/Kong/kong-mesh/pull/6354) [#6355](https://github.com/Kong/kong-mesh/pull/6355) [#6356](https://github.com/Kong/kong-mesh/pull/6356) [#6365](https://github.com/Kong/kong-mesh/pull/6365) [#6372](https://github.com/Kong/kong-mesh/pull/6372) [#6377](https://github.com/Kong/kong-mesh/pull/6377) [#6381](https://github.com/Kong/kong-mesh/pull/6381) [#6384](https://github.com/Kong/kong-mesh/pull/6384) [#6389](https://github.com/Kong/kong-mesh/pull/6389) [#6397](https://github.com/Kong/kong-mesh/pull/6397) [#6417](https://github.com/Kong/kong-mesh/pull/6417) [#6419](https://github.com/Kong/kong-mesh/pull/6419) [#6427](https://github.com/Kong/kong-mesh/pull/6427) [#6432](https://github.com/Kong/kong-mesh/pull/6432) [#6439](https://github.com/Kong/kong-mesh/pull/6439) [#6445](https://github.com/Kong/kong-mesh/pull/6445) [#6446](https://github.com/Kong/kong-mesh/pull/6446) [#6448](https://github.com/Kong/kong-mesh/pull/6448) [#6455](https://github.com/Kong/kong-mesh/pull/6455) [#6457](https://github.com/Kong/kong-mesh/pull/6457) [#6459](https://github.com/Kong/kong-mesh/pull/6459) [#6461](https://github.com/Kong/kong-mesh/pull/6461) [#6470](https://github.com/Kong/kong-mesh/pull/6470) [#6472](https://github.com/Kong/kong-mesh/pull/6472) [#6478](https://github.com/Kong/kong-mesh/pull/6478) [#6479](https://github.com/Kong/kong-mesh/pull/6479) [#6480](https://github.com/Kong/kong-mesh/pull/6480) [#6481](https://github.com/Kong/kong-mesh/pull/6481) [#6489](https://github.com/Kong/kong-mesh/pull/6489) [#6499](https://github.com/Kong/kong-mesh/pull/6499) [#6500](https://github.com/Kong/kong-mesh/pull/6500) [#6503](https://github.com/Kong/kong-mesh/pull/6503) [#6510](https://github.com/Kong/kong-mesh/pull/6510) [#6517](https://github.com/Kong/kong-mesh/pull/6517) [#6523](https://github.com/Kong/kong-mesh/pull/6523) [#6529](https://github.com/Kong/kong-mesh/pull/6529) [#6530](https://github.com/Kong/kong-mesh/pull/6530) [#6531](https://github.com/Kong/kong-mesh/pull/6531) [#6533](https://github.com/Kong/kong-mesh/pull/6533) [#6534](https://github.com/Kong/kong-mesh/pull/6534) [#6539](https://github.com/Kong/kong-mesh/pull/6539) [#6541](https://github.com/Kong/kong-mesh/pull/6541) [#6543](https://github.com/Kong/kong-mesh/pull/6543) [#6545](https://github.com/Kong/kong-mesh/pull/6545) [#6547](https://github.com/Kong/kong-mesh/pull/6547) [#6552](https://github.com/Kong/kong-mesh/pull/6552) [#6561](https://github.com/Kong/kong-mesh/pull/6561) [#6562](https://github.com/Kong/kong-mesh/pull/6562) [#6576](https://github.com/Kong/kong-mesh/pull/6576) [#6577](https://github.com/Kong/kong-mesh/pull/6577) [#6579](https://github.com/Kong/kong-mesh/pull/6579) [#6581](https://github.com/Kong/kong-mesh/pull/6581) [#6582](https://github.com/Kong/kong-mesh/pull/6582) [#6591](https://github.com/Kong/kong-mesh/pull/6591) [#6594](https://github.com/Kong/kong-mesh/pull/6594) [#6597](https://github.com/Kong/kong-mesh/pull/6597) [#6599](https://github.com/Kong/kong-mesh/pull/6599) [#6601](https://github.com/Kong/kong-mesh/pull/6601) [#6604](https://github.com/Kong/kong-mesh/pull/6604) [#6615](https://github.com/Kong/kong-mesh/pull/6615) [#6617](https://github.com/Kong/kong-mesh/pull/6617) [#6621](https://github.com/Kong/kong-mesh/pull/6621) [#6622](https://github.com/Kong/kong-mesh/pull/6622) [#6625](https://github.com/Kong/kong-mesh/pull/6625) [#6628](https://github.com/Kong/kong-mesh/pull/6628) [#6630](https://github.com/Kong/kong-mesh/pull/6630) [#6638](https://github.com/Kong/kong-mesh/pull/6638) [#6641](https://github.com/Kong/kong-mesh/pull/6641) [#6643](https://github.com/Kong/kong-mesh/pull/6643) [#6654](https://github.com/Kong/kong-mesh/pull/6654) [#6668](https://github.com/Kong/kong-mesh/pull/6668) [#6670](https://github.com/Kong/kong-mesh/pull/6670) [#6671](https://github.com/Kong/kong-mesh/pull/6671) [#6681](https://github.com/Kong/kong-mesh/pull/6681) [#6683](https://github.com/Kong/kong-mesh/pull/6683) [#6687](https://github.com/Kong/kong-mesh/pull/6687) [#6690](https://github.com/Kong/kong-mesh/pull/6690) [#6691](https://github.com/Kong/kong-mesh/pull/6691) [#6693](https://github.com/Kong/kong-mesh/pull/6693) [#6694](https://github.com/Kong/kong-mesh/pull/6694) [#6700](https://github.com/Kong/kong-mesh/pull/6700) [#6701](https://github.com/Kong/kong-mesh/pull/6701) [#6702](https://github.com/Kong/kong-mesh/pull/6702) [#6712](https://github.com/Kong/kong-mesh/pull/6712) [#6732](https://github.com/Kong/kong-mesh/pull/6732) [#6741](https://github.com/Kong/kong-mesh/pull/6741) [#6746](https://github.com/Kong/kong-mesh/pull/6746) [#6754](https://github.com/Kong/kong-mesh/pull/6754) [#6757](https://github.com/Kong/kong-mesh/pull/6757) [#6762](https://github.com/Kong/kong-mesh/pull/6762) [#6769](https://github.com/Kong/kong-mesh/pull/6769) [#6771](https://github.com/Kong/kong-mesh/pull/6771) [#6773](https://github.com/Kong/kong-mesh/pull/6773) [#6777](https://github.com/Kong/kong-mesh/pull/6777) [#6780](https://github.com/Kong/kong-mesh/pull/6780) [#6789](https://github.com/Kong/kong-mesh/pull/6789) [#6793](https://github.com/Kong/kong-mesh/pull/6793) [#6794](https://github.com/Kong/kong-mesh/pull/6794) [#6799](https://github.com/Kong/kong-mesh/pull/6799) [#6802](https://github.com/Kong/kong-mesh/pull/6802) [#6803](https://github.com/Kong/kong-mesh/pull/6803) [#6807](https://github.com/Kong/kong-mesh/pull/6807) [#6814](https://github.com/Kong/kong-mesh/pull/6814) [#6828](https://github.com/Kong/kong-mesh/pull/6828) [#6831](https://github.com/Kong/kong-mesh/pull/6831) @kong-mesh
+* chore(deps): bump kumahq/ubuntu-netools from `8675216` to `4243009` [#6250](https://github.com/Kong/kong-mesh/pull/6250) @dependabot
+* chore(deps): bump peter-evans/create-pull-request from 6 to 7 [#6573](https://github.com/Kong/kong-mesh/pull/6573) @dependabot
+* chore(deps): bump the go-opentelemetry-io group with 4 updates [#6631](https://github.com/Kong/kong-mesh/pull/6631) @dependabot
+* chore(deps): bump the opa group with 2 updates [#6255](https://github.com/Kong/kong-mesh/pull/6255) [#6407](https://github.com/Kong/kong-mesh/pull/6407) [#6434](https://github.com/Kong/kong-mesh/pull/6434) [#6718](https://github.com/Kong/kong-mesh/pull/6718) @dependabot
+* chore(deps): bump ubi9-minimal from 9.4-1134 to 9.4-1227.1726694542 [#6361](https://github.com/Kong/kong-mesh/pull/6361) [#6564](https://github.com/Kong/kong-mesh/pull/6564) [#6606](https://github.com/Kong/kong-mesh/pull/6606) [#6676](https://github.com/Kong/kong-mesh/pull/6676) @dependabot
+* chore(deps): replace all go control plane versions [#6642](https://github.com/Kong/kong-mesh/pull/6642) @slonka
+* chore(deps): security update [#6658](https://github.com/Kong/kong-mesh/pull/6658) @kong-mesh
+* chore(deps): update go-control-plane to kumahq fork v0.13.2 [#6698](https://github.com/Kong/kong-mesh/pull/6698) @jakubdyszkiewicz
+* chore(deps): use latest Kong/kong-mesh-gui [#6172](https://github.com/Kong/kong-mesh/pull/6172) [#6193](https://github.com/Kong/kong-mesh/pull/6193) [#6221](https://github.com/Kong/kong-mesh/pull/6221) [#6224](https://github.com/Kong/kong-mesh/pull/6224) [#6228](https://github.com/Kong/kong-mesh/pull/6228) [#6238](https://github.com/Kong/kong-mesh/pull/6238) [#6251](https://github.com/Kong/kong-mesh/pull/6251) [#6284](https://github.com/Kong/kong-mesh/pull/6284) [#6301](https://github.com/Kong/kong-mesh/pull/6301) [#6312](https://github.com/Kong/kong-mesh/pull/6312) [#6322](https://github.com/Kong/kong-mesh/pull/6322) [#6327](https://github.com/Kong/kong-mesh/pull/6327) [#6334](https://github.com/Kong/kong-mesh/pull/6334) [#6347](https://github.com/Kong/kong-mesh/pull/6347) [#6360](https://github.com/Kong/kong-mesh/pull/6360) [#6382](https://github.com/Kong/kong-mesh/pull/6382) [#6391](https://github.com/Kong/kong-mesh/pull/6391) [#6400](https://github.com/Kong/kong-mesh/pull/6400) [#6460](https://github.com/Kong/kong-mesh/pull/6460) [#6540](https://github.com/Kong/kong-mesh/pull/6540) [#6546](https://github.com/Kong/kong-mesh/pull/6546) [#6554](https://github.com/Kong/kong-mesh/pull/6554) [#6575](https://github.com/Kong/kong-mesh/pull/6575) [#6578](https://github.com/Kong/kong-mesh/pull/6578) [#6593](https://github.com/Kong/kong-mesh/pull/6593) [#6596](https://github.com/Kong/kong-mesh/pull/6596) [#6602](https://github.com/Kong/kong-mesh/pull/6602) [#6620](https://github.com/Kong/kong-mesh/pull/6620) [#6624](https://github.com/Kong/kong-mesh/pull/6624) [#6637](https://github.com/Kong/kong-mesh/pull/6637) [#6640](https://github.com/Kong/kong-mesh/pull/6640) [#6645](https://github.com/Kong/kong-mesh/pull/6645) [#6669](https://github.com/Kong/kong-mesh/pull/6669) [#6685](https://github.com/Kong/kong-mesh/pull/6685) [#6686](https://github.com/Kong/kong-mesh/pull/6686) [#6697](https://github.com/Kong/kong-mesh/pull/6697) [#6699](https://github.com/Kong/kong-mesh/pull/6699) [#6710](https://github.com/Kong/kong-mesh/pull/6710) [#6711](https://github.com/Kong/kong-mesh/pull/6711) [#6723](https://github.com/Kong/kong-mesh/pull/6723) [#6750](https://github.com/Kong/kong-mesh/pull/6750) [#6804](https://github.com/Kong/kong-mesh/pull/6804) @kong-mesh
+* feat(kuma-dp): add windows deprecation notice [#6770](https://github.com/Kong/kong-mesh/pull/6770) @johnharris85
+
+
 ## 2.8.4
 > Released on 2024/10/07