diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md
index c9aee39449a1..304c12f272bb 100644
--- a/src/Compute/Compute/ChangeLog.md
+++ b/src/Compute/Compute/ChangeLog.md
@@ -20,6 +20,12 @@
 
 -->
 ## Upcoming Release
+* Enhanced `Set-AzDiskSecurityProfile` cmdlet with new parameter `SecureVMDiskEncryptionSetId`.
+    - Added logic to verify `SecureVMDiskEncryptionSetId` is a resourceId.
+    - Added logic to verify `SecureVMDiskEncryptionSetId` is a string.
+    - Added logic to set all characters of `SecureVMDiskEncryptionSetId` to lower case.
+* Fixed `New-AzVmss` to correctly work when using `-EdgeZone` by creating the Load Balancer in the correct edge zone.
+* Removed references to image aliases in `New-AzVM` and `New-AzVmss` to images that were removed.
 * Fixed `New-AzVmss` to correctly work when using `-EdgeZone` by creating the Load Balancer in the correct edge zone.
 * Removed references to image aliases in `New-AzVM` and `New-AzVmss` to images that were removed.
 
diff --git a/src/Compute/Compute/Generated/Disk/Config/SetAzDiskSecurityProfile.cs b/src/Compute/Compute/Generated/Disk/Config/SetAzDiskSecurityProfile.cs
index 47e72f79c7d6..9a6a5cddb4d2 100644
--- a/src/Compute/Compute/Generated/Disk/Config/SetAzDiskSecurityProfile.cs
+++ b/src/Compute/Compute/Generated/Disk/Config/SetAzDiskSecurityProfile.cs
@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,7 +52,7 @@ public class SetAzDiskSecurityProfile : Microsoft.Azure.Commands.ResourceManager
            Mandatory = false,
            ValueFromPipelineByPropertyName = true,
            HelpMessage = "ResourceId of the disk encryption set to use for enabling encryption at rest.")]
-        public string SecureVMDiskEncryptionSet { get; set; }
+        public string SecureVMDiskEncryptionSetId { get; set; }
 
         protected override void ProcessRecord()
         {
@@ -85,17 +85,18 @@ private void Run()
                 this.Disk.SecurityProfile.SecurityType = SecurityType;
             }
 
-            if (this.IsParameterBound(c => c.SecureVMDiskEncryptionSet))
+            if (this.IsParameterBound(c => c.SecureVMDiskEncryptionSetId))
             {
                 if (this.Disk.SecurityProfile == null)
                 {
                     this.Disk.SecurityProfile = new DiskSecurityProfile();
                 }
-                this.Disk.SecurityProfile.SecureVMDiskEncryptionSetId = this.SecureVMDiskEncryptionSet;
+                this.Disk.SecurityProfile.SecureVMDiskEncryptionSetId = this.SecureVMDiskEncryptionSetId.ToLower();
             }
 
             WriteObject(this.Disk);
         }
     }
 
-}
\ No newline at end of file
+}
+
diff --git a/src/Compute/Compute/Generated/Models/PSDisk.cs b/src/Compute/Compute/Generated/Models/PSDisk.cs
index d257855adaae..a45f1e778339 100644
--- a/src/Compute/Compute/Generated/Models/PSDisk.cs
+++ b/src/Compute/Compute/Generated/Models/PSDisk.cs
@@ -1,4 +1,4 @@
-//
+ //
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -81,3 +81,4 @@ public string ResourceGroupName
         public bool? OptimizedForFrequentAttach { get; set; }
     }
 }
+.
\ No newline at end of file