diff --git a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/DataBoxEdgeManagementClient.cs b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/DataBoxEdgeManagementClient.cs
index 3dcfbdc2fd23..e88adfcc212b 100644
--- a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/DataBoxEdgeManagementClient.cs
+++ b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/DataBoxEdgeManagementClient.cs
@@ -433,7 +433,7 @@ private void Initialize()
             SupportPackages = new SupportPackagesOperations(this);
             Users = new UsersOperations(this);
             BaseUri = new System.Uri("https://management.azure.com");
-            ApiVersion = "2021-02-01";
+            ApiVersion = "2021-06-01";
             AcceptLanguage = "en-US";
             LongRunningOperationRetryTimeout = 30;
             GenerateClientRequestId = true;
diff --git a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/DiagnosticSettingsOperations.cs b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/DiagnosticSettingsOperations.cs
index 30fa4aa6d35e..f23046bdc2a8 100644
--- a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/DiagnosticSettingsOperations.cs
+++ b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/DiagnosticSettingsOperations.cs
@@ -266,10 +266,10 @@ internal DiagnosticSettingsOperations(DataBoxEdgeManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public async Task<AzureOperationResponse> UpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<DiagnosticProactiveLogCollectionSettings>> UpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             // Send Request
-            AzureOperationResponse _response = await BeginUpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(deviceName, proactiveLogCollectionSettings, resourceGroupName, customHeaders, cancellationToken).ConfigureAwait(false);
+            AzureOperationResponse<DiagnosticProactiveLogCollectionSettings> _response = await BeginUpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(deviceName, proactiveLogCollectionSettings, resourceGroupName, customHeaders, cancellationToken).ConfigureAwait(false);
             return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
@@ -489,10 +489,10 @@ internal DiagnosticSettingsOperations(DataBoxEdgeManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public async Task<AzureOperationResponse> UpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<DiagnosticRemoteSupportSettings>> UpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             // Send Request
-            AzureOperationResponse _response = await BeginUpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(deviceName, diagnosticRemoteSupportSettings, resourceGroupName, customHeaders, cancellationToken).ConfigureAwait(false);
+            AzureOperationResponse<DiagnosticRemoteSupportSettings> _response = await BeginUpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(deviceName, diagnosticRemoteSupportSettings, resourceGroupName, customHeaders, cancellationToken).ConfigureAwait(false);
             return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
@@ -518,6 +518,9 @@ internal DiagnosticSettingsOperations(DataBoxEdgeManagementClient client)
         /// <exception cref="CloudException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -527,7 +530,7 @@ internal DiagnosticSettingsOperations(DataBoxEdgeManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse> BeginUpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<DiagnosticProactiveLogCollectionSettings>> BeginUpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (deviceName == null)
             {
@@ -676,13 +679,31 @@ internal DiagnosticSettingsOperations(DataBoxEdgeManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse();
+            var _result = new AzureOperationResponse<DiagnosticProactiveLogCollectionSettings>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<DiagnosticProactiveLogCollectionSettings>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -712,6 +733,9 @@ internal DiagnosticSettingsOperations(DataBoxEdgeManagementClient client)
         /// <exception cref="CloudException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -721,7 +745,7 @@ internal DiagnosticSettingsOperations(DataBoxEdgeManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse> BeginUpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<DiagnosticRemoteSupportSettings>> BeginUpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (deviceName == null)
             {
@@ -866,13 +890,31 @@ internal DiagnosticSettingsOperations(DataBoxEdgeManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse();
+            var _result = new AzureOperationResponse<DiagnosticRemoteSupportSettings>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<DiagnosticRemoteSupportSettings>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
diff --git a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/DiagnosticSettingsOperationsExtensions.cs b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/DiagnosticSettingsOperationsExtensions.cs
index e32115a2d2c1..a8134025b5d0 100644
--- a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/DiagnosticSettingsOperationsExtensions.cs
+++ b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/DiagnosticSettingsOperationsExtensions.cs
@@ -79,9 +79,9 @@ public static DiagnosticProactiveLogCollectionSettings GetDiagnosticProactiveLog
             /// <param name='resourceGroupName'>
             /// The resource group name.
             /// </param>
-            public static void UpdateDiagnosticProactiveLogCollectionSettings(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName)
+            public static DiagnosticProactiveLogCollectionSettings UpdateDiagnosticProactiveLogCollectionSettings(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName)
             {
-                operations.UpdateDiagnosticProactiveLogCollectionSettingsAsync(deviceName, proactiveLogCollectionSettings, resourceGroupName).GetAwaiter().GetResult();
+                return operations.UpdateDiagnosticProactiveLogCollectionSettingsAsync(deviceName, proactiveLogCollectionSettings, resourceGroupName).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -103,9 +103,12 @@ public static void UpdateDiagnosticProactiveLogCollectionSettings(this IDiagnost
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task UpdateDiagnosticProactiveLogCollectionSettingsAsync(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<DiagnosticProactiveLogCollectionSettings> UpdateDiagnosticProactiveLogCollectionSettingsAsync(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                (await operations.UpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(deviceName, proactiveLogCollectionSettings, resourceGroupName, null, cancellationToken).ConfigureAwait(false)).Dispose();
+                using (var _result = await operations.UpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(deviceName, proactiveLogCollectionSettings, resourceGroupName, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
             }
 
             /// <summary>
@@ -166,9 +169,9 @@ public static DiagnosticRemoteSupportSettings GetDiagnosticRemoteSupportSettings
             /// <param name='resourceGroupName'>
             /// The resource group name.
             /// </param>
-            public static void UpdateDiagnosticRemoteSupportSettings(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName)
+            public static DiagnosticRemoteSupportSettings UpdateDiagnosticRemoteSupportSettings(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName)
             {
-                operations.UpdateDiagnosticRemoteSupportSettingsAsync(deviceName, diagnosticRemoteSupportSettings, resourceGroupName).GetAwaiter().GetResult();
+                return operations.UpdateDiagnosticRemoteSupportSettingsAsync(deviceName, diagnosticRemoteSupportSettings, resourceGroupName).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -190,9 +193,12 @@ public static void UpdateDiagnosticRemoteSupportSettings(this IDiagnosticSetting
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task UpdateDiagnosticRemoteSupportSettingsAsync(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<DiagnosticRemoteSupportSettings> UpdateDiagnosticRemoteSupportSettingsAsync(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                (await operations.UpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(deviceName, diagnosticRemoteSupportSettings, resourceGroupName, null, cancellationToken).ConfigureAwait(false)).Dispose();
+                using (var _result = await operations.UpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(deviceName, diagnosticRemoteSupportSettings, resourceGroupName, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
             }
 
             /// <summary>
@@ -211,9 +217,9 @@ public static void UpdateDiagnosticRemoteSupportSettings(this IDiagnosticSetting
             /// <param name='resourceGroupName'>
             /// The resource group name.
             /// </param>
-            public static void BeginUpdateDiagnosticProactiveLogCollectionSettings(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName)
+            public static DiagnosticProactiveLogCollectionSettings BeginUpdateDiagnosticProactiveLogCollectionSettings(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName)
             {
-                operations.BeginUpdateDiagnosticProactiveLogCollectionSettingsAsync(deviceName, proactiveLogCollectionSettings, resourceGroupName).GetAwaiter().GetResult();
+                return operations.BeginUpdateDiagnosticProactiveLogCollectionSettingsAsync(deviceName, proactiveLogCollectionSettings, resourceGroupName).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -235,9 +241,12 @@ public static void BeginUpdateDiagnosticProactiveLogCollectionSettings(this IDia
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task BeginUpdateDiagnosticProactiveLogCollectionSettingsAsync(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<DiagnosticProactiveLogCollectionSettings> BeginUpdateDiagnosticProactiveLogCollectionSettingsAsync(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                (await operations.BeginUpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(deviceName, proactiveLogCollectionSettings, resourceGroupName, null, cancellationToken).ConfigureAwait(false)).Dispose();
+                using (var _result = await operations.BeginUpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(deviceName, proactiveLogCollectionSettings, resourceGroupName, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
             }
 
             /// <summary>
@@ -256,9 +265,9 @@ public static void BeginUpdateDiagnosticProactiveLogCollectionSettings(this IDia
             /// <param name='resourceGroupName'>
             /// The resource group name.
             /// </param>
-            public static void BeginUpdateDiagnosticRemoteSupportSettings(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName)
+            public static DiagnosticRemoteSupportSettings BeginUpdateDiagnosticRemoteSupportSettings(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName)
             {
-                operations.BeginUpdateDiagnosticRemoteSupportSettingsAsync(deviceName, diagnosticRemoteSupportSettings, resourceGroupName).GetAwaiter().GetResult();
+                return operations.BeginUpdateDiagnosticRemoteSupportSettingsAsync(deviceName, diagnosticRemoteSupportSettings, resourceGroupName).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -280,9 +289,12 @@ public static void BeginUpdateDiagnosticRemoteSupportSettings(this IDiagnosticSe
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task BeginUpdateDiagnosticRemoteSupportSettingsAsync(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<DiagnosticRemoteSupportSettings> BeginUpdateDiagnosticRemoteSupportSettingsAsync(this IDiagnosticSettingsOperations operations, string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                (await operations.BeginUpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(deviceName, diagnosticRemoteSupportSettings, resourceGroupName, null, cancellationToken).ConfigureAwait(false)).Dispose();
+                using (var _result = await operations.BeginUpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(deviceName, diagnosticRemoteSupportSettings, resourceGroupName, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
             }
 
     }
diff --git a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/IDiagnosticSettingsOperations.cs b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/IDiagnosticSettingsOperations.cs
index 074a52219b97..69601c3ada5c 100644
--- a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/IDiagnosticSettingsOperations.cs
+++ b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/IDiagnosticSettingsOperations.cs
@@ -71,10 +71,13 @@ public partial interface IDiagnosticSettingsOperations
         /// <exception cref="Microsoft.Rest.Azure.CloudException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
+        /// <exception cref="Microsoft.Rest.SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse> UpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<DiagnosticProactiveLogCollectionSettings>> UpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Gets the diagnostic remote support settings of the specified Data
         /// Box Edge/Data Box Gateway device.
@@ -123,10 +126,13 @@ public partial interface IDiagnosticSettingsOperations
         /// <exception cref="Microsoft.Rest.Azure.CloudException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
+        /// <exception cref="Microsoft.Rest.SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse> UpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<DiagnosticRemoteSupportSettings>> UpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Updates the proactive log collection settings on a Data Box
         /// Edge/Data Box Gateway device.
@@ -149,10 +155,13 @@ public partial interface IDiagnosticSettingsOperations
         /// <exception cref="Microsoft.Rest.Azure.CloudException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
+        /// <exception cref="Microsoft.Rest.SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse> BeginUpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<DiagnosticProactiveLogCollectionSettings>> BeginUpdateDiagnosticProactiveLogCollectionSettingsWithHttpMessagesAsync(string deviceName, DiagnosticProactiveLogCollectionSettings proactiveLogCollectionSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Updates the diagnostic remote support settings on a Data Box
         /// Edge/Data Box Gateway device.
@@ -175,9 +184,12 @@ public partial interface IDiagnosticSettingsOperations
         /// <exception cref="Microsoft.Rest.Azure.CloudException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
+        /// <exception cref="Microsoft.Rest.SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse> BeginUpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<DiagnosticRemoteSupportSettings>> BeginUpdateDiagnosticRemoteSupportSettingsWithHttpMessagesAsync(string deviceName, DiagnosticRemoteSupportSettings diagnosticRemoteSupportSettings, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/CloudEdgeManagementRole.cs b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/CloudEdgeManagementRole.cs
index 10f29dbb8de3..eda17433f555 100644
--- a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/CloudEdgeManagementRole.cs
+++ b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/CloudEdgeManagementRole.cs
@@ -16,14 +16,7 @@ namespace Microsoft.Azure.Management.DataBoxEdge.Models
     using System.Linq;
 
     /// <summary>
-    /// The preview of Virtual Machine Cloud Management from the Azure supports
-    /// deploying and managing VMs on your Azure Stack Edge device from Azure
-    /// Portal.
-    /// For more information, refer to:
-    /// https://docs.microsoft.com/en-us/azure/databox-online/azure-stack-edge-gpu-virtual-machine-overview
-    /// By using this feature, you agree to the preview legal terms. See the
-    /// https://azure.microsoft.com/en-us/support/legal/preview-supplemental-terms/
-    /// for additional details.
+    /// CloudEdgeManagementRole role.
     /// </summary>
     [Newtonsoft.Json.JsonObject("CloudEdgeManagement")]
     [Rest.Serialization.JsonTransformation]
diff --git a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/IoTAddon.cs b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/IoTAddon.cs
deleted file mode 100644
index 48f9de7adfab..000000000000
--- a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/IoTAddon.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-// <auto-generated>
-// 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.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.DataBoxEdge.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// IoT Addon.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("IotEdge")]
-    [Rest.Serialization.JsonTransformation]
-    public partial class IoTAddon : Addon
-    {
-        /// <summary>
-        /// Initializes a new instance of the IoTAddon class.
-        /// </summary>
-        public IoTAddon()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the IoTAddon class.
-        /// </summary>
-        /// <param name="ioTDeviceDetails">IoT device metadata to which
-        /// appliance needs to be connected.</param>
-        /// <param name="ioTEdgeDeviceDetails">IoT edge device to which the IoT
-        /// Addon needs to be configured.</param>
-        /// <param name="id">The path ID that uniquely identifies the
-        /// object.</param>
-        /// <param name="name">The object name.</param>
-        /// <param name="type">The hierarchical type of the object.</param>
-        /// <param name="systemData">Addon type</param>
-        /// <param name="version">Version of IoT running on the
-        /// appliance.</param>
-        /// <param name="hostPlatform">Host OS supported by the IoT addon.
-        /// Possible values include: 'Windows', 'Linux'</param>
-        /// <param name="hostPlatformType">Platform where the runtime is
-        /// hosted. Possible values include: 'KubernetesCluster',
-        /// 'LinuxVM'</param>
-        /// <param name="provisioningState">Addon Provisioning State. Possible
-        /// values include: 'Invalid', 'Creating', 'Created', 'Updating',
-        /// 'Reconfiguring', 'Failed', 'Deleting'</param>
-        public IoTAddon(IoTDeviceInfo ioTDeviceDetails, IoTDeviceInfo ioTEdgeDeviceDetails, string id = default(string), string name = default(string), string type = default(string), SystemData systemData = default(SystemData), string version = default(string), string hostPlatform = default(string), string hostPlatformType = default(string), string provisioningState = default(string))
-            : base(id, name, type, systemData)
-        {
-            IoTDeviceDetails = ioTDeviceDetails;
-            IoTEdgeDeviceDetails = ioTEdgeDeviceDetails;
-            Version = version;
-            HostPlatform = hostPlatform;
-            HostPlatformType = hostPlatformType;
-            ProvisioningState = provisioningState;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets ioT device metadata to which appliance needs to be
-        /// connected.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.ioTDeviceDetails")]
-        public IoTDeviceInfo IoTDeviceDetails { get; set; }
-
-        /// <summary>
-        /// Gets or sets ioT edge device to which the IoT Addon needs to be
-        /// configured.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.ioTEdgeDeviceDetails")]
-        public IoTDeviceInfo IoTEdgeDeviceDetails { get; set; }
-
-        /// <summary>
-        /// Gets version of IoT running on the appliance.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.version")]
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// Gets host OS supported by the IoT addon. Possible values include:
-        /// 'Windows', 'Linux'
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.hostPlatform")]
-        public string HostPlatform { get; private set; }
-
-        /// <summary>
-        /// Gets platform where the runtime is hosted. Possible values include:
-        /// 'KubernetesCluster', 'LinuxVM'
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.hostPlatformType")]
-        public string HostPlatformType { get; private set; }
-
-        /// <summary>
-        /// Gets addon Provisioning State. Possible values include: 'Invalid',
-        /// 'Creating', 'Created', 'Updating', 'Reconfiguring', 'Failed',
-        /// 'Deleting'
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.provisioningState")]
-        public string ProvisioningState { get; private set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (IoTDeviceDetails == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "IoTDeviceDetails");
-            }
-            if (IoTEdgeDeviceDetails == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "IoTEdgeDeviceDetails");
-            }
-            if (IoTDeviceDetails != null)
-            {
-                IoTDeviceDetails.Validate();
-            }
-            if (IoTEdgeDeviceDetails != null)
-            {
-                IoTEdgeDeviceDetails.Validate();
-            }
-        }
-    }
-}
diff --git a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/KubernetesRole.cs b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/KubernetesRole.cs
index 00ca7daf64ad..d1872e334415 100644
--- a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/KubernetesRole.cs
+++ b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/KubernetesRole.cs
@@ -16,23 +16,7 @@ namespace Microsoft.Azure.Management.DataBoxEdge.Models
     using System.Linq;
 
     /// <summary>
-    /// The limited preview of Kubernetes Cluster Management from the Azure
-    /// supports:
-    /// 1. Using a simple turn-key option in Azure Portal, deploy a Kubernetes
-    /// cluster on your Azure Stack Edge device.
-    /// 2. Configure Kubernetes cluster running on your device with Arc enabled
-    /// Kubernetes with a click of a button in the Azure Portal.
-    /// Azure Arc enables organizations to view, manage, and govern their
-    /// on-premises Kubernetes clusters using the Azure Portal, command line
-    /// tools, and APIs.
-    /// 3. Easily configure Persistent Volumes using SMB and NFS shares for
-    /// storing container data.
-    /// For more information, refer to the document here:
-    /// https://databoxupdatepackages.blob.core.windows.net/documentation/Microsoft-Azure-Stack-Edge-K8-Cloud-Management-20210323.pdf
-    /// Or Demo:
-    /// https://databoxupdatepackages.blob.core.windows.net/documentation/Microsoft-Azure-Stack-Edge-K8S-Cloud-Management-20210323.mp4
-    /// By using this feature, you agree to the preview legal terms. See the
-    /// https://azure.microsoft.com/en-us/support/legal/preview-supplemental-terms/
+    /// Kubernetes role.
     /// </summary>
     [Newtonsoft.Json.JsonObject("Kubernetes")]
     [Rest.Serialization.JsonTransformation]
diff --git a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/TriggerSupportPackageRequest.cs b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/TriggerSupportPackageRequest.cs
index fedf74826336..bd3f8bea3e27 100644
--- a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/TriggerSupportPackageRequest.cs
+++ b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/Models/TriggerSupportPackageRequest.cs
@@ -38,8 +38,8 @@ public TriggerSupportPackageRequest()
         /// object.</param>
         /// <param name="name">The object name.</param>
         /// <param name="type">The hierarchical type of the object.</param>
-        /// <param name="minimumTimeStamp">MinimumTimeStamp from where logs
-        /// need to be collected</param>
+        /// <param name="minimumTimeStamp">Start of the timespan of the log
+        /// collection</param>
         /// <param name="maximumTimeStamp">MaximumTimeStamp until where logs
         /// need to be collected</param>
         /// <param name="include">Type of files, which need to be included in
@@ -62,7 +62,7 @@ public TriggerSupportPackageRequest()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets minimumTimeStamp from where logs need to be collected
+        /// Gets or sets start of the timespan of the log collection
         /// </summary>
         [JsonProperty(PropertyName = "properties.minimumTimeStamp")]
         public System.DateTime? MinimumTimeStamp { get; set; }
diff --git a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/SdkInfo_DataBoxEdgeManagementClient.cs b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/SdkInfo_DataBoxEdgeManagementClient.cs
index 642505b1e888..e25fca32500c 100644
--- a/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/SdkInfo_DataBoxEdgeManagementClient.cs
+++ b/sdk/databoxedge/Microsoft.Azure.Management.DataBoxEdge/src/Generated/SdkInfo_DataBoxEdgeManagementClient.cs
@@ -19,39 +19,28 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_DataBoxEdgeMana
           {
               return new Tuple<string, string, string>[]
               {
-                new Tuple<string, string, string>("DataBoxEdge", "Addons", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "Alerts", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "AvailableSkus", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "BandwidthSchedules", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "Containers", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "Devices", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "DiagnosticSettings", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "Jobs", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "MonitoringConfig", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "Nodes", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "Operations", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "OperationsStatus", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "Orders", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "Roles", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "Shares", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "StorageAccountCredentials", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "StorageAccounts", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "SupportPackages", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "Triggers", "2021-02-01"),
-                new Tuple<string, string, string>("DataBoxEdge", "Users", "2021-02-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "Addons", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "Alerts", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "AvailableSkus", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "BandwidthSchedules", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "Containers", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "Devices", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "DiagnosticSettings", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "Jobs", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "MonitoringConfig", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "Nodes", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "Operations", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "OperationsStatus", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "Orders", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "Roles", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "Shares", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "StorageAccountCredentials", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "StorageAccounts", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "SupportPackages", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "Triggers", "2021-06-01"),
+                new Tuple<string, string, string>("DataBoxEdge", "Users", "2021-06-01"),
               }.AsEnumerable();
           }
       }
-      // BEGIN: Code Generation Metadata Section
-      public static readonly String AutoRestVersion = "v2";
-      public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413";
-      public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/databoxedge/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=D:\\SDKRepos\\azure-sdk-for-net\\sdk";
-      public static readonly String GithubForkName = "Azure";
-      public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "b020247789ba2ab0065ebbcfa69050ce729493b8";
-      public static readonly String CodeGenerationErrors = "";
-      public static readonly String GithubRepoName = "azure-rest-api-specs";
-      // END: Code Generation Metadata Section
   }
 }
-