diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/managedClusters.json
index cca70a2e905b..5ffcfe6aad5b 100644
--- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/managedClusters.json
+++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/managedClusters.json
@@ -3129,24 +3129,20 @@
         "extendedLocation": {
           "$ref": "#/definitions/ExtendedLocation",
           "description": "The extended location of the Virtual Machine."
+        },
+        "identity": {
+          "$ref": "#/definitions/ManagedClusterIdentity",
+          "description": "The identity of the managed cluster, if configured."
+        },
+        "properties": {
+          "description": "Properties of a managed cluster.",
+          "$ref": "#/definitions/ManagedClusterProperties",
+          "x-ms-client-flatten": true
         }
       },
       "allOf": [
         {
           "$ref": "#/definitions/Resource"
-        },
-        {
-          "properties": {
-            "properties": {
-              "description": "Properties of a managed cluster.",
-              "$ref": "#/definitions/ManagedClusterProperties",
-              "x-ms-client-flatten": true
-            },
-            "identity": {
-              "$ref": "#/definitions/ManagedClusterIdentity",
-              "description": "The identity of the managed cluster, if configured."
-            }
-          }
         }
       ],
       "description": "Managed cluster."
@@ -3326,11 +3322,7 @@
         },
         "identityProfile": {
           "additionalProperties": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/UserAssignedIdentity"
-              }
-            ]
+            "$ref": "#/definitions/UserAssignedIdentity"
           },
           "description": "Identities associated with the cluster."
         },
@@ -3422,6 +3414,7 @@
           "type": "object",
           "additionalProperties": {
             "type": "object",
+            "x-ms-client-name": "ManagedServiceIdentityUserAssignedIdentitiesValue",
             "properties": {
               "principalId": {
                 "readOnly": true,
diff --git a/specification/containerservice/resource-manager/readme.go.md b/specification/containerservice/resource-manager/readme.go.md
index 6981ca930982..1ecd72072b97 100644
--- a/specification/containerservice/resource-manager/readme.go.md
+++ b/specification/containerservice/resource-manager/readme.go.md
@@ -20,6 +20,7 @@ azure-arm: true
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2021-07
   - tag: package-2021-05
   - tag: package-2021-03
   - tag: package-2021-02
@@ -48,6 +49,15 @@ batch:
   - tag: package-2017-07
 ```
 
+### Tag: package-2021-07 and go
+
+These settings apply only when `--package-2021-07 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag)=='package-2021-07' && $(go)
+namespace: containerservice
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2021-07-01/$(namespace)
+```
 ### Tag: package-2021-05 and go
 
 These settings apply only when `--package-2021-05 --go` is specified on the command line.
diff --git a/specification/containerservice/resource-manager/readme.java.md b/specification/containerservice/resource-manager/readme.java.md
index 7d2240627e7d..919684237f8e 100644
--- a/specification/containerservice/resource-manager/readme.java.md
+++ b/specification/containerservice/resource-manager/readme.java.md
@@ -37,6 +37,20 @@ batch:
   - tag: package-2021-02
   - tag: package-2021-03
   - tag: package-2021-05
+  - tag: package-2021-07
+```
+
+### Tag: package-2021-07 and java
+
+These settings apply only when `--tag=package-2021-07` is specified on the command line.
+Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.
+
+``` yaml $(tag) == 'package-2021-05' && $(java) && $(multiapi)
+java:
+  namespace: com.microsoft.azure.management.containerservice.v2021_07_01
+  output-folder: $(azure-libraries-for-java-folder)/sdk/containerservice/mgmt-v2021_07_01
+regenerate-manager: true
+generate-interface: true
 ```
 
 ### Tag: package-2021-05 and java
diff --git a/specification/containerservice/resource-manager/readme.md b/specification/containerservice/resource-manager/readme.md
index ed3673f16e43..6df52b84c2b6 100644
--- a/specification/containerservice/resource-manager/readme.md
+++ b/specification/containerservice/resource-manager/readme.md
@@ -42,10 +42,11 @@ tag: package-2021-07
 
 These settings apply only when `--tag=package-2021-07` is specified on the command line.
 
-```yaml $(tag) == 'package-2021-07'
+``` yaml $(tag) == 'package-2021-07'
 input-file:
   - Microsoft.ContainerService/stable/2021-07-01/managedClusters.json
 ```
+
 ### Tag: package-2021-05
 
 These settings apply only when `--tag=package-2021-05` is specified on the command line.
@@ -337,6 +338,19 @@ input-file:
 
 ```
 
+### Tag: package-2021-07-01-only
+
+These settings apply only when `--tag=package-2021-07-01-only` is specified on the command line.
+
+``` yaml $(tag) == 'package-2021-07-01-only'
+input-file:
+- Microsoft.ContainerService/stable/2021-07-01/managedClusters.json
+directive:
+  - suppress: DefinitionsPropertiesNamesCamelCase
+    where: $.definitions.ManagedClusterProperties.properties.autoScalerProfile
+    reason: Cluster-autoscaler settings are not camel-cased
+```
+
 ### Tag: package-2021-05-01-only
 
 These settings apply only when `--tag=package-2021-05-01-only` is specified on the command line.
diff --git a/specification/containerservice/resource-manager/readme.python.md b/specification/containerservice/resource-manager/readme.python.md
index 6b5fc7ba1912..d3ab06a27c51 100644
--- a/specification/containerservice/resource-manager/readme.python.md
+++ b/specification/containerservice/resource-manager/readme.python.md
@@ -26,6 +26,7 @@ Generate all API versions currently shipped for this package
 
 ```yaml $(python) && $(multiapi) && !$(track2)
 batch:
+  - tag: package-2021-07-01-only
   - tag: package-2021-05-01-only
   - tag: package-2021-03-01-only
   - tag: package-2021-02-01-only
@@ -55,6 +56,7 @@ batch:
 
 ```yaml $(python) && $(multiapi) && $(track2)
 batch:
+  - tag: package-2021-07-01-only
   - tag: package-2021-05-01-only
   - tag: package-2021-03-01-only
   - tag: package-2021-02-01-only
@@ -89,6 +91,19 @@ clear-output-folder: false
 perform-load: false
 ```
 
+### Tag: package-2021-07-01-only and python
+
+These settings apply only when `--tag=package-2021-07-01-only --python` is specified on the command line.
+Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
+
+``` yaml $(tag) == 'package-2021-05-01-only' && $(python)
+python:
+  namespace: azure.mgmt.containerservice.v2021_07_01
+  output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_07_01
+namespace: azure.mgmt.containerservice.v2021_07_01
+output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_07_01
+```
+
 ### Tag: package-2021-05-01-only and python
 
 These settings apply only when `--tag=package-2021-05-01-only --python` is specified on the command line.