diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersCreate_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersCreate_Update.json
index 9c035fe525fb..3ffc38106ea1 100644
--- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersCreate_Update.json
+++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersCreate_Update.json
@@ -31,6 +31,10 @@
             ]
           }
         },
+        "windowsProfile": {
+          "adminUsername": "azureuser",
+          "adminPassword": "replacePassword1234$"
+        },
         "servicePrincipalProfile": {
           "clientId": "clientid",
           "secret": "secret"
@@ -55,6 +59,7 @@
         "type": "Microsoft.ContainerService/ManagedClusters",
         "properties": {
           "provisioningState": "Succeeded",
+          "maxAgentPools": 1,
           "kubernetesVersion": "1.9.6",
           "dnsPrefix": "dnsprefix1",
           "agentPoolProfiles": [
@@ -78,6 +83,9 @@
               ]
             }
           },
+          "windowsProfile": {
+            "adminUsername": "azureuser"
+          },
           "servicePrincipalProfile": {
             "clientId": "clientid"
           },
@@ -107,6 +115,7 @@
         "type": "Microsoft.ContainerService/ManagedClusters",
         "properties": {
           "provisioningState": "Creating",
+          "maxAgentPools": 1,
           "kubernetesVersion": "1.9.6",
           "dnsPrefix": "dnsprefix1",
           "agentPoolProfiles": [
@@ -130,6 +139,9 @@
               ]
             }
           },
