diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_09_30/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_09_30/models/__init__.py
index e8a71aaf255f..4a1cc092e224 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_09_30/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_09_30/models/__init__.py
@@ -54,8 +54,6 @@
     SnapshotStorageAccountTypes,
     AccessLevel,
 )
-# Manual change to avoid major release until the next major release
-StorageAccountTypes = DiskStorageAccountTypes
 
 __all__ = [
     'Resource',
@@ -77,7 +75,6 @@
     'DiskPaged',
     'SnapshotPaged',
     'DiskStorageAccountTypes',
-    'StorageAccountTypes',
     'OperatingSystemTypes',
     'HyperVGeneration',
     'DiskCreateOption',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/__init__.py
index d72e960b4d23..7540dddd21c4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/__init__.py
@@ -52,6 +52,7 @@
     from .win_rm_listener_py3 import WinRMListener
     from .win_rm_configuration_py3 import WinRMConfiguration
     from .windows_configuration_py3 import WindowsConfiguration
+    from .virtual_machine_scale_set_windows_configuration_py3 import VirtualMachineScaleSetWindowsConfiguration
     from .ssh_public_key_py3 import SshPublicKey
     from .ssh_configuration_py3 import SshConfiguration
     from .linux_configuration_py3 import LinuxConfiguration
@@ -189,6 +190,7 @@
     from .win_rm_listener import WinRMListener
     from .win_rm_configuration import WinRMConfiguration
     from .windows_configuration import WindowsConfiguration
+    from .virtual_machine_scale_set_windows_configuration import VirtualMachineScaleSetWindowsConfiguration
     from .ssh_public_key import SshPublicKey
     from .ssh_configuration import SshConfiguration
     from .linux_configuration import LinuxConfiguration
@@ -369,6 +371,7 @@
     'WinRMListener',
     'WinRMConfiguration',
     'WindowsConfiguration',
+    'VirtualMachineScaleSetWindowsConfiguration',
     'SshPublicKey',
     'SshConfiguration',
     'LinuxConfiguration',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_os_profile.py
index f1682daccc25..8d60a2e18a07 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_os_profile.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_os_profile.py
@@ -60,7 +60,7 @@ class VirtualMachineScaleSetOSProfile(Model):
     :param windows_configuration: Specifies Windows operating system settings
      on the virtual machine.
     :type windows_configuration:
-     ~azure.mgmt.compute.v2018_10_01.models.WindowsConfiguration
+     ~azure.mgmt.compute.v2018_10_01.models.VirtualMachineScaleSetWindowsConfiguration
     :param linux_configuration: Specifies the Linux operating system settings
      on the virtual machine. <br><br>For a list of supported Linux
      distributions, see [Linux on Azure-Endorsed
@@ -81,7 +81,7 @@ class VirtualMachineScaleSetOSProfile(Model):
         'admin_username': {'key': 'adminUsername', 'type': 'str'},
         'admin_password': {'key': 'adminPassword', 'type': 'str'},
         'custom_data': {'key': 'customData', 'type': 'str'},
-        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'VirtualMachineScaleSetWindowsConfiguration'},
         'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
         'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
     }
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_os_profile_py3.py
index d60486034c60..8fe19c9a7533 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_os_profile_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_os_profile_py3.py
@@ -60,7 +60,7 @@ class VirtualMachineScaleSetOSProfile(Model):
     :param windows_configuration: Specifies Windows operating system settings
      on the virtual machine.
     :type windows_configuration:
-     ~azure.mgmt.compute.v2018_10_01.models.WindowsConfiguration
+     ~azure.mgmt.compute.v2018_10_01.models.VirtualMachineScaleSetWindowsConfiguration
     :param linux_configuration: Specifies the Linux operating system settings
      on the virtual machine. <br><br>For a list of supported Linux
      distributions, see [Linux on Azure-Endorsed
@@ -81,7 +81,7 @@ class VirtualMachineScaleSetOSProfile(Model):
         'admin_username': {'key': 'adminUsername', 'type': 'str'},
         'admin_password': {'key': 'adminPassword', 'type': 'str'},
         'custom_data': {'key': 'customData', 'type': 'str'},
-        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'VirtualMachineScaleSetWindowsConfiguration'},
         'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
         'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
     }
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_update_os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_update_os_profile.py
index 64c4844a9e47..9aad30d2414d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_update_os_profile.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_update_os_profile.py
@@ -19,7 +19,7 @@ class VirtualMachineScaleSetUpdateOSProfile(Model):
     :type custom_data: str
     :param windows_configuration: The Windows Configuration of the OS profile.
     :type windows_configuration:
-     ~azure.mgmt.compute.v2018_10_01.models.WindowsConfiguration
+     ~azure.mgmt.compute.v2018_10_01.models.VirtualMachineScaleSetWindowsConfiguration
     :param linux_configuration: The Linux Configuration of the OS profile.
     :type linux_configuration:
      ~azure.mgmt.compute.v2018_10_01.models.LinuxConfiguration
@@ -30,7 +30,7 @@ class VirtualMachineScaleSetUpdateOSProfile(Model):
 
     _attribute_map = {
         'custom_data': {'key': 'customData', 'type': 'str'},
-        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'VirtualMachineScaleSetWindowsConfiguration'},
         'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
         'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
     }
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_update_os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_update_os_profile_py3.py
index feba5c831a3d..011f6f04e1df 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_update_os_profile_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_update_os_profile_py3.py
@@ -19,7 +19,7 @@ class VirtualMachineScaleSetUpdateOSProfile(Model):
     :type custom_data: str
     :param windows_configuration: The Windows Configuration of the OS profile.
     :type windows_configuration:
-     ~azure.mgmt.compute.v2018_10_01.models.WindowsConfiguration
+     ~azure.mgmt.compute.v2018_10_01.models.VirtualMachineScaleSetWindowsConfiguration
     :param linux_configuration: The Linux Configuration of the OS profile.
     :type linux_configuration:
      ~azure.mgmt.compute.v2018_10_01.models.LinuxConfiguration