+          "windowsProfile": {
+            "adminUsername": "azureuser"
+          },
           "servicePrincipalProfile": {
             "clientId": "clientid"
           },
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersGet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersGet.json
index b2e9229c6b61..e8f00eda616e 100644
--- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersGet.json
+++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersGet.json
@@ -18,6 +18,7 @@
         "type": "Microsoft.ContainerService/ManagedClusters",
         "properties": {
           "provisioningState": "Succeeded",
+          "maxAgentPools": 1,
           "kubernetesVersion": "1.9.6",
           "dnsPrefix": "dnsprefix1",
           "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersList.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersList.json
index cd7e1548f57d..d82a40119aa8 100644
--- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersList.json
+++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersList.json
@@ -19,6 +19,7 @@
             "properties": {
               "provisioningState": "Succeeded",
               "kubernetesVersion": "1.9.6",
+              "maxAgentPools": 1,
               "dnsPrefix": "dnsprefix1",
               "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io",
               "agentPoolProfiles": [
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersListByResourceGroup.json
index b02247dff002..d0263d296eee 100644
--- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersListByResourceGroup.json
+++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/examples/ManagedClustersListByResourceGroup.json
@@ -20,6 +20,7 @@
             "properties": {
               "provisioningState": "Succeeded",
               "kubernetesVersion": "1.9.6",
+              "maxAgentPools": 1,
               "dnsPrefix": "dnsprefix1",
               "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io",
               "agentPoolProfiles": [
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/managedClusters.json
index 2e831d040cc8..f50cbfef20bc 100644
--- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/managedClusters.json
+++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/managedClusters.json
@@ -1513,7 +1513,7 @@
       ],
       "description": "Agent Pool."
     },
-    "ContainerServiceWindowsProfile": {
+    "ManagedClusterWindowsProfile": {
       "properties": {
         "adminUsername": {
           "type": "string",
@@ -1527,8 +1527,7 @@
         }
       },
       "required": [
-        "adminUsername",
-        "adminPassword"
+        "adminUsername"
       ],
       "description": "Profile for Windows VMs in the container service cluster."
     },
@@ -1701,6 +1700,12 @@
           "type": "string",
           "description": "The current deployment or provisioning state, which only appears in the response."
         },
+        "maxAgentPools": {
+          "readOnly": true,
+          "type": "integer",
+          "format": "int32",
+          "description": "The max number of agent pools for the managed cluster."
+        },
         "kubernetesVersion": {
           "type": "string",
           "description": "Version of Kubernetes specified when creating the managed cluster."
@@ -1725,6 +1730,10 @@
           "$ref": "#/definitions/ContainerServiceLinuxProfile",
           "description": "Profile for Linux VMs in the container service cluster."
         },
+        "windowsProfile": {
+          "$ref": "#/definitions/ManagedClusterWindowsProfile",
+          "description": "Profile for Windows VMs in the container service cluster."
+        },
         "servicePrincipalProfile": {
           "$ref": "#/definitions/ManagedClusterServicePrincipalProfile",
           "description": "Information about a service principal identity for the cluster to use for manipulating Azure APIs."
diff --git a/specification/containerservice/resource-manager/readme.go.md b/specification/containerservice/resource-manager/readme.go.md
index 0c4f8b261efc..a9e459c9393b 100644
--- a/specification/containerservice/resource-manager/readme.go.md
+++ b/specification/containerservice/resource-manager/readme.go.md
@@ -12,6 +12,7 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2019-04
   - tag: package-2019-02
   - tag: package-2018-09-30-preview
   - tag: package-2018-08-preview
@@ -21,6 +22,16 @@ batch:
   - tag: package-2017-07
 ```
 
+### Tag: package-2019-04 and go
+
+These settings apply only when `--package-2019-04 --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-2019-04' && $(go)
+namespace: containerservice
+output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2019-04-01/$(namespace)
+```
+
 ### Tag: package-2019-02 and go
 
 These settings apply only when `--package-2019-02 --go` is specified on the command line.
diff --git a/specification/containerservice/resource-manager/readme.md b/specification/containerservice/resource-manager/readme.md
index a150cdbfba14..865ec446a9be 100644
--- a/specification/containerservice/resource-manager/readme.md
+++ b/specification/containerservice/resource-manager/readme.md
@@ -44,8 +44,12 @@ These settings apply only when `--tag=package-2019-04` is specified on the comma
 
 ```yaml $(tag) == 'package-2019-04'
 input-file:
+  - Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json
+  - Microsoft.ContainerService/stable/2017-07-01/containerService.json
   - Microsoft.ContainerService/stable/2019-04-01/managedClusters.json
+  - Microsoft.ContainerService/stable/2017-09-30/location.json
 ```
+
 ### Tag: package-2019-02
 
 These settings apply only when `--tag=package-2019-02` is specified on the command line.
@@ -123,6 +127,15 @@ input-file:
 - Microsoft.ContainerService/stable/2017-07-01/containerService.json
 ```
 
+### Tag: package-2019-04-only
+
+These settings apply only when `--tag=package-2019-04-only` is specified on the command line.
+
+``` yaml $(tag) == 'package-2019-04-only'
+input-file:
+- Microsoft.ContainerService/stable/2019-04-01/managedClusters.json
+```
+
 ### Tag: package-2019-02-only
 
 These settings apply only when `--tag=package-2019-02-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 ffeb71b925d5..df6cafdae6b1 100644
--- a/specification/containerservice/resource-manager/readme.python.md
+++ b/specification/containerservice/resource-manager/readme.python.md
@@ -18,12 +18,24 @@ Generate all API versions currently shipped for this package
 
 ```yaml $(python) && $(multiapi)
 batch:
+  - tag: package-2019-04-only
   - tag: package-2019-02-only
   - tag: package-2018-09-preview-only
   - tag: package-2018-08-preview-only
   - tag: package-2018-03-only
   - tag: package-2017-07-only-extended
 ```
+### Tag: package-2019-04-only and python
+
+These settings apply only when `--tag=package-2019-04-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-2019-04-only' && $(python)
+python:
+  namespace: azure.mgmt.containerservice.v2019_04_01
+  output-folder: $(python-sdks-folder)/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_04_01
+```
+
 ### Tag: package-2019-02-only and python
 
 These settings apply only when `--tag=package-2019-02-only --python` is specified on the command line.