@@ -30,7 +30,7 @@ class VirtualMachineScaleSetUpdateOSProfile(Model):
 
     _attribute_map = {
         'custom_data': {'key': 'customData', 'type': 'str'},
-        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'VirtualMachineScaleSetWindowsConfiguration'},
         'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
         'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
     }
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_windows_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_windows_configuration.py
new file mode 100644
index 000000000000..853832852e49
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_windows_configuration.py
@@ -0,0 +1,56 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class VirtualMachineScaleSetWindowsConfiguration(Model):
+    """Specifies Windows operating system settings on the virtual machine.
+
+    :param provision_vm_agent: Indicates whether virtual machine agent should
+     be provisioned on the virtual machine. <br><br> When this property is not
+     specified in the request body, default behavior is to set it to true.
+     This will ensure that VM Agent is installed on the VM so that extensions
+     can be added to the VM later.
+    :type provision_vm_agent: bool
+    :param enable_automatic_updates: Indicates whether Virtual Machine Scale
+     Set virtual machine is enabled for automatic windows updates. <br><br>
+     Default behavior is true. Updates to this property will take effect on OS
+     reprovisioning.
+    :type enable_automatic_updates: bool
+    :param time_zone: Specifies the time zone of the virtual machine. e.g.
+     "Pacific Standard Time"
+    :type time_zone: str
+    :param additional_unattend_content: Specifies additional base-64 encoded
+     XML formatted information that can be included in the Unattend.xml file,
+     which is used by Windows Setup.
+    :type additional_unattend_content:
+     list[~azure.mgmt.compute.v2018_10_01.models.AdditionalUnattendContent]
+    :param win_rm: Specifies the Windows Remote Management listeners. This
+     enables remote Windows PowerShell.
+    :type win_rm: ~azure.mgmt.compute.v2018_10_01.models.WinRMConfiguration
+    """
+
+    _attribute_map = {
+        'provision_vm_agent': {'key': 'provisionVMAgent', 'type': 'bool'},
+        'enable_automatic_updates': {'key': 'enableAutomaticUpdates', 'type': 'bool'},
+        'time_zone': {'key': 'timeZone', 'type': 'str'},
+        'additional_unattend_content': {'key': 'additionalUnattendContent', 'type': '[AdditionalUnattendContent]'},
+        'win_rm': {'key': 'winRM', 'type': 'WinRMConfiguration'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetWindowsConfiguration, self).__init__(**kwargs)
+        self.provision_vm_agent = kwargs.get('provision_vm_agent', None)
+        self.enable_automatic_updates = kwargs.get('enable_automatic_updates', None)
+        self.time_zone = kwargs.get('time_zone', None)
+        self.additional_unattend_content = kwargs.get('additional_unattend_content', None)
+        self.win_rm = kwargs.get('win_rm', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_windows_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_windows_configuration_py3.py
new file mode 100644
index 000000000000..cd72f16e2954
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/virtual_machine_scale_set_windows_configuration_py3.py
@@ -0,0 +1,56 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class VirtualMachineScaleSetWindowsConfiguration(Model):
+    """Specifies Windows operating system settings on the virtual machine.
+
+    :param provision_vm_agent: Indicates whether virtual machine agent should
+     be provisioned on the virtual machine. <br><br> When this property is not
+     specified in the request body, default behavior is to set it to true.
+     This will ensure that VM Agent is installed on the VM so that extensions
+     can be added to the VM later.
+    :type provision_vm_agent: bool
+    :param enable_automatic_updates: Indicates whether Virtual Machine Scale
+     Set virtual machine is enabled for automatic windows updates. <br><br>
+     Default behavior is true. Updates to this property will take effect on OS
+     reprovisioning.
+    :type enable_automatic_updates: bool
+    :param time_zone: Specifies the time zone of the virtual machine. e.g.
+     "Pacific Standard Time"
+    :type time_zone: str
+    :param additional_unattend_content: Specifies additional base-64 encoded
+     XML formatted information that can be included in the Unattend.xml file,
+     which is used by Windows Setup.
+    :type additional_unattend_content:
+     list[~azure.mgmt.compute.v2018_10_01.models.AdditionalUnattendContent]
+    :param win_rm: Specifies the Windows Remote Management listeners. This
+     enables remote Windows PowerShell.
+    :type win_rm: ~azure.mgmt.compute.v2018_10_01.models.WinRMConfiguration
+    """
+
+    _attribute_map = {
+        'provision_vm_agent': {'key': 'provisionVMAgent', 'type': 'bool'},
+        'enable_automatic_updates': {'key': 'enableAutomaticUpdates', 'type': 'bool'},
+        'time_zone': {'key': 'timeZone', 'type': 'str'},
+        'additional_unattend_content': {'key': 'additionalUnattendContent', 'type': '[AdditionalUnattendContent]'},
+        'win_rm': {'key': 'winRM', 'type': 'WinRMConfiguration'},
+    }
+
+    def __init__(self, *, provision_vm_agent: bool=None, enable_automatic_updates: bool=None, time_zone: str=None, additional_unattend_content=None, win_rm=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetWindowsConfiguration, self).__init__(**kwargs)
+        self.provision_vm_agent = provision_vm_agent
+        self.enable_automatic_updates = enable_automatic_updates
+        self.time_zone = time_zone
+        self.additional_unattend_content = additional_unattend_content
+        self.win_rm = win_rm
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/windows_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/windows_configuration.py
index e32c345c11c4..fad23f86db89 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/windows_configuration.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/windows_configuration.py
@@ -22,7 +22,7 @@ class WindowsConfiguration(Model):
      can be added to the VM later.
     :type provision_vm_agent: bool
     :param enable_automatic_updates: Indicates whether virtual machine is
-     enabled for automatic updates.
+     enabled for automatic windows updates. <br> <br> Default behavior is true.
     :type enable_automatic_updates: bool
     :param time_zone: Specifies the time zone of the virtual machine. e.g.
      "Pacific Standard Time"
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/windows_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/windows_configuration_py3.py
index f6e91dc1a014..1eb697231b45 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/windows_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01/models/windows_configuration_py3.py
@@ -22,7 +22,7 @@ class WindowsConfiguration(Model):
      can be added to the VM later.
     :type provision_vm_agent: bool
     :param enable_automatic_updates: Indicates whether virtual machine is
-     enabled for automatic updates.
+     enabled for automatic windows updates. <br> <br> Default behavior is true.
     :type enable_automatic_updates: bool
     :param time_zone: Specifies the time zone of the virtual machine. e.g.
      "Pacific Standard Time"