diff --git a/src/AzureIoTHub.Portal.Application/Helpers/ConfigHelper.cs b/src/AzureIoTHub.Portal.Application/Helpers/ConfigHelper.cs
index d190ddcde..af0490b8e 100644
--- a/src/AzureIoTHub.Portal.Application/Helpers/ConfigHelper.cs
+++ b/src/AzureIoTHub.Portal.Application/Helpers/ConfigHelper.cs
@@ -148,8 +148,8 @@ public static IoTEdgeModule CreateGatewayModule(Configuration config, JProperty
             var edgeModule = new IoTEdgeModule
             {
                 ModuleName = module.Name,
-                ImageURI = module.Value["settings"]["image"]?.Value<string>(),
-                ContainerCreateOptions = module.Value["settings"]["createOptions"]?.Value<string>(),
+                ImageURI = module.Value["settings"]?["image"]?.Value<string>(),
+                ContainerCreateOptions = module.Value["settings"]?["createOptions"]?.Value<string>(),
                 Status = module.Value["status"]?.Value<string>(),
             };
 
@@ -211,7 +211,7 @@ private static Dictionary<string, string> GetEnvironmentVariables(JProperty modu
             {
                 foreach (var val in environmentVariables.Cast<JProperty>())
                 {
-                    envVariables.Add(val.Name, val.Value["value"].Value<string>());
+                    envVariables.Add(val.Name, val.Value["value"]!.Value<string>()!);
                 }
             }
 
@@ -251,12 +251,12 @@ public static Dictionary<string, IDictionary<string, object>> GenerateModulesCon
 
             foreach (var item in edgeModel.SystemModules.Single(x => x.Name == "edgeAgent").EnvironmentVariables)
             {
-                edgeAgentPropertiesDesired.SystemModules.EdgeAgent.EnvironmentVariables.Add(item.Name, new EnvironmentVariable() { EnvValue = item.Value });
+                edgeAgentPropertiesDesired.SystemModules.EdgeAgent.EnvironmentVariables?.Add(item.Name, new EnvironmentVariable() { EnvValue = item.Value });
             }
 
             foreach (var item in edgeModel.SystemModules.Single(x => x.Name == "edgeHub").EnvironmentVariables)
             {
-                edgeAgentPropertiesDesired.SystemModules.EdgeHub.EnvironmentVariables.Add(item.Name, new EnvironmentVariable() { EnvValue = item.Value });
+                edgeAgentPropertiesDesired.SystemModules.EdgeHub.EnvironmentVariables?.Add(item.Name, new EnvironmentVariable() { EnvValue = item.Value });
             }
 
             var modulesContent =  new Dictionary<string, IDictionary<string, object>>();
diff --git a/src/AzureIoTHub.Portal.Application/Helpers/DeviceHelper.cs b/src/AzureIoTHub.Portal.Application/Helpers/DeviceHelper.cs
index b9cff5c34..2ea7aadd6 100644
--- a/src/AzureIoTHub.Portal.Application/Helpers/DeviceHelper.cs
+++ b/src/AzureIoTHub.Portal.Application/Helpers/DeviceHelper.cs
@@ -42,7 +42,7 @@ public static string RetrieveSymmetricKey(string deviceId, SymmetricKeyAttestati
         /// <param name="item">the device twin.</param>
         /// <param name="tagName">the tag property.</param>
         /// <returns>The corresponding tag value, or null if it doesn't exist.</returns>
-        public static string RetrieveTagValue(Twin item, string tagName)
+        public static string? RetrieveTagValue(Twin item, string tagName)
         {
             ArgumentNullException.ThrowIfNull(item, nameof(item));
 
@@ -77,7 +77,7 @@ public static void SetTagValue(Twin item, string tagName, string value)
         /// <param name="twin">Device twin.</param>
         /// <param name="propertyName">Property to retrieve.</param>
         /// <returns>The corresponding property value, or null if it doesn't exist.</returns>
-        public static string RetrieveDesiredPropertyValue(Twin twin, string propertyName)
+        public static string? RetrieveDesiredPropertyValue(Twin twin, string propertyName)
         {
             ArgumentNullException.ThrowIfNull(twin, nameof(twin));
 
@@ -91,7 +91,7 @@ public static string RetrieveDesiredPropertyValue(Twin twin, string propertyName
         /// <param name="twin">Device twin.</param>
         /// <param name="propertyName">Property to set.</param>
         /// <param name="value">Property value.</param>
-        public static void SetDesiredProperty(Twin twin, string propertyName, object value)
+        public static void SetDesiredProperty(Twin twin, string propertyName, object? value)
         {
             ArgumentNullException.ThrowIfNull(twin, nameof(twin));
 
@@ -105,7 +105,7 @@ public static void SetDesiredProperty(Twin twin, string propertyName, object val
         /// <param name="twin">Device twin.</param>
         /// <param name="propertyName">Property to retrieve.</param>
         /// <returns>Corresponding property value, or null if it doesn't exist.</returns>
-        public static string RetrieveReportedPropertyValue(Twin twin, string propertyName)
+        public static string? RetrieveReportedPropertyValue(Twin twin, string propertyName)
         {
             ArgumentNullException.ThrowIfNull(twin, nameof(twin));
 
@@ -149,15 +149,15 @@ public static int RetrieveNbModuleCount(Twin twin, string deviceId)
         /// </summary>
         /// <param name="twin">the twin of the device we want.</param>
         /// <returns>string.</returns>
-        public static string RetrieveRuntimeResponse(Twin twin)
+        public static string? RetrieveRuntimeResponse(Twin twin)
         {
             ArgumentNullException.ThrowIfNull(twin, nameof(twin));
 
             var reportedProperties = JObject.Parse(twin.Properties.Reported.ToJson());
 
             if (reportedProperties.TryGetValue("systemModules", out var systemModules)
-                && systemModules.Value<JObject>().TryGetValue("edgeAgent", out var edgeAgentModule)
-                && edgeAgentModule.Value<JObject>().TryGetValue("runtimeStatus", out var runtimeStatus))
+                && systemModules.Value<JObject>()!.TryGetValue("edgeAgent", out var edgeAgentModule)
+                && edgeAgentModule.Value<JObject>()!.TryGetValue("runtimeStatus", out var runtimeStatus))
             {
                 return runtimeStatus.Value<string>();
             }
@@ -182,19 +182,19 @@ public static IReadOnlyCollection<IoTEdgeModule> RetrieveModuleList(Twin twin)
                 return list;
             }
 
-            foreach (var property in modules.Value<JObject>())
+            foreach (var property in modules.Value<JObject>()!)
             {
-                var propertyObject = property.Value.Value<JObject>();
+                var propertyObject = property.Value?.Value<JObject>();
 
                 var module = new IoTEdgeModule()
                 {
                     ModuleName = property.Key
                 };
 
-                if (propertyObject.TryGetValue("settings", out var moduleSettings))
+                if (propertyObject!.TryGetValue("settings", out var moduleSettings))
                 {
                     var setting = moduleSettings.ToObject<Dictionary<string, string>>();
-                    module.ImageURI = setting["image"];
+                    module.ImageURI = setting?["image"];
                 }
 
                 if (propertyObject.TryGetValue("status", out var status))
@@ -247,7 +247,7 @@ public static TwinCollection PropertiesWithDotNotationToTwinCollection(Dictionar
             return new TwinCollection(JsonConvert.SerializeObject(root));
         }
 
-        public static string RetrieveClientThumbprintValue(Twin twin)
+        public static string? RetrieveClientThumbprintValue(Twin twin)
         {
             var serializedClientThumbprint = RetrieveDesiredPropertyValue(twin, nameof(Concentrator.ClientThumbprint).ToCamelCase());
 
@@ -261,13 +261,13 @@ public static string RetrieveClientThumbprintValue(Twin twin)
             {
                 var clientThumbprintArray=JsonConvert.DeserializeObject<string[]>(serializedClientThumbprint);
 
-                if (clientThumbprintArray.Length == 0)
+                if (clientThumbprintArray?.Length == 0)
                 {
                     // clientThumbprint array is empty in the device twin
                     return null;
                 }
 
-                return clientThumbprintArray[0];
+                return clientThumbprintArray?[0];
             }
             catch (JsonReaderException)
             {
diff --git a/src/AzureIoTHub.Portal.Application/Services/IDeviceService.cs b/src/AzureIoTHub.Portal.Application/Services/IDeviceService.cs
index 6956a0833..b34735473 100644
--- a/src/AzureIoTHub.Portal.Application/Services/IDeviceService.cs
+++ b/src/AzureIoTHub.Portal.Application/Services/IDeviceService.cs
@@ -15,15 +15,15 @@ public interface IDeviceService<TDto>
         where TDto : IDeviceDetails
     {
         Task<PaginatedResult<DeviceListItem>> GetDevices(
-            string searchText = null,
+            string? searchText = null,
             bool? searchStatus = null,
             bool? searchState = null,
             int pageSize = 10,
             int pageNumber = 0,
-            string[] orderBy = null,
-            Dictionary<string, string> tags = default,
-            string modelId = null,
-            List<string> labels = default);
+            string[]? orderBy = null,
+            Dictionary<string, string>? tags = default,
+            string? modelId = null,
+            List<string>? labels = default);
 
         Task<TDto> GetDevice(string deviceId);
 
diff --git a/src/AzureIoTHub.Portal.Application/Services/IEdgeDevicesService.cs b/src/AzureIoTHub.Portal.Application/Services/IEdgeDevicesService.cs
index 8ed6fd9b1..51785a979 100644
--- a/src/AzureIoTHub.Portal.Application/Services/IEdgeDevicesService.cs
+++ b/src/AzureIoTHub.Portal.Application/Services/IEdgeDevicesService.cs
@@ -12,13 +12,13 @@ namespace AzureIoTHub.Portal.Application.Services
     public interface IEdgeDevicesService
     {
         Task<PaginatedResult<IoTEdgeListItem>> GetEdgeDevicesPage(
-            string searchText = null,
+            string? searchText = null,
             bool? searchStatus = null,
             int pageSize = 10,
             int pageNumber = 0,
-            string[] orderBy = null,
-            string modelId = null,
-            List<string> labels = default);
+            string[]? orderBy = null,
+            string? modelId = null,
+            List<string>? labels = default);
 
         Task<IoTEdgeDevice> GetEdgeDevice(string edgeDeviceId);
 
diff --git a/src/AzureIoTHub.Portal.Application/Services/IExternalDeviceService.cs b/src/AzureIoTHub.Portal.Application/Services/IExternalDeviceService.cs
index c781eaae7..9d9a4d57a 100644
--- a/src/AzureIoTHub.Portal.Application/Services/IExternalDeviceService.cs
+++ b/src/AzureIoTHub.Portal.Application/Services/IExternalDeviceService.cs
@@ -31,20 +31,20 @@ public interface IExternalDeviceService
         Task DeleteDevice(string deviceId);
 
         Task<PaginationResult<Twin>> GetAllDevice(
-            string continuationToken = null,
-            string filterDeviceType = null,
-            string excludeDeviceType = null,
-            string searchText = null,
+            string? continuationToken = null,
+            string? filterDeviceType = null,
+            string? excludeDeviceType = null,
+            string? searchText = null,
             bool? searchStatus = null,
             bool? searchState = null,
-            Dictionary<string, string> searchTags = null,
+            Dictionary<string, string>? searchTags = null,
             int pageSize = 10);
 
         Task<PaginationResult<Twin>> GetAllEdgeDevice(
-            string continuationToken = null,
-            string searchText = null,
+            string? continuationToken = null,
+            string? searchText = null,
             bool? searchStatus = null,
-            string searchType = null,
+            string? searchType = null,
             int pageSize = 10);
 
         Task<IEnumerable<IoTEdgeDeviceLog>> GetEdgeDeviceLogs(string deviceId, IoTEdgeModule edgeModule);
diff --git a/src/AzureIoTHub.Portal.Application/Services/ILoRaWanManagementService.cs b/src/AzureIoTHub.Portal.Application/Services/ILoRaWanManagementService.cs
index ea507a765..77fa44731 100644
--- a/src/AzureIoTHub.Portal.Application/Services/ILoRaWanManagementService.cs
+++ b/src/AzureIoTHub.Portal.Application/Services/ILoRaWanManagementService.cs
@@ -12,6 +12,6 @@ public interface ILoRaWanManagementService
     {
         Task<HttpResponseMessage> CheckAzureFunctionReturn(CancellationToken cancellationToken);
         Task<HttpResponseMessage> ExecuteLoRaDeviceMessage(string deviceId, DeviceModelCommandDto commandDto);
-        Task<RouterConfig> GetRouterConfig(string loRaRegion);
+        Task<RouterConfig?> GetRouterConfig(string loRaRegion);
     }
 }
diff --git a/src/AzureIoTHub.Portal.Client/App.razor b/src/AzureIoTHub.Portal.Client/App.razor
index 87a059950..85bf3c1b7 100644
--- a/src/AzureIoTHub.Portal.Client/App.razor
+++ b/src/AzureIoTHub.Portal.Client/App.razor
@@ -8,7 +8,7 @@
         <Found Context="routeData">
             <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
                 <NotAuthorized>
-                    @if (!context.User.Identity.IsAuthenticated)
+                    @if (!(context.User.Identity?.IsAuthenticated ?? false))
                     {
                         <RedirectToLogin />
                     }
diff --git a/src/AzureIoTHub.Portal.Client/Components/Commons/Labels.razor b/src/AzureIoTHub.Portal.Client/Components/Commons/Labels.razor
index f4ddf69d2..c9eb97622 100644
--- a/src/AzureIoTHub.Portal.Client/Components/Commons/Labels.razor
+++ b/src/AzureIoTHub.Portal.Client/Components/Commons/Labels.razor
@@ -12,16 +12,16 @@
 
 @code {
 
-    private IEnumerable<LabelDto> displayedLabels;
+    private IEnumerable<LabelDto> displayedLabels = Array.Empty<LabelDto>();
 
     [Parameter]
     public int MaxDisplayedLabels { get; set; } = 3;
 
     [Parameter]
-    public IEnumerable<LabelDto> SearchedLabels { get; set; }
+    public IEnumerable<LabelDto> SearchedLabels { get; set; } = Array.Empty<LabelDto>();
 
     [Parameter]
-    public IEnumerable<LabelDto> Items { get; set; }
+    public IEnumerable<LabelDto> Items { get; set; } = Array.Empty<LabelDto>();
 
     protected override void OnInitialized()
     {
diff --git a/src/AzureIoTHub.Portal.Client/Components/Commons/LabelsEditor.razor b/src/AzureIoTHub.Portal.Client/Components/Commons/LabelsEditor.razor
index c2b679deb..4ae627196 100644
--- a/src/AzureIoTHub.Portal.Client/Components/Commons/LabelsEditor.razor
+++ b/src/AzureIoTHub.Portal.Client/Components/Commons/LabelsEditor.razor
@@ -52,8 +52,8 @@
     [Parameter]
     public List<LabelDto> Labels { get; set; } = new();
 
-    private string labelNameValue;
-    private string labelColorValue;
+    private string labelNameValue = default!;
+    private string labelColorValue = default!;
 
     public void AddLabel()
     {
diff --git a/src/AzureIoTHub.Portal.Client/Components/Dashboard/DashboardMetricCounter.razor b/src/AzureIoTHub.Portal.Client/Components/Dashboard/DashboardMetricCounter.razor
index 3505d28a2..80723013e 100644
--- a/src/AzureIoTHub.Portal.Client/Components/Dashboard/DashboardMetricCounter.razor
+++ b/src/AzureIoTHub.Portal.Client/Components/Dashboard/DashboardMetricCounter.razor
@@ -8,13 +8,13 @@
 
 @code {
     [Parameter]
-    public string Title { get; set; }
+    public string Title { get; set; } = default!;
 
     [Parameter]
     public int Counter { get; set; }
 
     [Parameter]
-    public string Icon { get; set; }
+    public string Icon { get; set; } = default!;
 
     [Parameter]
     public Color Color { get; set; } = Color.Inherit;
diff --git a/src/AzureIoTHub.Portal.Client/Components/Dashboard/DashboardMetrics.razor b/src/AzureIoTHub.Portal.Client/Components/Dashboard/DashboardMetrics.razor
index ab40a6117..103d82e42 100644
--- a/src/AzureIoTHub.Portal.Client/Components/Dashboard/DashboardMetrics.razor
+++ b/src/AzureIoTHub.Portal.Client/Components/Dashboard/DashboardMetrics.razor
@@ -27,19 +27,19 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
 
     private PortalMetric portalMetric = new();
 
     protected override async Task OnInitializedAsync()
     {
-        DashboardLayoutService.RefreshDashboardOccurred += DashboardLayoutServiceOnRefreshDashboardOccurred;
+        DashboardLayoutService.RefreshDashboardOccurred += DashboardLayoutServiceOnRefreshDashboardOccurred!;
         await LoadMetrics();
     }
 
     public void Dispose()
     {
-        DashboardLayoutService.RefreshDashboardOccurred -= DashboardLayoutServiceOnRefreshDashboardOccurred;
+        DashboardLayoutService.RefreshDashboardOccurred -= DashboardLayoutServiceOnRefreshDashboardOccurred!;
     }
 
     private async Task LoadMetrics()
diff --git a/src/AzureIoTHub.Portal.Client/Components/DeviceModels/LoRaWAN/CreateLoraDeviceModel.razor b/src/AzureIoTHub.Portal.Client/Components/DeviceModels/LoRaWAN/CreateLoraDeviceModel.razor
index 43d7f0d81..ba79d4a35 100644
--- a/src/AzureIoTHub.Portal.Client/Components/DeviceModels/LoRaWAN/CreateLoraDeviceModel.razor
+++ b/src/AzureIoTHub.Portal.Client/Components/DeviceModels/LoRaWAN/CreateLoraDeviceModel.razor
@@ -176,10 +176,10 @@
 
 @code {
     [Parameter]
-    public LoRaDeviceModelDto LoRaDeviceModel { get; set; }
+    public LoRaDeviceModelDto LoRaDeviceModel { get; set; } = default!;
 
     [Parameter]
-    public IList<DeviceModelCommandDto> Commands { get; set; }
+    public IList<DeviceModelCommandDto> Commands { get; set; } = new List<DeviceModelCommandDto>();
 
     private bool loraProperty { get; set; }
 
@@ -189,7 +189,7 @@
     {
         var last = Commands.LastOrDefault();
 
-        if (Commands.Count == 0 || (last.Name is not null && last.Frame is not null))
+        if (Commands.Count == 0 || (last?.Name is not null && last?.Frame is not null))
         {
             Commands.Add(new DeviceModelCommandDto());
         }
diff --git a/src/AzureIoTHub.Portal.Client/Components/DeviceModels/LoRaWAN/EditLoraDeviceModel.razor b/src/AzureIoTHub.Portal.Client/Components/DeviceModels/LoRaWAN/EditLoraDeviceModel.razor
index e623a101e..b64a6f0e3 100644
--- a/src/AzureIoTHub.Portal.Client/Components/DeviceModels/LoRaWAN/EditLoraDeviceModel.razor
+++ b/src/AzureIoTHub.Portal.Client/Components/DeviceModels/LoRaWAN/EditLoraDeviceModel.razor
@@ -179,10 +179,10 @@
 
 @code {
     [Parameter]
-    public LoRaDeviceModelDto LoRaDeviceModel { get; set; }
+    public LoRaDeviceModelDto LoRaDeviceModel { get; set; } = default!;
 
     [Parameter]
-    public IList<DeviceModelCommandDto> Commands { get; set; }
+    public IList<DeviceModelCommandDto> Commands { get; set; } = default!;
 
     private DeviceModelCommandDto DeviceModelCommandDto { get; set; } = new DeviceModelCommandDto();
 
@@ -195,7 +195,7 @@
     {
         var last = Commands.LastOrDefault();
 
-        if (Commands.Count == 0 || (last.Name is not null && last.Frame is not null))
+        if (Commands.Count == 0 || (last?.Name is not null && last?.Frame is not null))
         {
             Commands.Add(new DeviceModelCommandDto());
         }
diff --git a/src/AzureIoTHub.Portal.Client/Components/Devices/DeviceToDuplicateSelector.razor b/src/AzureIoTHub.Portal.Client/Components/Devices/DeviceToDuplicateSelector.razor
index 162fe38e1..257e857df 100644
--- a/src/AzureIoTHub.Portal.Client/Components/Devices/DeviceToDuplicateSelector.razor
+++ b/src/AzureIoTHub.Portal.Client/Components/Devices/DeviceToDuplicateSelector.razor
@@ -40,7 +40,7 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
 
     private async Task<IEnumerable<DeviceListItem>> SearchDevicesToDuplicate(string query)
     {
diff --git a/src/AzureIoTHub.Portal.Client/Components/Devices/LoRaDeviceTelemetry.razor b/src/AzureIoTHub.Portal.Client/Components/Devices/LoRaDeviceTelemetry.razor
index 64b30bd3d..6a2c9f8de 100644
--- a/src/AzureIoTHub.Portal.Client/Components/Devices/LoRaDeviceTelemetry.razor
+++ b/src/AzureIoTHub.Portal.Client/Components/Devices/LoRaDeviceTelemetry.razor
@@ -16,13 +16,13 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
     [Parameter]
-    public string DeviceId { get; set; }
+    public string DeviceId { get; set; } = default!;
 
     private IEnumerable<LoRaDeviceTelemetryDto> Telemetries = new List<LoRaDeviceTelemetryDto>();
-    private LineConfig chartConfig;
+    private LineConfig chartConfig = default!;
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
diff --git a/src/AzureIoTHub.Portal.Client/Components/Devices/LoRaWAN/CreateLoraDevice.razor b/src/AzureIoTHub.Portal.Client/Components/Devices/LoRaWAN/CreateLoraDevice.razor
index 1d085d63d..b5e2ad153 100644
--- a/src/AzureIoTHub.Portal.Client/Components/Devices/LoRaWAN/CreateLoraDevice.razor
+++ b/src/AzureIoTHub.Portal.Client/Components/Devices/LoRaWAN/CreateLoraDevice.razor
@@ -66,16 +66,16 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
     [Parameter]
-    public LoRaDeviceDetails LoRaDevice { get; set; }
+    public LoRaDeviceDetails LoRaDevice { get; set; } = default!;
 
     [Parameter]
-    public LoRaDeviceDetailsValidator LoraValidator { get; set; }
+    public LoRaDeviceDetailsValidator LoraValidator { get; set; } = default!;
 
     [Parameter]
-    public LoRaDeviceModelDto LoraModelDto { get; set; }
+    public LoRaDeviceModelDto LoraModelDto { get; set; } = default!;
 
     public List<string> GatewayIdList = new();
 
@@ -93,6 +93,8 @@
 
     private async Task<IEnumerable<string>> SearchGatewayID(string value)
     {
+        await Task.Delay(50);
+
         // if text is null or empty, show complete list
         if (string.IsNullOrEmpty(value))
             return GatewayIdList;
diff --git a/src/AzureIoTHub.Portal.Client/Components/Devices/LoRaWAN/EditLoraDevice.razor b/src/AzureIoTHub.Portal.Client/Components/Devices/LoRaWAN/EditLoraDevice.razor
index 33c65ec8c..fb75858c6 100644
--- a/src/AzureIoTHub.Portal.Client/Components/Devices/LoRaWAN/EditLoraDevice.razor
+++ b/src/AzureIoTHub.Portal.Client/Components/Devices/LoRaWAN/EditLoraDevice.razor
@@ -170,19 +170,19 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
     [Parameter]
-    public LoRaDeviceDetails LoRaDevice { get; set; }
+    public LoRaDeviceDetails LoRaDevice { get; set; } = default!;
 
     [Parameter]
-    public LoRaDeviceDetailsValidator LoraValidator { get; set; }
+    public LoRaDeviceDetailsValidator LoraValidator { get; set; } = default!;
 
     [Parameter]
-    public LoRaDeviceModelDto LoRaDeviceModelDto { get; set; }
+    public LoRaDeviceModelDto LoRaDeviceModelDto { get; set; } = default!;
 
     [Parameter]
-    public IEnumerable<DeviceModelCommandDto> Commands { get; set; }
+    public IEnumerable<DeviceModelCommandDto> Commands { get; set; } = Array.Empty<DeviceModelCommandDto>();
 
     private bool isProcessing;
 
@@ -202,6 +202,8 @@
 
     private async Task<IEnumerable<string>> SearchGatewayID(string value)
     {
+        await Task.Delay(50);
+
         // if text is null or empty, show complete list
         if (string.IsNullOrEmpty(value))
             return GatewayIdList;
diff --git a/src/AzureIoTHub.Portal.Client/Components/EdgeDevices/EdgeDeviceToDuplicateSelector.razor b/src/AzureIoTHub.Portal.Client/Components/EdgeDevices/EdgeDeviceToDuplicateSelector.razor
index b310785f8..5f5c85d94 100644
--- a/src/AzureIoTHub.Portal.Client/Components/EdgeDevices/EdgeDeviceToDuplicateSelector.razor
+++ b/src/AzureIoTHub.Portal.Client/Components/EdgeDevices/EdgeDeviceToDuplicateSelector.razor
@@ -32,7 +32,7 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
     private async Task<IEnumerable<IoTEdgeListItem>> SearchDevicesToDuplicate(string query)
     {
diff --git a/src/AzureIoTHub.Portal.Client/Components/EdgeModels/EdgeModelSearch.razor b/src/AzureIoTHub.Portal.Client/Components/EdgeModels/EdgeModelSearch.razor
index 06f0aaa1c..f6a35e137 100644
--- a/src/AzureIoTHub.Portal.Client/Components/EdgeModels/EdgeModelSearch.razor
+++ b/src/AzureIoTHub.Portal.Client/Components/EdgeModels/EdgeModelSearch.razor
@@ -18,7 +18,7 @@
     [Parameter]
     public EventCallback<string> OnSearch { get; set; }
 
-    private string searchKeyword;
+    private string searchKeyword = default!;
 
     private async Task Search()
     {
diff --git a/src/AzureIoTHub.Portal.Client/Converters/StringToBoolConverter.cs b/src/AzureIoTHub.Portal.Client/Converters/StringToBoolConverter.cs
index d9553d8e8..0402e3b8a 100644
--- a/src/AzureIoTHub.Portal.Client/Converters/StringToBoolConverter.cs
+++ b/src/AzureIoTHub.Portal.Client/Converters/StringToBoolConverter.cs
@@ -14,7 +14,7 @@ public StringToBoolConverter()
         }
 
 #pragma warning disable CA1308 // Normalize strings to uppercase
-        private string OnGet(bool? value) => value?.ToString()?.ToLowerInvariant();
+        private string OnGet(bool? value) => value?.ToString()?.ToLowerInvariant() ?? string.Empty;
 #pragma warning restore CA1308 // Normalize strings to uppercase
 
         private bool? OnSet(string arg)
diff --git a/src/AzureIoTHub.Portal.Client/Exceptions/ProblemDetailsException.cs b/src/AzureIoTHub.Portal.Client/Exceptions/ProblemDetailsException.cs
index 4743d7522..53da129fd 100644
--- a/src/AzureIoTHub.Portal.Client/Exceptions/ProblemDetailsException.cs
+++ b/src/AzureIoTHub.Portal.Client/Exceptions/ProblemDetailsException.cs
@@ -8,9 +8,9 @@ namespace AzureIoTHub.Portal.Client.Exceptions
 
     public class ProblemDetailsException : Exception
     {
-        public ProblemDetailsException(ProblemDetailsWithExceptionDetails problemDetailsWithExceptionDetails)
+        public ProblemDetailsException(ProblemDetailsWithExceptionDetails? problemDetailsWithExceptionDetails)
         {
-            ProblemDetailsWithExceptionDetails = problemDetailsWithExceptionDetails;
+            ProblemDetailsWithExceptionDetails = problemDetailsWithExceptionDetails ?? new ProblemDetailsWithExceptionDetails();
         }
 
         public ProblemDetailsWithExceptionDetails ProblemDetailsWithExceptionDetails { get; }
diff --git a/src/AzureIoTHub.Portal.Client/Handlers/ProblemDetailsHandler.cs b/src/AzureIoTHub.Portal.Client/Handlers/ProblemDetailsHandler.cs
index 33054ad57..bc3681af5 100644
--- a/src/AzureIoTHub.Portal.Client/Handlers/ProblemDetailsHandler.cs
+++ b/src/AzureIoTHub.Portal.Client/Handlers/ProblemDetailsHandler.cs
@@ -21,6 +21,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
             }
 
             var problemDetails = await response.Content.ReadFromJsonAsync<ProblemDetailsWithExceptionDetails>(cancellationToken: cancellationToken);
+
             throw new ProblemDetailsException(problemDetails);
         }
     }
diff --git a/src/AzureIoTHub.Portal.Client/Models/ProblemDetailsWithExceptionDetails.cs b/src/AzureIoTHub.Portal.Client/Models/ProblemDetailsWithExceptionDetails.cs
index cfe534e79..967f9141d 100644
--- a/src/AzureIoTHub.Portal.Client/Models/ProblemDetailsWithExceptionDetails.cs
+++ b/src/AzureIoTHub.Portal.Client/Models/ProblemDetailsWithExceptionDetails.cs
@@ -7,28 +7,28 @@ namespace AzureIoTHub.Portal.Client.Models
 
     public class ProblemDetailsWithExceptionDetails : Microsoft.AspNetCore.Mvc.ProblemDetails
     {
-        public string TraceId { get; set; }
+        public string TraceId { get; set; } = default!;
 
-        public List<ExceptionDetail> ExceptionDetails { get; set; }
+        public List<ExceptionDetail> ExceptionDetails { get; set; } = new();
 
         public class ExceptionDetail
         {
-            public string Message { get; set; }
-            public string Type { get; set; }
-            public string Raw { get; set; }
-            public List<StackFrame> StackFrames { get; set; }
+            public string Message { get; set; } = default!;
+            public string Type { get; set; } = default!;
+            public string Raw { get; set; } = default!;
+            public List<StackFrame> StackFrames { get; set; } = new();
         }
 
         public class StackFrame
         {
-            public string FilePath { get; set; }
-            public string FileName { get; set; }
-            public string Function { get; set; }
+            public string FilePath { get; set; } = default!;
+            public string FileName { get; set; } = default!;
+            public string Function { get; set; } = default!;
             public int? Line { get; set; }
             public int? PreContextLine { get; set; }
-            public List<string> PreContextCode { get; set; }
-            public List<string> ContextCode { get; set; }
-            public List<string> PostContextCode { get; set; }
+            public List<string> PreContextCode { get; set; } = new();
+            public List<string> ContextCode { get; set; } = new();
+            public List<string> PostContextCode { get; set; } = new();
         }
     }
 }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Authentication.razor b/src/AzureIoTHub.Portal.Client/Pages/Authentication.razor
index 22520e1cf..71593f6b4 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/Authentication.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/Authentication.razor
@@ -29,7 +29,7 @@
 </MudMainContent>
 
 @code {
-    [Parameter] public string Action { get; set; }
+    [Parameter] public string Action { get; set; } = default!;
 
     protected override Task OnInitializedAsync()
     {
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Dashboard/Dashboard.razor b/src/AzureIoTHub.Portal.Client/Pages/Dashboard/Dashboard.razor
index 484cdbbca..a793ba1b4 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/Dashboard/Dashboard.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/Dashboard/Dashboard.razor
@@ -4,7 +4,7 @@
     <MudText Typo="Typo.h5" Color="Color.Primary">Dashboard</MudText>
     <MudSpacer />
     <MudTooltip Duration="1000" Text="Refresh Dashboard">
-        <MudIconButton id="refresh-dashboard" Icon="@Icons.Filled.Refresh" Color="Color.Inherit" OnClick="@DashboardLayoutService.RefreshDashboard"/>
+        <MudIconButton id="refresh-dashboard" Icon="@Icons.Material.Filled.Refresh" Color="Color.Inherit" OnClick="@DashboardLayoutService.RefreshDashboard"/>
     </MudTooltip>
 </div>
 
diff --git a/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/CreateDeviceConfigurationsPage.razor b/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/CreateDeviceConfigurationsPage.razor
index e131fa1cf..656b705ca 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/CreateDeviceConfigurationsPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/CreateDeviceConfigurationsPage.razor
@@ -90,7 +90,7 @@
                                                    Color="Color.Primary"
                                                    Disabled="string.IsNullOrEmpty(SelectedTag)"
                                                    OnClick="AddSelectedTag"
-                                                   StartIcon="@Icons.Filled.Add" id="addTagButton">Add Tag</MudButton>
+                                                   StartIcon="@Icons.Material.Filled.Add" id="addTagButton">Add Tag</MudButton>
                                     </MudItem>
                                 </MudGrid>
                             </MudItem>
@@ -148,7 +148,7 @@
                                                    Color="Color.Primary"
                                                    Disabled="string.IsNullOrEmpty(SelectedProperty)"
                                                    OnClick="AddSelectedProperty"
-                                                   StartIcon="@Icons.Filled.Add" id="addPropertyButton">Add Property</MudButton>
+                                                   StartIcon="@Icons.Material.Filled.Add" id="addPropertyButton">Add Property</MudButton>
                                     </MudItem>
                                 </MudGrid>
                             </MudItem>
@@ -224,7 +224,7 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
 
     public DeviceConfig Configuration { get; set; } = new();
 
@@ -232,8 +232,8 @@
     IEnumerable<DeviceProperty> AvailableProperties = Array.Empty<DeviceProperty>();
     IEnumerable<DeviceModelDto> AvailableModels = Array.Empty<DeviceModelDto>();
 
-    public string SelectedTag { get; set; }
-    public string SelectedProperty { get; set; }
+    public string SelectedTag { get; set; } = default!;
+    public string SelectedProperty { get; set; } = default!;
 
     private bool isProcessing;
 
diff --git a/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/DeleteDeviceConfiguration.razor b/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/DeleteDeviceConfiguration.razor
index 24fe66796..80a08c18c 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/DeleteDeviceConfiguration.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/DeleteDeviceConfiguration.razor
@@ -22,11 +22,11 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
-    
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
-    [Parameter] public string configurationName { get; set; }
-    [Parameter] public string configurationId { get; set; }
+    public Error Error { get; set; } = default!;
+
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
+    [Parameter] public string configurationName { get; set; } = default!;
+    [Parameter] public string configurationId { get; set; } = default!;
     
     void Cancel() => MudDialog.Cancel();
 
diff --git a/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/DeviceConfigurationDetailPage.razor b/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/DeviceConfigurationDetailPage.razor
index a5cd356cd..cfcad67c2 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/DeviceConfigurationDetailPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/DeviceConfigurationDetailPage.razor
@@ -12,7 +12,7 @@
 @inject IDeviceTagSettingsClientService DeviceTagSettingsClientService
 
 <MudTooltip Text="Return" Placement="Placement.Left">
-    <MudFab Icon="@Icons.Outlined.ArrowBack" Color="Color.Secondary" Size="Size.Small" OnClick="Return" id = "returnButton" />       
+    <MudFab StartIcon="@Icons.Material.Outlined.ArrowBack" Color="Color.Secondary" Size="Size.Small" OnClick="Return" id = "returnButton" />       
 </MudTooltip>
 <MudTooltip Placement="Placement.Top">
 <MudText Typo="Typo.h5" Color="Color.Primary" Class="mb-4">  Device Configuration Details</MudText>
@@ -86,7 +86,7 @@
                                                    Color="Color.Primary"
                                                    Disabled="string.IsNullOrEmpty(SelectedTag)"
                                                    OnClick="AddSelectedTag"
-                                                   StartIcon="@Icons.Filled.Add" id="addTagButton">Add Tag</MudButton>
+                                                   StartIcon="@Icons.Material.Filled.Add" id="addTagButton">Add Tag</MudButton>
                                     </MudItem>
                                 </MudGrid>
                             </MudItem>
@@ -143,7 +143,7 @@
                                                    Color="Color.Primary"
                                                    Disabled="string.IsNullOrEmpty(SelectedProperty)"
                                                    OnClick="AddSelectedProperty"
-                                                   StartIcon="@Icons.Filled.Add" id="addPropertyButton">Add Property</MudButton>
+                                                   StartIcon="@Icons.Material.Filled.Add" id="addPropertyButton">Add Property</MudButton>
                                     </MudItem>
                                 </MudGrid>
                             </MudItem>
@@ -219,16 +219,16 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
 
     IEnumerable<DeviceTagDto> AvailableTags { get; set; } = Array.Empty<DeviceTagDto>();
     IEnumerable<DeviceProperty> AvailableProperties = Array.Empty<DeviceProperty>();
 
-    public string SelectedTag { get; set; }
-    public string SelectedProperty { get; set; }
+    public string SelectedTag { get; set; } = default!;
+    public string SelectedProperty { get; set; } = default!;
 
     [Parameter]
-    public string ConfigId { get; set; }
+    public string ConfigId { get; set; } = default!;
 
     public DeviceConfig Configuration { get; set; } = new();
     public DeviceModelDto DeviceModel { get; set; } = new();
@@ -286,7 +286,7 @@
 
         isProcessing = false;
 
-        if (confirm.Cancelled)
+        if (confirm.Canceled)
         {
             return;
         }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/DeviceConfigurationListPage.razor b/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/DeviceConfigurationListPage.razor
index 4edc7ea7a..79c1f9819 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/DeviceConfigurationListPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/DeviceConfigurations/DeviceConfigurationListPage.razor
@@ -21,7 +21,7 @@
                 <MudText Typo="Typo.h6">Device configurations</MudText>
                 <MudSpacer />
                 <MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick=LoadConfigurations Size="Size.Medium" id="tableRefreshButton" Class="ma-2"></MudIconButton>
-                <MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDevice" id="addDeviceButton" />
+                <MudFab Color="Color.Secondary" StartIcon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDevice" id="addDeviceButton" />
             </ToolBarContent>
             <HeaderContent>
                 <MudTh>ID</MudTh>
@@ -50,7 +50,7 @@
                 <MudTd DataLabel="Priority" Style="text-align: center">@context.Priority</MudTd>
                 <MudTd DataLabel="Creation date" Style="text-align: center;">@context.CreationDate</MudTd>
                 <MudTd DataLabel="Details" Style="text-align: center">
-                    <MudIconButton Icon="@Icons.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />
+                    <MudIconButton Icon="@Icons.Material.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />
                 </MudTd>
             </RowTemplate>
             <NoRecordsContent>
@@ -68,7 +68,7 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
     
     private readonly List<ConfigListItem> result = new();
     private bool IsLoading { get; set; } = true;
diff --git a/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/CreateDeviceModelPage.razor b/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/CreateDeviceModelPage.razor
index 21caaf8a7..ca55dead3 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/CreateDeviceModelPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/CreateDeviceModelPage.razor
@@ -33,7 +33,7 @@
                     else
                     {
                         <InputFile id="fileInput" hidden accept=".jpg, .jpeg, .png" OnChange="UploadFiles" />
-                        <MudButton HtmlTag="label" for="fileInput" Color="Color.Primary" StartIcon="@Icons.Filled.CloudUpload">Change Picture</MudButton>
+                        <MudButton HtmlTag="label" for="fileInput" Color="Color.Primary" StartIcon="@Icons.Material.Filled.CloudUpload">Change Picture</MudButton>
                     }
                 </MudCardActions>
             </MudCard>
@@ -86,7 +86,7 @@
                                         <ChildContent>
                                             <MudGrid>
                                                 <MudItem xs="12">
-                                                    <MudButton Variant="Variant.Text" Color="Color.Primary" OnClick="@(() => Properties.Add(new DeviceProperty() {  Order = Properties.Select(x => x.Order).Next() }))" StartIcon="@Icons.Filled.Add" id="addPropertyButton">Add property</MudButton>
+                                                    <MudButton Variant="Variant.Text" Color="Color.Primary" OnClick="@(() => Properties.Add(new DeviceProperty() {  Order = Properties.Select(x => x.Order).Next() }))" StartIcon="@Icons.Material.Filled.Add" id="addPropertyButton">Add property</MudButton>
                                                 </MudItem>
                                                 <MudItem xs="12">
                                                     @foreach (var item in this.Properties.OrderBy(x => x.Order))
@@ -134,7 +134,7 @@
 
                                                             </MudItem>
                                                             <MudItem md="1" xs="3">
-                                                                <MudIconButton id="deletePropertyButton" Icon="@Icons.Filled.Delete" OnClick="@(() => Properties.Remove(item))">Remove</MudIconButton>
+                                                                <MudIconButton id="deletePropertyButton" Icon="@Icons.Material.Filled.Delete" OnClick="@(() => Properties.Remove(item))">Remove</MudIconButton>
                                                             </MudItem>
                                                         </MudGrid>
                                                     }
@@ -173,14 +173,14 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
-    private MudForm form;
+    private MudForm form = default!;
 
     private DeviceModelValidator standardValidator = new DeviceModelValidator();
     private LoRaDeviceModelValidator loraValidator = new LoRaDeviceModelValidator();
     private DevicePropertyValidator propertiesValidator = new DevicePropertyValidator();
-    private List<DeviceModelCommandDto> Commands { get; set; }
+    private List<DeviceModelCommandDto> Commands { get; set; } = new();
     private List<DeviceProperty> Properties { get; set; } = new List<DeviceProperty>();
 
     private LoRaDeviceModelCommandValidator CommandValidator = new LoRaDeviceModelCommandValidator();
@@ -228,8 +228,8 @@
         };
 
     // Used to manage the picture
-    private MultipartFormDataContent content;
-    private string imageDataUrl;
+    private MultipartFormDataContent? content = default!;
+    private string? imageDataUrl = default!;
 
     private bool CheckLoRaValidation()
     {
@@ -308,8 +308,8 @@
             }
         }
 
-        if (!IsLoRa ? !standardValidator.Validate(Model as DeviceModelDto).IsValid :
-            (!this.loraValidator.Validate(this.Model as LoRaDeviceModelDto).IsValid
+        if (!IsLoRa ? !standardValidator.Validate((Model as DeviceModelDto)!).IsValid :
+            (!this.loraValidator.Validate((this.Model as LoRaDeviceModelDto)!).IsValid
             || duplicated
             || cmdValidationError))
         {
@@ -324,13 +324,13 @@
         {
             if (IsLoRa)
             {
-                await LoRaWanDeviceModelsClientService.CreateDeviceModel(Model as LoRaDeviceModelDto);
+                await LoRaWanDeviceModelsClientService.CreateDeviceModel((Model as LoRaDeviceModelDto)!);
 
                 await LoRaWanDeviceModelsClientService.SetDeviceModelCommands(Model.ModelId, Commands);
             }
             else
             {
-                await DeviceModelsClientService.CreateDeviceModel(Model as DeviceModelDto);
+                await DeviceModelsClientService.CreateDeviceModel((Model as DeviceModelDto)!);
 
                 await DeviceModelsClientService.SetDeviceModelModelProperties(Model.ModelId, Properties);
             }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/DeleteDeviceModelPage.razor b/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/DeleteDeviceModelPage.razor
index d9bb63362..76359f8bb 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/DeleteDeviceModelPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/DeleteDeviceModelPage.razor
@@ -15,11 +15,11 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
-    [Parameter] public string deviceModelID { get; set; }
-    [Parameter] public string deviceModelName { get; set; }
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
+    [Parameter] public string deviceModelID { get; set; } = default!;
+    [Parameter] public string deviceModelName { get; set; } = default!;
 
     void Submit() => MudDialog.Close(DialogResult.Ok(true));
     void Cancel() => MudDialog.Cancel();
diff --git a/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/DeviceModelDetailPage.razor b/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/DeviceModelDetailPage.razor
index 3e8d935d3..3814afd4c 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/DeviceModelDetailPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/DeviceModelDetailPage.razor
@@ -15,7 +15,7 @@
 @inject ILoRaWanDeviceModelsClientService LoRaWanDeviceModelsClientService
 
 <MudTooltip Text="Return" Placement="Placement.Left">
-    <MudFab Icon="@Icons.Outlined.ArrowBack" Color="Color.Secondary" Size="Size.Small" OnClick="Return" id="returnButton" />       
+    <MudFab StartIcon="@Icons.Material.Outlined.ArrowBack" Color="Color.Secondary" Size="Size.Small" OnClick="Return" id="returnButton" />       
 </MudTooltip>
 <MudTooltip Placement="Placement.Top">
 <MudText Typo="Typo.h5" Color="Color.Primary" Class="mb-4">  Device Model</MudText>
@@ -38,7 +38,7 @@
                     else
                     {
                         <InputFile id="fileInput" hidden accept=".jpg, .jpeg, .png" OnChange="UploadFiles" />
-                        <MudButton HtmlTag="label" for="fileInput" Color="Color.Primary" StartIcon="@Icons.Filled.CloudUpload" Disabled="Model.IsBuiltin">Change Picture</MudButton>
+                        <MudButton HtmlTag="label" for="fileInput" Color="Color.Primary" StartIcon="@Icons.Material.Filled.CloudUpload" Disabled="Model.IsBuiltin">Change Picture</MudButton>
                     }
                 </MudCardActions>
             </MudCard>
@@ -76,7 +76,7 @@
                                         <TitleContent><MudText Typo="Typo.h6">Properties</MudText></TitleContent>
                                         <ChildContent>
                                             <MudItem xs="12">
-                                                <MudButton Variant="Variant.Text" Color="Color.Primary" OnClick="@(() => Properties.Add(new DeviceProperty() {  Order = Properties.Select(x => x.Order).Next() }))" StartIcon="@Icons.Filled.Add" id="addPropertyButton">Add property</MudButton>
+                                                <MudButton Variant="Variant.Text" Color="Color.Primary" OnClick="@(() => Properties.Add(new DeviceProperty() {  Order = Properties.Select(x => x.Order).Next() }))" StartIcon="@Icons.Material.Filled.Add" id="addPropertyButton">Add property</MudButton>
                                             </MudItem>
                                             <MudItem xs="12">
                                                 @foreach (var item in this.Properties.OrderBy(x => x.Order))
@@ -124,7 +124,7 @@
                                                 <MudInputLabel>Writable</MudInputLabel>
                                             </MudItem>
                                             <MudItem md="1" xs="3">
-                                                <MudIconButton id="DeletePropertyButton" Icon="@Icons.Filled.Delete" OnClick="@(() => Properties.Remove(item))">Remove</MudIconButton>
+                                                <MudIconButton id="DeletePropertyButton" Icon="@Icons.Material.Filled.Delete" OnClick="@(() => Properties.Remove(item))">Remove</MudIconButton>
                                             </MudItem>
                                         </MudGrid>
                                                 }
@@ -162,14 +162,14 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
 
     [Parameter]
-    public string ModelID { get; set; }
+    public string ModelID { get; set; } = default!;
 
     private bool isProcessing;
 
-    private MudForm form;
+    private MudForm form = default!;
 
     private void Return() => NavigationManager.NavigateTo("/device-models");
 
@@ -184,6 +184,7 @@
 
     [Parameter]
     [SupplyParameterFromQuery]
+#pragma warning disable BL0007
     public bool IsLoRa
     {
         get
@@ -201,6 +202,7 @@
             SetStandardDeviceModel();
         }
     }
+#pragma warning restore BL0007
 
     private void SetLoRaDeviceModel() => Model = new LoRaDeviceModelDto(Model);
 
@@ -218,8 +220,8 @@
         };
 
     // Used to manage the picture
-    private MultipartFormDataContent content;
-    private string imageDataUrl;
+    private MultipartFormDataContent? content = default!;
+    private string? imageDataUrl = default!;
 
     private bool CheckLoRaValidation()
     {
@@ -324,8 +326,8 @@
             }
         }
 
-        if (!IsLoRa ? !standardValidator.Validate(Model as DeviceModelDto).IsValid :
-            (!this.loraValidator.Validate(this.Model as LoRaDeviceModelDto).IsValid
+        if (!IsLoRa ? !standardValidator.Validate((Model as DeviceModelDto)!).IsValid :
+            (!this.loraValidator.Validate((this.Model as LoRaDeviceModelDto)!).IsValid
             || duplicated
             || cmdValidationError))
         {
@@ -344,13 +346,13 @@
         {
             if (IsLoRa)
             {
-                await LoRaWanDeviceModelsClientService.UpdateDeviceModel(Model as LoRaDeviceModelDto);
+                await LoRaWanDeviceModelsClientService.UpdateDeviceModel((Model as LoRaDeviceModelDto)!);
 
                 await LoRaWanDeviceModelsClientService.SetDeviceModelCommands(Model.ModelId, Commands);
             }
             else
             {
-                await DeviceModelsClientService.UpdateDeviceModel(Model as DeviceModelDto);
+                await DeviceModelsClientService.UpdateDeviceModel((Model as DeviceModelDto)!);
 
                 await DeviceModelsClientService.SetDeviceModelModelProperties(Model.ModelId, Properties);
             }
@@ -396,7 +398,7 @@
 
         isProcessing = false;
 
-        if (result.Cancelled)
+        if (result.Canceled)
         {
             return;
         }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/DeviceModelListPage.razor b/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/DeviceModelListPage.razor
index ffb6e4263..a6f83d755 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/DeviceModelListPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/DeviceModels/DeviceModelListPage.razor
@@ -28,7 +28,7 @@
                     <MudIconButton Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="@Refresh" Class="ma-2" id="tableRefreshButton"></MudIconButton>
                 </MudTooltip>
                 <MudTooltip Text="Add device model">
-                    <MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDeviceModel" id="addDeviceModelButton" />
+                    <MudFab Color="Color.Secondary" StartIcon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDeviceModel" id="addDeviceModelButton" />
                 </MudTooltip>
             </ToolBarContent>
             <HeaderContent>
@@ -57,7 +57,7 @@
                 </MudTd>
                 <MudTd DataLabel="Details" Style="text-align: center">
                     <MudTooltip Text="Delete device model">
-                        <MudIconButton Icon="@Icons.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />
+                        <MudIconButton Icon="@Icons.Material.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />
                     </MudTooltip>
                 </MudTd>
                 <MudTd DataLabel="Delete" Style="text-align: center">
@@ -82,9 +82,9 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
-    private MudTable<DeviceModelDto> table;
+    private MudTable<DeviceModelDto> table = default!;
 
     private readonly Dictionary<int, string> pages = new();
 
@@ -114,7 +114,7 @@
         {
             IsLoading = true;
 
-            string orderBy = null;
+            string orderBy = default!;
 
             switch (state.SortDirection)
             {
@@ -128,7 +128,7 @@
 
             var result = await DeviceModelsClientService.GetDeviceModels(new DeviceModelFilter
                 {
-                    SearchText = this.deviceModelSearchInfo.SearchText,
+                    SearchText = this.deviceModelSearchInfo.SearchText!,
                     PageNumber = state.Page,
                     PageSize = state.PageSize,
                     OrderBy = new string[] { orderBy }
@@ -158,7 +158,7 @@
         parameters.Add("deviceModelName", deviceModel.Name);
         var result = await dialogService.Show<DeleteDeviceModelPage>("Confirm Deletion", parameters).Result;
 
-        if (result.Cancelled)
+        if (result.Canceled)
         {
             return;
         }
@@ -173,7 +173,7 @@
         navigationManager.NavigateTo($"/device-models/{item.ModelId}{((item.SupportLoRaFeatures && Portal.IsLoRaSupported) ? "?isLora=true" : "")}");
     }
 
-    private async Task Search(DeviceModelSearchInfo deviceModelSearchInfo = null)
+    private async Task Search(DeviceModelSearchInfo? deviceModelSearchInfo = null)
     {
         if (deviceModelSearchInfo == null)
         {
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Devices/ConnectionStringDialog.razor b/src/AzureIoTHub.Portal.Client/Pages/Devices/ConnectionStringDialog.razor
index 923c50ad9..97b90151a 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/Devices/ConnectionStringDialog.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/Devices/ConnectionStringDialog.razor
@@ -11,19 +11,19 @@
                     <MudGrid>
                         <MudItem xs="12">
                             <MudText Style="text-decoration:underline"><b>Service Endpoint</b></MudText>
-                            <MudTextField @bind-Value="@credentials.ProvisioningEndpoint" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.ProvisioningEndpoint))"/>
+                            <MudTextField @bind-Value="@credentials.ProvisioningEndpoint" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.ProvisioningEndpoint))"/>
                         </MudItem>
                         <MudItem Class="mt-0" xs="12">
                             <MudText Style="text-decoration:underline"><b>Registration Id</b></MudText>
-                            <MudTextField @bind-Value="@credentials.RegistrationID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.RegistrationID))" />
+                            <MudTextField @bind-Value="@credentials.RegistrationID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.RegistrationID))" />
                         </MudItem>
                         <MudItem Class="mt-0" xs="12">
                             <MudText Style="text-decoration:underline"><b>Scope Id</b></MudText>
-                            <MudTextField @bind-Value="@credentials.ScopeID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.ScopeID))" />
+                            <MudTextField @bind-Value="@credentials.ScopeID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.ScopeID))" />
                         </MudItem>
                         <MudItem Class="mt-0" xs="12">
                             <MudText Style="text-decoration:underline"><b>Symmetric Key</b></MudText>
-                            <MudTextField @bind-Value="@credentials.SymmetricKey" Variant="Variant.Text" InputType="InputType.Password" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.SymmetricKey))" />
+                            <MudTextField @bind-Value="@credentials.SymmetricKey" Variant="Variant.Text" InputType="InputType.Password" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.SymmetricKey))" />
                         </MudItem>
                     </MudGrid>
                 </MudCardContent>
@@ -37,10 +37,10 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
     
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
-    [Parameter] public string deviceId { get; set; }
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
+    [Parameter] public string deviceId { get; set; } = default!;
     private EnrollmentCredentials credentials = new();
 
     protected override async Task OnInitializedAsync()
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Devices/CreateDevicePage.razor b/src/AzureIoTHub.Portal.Client/Pages/Devices/CreateDevicePage.razor
index 6c949e6cc..7674f9b22 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/Devices/CreateDevicePage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/Devices/CreateDevicePage.razor
@@ -259,15 +259,15 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
     private IDeviceDetails Device = new DeviceDetails();
 
-    private MudForm form;
+    private MudForm form = default!;
 
     private DeviceDetailsValidator standardValidator = new DeviceDetailsValidator();
     private LoRaDeviceDetailsValidator loraValidator = new LoRaDeviceDetailsValidator();
-    private LoRaDeviceModelDto LoRaDeviceModelDto { get; set; }
+    private LoRaDeviceModelDto LoRaDeviceModelDto { get; set; } = default!;
 
     private bool IsLoRa
     {
@@ -286,7 +286,7 @@
 
     private static char AllUpperCase(char c) => c.ToString().ToUpperInvariant()[0];
 
-    private IDeviceModel _deviceModel;
+    private IDeviceModel _deviceModel = default!;
 
     private IDeviceModel DeviceModel
     {
@@ -309,7 +309,7 @@
     {
         try
         {
-            DeviceLayoutService.RefreshDeviceOccurred += DeviceServiceOnRefreshDeviceOccurred;
+            DeviceLayoutService.RefreshDeviceOccurred += DeviceServiceOnRefreshDeviceOccurred!;
             Device = DeviceLayoutService.GetSharedDevice() ?? this.Device;
             DeviceModel = DeviceLayoutService.GetSharedDeviceModel() ?? this.DeviceModel;
 
@@ -334,7 +334,7 @@
     {
         DeviceLayoutService.ResetSharedDevice<DeviceDetails>();
         DeviceLayoutService.ResetSharedDeviceModel<DeviceModelDto>();
-        DeviceLayoutService.RefreshDeviceOccurred -= DeviceServiceOnRefreshDeviceOccurred;
+        DeviceLayoutService.RefreshDeviceOccurred -= DeviceServiceOnRefreshDeviceOccurred!;
     }
 
     /// <summary>
@@ -361,10 +361,10 @@
             }
 
             if (IsLoRa)
-                await LoRaWanDeviceClientService.CreateDevice(Device as LoRaDeviceDetails);
+                await LoRaWanDeviceClientService.CreateDevice((Device as LoRaDeviceDetails)!);
             else
             {
-                await DeviceClientService.CreateDevice(Device as DeviceDetails);
+                await DeviceClientService.CreateDevice((Device as DeviceDetails)!);
                 await DeviceClientService.SetDeviceProperties(Device.DeviceID, Properties);
             }
 
@@ -395,7 +395,7 @@
                 DeviceModel = DeviceLayoutService.ResetSharedDeviceModel<DeviceModelDto>();
                 break;
             case DeviceSaveAction.SaveAndDuplicate:
-                Device = DeviceLayoutService.DuplicateSharedDevice(Device as DeviceDetails);
+                Device = DeviceLayoutService.DuplicateSharedDevice((Device as DeviceDetails)!);
                 DeviceModel = DeviceLayoutService.DuplicateSharedDeviceModel(DeviceModel);
                 break;
         }
@@ -461,7 +461,7 @@
             PageSize = 100,
             OrderBy = new string[]
             {
-                null
+                string.Empty
             }
         };
         return (await DeviceModelsClientService.GetDeviceModels(filter)).Items.ToList<IDeviceModel>();
@@ -490,8 +490,8 @@
             Device = new DeviceDetails
                 {
                     DeviceID = Device.DeviceID,
-                    ModelId = model?.ModelId,
-                    ImageUrl = model?.ImageUrl,
+                    ModelId = model?.ModelId!,
+                    ImageUrl = model?.ImageUrl!,
                     DeviceName = Device.DeviceName,
                     IsEnabled = Device.IsEnabled,
                     Tags = Device.Tags
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Devices/DeleteDevicePage.razor b/src/AzureIoTHub.Portal.Client/Pages/Devices/DeleteDevicePage.razor
index e223ebb28..c00f3f578 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/Devices/DeleteDevicePage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/Devices/DeleteDevicePage.razor
@@ -23,11 +23,11 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
 
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
-    [Parameter] public string deviceID { get; set; }
-    [Parameter] public string deviceName { get; set; }
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
+    [Parameter] public string deviceID { get; set; } = default!;
+    [Parameter] public string deviceName { get; set; } = default!;
     [Parameter] public bool IsLoRaWan { get; set; }
 
     void Submit() => MudDialog.Close(DialogResult.Ok(true));
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Devices/DeviceDetailPage.razor b/src/AzureIoTHub.Portal.Client/Pages/Devices/DeviceDetailPage.razor
index dc625303f..07cc10339 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/Devices/DeviceDetailPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/Devices/DeviceDetailPage.razor
@@ -18,7 +18,7 @@
 @inject IDeviceLayoutService DeviceLayoutService
 
 <MudTooltip Text="Return" Placement="Placement.Left">
-    <MudFab Icon="@Icons.Outlined.ArrowBack" Color="Color.Secondary" Size="Size.Small" OnClick="Return" id="returnButton"/>       
+    <MudFab StartIcon="@Icons.Material.Outlined.ArrowBack" Color="Color.Secondary" Size="Size.Small" OnClick="Return" id="returnButton"/>       
 </MudTooltip>
 <MudTooltip Placement="Placement.Top">
 <MudText Typo="Typo.h5" Color="Color.Primary" Class="mb-4">  Device Details</MudText>
@@ -42,7 +42,7 @@
                 <MudCardActions Class="pb-4 pl-4 justify-center">
                     @if (isLoaded && (!IsLoRa || !(Device is LoRaDeviceDetails)))
                     {
-                            <MudButton Variant="Variant.Outlined" Color="Color.Primary" StartIcon="@Icons.Filled.Cable" OnClick="ShowConnectionString" id="connectButton">Connect</MudButton>
+                            <MudButton Variant="Variant.Outlined" Color="Color.Primary" StartIcon="@Icons.Material.Filled.Cable" OnClick="ShowConnectionString" id="connectButton">Connect</MudButton>
                     }
                 </MudCardActions>
             </MudCard>
@@ -223,9 +223,9 @@
 </MudForm>
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
 
-    private MudForm form;
+    private MudForm form = default!;
 
     [Parameter]
     [SupplyParameterFromQuery]
@@ -239,7 +239,7 @@
     private LoRaDeviceDetailsValidator loraValidator = new LoRaDeviceDetailsValidator();
 
     [Parameter]
-    public string DeviceID { get; set; }
+    public string DeviceID { get; set; } = default!;
 
     private IDeviceDetails Device { get; set; } = new DeviceDetails();
 
@@ -254,7 +254,7 @@
 
     private void Return() => NavManager.NavigateTo("devices");
 
-    private IEnumerable<DeviceModelCommandDto> Commands { get; set; }
+    private IEnumerable<DeviceModelCommandDto> Commands { get; set; } = Array.Empty<DeviceModelCommandDto>();
 
     private IEnumerable<DeviceTagDto> TagList { get; set; } = Array.Empty<DeviceTagDto>();
 
@@ -327,11 +327,11 @@
 
             if (IsLoRa)
             {
-                await LoRaWanDeviceClientService.UpdateDevice(Device as LoRaDeviceDetails);
+                await LoRaWanDeviceClientService.UpdateDevice((Device as LoRaDeviceDetails)!);
             }
             else
             {
-                await DeviceClientService.UpdateDevice(Device as DeviceDetails);
+                await DeviceClientService.UpdateDevice((Device as DeviceDetails)!);
 
                 await DeviceClientService.SetDeviceProperties(DeviceID, Properties.ToList());
             }
@@ -418,7 +418,7 @@
 
         isProcessing = false;
 
-        if (result.Cancelled)
+        if (result.Canceled)
         {
             return;
         }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor b/src/AzureIoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor
index d7f4af2af..89b50be79 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor
@@ -136,7 +136,7 @@
                     <MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick="@Refresh" Size="Size.Medium" id="tableRefreshButton" Class="ma-1"></MudIconButton>
                 </MudTooltip>
                 <MudTooltip Text="Add device">
-                    <MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDevice" id="addDeviceButton" Class="ma-1" />
+                    <MudFab Color="Color.Secondary" StartIcon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDevice" id="addDeviceButton" Class="ma-1" />
                 </MudTooltip>
 
                 <MudButton id="manageDevicesButtonToggle" Variant="Variant.Filled" Color="Color.Primary" OnClick="@ToggleOpen">
@@ -154,7 +154,7 @@
                                     <MudButton Variant="Variant.Text"
                                                HtmlTag="label"
                                                Color="Color.Primary"
-                                               StartIcon="@Icons.Outlined.Upload"
+                                               StartIcon="@Icons.Material.Outlined.Upload"
                                                for="@context">
                                         Import device list
                                     </MudButton>
@@ -196,13 +196,13 @@
                     @if (context.IsEnabled)
                     {
                         <MudTooltip Text="Device can connect">
-                            <MudIcon Icon="@Icons.Filled.CheckCircle" Color="Color.Success" />
+                            <MudIcon Icon="@Icons.Material.Filled.CheckCircle" Color="Color.Success" />
                         </MudTooltip>
                     }
                     else
                     {
                         <MudTooltip Text="Device cannot connect">
-                            <MudIcon Icon="@Icons.Filled.Error" Color="Color.Default" />
+                            <MudIcon Icon="@Icons.Material.Filled.Error" Color="Color.Default" />
                         </MudTooltip>
                     }
                 </MudTd>
@@ -211,13 +211,13 @@
                     @if (context.IsConnected)
                     {
                         <MudTooltip Text="Device is connected">
-                            <MudIcon Icon="@Icons.Filled.Wifi" Color="Color.Success" />
+                            <MudIcon Icon="@Icons.Material.Filled.Wifi" Color="Color.Success" />
                         </MudTooltip>
                     }
                     else
                     {
                         <MudTooltip Text="Device is not connected">
-                            <MudIcon Icon="@Icons.Filled.WifiOff" Color="Color.Error" />
+                            <MudIcon Icon="@Icons.Material.Filled.WifiOff" Color="Color.Error" />
                         </MudTooltip>
                     }
                 </MudTd>
@@ -229,7 +229,7 @@
                         @if (context.HasLoRaTelemetry)
                         {
                             <MudTooltip Text="See device telemetries">
-                                <MudIconButton id="@($"show-device-telemetry-{@context.DeviceID}")" Icon="@Icons.Filled.ShowChart" Color="Color.Default" OnClick="@(() => ShowDeviceTelemetry(context))" />
+                                <MudIconButton id="@($"show-device-telemetry-{@context.DeviceID}")" Icon="@Icons.Material.Filled.ShowChart" Color="Color.Default" OnClick="@(() => ShowDeviceTelemetry(context))" />
                             </MudTooltip>
                         }
                     </MudTd>
@@ -237,7 +237,7 @@
 
                 <MudTd DataLabel="Details" Style="text-align: center">
                     <MudTooltip Text="See device details">
-                        <MudIconButton Icon="@Icons.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />
+                        <MudIconButton Icon="@Icons.Material.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />
                     </MudTooltip>
                 </MudTd>
                 <MudTd DataLabel="Delete" Style="text-align: center">
@@ -272,7 +272,7 @@
 
     private bool IsLoading { get; set; } = true;   
 
-    private DeviceModelDto Model {get; set;}
+    private DeviceModelDto Model { get; set; } = default!;
 
     private IEnumerable<DeviceTagDto> TagList { get; set; } = new List<DeviceTagDto>();
 
@@ -370,12 +370,12 @@
 
     private void Search()
     {
-        table.ReloadServerData();
+        table?.ReloadServerData();
     }
 
     private void Refresh()
     {
-        table.ReloadServerData();
+        table?.ReloadServerData();
     }
 
     /// <summary>
@@ -392,7 +392,7 @@
 
         var result = await DialogService.Show<DeleteDevicePage>("Confirm Deletion", parameters).Result;
 
-        if (result.Cancelled)
+        if (result.Canceled)
         {
             return;
         }
@@ -419,7 +419,7 @@
             PageSize = 10,
             OrderBy = new string[]
             {
-                null
+                string.Empty
             }
         };
         return (await DeviceModelsClientService.GetDeviceModels(filter)).Items.ToList();
@@ -432,7 +432,7 @@
         var export = await this.DeviceClientService.ExportDeviceList();
         var fileName = export?.Headers?.ContentDisposition?.Parameters.Single(c => c.Name == "filename").Value;
 
-        using var streamRef = new DotNetStreamReference(stream: await export.ReadAsStreamAsync());
+        using var streamRef = new DotNetStreamReference(stream: await (export?.ReadAsStreamAsync())!);
         await JS.InvokeVoidAsync("downloadFileFromStream", fileName, streamRef);
     }
 
@@ -443,7 +443,7 @@
         var export = await this.DeviceClientService.ExportTemplateFile();
         var fileName = export?.Headers?.ContentDisposition?.Parameters.Single(c => c.Name == "filename").Value;
 
-        using var streamRef = new DotNetStreamReference(stream: await export.ReadAsStreamAsync());
+        using var streamRef = new DotNetStreamReference(stream: await (export?.ReadAsStreamAsync())!);
         await JS.InvokeVoidAsync("downloadFileFromStream", fileName, streamRef);
     }
 
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Devices/ImportReportDialog.razor b/src/AzureIoTHub.Portal.Client/Pages/Devices/ImportReportDialog.razor
index 3abc29c52..c50868139 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/Devices/ImportReportDialog.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/Devices/ImportReportDialog.razor
@@ -39,16 +39,16 @@
 </MudDialog>
 
 @code {
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
-    [CascadingParameter] public Error Error { get; set; }
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
+    [CascadingParameter] public Error Error { get; set; } = default!;
 
-    [Inject] IDeviceClientService DeviceClientService { get; set; }
+    [Inject] IDeviceClientService DeviceClientService { get; set; } = default!;
 
     [Parameter]
-    public MultipartFormDataContent Content { get; set; }
+    public MultipartFormDataContent Content { get; set; } = default!;
 
     private bool Loading = false;
-    private ImportResultLine[] ErrorReport;
+    private ImportResultLine[] ErrorReport = default!;
 
     void Close() => MudDialog.Close();
 
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Devices/LoRaDeviceTelemetryDialog.razor b/src/AzureIoTHub.Portal.Client/Pages/Devices/LoRaDeviceTelemetryDialog.razor
index 0c21e1949..c0959d30e 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/Devices/LoRaDeviceTelemetryDialog.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/Devices/LoRaDeviceTelemetryDialog.razor
@@ -8,10 +8,10 @@
 </MudDialog>
 
 @code {
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
 
     [Parameter]
-    public string DeviceId { get; set; }
+    public string DeviceId { get; set; } = default!;
 
     void Cancel() => MudDialog.Cancel();
 }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/ConnectionStringDialog.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/ConnectionStringDialog.razor
index da2ed44a2..2277991f0 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/ConnectionStringDialog.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/ConnectionStringDialog.razor
@@ -10,19 +10,19 @@
                     <MudGrid>
                         <MudItem xs="12">
                             <MudText Style="text-decoration:underline"><b>Service Endpoint</b></MudText>
-                            <MudTextField @bind-Value="@Credentials.ProvisioningEndpoint" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.ProvisioningEndpoint))"/>
+                            <MudTextField @bind-Value="@Credentials.ProvisioningEndpoint" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.ProvisioningEndpoint))"/>
                         </MudItem>
                         <MudItem Class="mt-0" xs="12">
                             <MudText Style="text-decoration:underline"><b>Registration Id</b></MudText>
-                            <MudTextField @bind-Value="@Credentials.RegistrationID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.RegistrationID))" />
+                            <MudTextField @bind-Value="@Credentials.RegistrationID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.RegistrationID))" />
                         </MudItem>
                         <MudItem Class="mt-0" xs="12">
                             <MudText Style="text-decoration:underline"><b>Scope Id</b></MudText>
-                            <MudTextField @bind-Value="@Credentials.ScopeID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.ScopeID))" />
+                            <MudTextField @bind-Value="@Credentials.ScopeID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.ScopeID))" />
                         </MudItem>
                         <MudItem Class="mt-0" xs="12">
                             <MudText Style="text-decoration:underline"><b>Symmetric Key</b></MudText>
-                            <MudTextField @bind-Value="@Credentials.SymmetricKey" Variant="Variant.Text" InputType="InputType.Password" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.SymmetricKey))" />
+                            <MudTextField @bind-Value="@Credentials.SymmetricKey" Variant="Variant.Text" InputType="InputType.Password" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.SymmetricKey))" />
                         </MudItem>
                     </MudGrid>
                 </MudCardContent>
@@ -35,11 +35,11 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
     
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
 
-    [Parameter] public string deviceId { get; set; }
+    [Parameter] public string deviceId { get; set; } = default!;
 
     private EnrollmentCredentials Credentials = new EnrollmentCredentials();
 
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/CreateEdgeDevicePage.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/CreateEdgeDevicePage.razor
index 93d23d18c..bfe6c2051 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/CreateEdgeDevicePage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/CreateEdgeDevicePage.razor
@@ -165,14 +165,14 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
-    private MudForm form;
+    private MudForm form = default!;
 
     private IoTEdgeDevice EdgeDevice = new IoTEdgeDevice();
 
     private IEnumerable<IoTEdgeModelListItem> edgeModelList = new List<IoTEdgeModelListItem>();
-    private IoTEdgeModel _edgeModel;
+    private IoTEdgeModel _edgeModel = default!;
     private IoTEdgeModel edgeModel
     {
         get => _edgeModel;
@@ -196,7 +196,7 @@
     {
         try
         {
-            EdgeDeviceLayoutService.RefreshDeviceOccurred += DeviceServiceOnRefreshDeviceOccurred;
+            EdgeDeviceLayoutService.RefreshDeviceOccurred += DeviceServiceOnRefreshDeviceOccurred!;
             EdgeDevice = EdgeDeviceLayoutService.GetSharedDevice() ?? this.EdgeDevice;
             edgeModel = EdgeDeviceLayoutService.GetSharedDeviceModel() ?? this.edgeModel;
 
@@ -219,7 +219,7 @@
     {
         EdgeDeviceLayoutService.ResetSharedDevice();
         EdgeDeviceLayoutService.ResetSharedDeviceModel();
-        EdgeDeviceLayoutService.RefreshDeviceOccurred -= DeviceServiceOnRefreshDeviceOccurred;
+        EdgeDeviceLayoutService.RefreshDeviceOccurred -= DeviceServiceOnRefreshDeviceOccurred!;
     }
 
     public async void Save()
@@ -330,8 +330,8 @@
                 {
                     DeviceId = this.EdgeDevice.DeviceId,
                     DeviceName = this.EdgeDevice.DeviceName,
-                    ModelId = edgeModel?.ModelId,
-                    ImageUrl = edgeModel?.ImageUrl,
+                    ModelId = edgeModel?.ModelId!,
+                    ImageUrl = edgeModel?.ImageUrl!,
                     Tags = this.EdgeDevice.Tags,
                     IsEnabled = this.EdgeDevice.IsEnabled
                 };
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceDeleteConfirmationDialog.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceDeleteConfirmationDialog.razor
index 37fe88397..58c5e413f 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceDeleteConfirmationDialog.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceDeleteConfirmationDialog.razor
@@ -22,10 +22,10 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
     
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
-    [Parameter] public string DeviceId { get; set; }
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
+    [Parameter] public string DeviceId { get; set; } = default!;
 
     void Cancel() => MudDialog.Cancel();
 
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceDetailPage.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceDetailPage.razor
index d178e0b39..7f9e17d5f 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceDetailPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceDetailPage.razor
@@ -13,7 +13,7 @@
 @inject IDeviceTagSettingsClientService DeviceTagSettingsClientService
 
 <MudTooltip Text="Return" Placement="Placement.Left">
-    <MudFab Icon="@Icons.Outlined.ArrowBack" Color="Color.Secondary" Size="Size.Small" OnClick="Return" id = "returnButton"/>       
+    <MudFab StartIcon="@Icons.Material.Outlined.ArrowBack" Color="Color.Secondary" Size="Size.Small" OnClick="Return" id = "returnButton"/>       
 </MudTooltip>
 <MudTooltip Placement="Placement.Top">
 <MudText Typo="Typo.h5" Color="Color.Primary" Class="mb-4">  Edge Device Details</MudText>
@@ -37,7 +37,7 @@
                 <MudCardActions Class="pb-4 pl-4 justify-center">
                     @if (isLoaded)
                     {
-                        <MudButton Variant="Variant.Outlined" Color="Color.Primary" StartIcon="@Icons.Filled.Cable" OnClick="ShowConnectionString" id="connectButton">Connect</MudButton>
+                        <MudButton Variant="Variant.Outlined" Color="Color.Primary" StartIcon="@Icons.Material.Filled.Cable" OnClick="ShowConnectionString" id="connectButton">Connect</MudButton>
                     }
                 </MudCardActions>
             </MudCard>
@@ -87,14 +87,14 @@
                                                 @if (edgeDevice.RuntimeResponse == "running")
                                                 {
                                                     <MudTooltip Text="Runtime is running well">
-                                                        <MudIcon Icon="@Icons.Filled.CheckCircle" Color="Color.Success" />
+                                                        <MudIcon Icon="@Icons.Material.Filled.CheckCircle" Color="Color.Success" />
                                                     </MudTooltip>
                                                 }
                                                 else
                                                 {
                                                     <MudItem>
                                                         <MudTooltip Text="Runtime has an error">
-                                                            <MudIcon Icon="@Icons.Filled.Error" Color="Color.Error" />
+                                                            <MudIcon Icon="@Icons.Material.Filled.Error" Color="Color.Error" />
                                                         </MudTooltip>
                                                     </MudItem>
                                                 }
@@ -217,17 +217,17 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
 
-    private MudForm form;
+    private MudForm form = default!;
 
     [Parameter]
-    public string deviceId { get; set; }
+    public string deviceId { get; set; } = default!;
 
     private bool btn_disable = false;
     private void Return() => NavigationManager.NavigateTo("edge/devices");
 
-    private IoTEdgeDevice edgeDevice;
+    private IoTEdgeDevice edgeDevice = default!;
     private IoTEdgeModel edgeModel = new IoTEdgeModel();
 
     private IEnumerable<DeviceTagDto> TagList { get; set; } = Array.Empty<DeviceTagDto>();
@@ -402,7 +402,7 @@
 
         isProcessing = false;
 
-        if (result.Cancelled)
+        if (result.Canceled)
         {
             return;
         }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor
index 04a55de85..4272faa5c 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor
@@ -96,7 +96,7 @@
                     <MudIconButton Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="@Refresh" id="tableRefreshButton" Class="ma-2"></MudIconButton>
                 </MudTooltip>
                 <MudTooltip Text="Add device">
-                    <MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="RedirectToCreatePage" />
+                    <MudFab Color="Color.Secondary" StartIcon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="RedirectToCreatePage" />
                 </MudTooltip>
             </ToolBarContent>
             <HeaderContent>
@@ -124,13 +124,13 @@
                     @if (context.Status == "Enabled")
                     {
                         <MudTooltip Text="Device can connect">
-                            <MudIcon Icon="@Icons.Filled.CheckCircle" Color="Color.Success" />
+                            <MudIcon Icon="@Icons.Material.Filled.CheckCircle" Color="Color.Success" />
                         </MudTooltip>
                     }
                     else
                     {
                         <MudTooltip Text="Device cannot connect">
-                            <MudIcon Icon="@Icons.Filled.Error" Color="Color.Default" />
+                            <MudIcon Icon="@Icons.Material.Filled.Error" Color="Color.Default" />
                         </MudTooltip>
                     }
                 </MudTd>
@@ -138,7 +138,7 @@
                 <MudTd DataLabel="NbDevices" Style="text-align: center">@context.NbDevices</MudTd>
                 <MudTd DataLabel="Details" Style="text-align: center">
                         <MudTooltip Text="See device details">
-                        <MudIconButton Icon="@Icons.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />
+                        <MudIconButton Icon="@Icons.Material.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />
                         </MudTooltip>
                 </MudTd>
                 <MudTd DataLabel="Delete" Style="text-align: center">
@@ -162,13 +162,13 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
-    private MudTable<IoTEdgeListItem> table;
+    private MudTable<IoTEdgeListItem> table = default!;
     private SearchModel searchModel = new();
 
     private List<IoTEdgeModelListItem> edgeModelList = new List<IoTEdgeModelListItem>();
-    private IoTEdgeModelListItem _edgeModel;
+    private IoTEdgeModelListItem _edgeModel = default!;
     public IoTEdgeModelListItem edgeModel
     {
         get => _edgeModel;
@@ -212,7 +212,7 @@
     {
         try
         {
-            string orderBy = null;
+            string orderBy = default!;
 
             switch (state.SortDirection)
             {
@@ -267,7 +267,7 @@
         var parameters = new DialogParameters { { nameof(IoTEdgeDevice.DeviceId), gateway.DeviceId } };
         var result = await DialogService.Show<EdgeDeviceDeleteConfirmationDialog>("Confirm Deletion", parameters).Result;
 
-        if (result.Cancelled)
+        if (result.Canceled)
         {
             return;
         }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/ModuleLogsDialog.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/ModuleLogsDialog.razor
index 1396ec812..4cb22b26b 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/ModuleLogsDialog.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeDevices/ModuleLogsDialog.razor
@@ -53,11 +53,11 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
     
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
-    [Parameter] public string deviceId { get; set; }
-    [Parameter] public IoTEdgeModule edgeModule { get; set; }
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
+    [Parameter] public string deviceId { get; set; } = default!;
+    [Parameter] public IoTEdgeModule edgeModule { get; set; } = default!;
     
     private int[] pageSizeOptions = new int[] { 3, 5 , 10};
     private List<IoTEdgeDeviceLog> logs = new();
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/CreateEdgeModelsPage.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/CreateEdgeModelsPage.razor
index f09b9a7c4..0fba80663 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/CreateEdgeModelsPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/CreateEdgeModelsPage.razor
@@ -32,7 +32,7 @@
                     else
                     {
                         <InputFile id="fileInput" hidden accept=".jpg, .jpeg, .png" OnChange="UploadFiles" />
-                        <MudButton HtmlTag="label" for="fileInput" Color="Color.Primary" StartIcon="@Icons.Filled.CloudUpload">Change Picture</MudButton>
+                        <MudButton HtmlTag="label" for="fileInput" Color="Color.Primary" StartIcon="@Icons.Material.Filled.CloudUpload">Change Picture</MudButton>
                     }
                 </MudCardActions>
             </MudCard>
@@ -212,7 +212,7 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
     readonly DialogOptions maxWidth = new() { MaxWidth = MaxWidth.Medium, FullWidth = true };
 
@@ -222,7 +222,7 @@
     public IoTEdgeModuleValidator edgeModuleValidator = new IoTEdgeModuleValidator();
     public IoTEdgeRouteValidator edgeRouteValidator = new IoTEdgeRouteValidator();
 
-    private MudForm form;
+    private MudForm form = default!;
     private bool isProcessing;
 
     private IoTEdgeModel Model = new IoTEdgeModel()
@@ -231,8 +231,8 @@
         };
 
     // Used to manage the picture
-    private MultipartFormDataContent content;
-    private string imageDataUrl;
+    private MultipartFormDataContent? content = default!;
+    private string? imageDataUrl = default!;
 
     private void DeleteAvatar()
     {
@@ -275,7 +275,7 @@
         {
             var result = await DialogService.Show<ModuleDialog>(module.ModuleName, parameters, options).Result;
 
-            if (result.Cancelled)
+            if (result.Canceled)
             {
                 return;
             }
@@ -291,7 +291,7 @@
 
         var result = await DialogService.Show<SystemModuleDialog>(systemModule.Name, parameters, options).Result;
 
-        if (result.Cancelled)
+        if (result.Canceled)
         {
             return;
         }
@@ -370,7 +370,7 @@
     {
         var last = Model.EdgeRoutes.LastOrDefault();
 
-        if (Model.EdgeRoutes.Count == 0 || (last.Name is not null && last.Value is not null))
+        if (Model.EdgeRoutes.Count == 0 || (last?.Name is not null && last?.Value is not null))
         {
             Model.EdgeRoutes.Add(new IoTEdgeRoute());
         }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/DeleteEdgeModelDialog.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/DeleteEdgeModelDialog.razor
index 3a2977dd8..898083d5d 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/DeleteEdgeModelDialog.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/DeleteEdgeModelDialog.razor
@@ -15,11 +15,11 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
-    [Parameter] public string deviceModelID { get; set; }
-    [Parameter] public string deviceModelName { get; set; }
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
+    [Parameter] public string deviceModelID { get; set; } = default!;
+    [Parameter] public string deviceModelName { get; set; } = default!;
 
     void Submit() => MudDialog.Close(DialogResult.Ok(true));
     void Cancel() => MudDialog.Cancel();
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModelDetailPage.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModelDetailPage.razor
index 11bc4774d..1d199a89d 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModelDetailPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModelDetailPage.razor
@@ -15,7 +15,7 @@
 @inject IDialogService DialogService
 
 <MudTooltip Text="Return" Placement="Placement.Left">
-    <MudFab Icon="@Icons.Outlined.ArrowBack" Color="Color.Secondary" Size="Size.Small" OnClick="Return" id="returnButton" />
+    <MudFab StartIcon="@Icons.Material.Outlined.ArrowBack" Color="Color.Secondary" Size="Size.Small" OnClick="Return" id="returnButton" />
 </MudTooltip>
 <MudTooltip Placement="Placement.Top">
     <MudText Typo="Typo.h5" Color="Color.Primary" Class="mb-4"> Edge Device Model</MudText>
@@ -38,7 +38,7 @@
                     else
                     {
                         <InputFile id="fileInput" hidden accept=".jpg, .jpeg, .png" OnChange="UploadFiles" />
-                        <MudButton HtmlTag="label" for="fileInput" Color="Color.Primary" StartIcon="@Icons.Filled.CloudUpload">Change Picture</MudButton>
+                        <MudButton HtmlTag="label" for="fileInput" Color="Color.Primary" StartIcon="@Icons.Material.Filled.CloudUpload">Change Picture</MudButton>
                     }
                 </MudCardActions>
             </MudCard>
@@ -221,12 +221,12 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
     [Parameter]
-    public string ModelID { get; set; }
+    public string ModelID { get; set; } = default!;
 
-    private IoTEdgeModel EdgeModel { get; set; }
+    private IoTEdgeModel EdgeModel { get; set; } = default!;
 
     public EdgeModelValidator edgeModelValidator = new EdgeModelValidator();
     public IoTEdgeModuleValidator edgeModuleValidator = new IoTEdgeModuleValidator();
@@ -234,13 +234,13 @@
 
     private bool isProcessing;
 
-    private MudForm form;
+    private MudForm form = default!;
 
     private void Return() => NavigationManager.NavigateTo("/edge/models");
 
     // Used to manage the picture
-    private MultipartFormDataContent content;
-    private string imageDataUrl;
+    private MultipartFormDataContent? content = default!;
+    private string? imageDataUrl = default!;
 
     protected override async Task OnInitializedAsync()
     {
@@ -365,7 +365,7 @@
         {
             var result = await DialogService.Show<ModuleDialog>(module.ModuleName, parameters, options).Result;
 
-            if (result.Cancelled)
+            if (result.Canceled)
             {
                 return;
             }
@@ -389,7 +389,7 @@
 
         isProcessing = false;
 
-        if (result.Cancelled)
+        if (result.Canceled)
         {
             return;
         }
@@ -406,7 +406,7 @@
     {
         var last = EdgeModel.EdgeRoutes.LastOrDefault();
 
-        if (EdgeModel.EdgeRoutes.Count == 0 || (last.Name is not null && last.Value is not null))
+        if (EdgeModel.EdgeRoutes.Count == 0 || (last?.Name is not null && last?.Value is not null))
         {
             EdgeModel.EdgeRoutes.Add(new IoTEdgeRoute());
         }
@@ -421,7 +421,7 @@
 
         var result = await DialogService.Show<SystemModuleDialog>(systemModule.Name, parameters, options).Result;
 
-        if (result.Cancelled)
+        if (result.Canceled)
         {
             return;
         }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModelListPage.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModelListPage.razor
index 7e3cc0cb8..5eeaa147c 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModelListPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModelListPage.razor
@@ -30,7 +30,7 @@
                     <MudIconButton Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" id="tableRefreshButton" OnClick="@LoadEdgeModels" Class="ma-2"></MudIconButton>
                 </MudTooltip>
                 <MudTooltip Text="Add device model">
-                    <MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" OnClick="@RedirectToCreatePage" Size="Size.Medium" id="addEdgeModelButton" />
+                    <MudFab Color="Color.Secondary" StartIcon="@Icons.Material.Filled.Add" OnClick="@RedirectToCreatePage" Size="Size.Medium" id="addEdgeModelButton" />
                 </MudTooltip>
             </ToolBarContent>
             <HeaderContent>
@@ -59,7 +59,7 @@
                 </MudTd>
                 <MudTd DataLabel="Details" Style="text-align: center">
                     <MudTooltip Text="Go to the detail">
-                        <MudIconButton Icon="@Icons.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />
+                        <MudIconButton Icon="@Icons.Material.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />
                     </MudTooltip>
                 </MudTd>
                 <MudTd DataLabel="Delete" Style="text-align: center">
@@ -83,7 +83,7 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
 
     private List<IoTEdgeModelListItem> EdgeModelList = new List<IoTEdgeModelListItem>();
 
@@ -136,7 +136,7 @@
         parameters.Add("deviceModelName", ioTEdgeModel.Name);
         var result = await dialogService.Show<DeleteEdgeModelDialog>("Confirm Deletion", parameters).Result;
 
-        if (result.Cancelled)
+        if (result.Canceled)
         {
             return;
         }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialog.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialog.razor
index 04ef131cc..3cb673dd6 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialog.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialog.razor
@@ -57,14 +57,14 @@
 
 @code {
     [CascadingParameter]
-    MudDialogInstance MudDialog { get; set; }
+    MudDialogInstance MudDialog { get; set; } = default!;
 
     [Parameter]
-    public IoTEdgeModule Module { get; set; }
+    public IoTEdgeModule Module { get; set; } = default!;
 
-    private string currentModuleName;
-    private string currentImageUri;
-    private string currentContainerCreateOptions;
+    private string currentModuleName = default!;
+    private string currentImageUri = default!;
+    private string currentContainerCreateOptions = default!;
 
     private List<IoTEdgeModuleEnvironmentVariable> currentEnvironmentVariables = new();
     private List<IoTEdgeModuleTwinSetting> currentModuleIdentityTwinSettings = new();
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialogTab1.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialogTab1.razor
index 99d541598..a83ac471e 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialogTab1.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialogTab1.razor
@@ -53,14 +53,14 @@
 
 @code {
     [Parameter]
-    public IList<IoTEdgeModuleEnvironmentVariable> EnvironmentVariables { get; set; }
+    public IList<IoTEdgeModuleEnvironmentVariable> EnvironmentVariables { get; set; } = new List<IoTEdgeModuleEnvironmentVariable>();
     private bool IsLoading = false;
 
     public void AddRow()
     {
         var last = EnvironmentVariables.LastOrDefault();
 
-        if (EnvironmentVariables.Count == 0 || (last.Name is not null && last.Value is not null))
+        if (EnvironmentVariables.Count == 0 || (last?.Name is not null && last?.Value is not null))
         {
             EnvironmentVariables.Add(new IoTEdgeModuleEnvironmentVariable());
         }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialogTab2.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialogTab2.razor
index 89fc50f0f..e348f0643 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialogTab2.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialogTab2.razor
@@ -50,14 +50,14 @@
 
 @code {
     [Parameter]
-    public IList<IoTEdgeModuleTwinSetting> ModuleIdentityTwinSettings { get; set; }
+    public IList<IoTEdgeModuleTwinSetting> ModuleIdentityTwinSettings { get; set; } = new List<IoTEdgeModuleTwinSetting>();
     private bool IsLoading = false;
 
     public void AddRow()
     {
         var last = ModuleIdentityTwinSettings.LastOrDefault();
 
-        if (ModuleIdentityTwinSettings.Count == 0 || (last.Name is not null && last.Value is not null))
+        if (ModuleIdentityTwinSettings.Count == 0 || (last?.Name is not null && last?.Value is not null))
         {
             ModuleIdentityTwinSettings.Add(new IoTEdgeModuleTwinSetting());
         }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialogTab3.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialogTab3.razor
index bb5d19322..7efc26160 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialogTab3.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/ModuleDialogTab3.razor
@@ -44,14 +44,14 @@
 
 @code {
     [Parameter]
-    public IList<IoTEdgeModuleCommand> Commands { get; set; }
+    public IList<IoTEdgeModuleCommand> Commands { get; set; } = new List<IoTEdgeModuleCommand>();
     private bool IsLoading = false;
 
     public void AddRow()
     {
         var last = Commands.LastOrDefault();
 
-        if (Commands.Count == 0 || (last.Name is not null))
+        if (Commands.Count == 0 || (last?.Name is not null))
         {
             Commands.Add(new IoTEdgeModuleCommand());
         }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/SystemModuleDialog.razor b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/SystemModuleDialog.razor
index 7a911cefc..6be94e4f5 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/SystemModuleDialog.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/EdgeModels/EdgeModule/SystemModuleDialog.razor
@@ -48,14 +48,14 @@
 
 @code {
     [CascadingParameter]
-    MudDialogInstance MudDialog { get; set; }
+    MudDialogInstance MudDialog { get; set; } = default!;
 
     [Parameter]
-    public EdgeModelSystemModule Module { get; set; }
+    public EdgeModelSystemModule Module { get; set; } = default!;
 
-    private string currentModuleName;
-    private string currentImageUri;
-    private string currentContainerCreateOptions;
+    private string currentModuleName = default!;
+    private string currentImageUri = default!;
+    private string currentContainerCreateOptions = default!;
 
     private List<IoTEdgeModuleEnvironmentVariable> currentEnvironmentVariables = new();
 
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Ideas/SubmitIdeaDialog.razor b/src/AzureIoTHub.Portal.Client/Pages/Ideas/SubmitIdeaDialog.razor
index 1b123bdfb..9d245098d 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/Ideas/SubmitIdeaDialog.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/Ideas/SubmitIdeaDialog.razor
@@ -52,13 +52,13 @@
 </MudDialog>
 
 @code {
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
 
-    [CascadingParameter] Error Error { get; set; }
+    [CascadingParameter] Error Error { get; set; } = default!;
 
     bool formIsValid;
     private bool isSubmitting;
-    MudForm form;
+    MudForm form = default!;
 
     private readonly IdeaRequest ideaRequest = new IdeaRequest
     {
diff --git a/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor b/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor
index c966051ba..d097665ea 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor
@@ -10,7 +10,7 @@
 @inject ILoRaWanConcentratorClientService LoRaWanConcentratorsClientService
 
 <MudTooltip Text="Return" Placement="Placement.Left">
-    <MudFab Icon="@Icons.Outlined.ArrowBack" Color="Color.Secondary" Size="Size.Small" OnClick="Return" id="returnButton" />
+    <MudFab StartIcon="@Icons.Material.Outlined.ArrowBack" Color="Color.Secondary" Size="Size.Small" OnClick="Return" id="returnButton" />
 </MudTooltip>
 <MudTooltip Placement="Placement.Top">
     <MudText Typo="Typo.h5" Color="Color.Primary" Class="mb-4">  LoRaWAN Concentrator</MudText>
@@ -28,13 +28,13 @@
                         @if (concentrator.IsConnected)
                         {
                             <MudTooltip Text="Concentrator is connected">
-                                <MudIcon Icon="@Icons.Filled.Wifi" Color="Color.Success" />
+                                <MudIcon Icon="@Icons.Material.Filled.Wifi" Color="Color.Success" />
                             </MudTooltip>
                         }
                         else
                         {
                             <MudTooltip Text="Concentrator is not connected">
-                                <MudIcon Icon="@Icons.Filled.WifiOff" Color="Color.Error" />
+                                <MudIcon Icon="@Icons.Material.Filled.WifiOff" Color="Color.Error" />
                             </MudTooltip>
                         }
                     </CardHeaderAvatar>
@@ -111,13 +111,13 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
     [Parameter]
-    public string DeviceID { get; set; }
+    public string DeviceID { get; set; } = default!;
 
     private ConcentratorDto concentrator { get; set; } = new();
-    private MudForm form;
+    private MudForm form = default!;
     private ConcentratorValidator concentratorValidator = new();
     private List<FrequencyPlan> FrequencyPlans = new List<FrequencyPlan>();
 
@@ -202,7 +202,7 @@
 
         isProcessing = false;
 
-        if (result.Cancelled)
+        if (result.Canceled)
         {
             return;
         }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor b/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor
index c4840beb3..7ce1fc459 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor
@@ -28,7 +28,7 @@
                     <MudIconButton Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="@Refresh" id="tableRefreshButton" Class="ma-2"></MudIconButton>
                 </MudTooltip>
                 <MudTooltip Text="Add LoRaWAN concentrator">
-                    <MudFab id="add-concentrator" Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDevice" />
+                    <MudFab id="add-concentrator" Color="Color.Secondary" StartIcon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDevice" />
                 </MudTooltip>
             </ToolBarContent>
             <HeaderContent>
@@ -46,13 +46,13 @@
                     @if (context.IsEnabled)
                     {
                         <MudTooltip Text="Concentrator can connect">
-                            <MudIcon Icon="@Icons.Filled.CheckCircle" Color="Color.Success" />
+                            <MudIcon Icon="@Icons.Material.Filled.CheckCircle" Color="Color.Success" />
                         </MudTooltip>
                     }
                     else
                     {
                         <MudTooltip Text="Concentrator cannot connect">
-                            <MudIcon Icon="@Icons.Filled.Error" Color="Color.Default" />
+                            <MudIcon Icon="@Icons.Material.Filled.Error" Color="Color.Default" />
                         </MudTooltip>
                     }
                 </MudTd>
@@ -61,19 +61,19 @@
                     @if (context.IsConnected)
                     {
                         <MudTooltip Text="Concentrator is connected">
-                            <MudIcon Icon="@Icons.Filled.Wifi" Color="Color.Success" />
+                            <MudIcon Icon="@Icons.Material.Filled.Wifi" Color="Color.Success" />
                         </MudTooltip>
                     }
                     else
                     {
                         <MudTooltip Text="Concentrator is not connected">
-                            <MudIcon Icon="@Icons.Filled.WifiOff" Color="Color.Error" />
+                            <MudIcon Icon="@Icons.Material.Filled.WifiOff" Color="Color.Error" />
                         </MudTooltip>
                     }
                 </MudTd>
                 <MudTd DataLabel="Details" Style="text-align: center">
                     <MudTooltip Text="See concentrator details">
-                        <MudIconButton Icon="@Icons.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />
+                        <MudIconButton Icon="@Icons.Material.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />
                     </MudTooltip>
                 </MudTd>
                 <MudTd DataLabel="Delete" Style="text-align: center">
@@ -98,9 +98,9 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
 
-    private MudTable<ConcentratorDto> table;
+    private MudTable<ConcentratorDto> table = default!;
 
     private readonly Dictionary<int, string> pages = new();
 
@@ -112,7 +112,7 @@
     {
         try
         {
-            string orderBy = null;
+            string orderBy = default!;
 
             switch (state.SortDirection)
             {
@@ -156,7 +156,7 @@
 
         var result = await DialogService.Show<DeleteConcentratorPage>("Confirm Deletion", parameters).Result;
 
-        if (result.Cancelled)
+        if (result.Canceled)
         {
             return;
         }
@@ -165,7 +165,7 @@
         await Search();
     }
 
-    private async Task Search(ConcentratorSearchInfo concentratorSearchInfo = null)
+    private async Task Search(ConcentratorSearchInfo? concentratorSearchInfo = null)
     {
         if (concentratorSearchInfo == null)
         {
diff --git a/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor b/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor
index 774dfe8d3..dfbca3ff9 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor
@@ -94,10 +94,10 @@
 
     @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; } = default!;
 
     private ConcentratorDto concentrator = new();
-    private MudForm form;
+    private MudForm form = default!;
     private ConcentratorValidator concentratorValidator = new();
 
     private List<FrequencyPlan> FrequencyPlans = new List<FrequencyPlan>();
diff --git a/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/DeleteConcentratorPage.razor b/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/DeleteConcentratorPage.razor
index eab22cf5f..045b03d8d 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/DeleteConcentratorPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/DeleteConcentratorPage.razor
@@ -15,11 +15,11 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
-    
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
-    [Parameter] public string deviceId { get; set; }
-    
+    public Error Error { get; set; } = default!;
+
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
+    [Parameter] public string deviceId { get; set; } = default!;
+
     void Cancel() => MudDialog.Cancel();
 
     /// <summary>
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Settings/DeviceTagsPage.razor b/src/AzureIoTHub.Portal.Client/Pages/Settings/DeviceTagsPage.razor
index c84fd1593..84d05cc3c 100644
--- a/src/AzureIoTHub.Portal.Client/Pages/Settings/DeviceTagsPage.razor
+++ b/src/AzureIoTHub.Portal.Client/Pages/Settings/DeviceTagsPage.razor
@@ -61,7 +61,7 @@
                 </MudTd>
                 <MudTd DataLabel="Validate" Style="text-align: center;">
                     <MudTooltip Text="Validate device">
-                        <MudIconButton Color="Color.Default" Icon="@Icons.Filled.CheckCircle" Size="Size.Medium" OnClick="@(() => Save(TagContexte))" id="saveButton" Disabled="isProcessing">Save Changes></MudIconButton>
+                        <MudIconButton Color="Color.Default" Icon="@Icons.Material.Filled.CheckCircle" Size="Size.Medium" OnClick="@(() => Save(TagContexte))" id="saveButton" Disabled="isProcessing">Save Changes></MudIconButton>
                     </MudTooltip>
                 </MudTd>
             </RowTemplate>
@@ -81,12 +81,12 @@
 
 @code {
     [CascadingParameter]
-    public Error Error { get; set; }
+    public Error Error { get; set; } = default!;
 
     List<DeviceTagModel> Tags { get; } = new();
-    private MudForm FormName { get; set; }
-    private MudForm FormLabel { get; set; }
-    
+    private MudForm FormName { get; set; } = default!;
+    private MudForm FormLabel { get; set; } = default!;
+
     private bool isProcessing;
 
     protected override async Task OnInitializedAsync()
@@ -119,7 +119,7 @@
     {
         var last = Tags.LastOrDefault();
 
-        if (Tags.Count == 0 || (last.Name is not null && last.Label is not null))
+        if (Tags.Count == 0 || (last!.Name is not null && last.Label is not null))
         {
             Tags.Add(new DeviceTagModel());
         }
diff --git a/src/AzureIoTHub.Portal.Client/Program.cs b/src/AzureIoTHub.Portal.Client/Program.cs
index f4cd8a767..c3db5e4a5 100644
--- a/src/AzureIoTHub.Portal.Client/Program.cs
+++ b/src/AzureIoTHub.Portal.Client/Program.cs
@@ -36,23 +36,26 @@
 using var httpClient = new HttpClient() { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) };
 var settings = await httpClient.GetFromJsonAsync<OIDCSettings>("api/settings/oidc");
 
-_ = builder.Services.Configure<OIDCSettings>(opts =>
+if (settings != null)
 {
-    opts.ClientId = settings.ClientId;
-    opts.MetadataUrl = settings.MetadataUrl;
-    opts.Authority = settings.Authority;
-    opts.Scope = settings.Scope;
-});
-
-builder.Services.AddOidcAuthentication(options =>
-{
-    options.ProviderOptions.Authority = settings.Authority;
-    options.ProviderOptions.MetadataUrl = settings.MetadataUrl.ToString();
-    options.ProviderOptions.ClientId = settings.ClientId;
-    options.ProviderOptions.ResponseType = "code";
-
-    options.ProviderOptions.DefaultScopes.Add(settings.Scope);
-});
+    _ = builder.Services.Configure<OIDCSettings>(opts =>
+    {
+        opts.ClientId = settings.ClientId;
+        opts.MetadataUrl = settings.MetadataUrl;
+        opts.Authority = settings.Authority;
+        opts.Scope = settings.Scope;
+    });
+
+    _ = builder.Services.AddOidcAuthentication(options =>
+    {
+        options.ProviderOptions.Authority = settings.Authority;
+        options.ProviderOptions.MetadataUrl = settings.MetadataUrl.ToString();
+        options.ProviderOptions.ClientId = settings.ClientId;
+        options.ProviderOptions.ResponseType = "code";
+
+        options.ProviderOptions.DefaultScopes.Add(settings.Scope);
+    });
+}
 
 builder.Services.AddApiAuthorization();
 
@@ -100,5 +103,5 @@ static async Task ConfigurePortalSettings(WebAssemblyHostBuilder builder)
     using var httpClient = new HttpClient() { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) };
     var settings = await httpClient.GetFromJsonAsync<PortalSettings>("api/settings/portal");
 
-    _ = builder.Services.AddSingleton(settings);
+    _ = builder.Services.AddSingleton(settings!);
 }
diff --git a/src/AzureIoTHub.Portal.Client/Services/DashboardLayoutService.cs b/src/AzureIoTHub.Portal.Client/Services/DashboardLayoutService.cs
index 01fc4ff26..5ae543330 100644
--- a/src/AzureIoTHub.Portal.Client/Services/DashboardLayoutService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/DashboardLayoutService.cs
@@ -7,7 +7,7 @@ namespace AzureIoTHub.Portal.Client.Services
 
     public class DashboardLayoutService : IDashboardLayoutService
     {
-        public event EventHandler RefreshDashboardOccurred;
+        public event EventHandler RefreshDashboardOccurred = default!;
 
         public void RefreshDashboard()
         {
diff --git a/src/AzureIoTHub.Portal.Client/Services/DashboardMetricsClientService.cs b/src/AzureIoTHub.Portal.Client/Services/DashboardMetricsClientService.cs
index 635d2fae7..1e09f7603 100644
--- a/src/AzureIoTHub.Portal.Client/Services/DashboardMetricsClientService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/DashboardMetricsClientService.cs
@@ -19,7 +19,7 @@ public DashboardMetricsClientService(HttpClient http)
 
         public Task<PortalMetric> GetPortalMetrics()
         {
-            return this.http.GetFromJsonAsync<PortalMetric>("api/dashboard/metrics");
+            return this.http.GetFromJsonAsync<PortalMetric>("api/dashboard/metrics")!;
         }
     }
 }
diff --git a/src/AzureIoTHub.Portal.Client/Services/DeviceClientService.cs b/src/AzureIoTHub.Portal.Client/Services/DeviceClientService.cs
index 5900194ee..c6f628afa 100644
--- a/src/AzureIoTHub.Portal.Client/Services/DeviceClientService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/DeviceClientService.cs
@@ -21,12 +21,12 @@ public DeviceClientService(HttpClient http)
 
         public Task<PaginationResult<DeviceListItem>> GetDevices(string continuationUri)
         {
-            return this.http.GetFromJsonAsync<PaginationResult<DeviceListItem>>(continuationUri);
+            return this.http.GetFromJsonAsync<PaginationResult<DeviceListItem>>(continuationUri)!;
         }
 
         public Task<DeviceDetails> GetDevice(string deviceId)
         {
-            return this.http.GetFromJsonAsync<DeviceDetails>($"api/devices/{deviceId}");
+            return this.http.GetFromJsonAsync<DeviceDetails>($"api/devices/{deviceId}")!;
         }
 
         public Task CreateDevice(DeviceDetails device)
@@ -41,7 +41,7 @@ public Task UpdateDevice(DeviceDetails device)
 
         public async Task<IList<DevicePropertyValue>> GetDeviceProperties(string deviceId)
         {
-            return await this.http.GetFromJsonAsync<List<DevicePropertyValue>>($"api/devices/{deviceId}/properties");
+            return await this.http.GetFromJsonAsync<List<DevicePropertyValue>>($"api/devices/{deviceId}/properties") ?? new List<DevicePropertyValue>();
         }
 
         public Task SetDeviceProperties(string deviceId, IList<DevicePropertyValue> deviceProperties)
@@ -51,7 +51,7 @@ public Task SetDeviceProperties(string deviceId, IList<DevicePropertyValue> devi
 
         public Task<EnrollmentCredentials> GetEnrollmentCredentials(string deviceId)
         {
-            return this.http.GetFromJsonAsync<EnrollmentCredentials>($"api/devices/{deviceId}/credentials");
+            return this.http.GetFromJsonAsync<EnrollmentCredentials>($"api/devices/{deviceId}/credentials")!;
         }
 
         public Task DeleteDevice(string deviceId)
@@ -74,12 +74,12 @@ public async Task<ImportResultLine[]> ImportDeviceList(MultipartFormDataContent
         {
             var result = await this.http.PostAsync($"/api/admin/devices/_import", dataContent);
             _ = result.EnsureSuccessStatusCode();
-            return await result.Content.ReadFromJsonAsync<ImportResultLine[]>();
+            return await result.Content.ReadFromJsonAsync<ImportResultLine[]>() ?? Array.Empty<ImportResultLine>();
         }
 
         public async Task<IEnumerable<LabelDto>> GetAvailableLabels()
         {
-            return await this.http.GetFromJsonAsync<List<LabelDto>>($"api/devices/available-labels");
+            return await this.http.GetFromJsonAsync<List<LabelDto>>($"api/devices/available-labels") ?? new List<LabelDto>();
         }
     }
 }
diff --git a/src/AzureIoTHub.Portal.Client/Services/DeviceConfigurationsClientService.cs b/src/AzureIoTHub.Portal.Client/Services/DeviceConfigurationsClientService.cs
index 13f42cad9..6a5e95ede 100644
--- a/src/AzureIoTHub.Portal.Client/Services/DeviceConfigurationsClientService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/DeviceConfigurationsClientService.cs
@@ -21,17 +21,17 @@ public DeviceConfigurationsClientService(HttpClient http)
 
         public async Task<IList<ConfigListItem>> GetDeviceConfigurations()
         {
-            return await this.http.GetFromJsonAsync<List<ConfigListItem>>("api/device-configurations");
+            return await this.http.GetFromJsonAsync<List<ConfigListItem>>("api/device-configurations") ?? new List<ConfigListItem>();
         }
 
         public Task<DeviceConfig> GetDeviceConfiguration(string deviceConfigurationId)
         {
-            return this.http.GetFromJsonAsync<DeviceConfig>($"api/device-configurations/{deviceConfigurationId}");
+            return this.http.GetFromJsonAsync<DeviceConfig>($"api/device-configurations/{deviceConfigurationId}")!;
         }
 
         public Task<ConfigurationMetrics> GetDeviceConfigurationMetrics(string deviceConfigurationId)
         {
-            return this.http.GetFromJsonAsync<ConfigurationMetrics>($"api/device-configurations/{deviceConfigurationId}/metrics");
+            return this.http.GetFromJsonAsync<ConfigurationMetrics>($"api/device-configurations/{deviceConfigurationId}/metrics")!;
         }
 
         public Task CreateDeviceConfiguration(DeviceConfig deviceConfiguration)
diff --git a/src/AzureIoTHub.Portal.Client/Services/DeviceLayoutService.cs b/src/AzureIoTHub.Portal.Client/Services/DeviceLayoutService.cs
index 506ce94d6..7542ec482 100644
--- a/src/AzureIoTHub.Portal.Client/Services/DeviceLayoutService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/DeviceLayoutService.cs
@@ -11,10 +11,10 @@ namespace AzureIoTHub.Portal.Client.Services
 
     public class DeviceLayoutService : IDeviceLayoutService
     {
-        private IDeviceDetails sharedDevice;
-        private IDeviceModel sharedDeviceModel;
+        private IDeviceDetails sharedDevice = default!;
+        private IDeviceModel sharedDeviceModel = default!;
 
-        public event EventHandler RefreshDeviceOccurred;
+        public event EventHandler RefreshDeviceOccurred = default!;
 
         public void RefreshDevice()
         {
@@ -31,7 +31,7 @@ public IDeviceModel GetSharedDeviceModel()
             return this.sharedDeviceModel;
         }
 
-        public TDevice ResetSharedDevice<TDevice>(List<DeviceTagDto> tags = null)
+        public TDevice ResetSharedDevice<TDevice>(List<DeviceTagDto>? tags = null)
             where TDevice : class, IDeviceDetails, new()
         {
             this.sharedDevice = new TDevice();
@@ -41,7 +41,7 @@ public TDevice ResetSharedDevice<TDevice>(List<DeviceTagDto> tags = null)
                 _ = this.sharedDevice.Tags.TryAdd(tag.Name, string.Empty);
             }
 
-            return this.sharedDevice as TDevice;
+            return (TDevice)this.sharedDevice;
         }
 
         public TDeviceModel ResetSharedDeviceModel<TDeviceModel>()
@@ -49,7 +49,7 @@ public TDeviceModel ResetSharedDeviceModel<TDeviceModel>()
         {
             this.sharedDeviceModel = new TDeviceModel();
 
-            return this.sharedDeviceModel as TDeviceModel;
+            return (TDeviceModel)this.sharedDeviceModel;
         }
 
         public TDevice DuplicateSharedDevice<TDevice>(TDevice deviceToDuplicate)
diff --git a/src/AzureIoTHub.Portal.Client/Services/DeviceModelsClientService.cs b/src/AzureIoTHub.Portal.Client/Services/DeviceModelsClientService.cs
index 4005ce7ff..705ee5359 100644
--- a/src/AzureIoTHub.Portal.Client/Services/DeviceModelsClientService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/DeviceModelsClientService.cs
@@ -26,19 +26,21 @@ public async Task<PaginationResult<DeviceModelDto>> GetDeviceModels(DeviceModelF
             var query = new Dictionary<string, string>
             {
                 { nameof(DeviceModelFilter.SearchText), deviceModelFilter?.SearchText ?? string.Empty },
+#pragma warning disable CA1305
                 { nameof(DeviceModelFilter.PageNumber), deviceModelFilter?.PageNumber.ToString() ?? string.Empty },
                 { nameof(DeviceModelFilter.PageSize), deviceModelFilter?.PageSize.ToString() ?? string.Empty },
-                { nameof(DeviceModelFilter.OrderBy), string.Join("", deviceModelFilter?.OrderBy) ?? string.Empty }
+#pragma warning restore CA1305
+                { nameof(DeviceModelFilter.OrderBy), string.Join("", deviceModelFilter?.OrderBy!) ?? string.Empty }
             };
 
             var uri = QueryHelpers.AddQueryString(this.apiUrlBase, query);
 
-            return await this.http.GetFromJsonAsync<PaginationResult<DeviceModelDto>>(uri);
+            return await this.http.GetFromJsonAsync<PaginationResult<DeviceModelDto>>(uri) ?? new PaginationResult<DeviceModelDto>();
         }
 
         public Task<DeviceModelDto> GetDeviceModel(string deviceModelId)
         {
-            return this.http.GetFromJsonAsync<DeviceModelDto>($"api/models/{deviceModelId}");
+            return this.http.GetFromJsonAsync<DeviceModelDto>($"api/models/{deviceModelId}")!;
         }
 
         public Task CreateDeviceModel(DeviceModelDto deviceModel)
@@ -58,7 +60,7 @@ public Task DeleteDeviceModel(string deviceModelId)
 
         public async Task<IList<DeviceProperty>> GetDeviceModelModelProperties(string deviceModelId)
         {
-            return await this.http.GetFromJsonAsync<List<DeviceProperty>>($"api/models/{deviceModelId}/properties");
+            return await this.http.GetFromJsonAsync<List<DeviceProperty>>($"api/models/{deviceModelId}/properties") ?? new List<DeviceProperty>();
         }
 
         public Task SetDeviceModelModelProperties(string deviceModelId, IList<DeviceProperty> deviceProperties)
diff --git a/src/AzureIoTHub.Portal.Client/Services/DeviceTagSettingsClientService.cs b/src/AzureIoTHub.Portal.Client/Services/DeviceTagSettingsClientService.cs
index 3c23c6012..0ceeea46b 100644
--- a/src/AzureIoTHub.Portal.Client/Services/DeviceTagSettingsClientService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/DeviceTagSettingsClientService.cs
@@ -35,7 +35,7 @@ public Task DeleteDeviceTagByName(string deviceTagName)
 
         public async Task<IList<DeviceTagDto>> GetDeviceTags()
         {
-            return await this.http.GetFromJsonAsync<List<DeviceTagDto>>("api/settings/device-tags");
+            return await this.http.GetFromJsonAsync<List<DeviceTagDto>>("api/settings/device-tags") ?? new List<DeviceTagDto>();
         }
 
     }
diff --git a/src/AzureIoTHub.Portal.Client/Services/EdgeDeviceClientService.cs b/src/AzureIoTHub.Portal.Client/Services/EdgeDeviceClientService.cs
index 560e7de58..36312cf7b 100644
--- a/src/AzureIoTHub.Portal.Client/Services/EdgeDeviceClientService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/EdgeDeviceClientService.cs
@@ -21,12 +21,12 @@ public EdgeDeviceClientService(HttpClient http)
 
         public Task<PaginationResult<IoTEdgeListItem>> GetDevices(string continuationUri)
         {
-            return this.http.GetFromJsonAsync<PaginationResult<IoTEdgeListItem>>(continuationUri);
+            return this.http.GetFromJsonAsync<PaginationResult<IoTEdgeListItem>>(continuationUri)!;
         }
 
         public Task<IoTEdgeDevice> GetDevice(string deviceId)
         {
-            return this.http.GetFromJsonAsync<IoTEdgeDevice>($"api/edge/devices/{deviceId}");
+            return this.http.GetFromJsonAsync<IoTEdgeDevice>($"api/edge/devices/{deviceId}")!;
         }
 
         public Task CreateDevice(IoTEdgeDevice device)
@@ -46,26 +46,26 @@ public Task DeleteDevice(string deviceId)
 
         public Task<EnrollmentCredentials> GetEnrollmentCredentials(string deviceId)
         {
-            return this.http.GetFromJsonAsync<EnrollmentCredentials>($"api/edge/devices/{deviceId}/credentials");
+            return this.http.GetFromJsonAsync<EnrollmentCredentials>($"api/edge/devices/{deviceId}/credentials")!;
         }
 
         public async Task<List<IoTEdgeDeviceLog>> GetEdgeDeviceLogs(string deviceId, IoTEdgeModule edgeModule)
         {
             var response = await this.http.PostAsJsonAsync($"api/edge/devices/{deviceId}/logs", edgeModule);
 
-            return await response.Content.ReadFromJsonAsync<List<IoTEdgeDeviceLog>>();
+            return await response.Content.ReadFromJsonAsync<List<IoTEdgeDeviceLog>>() ?? new List<IoTEdgeDeviceLog>();
         }
 
         public async Task<C2Dresult> ExecuteModuleMethod(string deviceId, string moduleName, string methodName)
         {
-            var response = await this.http.PostAsJsonAsync<HttpResponseMessage>($"api/edge/devices/{deviceId}/{moduleName}/{methodName}", null);
+            var response = await this.http.PostAsJsonAsync<HttpResponseMessage?>($"api/edge/devices/{deviceId}/{moduleName}/{methodName}", null);
 
-            return await response.Content.ReadFromJsonAsync<C2Dresult>();
+            return await response.Content.ReadFromJsonAsync<C2Dresult>() ?? new C2Dresult();
         }
 
         public async Task<IEnumerable<LabelDto>> GetAvailableLabels()
         {
-            return await this.http.GetFromJsonAsync<List<LabelDto>>("api/edge/devices/available-labels");
+            return await this.http.GetFromJsonAsync<List<LabelDto>>("api/edge/devices/available-labels") ?? new List<LabelDto>();
         }
     }
 }
diff --git a/src/AzureIoTHub.Portal.Client/Services/EdgeDeviceConfigurationsClientService.cs b/src/AzureIoTHub.Portal.Client/Services/EdgeDeviceConfigurationsClientService.cs
index 6557ca012..88dffd135 100644
--- a/src/AzureIoTHub.Portal.Client/Services/EdgeDeviceConfigurationsClientService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/EdgeDeviceConfigurationsClientService.cs
@@ -20,12 +20,12 @@ public EdgeDeviceConfigurationsClientService(HttpClient http)
 
         public async Task<IList<ConfigListItem>> GetDeviceConfigurations()
         {
-            return await this.http.GetFromJsonAsync<List<ConfigListItem>>("api/edge/configurations");
+            return await this.http.GetFromJsonAsync<List<ConfigListItem>>("api/edge/configurations") ?? new List<ConfigListItem>();
         }
 
         public Task<ConfigListItem> GetDeviceConfiguration(string deviceConfigurationId)
         {
-            return this.http.GetFromJsonAsync<ConfigListItem>($"api/edge/configurations/{deviceConfigurationId}");
+            return this.http.GetFromJsonAsync<ConfigListItem>($"api/edge/configurations/{deviceConfigurationId}")!;
         }
     }
 }
diff --git a/src/AzureIoTHub.Portal.Client/Services/EdgeDeviceLayoutService.cs b/src/AzureIoTHub.Portal.Client/Services/EdgeDeviceLayoutService.cs
index 29c698a6a..0f26333a5 100644
--- a/src/AzureIoTHub.Portal.Client/Services/EdgeDeviceLayoutService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/EdgeDeviceLayoutService.cs
@@ -9,10 +9,10 @@ namespace AzureIoTHub.Portal.Client.Services
 
     public class EdgeDeviceLayoutService : IEdgeDeviceLayoutService
     {
-        private IoTEdgeDevice sharedDevice;
-        private IoTEdgeModel sharedDeviceModel;
+        private IoTEdgeDevice sharedDevice = default!;
+        private IoTEdgeModel sharedDeviceModel = default!;
 
-        public event EventHandler RefreshDeviceOccurred;
+        public event EventHandler RefreshDeviceOccurred = default!;
 
         public void RefreshDevice()
         {
@@ -29,7 +29,7 @@ public IoTEdgeModel GetSharedDeviceModel()
             return this.sharedDeviceModel;
         }
 
-        public IoTEdgeDevice ResetSharedDevice(List<DeviceTagDto> tags = null)
+        public IoTEdgeDevice ResetSharedDevice(List<DeviceTagDto>? tags = null)
         {
             this.sharedDevice = new IoTEdgeDevice();
 
diff --git a/src/AzureIoTHub.Portal.Client/Services/EdgeModelClientService.cs b/src/AzureIoTHub.Portal.Client/Services/EdgeModelClientService.cs
index 8b49ba307..289a6f8cb 100644
--- a/src/AzureIoTHub.Portal.Client/Services/EdgeModelClientService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/EdgeModelClientService.cs
@@ -30,12 +30,12 @@ public async Task<List<IoTEdgeModelListItem>> GetIoTEdgeModelList(EdgeModelFilte
 
             var uri = QueryHelpers.AddQueryString(this.apiUrlBase, query);
 
-            return await this.http.GetFromJsonAsync<List<IoTEdgeModelListItem>>(uri);
+            return await this.http.GetFromJsonAsync<List<IoTEdgeModelListItem>>(uri) ?? new List<IoTEdgeModelListItem>();
         }
 
         public async Task<IoTEdgeModel> GetIoTEdgeModel(string modelId)
         {
-            return await this.http.GetFromJsonAsync<IoTEdgeModel>($"{this.apiUrlBase}/{modelId}");
+            return await this.http.GetFromJsonAsync<IoTEdgeModel>($"{this.apiUrlBase}/{modelId}") ?? new IoTEdgeModel();
         }
 
         public Task CreateIoTEdgeModel(IoTEdgeModel model)
diff --git a/src/AzureIoTHub.Portal.Client/Services/IDeviceLayoutService.cs b/src/AzureIoTHub.Portal.Client/Services/IDeviceLayoutService.cs
index f14f47d3a..2201ff868 100644
--- a/src/AzureIoTHub.Portal.Client/Services/IDeviceLayoutService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/IDeviceLayoutService.cs
@@ -16,7 +16,7 @@ public interface IDeviceLayoutService
 
         IDeviceDetails GetSharedDevice();
         IDeviceModel GetSharedDeviceModel();
-        TDevice ResetSharedDevice<TDevice>(List<DeviceTagDto> tags = null)
+        TDevice ResetSharedDevice<TDevice>(List<DeviceTagDto>? tags = null)
             where TDevice : class, IDeviceDetails, new();
         TDeviceModel ResetSharedDeviceModel<TDeviceModel>()
             where TDeviceModel : class, IDeviceModel, new();
diff --git a/src/AzureIoTHub.Portal.Client/Services/IEdgeDeviceLayoutService.cs b/src/AzureIoTHub.Portal.Client/Services/IEdgeDeviceLayoutService.cs
index e2f3e25ba..b599b8cbf 100644
--- a/src/AzureIoTHub.Portal.Client/Services/IEdgeDeviceLayoutService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/IEdgeDeviceLayoutService.cs
@@ -15,7 +15,7 @@ public interface IEdgeDeviceLayoutService
 
         IoTEdgeDevice GetSharedDevice();
         IoTEdgeModel GetSharedDeviceModel();
-        IoTEdgeDevice ResetSharedDevice(List<DeviceTagDto> tags = null);
+        IoTEdgeDevice ResetSharedDevice(List<DeviceTagDto>? tags = null);
         IoTEdgeModel ResetSharedDeviceModel();
         IoTEdgeDevice DuplicateSharedDevice(IoTEdgeDevice deviceToDuplicate);
         IoTEdgeModel DuplicateSharedDeviceModel(IoTEdgeModel deviceModelToDuplicate);
diff --git a/src/AzureIoTHub.Portal.Client/Services/IdeaClientService.cs b/src/AzureIoTHub.Portal.Client/Services/IdeaClientService.cs
index f40368c08..68426eed9 100644
--- a/src/AzureIoTHub.Portal.Client/Services/IdeaClientService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/IdeaClientService.cs
@@ -21,7 +21,7 @@ public async Task<IdeaResponse> SubmitIdea(IdeaRequest ideaRequest)
         {
             var response = await this.http.PostAsJsonAsync("api/ideas", ideaRequest);
 
-            return await response.Content.ReadFromJsonAsync<IdeaResponse>();
+            return await response.Content.ReadFromJsonAsync<IdeaResponse>() ?? new IdeaResponse();
         }
     }
 }
diff --git a/src/AzureIoTHub.Portal.Client/Services/LayoutService.cs b/src/AzureIoTHub.Portal.Client/Services/LayoutService.cs
index 1348f8fb5..8d90fe261 100644
--- a/src/AzureIoTHub.Portal.Client/Services/LayoutService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/LayoutService.cs
@@ -24,7 +24,7 @@ public LayoutService(ILocalStorageService localStorageService)
 
         public Dictionary<string, bool> CollapsibleNavMenu { get; set; }
 
-        public event EventHandler MajorUpdateOccurred;
+        public event EventHandler? MajorUpdateOccurred;
 
         public async Task LoadLayoutConfigurationFromLocalStorage()
         {
diff --git a/src/AzureIoTHub.Portal.Client/Services/LoRaWanConcentratorClientService.cs b/src/AzureIoTHub.Portal.Client/Services/LoRaWanConcentratorClientService.cs
index 46df1450e..330e3ff7a 100644
--- a/src/AzureIoTHub.Portal.Client/Services/LoRaWanConcentratorClientService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/LoRaWanConcentratorClientService.cs
@@ -21,12 +21,12 @@ public LoRaWanConcentratorClientService(HttpClient http)
 
         public Task<PaginationResult<ConcentratorDto>> GetConcentrators(string continuationUri)
         {
-            return this.http.GetFromJsonAsync<PaginationResult<ConcentratorDto>>(continuationUri);
+            return this.http.GetFromJsonAsync<PaginationResult<ConcentratorDto>>(continuationUri)!;
         }
 
         public Task<ConcentratorDto> GetConcentrator(string deviceId)
         {
-            return this.http.GetFromJsonAsync<ConcentratorDto>($"api/lorawan/concentrators/{deviceId}");
+            return this.http.GetFromJsonAsync<ConcentratorDto>($"api/lorawan/concentrators/{deviceId}")!;
         }
 
         public Task CreateConcentrator(ConcentratorDto concentrator)
@@ -46,7 +46,7 @@ public Task DeleteConcentrator(string deviceId)
 
         public Task<IEnumerable<FrequencyPlan>> GetFrequencyPlans()
         {
-            return this.http.GetFromJsonAsync<IEnumerable<FrequencyPlan>>("api/lorawan/freqencyplans");
+            return this.http.GetFromJsonAsync<IEnumerable<FrequencyPlan>>("api/lorawan/freqencyplans")!;
         }
     }
 }
diff --git a/src/AzureIoTHub.Portal.Client/Services/LoRaWanDeviceClientService.cs b/src/AzureIoTHub.Portal.Client/Services/LoRaWanDeviceClientService.cs
index 2d591a9df..fbab031f6 100644
--- a/src/AzureIoTHub.Portal.Client/Services/LoRaWanDeviceClientService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/LoRaWanDeviceClientService.cs
@@ -22,7 +22,7 @@ public LoRaWanDeviceClientService(HttpClient http)
 
         public Task<LoRaDeviceDetails> GetDevice(string deviceId)
         {
-            return this.http.GetFromJsonAsync<LoRaDeviceDetails>($"api/lorawan/devices/{deviceId}");
+            return this.http.GetFromJsonAsync<LoRaDeviceDetails>($"api/lorawan/devices/{deviceId}")!;
         }
 
         public Task CreateDevice(LoRaDeviceDetails device)
@@ -47,12 +47,12 @@ public Task ExecuteCommand(string deviceId, string commandId)
 
         public Task<LoRaGatewayIDList> GetGatewayIdList()
         {
-            return this.http.GetFromJsonAsync<LoRaGatewayIDList>($"api/lorawan/devices/gateways");
+            return this.http.GetFromJsonAsync<LoRaGatewayIDList>($"api/lorawan/devices/gateways")!;
         }
 
         public async Task<IEnumerable<LoRaDeviceTelemetryDto>> GetDeviceTelemetry(string deviceId)
         {
-            return await this.http.GetFromJsonAsync<List<LoRaDeviceTelemetryDto>>($"api/lorawan/devices/{deviceId}/telemetry");
+            return await this.http.GetFromJsonAsync<List<LoRaDeviceTelemetryDto>>($"api/lorawan/devices/{deviceId}/telemetry") ?? new List<LoRaDeviceTelemetryDto>();
         }
     }
 }
diff --git a/src/AzureIoTHub.Portal.Client/Services/LoRaWanDeviceModelsClientService.cs b/src/AzureIoTHub.Portal.Client/Services/LoRaWanDeviceModelsClientService.cs
index 3306ae0e7..72a157b3c 100644
--- a/src/AzureIoTHub.Portal.Client/Services/LoRaWanDeviceModelsClientService.cs
+++ b/src/AzureIoTHub.Portal.Client/Services/LoRaWanDeviceModelsClientService.cs
@@ -20,7 +20,7 @@ public LoRaWanDeviceModelsClientService(HttpClient http)
 
         public Task<LoRaDeviceModelDto> GetDeviceModel(string deviceModelId)
         {
-            return this.http.GetFromJsonAsync<LoRaDeviceModelDto>($"api/lorawan/models/{deviceModelId}");
+            return this.http.GetFromJsonAsync<LoRaDeviceModelDto>($"api/lorawan/models/{deviceModelId}")!;
         }
 
         public Task CreateDeviceModel(LoRaDeviceModelDto deviceModelDto)
@@ -40,7 +40,7 @@ public Task SetDeviceModelCommands(string deviceModelId, IList<DeviceModelComman
 
         public async Task<IList<DeviceModelCommandDto>> GetDeviceModelCommands(string deviceModelId)
         {
-            return await this.http.GetFromJsonAsync<List<DeviceModelCommandDto>>($"api/lorawan/models/{deviceModelId}/commands");
+            return await this.http.GetFromJsonAsync<List<DeviceModelCommandDto>>($"api/lorawan/models/{deviceModelId}/commands") ?? new List<DeviceModelCommandDto>();
         }
 
         public Task<string> GetAvatarUrl(string deviceModelId)
diff --git a/src/AzureIoTHub.Portal.Client/Shared/Appbar.razor b/src/AzureIoTHub.Portal.Client/Shared/Appbar.razor
index a3a38f9e8..8fa578453 100644
--- a/src/AzureIoTHub.Portal.Client/Shared/Appbar.razor
+++ b/src/AzureIoTHub.Portal.Client/Shared/Appbar.razor
@@ -3,7 +3,6 @@
 @using AzureIoTHub.Portal.Client.Pages.Ideas
 
 @inject PortalSettings Portal
-@inject SignOutSessionStateManager SignOutManager
 @inject NavigationManager Navigation
 @inject IDialogService DialogService
 @inject ILayoutService LayoutService
@@ -16,16 +15,16 @@
         @if (Portal.IsIdeasFeatureEnabled)
         {
             <MudTooltip id="ideas" Duration="1000" Text="New Ideas ?">
-                <MudIconButton Icon="@Icons.Filled.Lightbulb" Color="Color.Inherit" OnClick="@OpenSubmitIdeaDialog" />
+                <MudIconButton Icon="@Icons.Material.Filled.Lightbulb" Color="Color.Inherit" OnClick="@OpenSubmitIdeaDialog" />
             </MudTooltip>
         }
         <MudTooltip id="dark_light_switch" Duration="1000" Text="@(LayoutService.IsDarkMode ? "Switch to Light Theme" : "Switch to Dark Theme")">
-            <MudIconButton Icon="@(LayoutService.IsDarkMode ? @Icons.Rounded.LightMode : @Icons.Material.Outlined.DarkMode)" Color="Color.Inherit" OnClick="@LayoutService.ToggleDarkMode" />
+            <MudIconButton Icon="@(LayoutService.IsDarkMode ? @Icons.Material.Rounded.LightMode : @Icons.Material.Outlined.DarkMode)" Color="Color.Inherit" OnClick="@LayoutService.ToggleDarkMode" />
         </MudTooltip>
         <MudMenu AnchorOrigin="Origin.BottomRight" TransformOrigin="Origin.TopRight" Class="help-menu">
             <ActivatorContent>
                 <MudTooltip id="dark_light_switch" Duration="1000" Text="Support + documentation">
-                    <MudIconButton Icon="@Icons.Rounded.HelpOutline" Style="color: white;" Size="Size.Medium" />
+                    <MudIconButton Icon="@Icons.Material.Rounded.HelpOutline" Style="color: white;" Size="Size.Medium" />
                 </MudTooltip>
             </ActivatorContent>
             <ChildContent>
@@ -62,7 +61,7 @@
                 <MudList Clickable="true">
                     <MudListSubheader>
                         <MudText Typo="Typo.caption">Signed in as</MudText>
-                        <MudText Typo="Typo.body1"><b>@context.User.Identity.Name</b></MudText>
+                        <MudText Typo="Typo.body1"><b>@context.User.Identity?.Name</b></MudText>
                     </MudListSubheader>
                     <MudDivider />
                     <MudListItem Href="#" OnClick="BeginLogout" Icon="@Icons.Material.Filled.Logout">Log out</MudListItem>
@@ -76,10 +75,9 @@
 </AuthorizeView>
 
 @code {
-    private async Task BeginLogout(MouseEventArgs args)
+    private void BeginLogout(MouseEventArgs args)
     {
-        await SignOutManager.SetSignOutState();
-        Navigation.NavigateTo("authentication/logout");
+        Navigation.NavigateToLogout("authentication/logout");
     }
 
     private void BeginLogin(MouseEventArgs args)
diff --git a/src/AzureIoTHub.Portal.Client/Shared/Error.razor b/src/AzureIoTHub.Portal.Client/Shared/Error.razor
index 8e3aad62b..34032bce7 100644
--- a/src/AzureIoTHub.Portal.Client/Shared/Error.razor
+++ b/src/AzureIoTHub.Portal.Client/Shared/Error.razor
@@ -7,7 +7,7 @@
 
 @code {
     [Parameter]
-    public RenderFragment ChildContent { get; set; }
+    public RenderFragment ChildContent { get; set; } = default!;
 
     public void ProcessProblemDetails(ProblemDetailsException exception)
     {
diff --git a/src/AzureIoTHub.Portal.Client/Shared/MainLayout.razor b/src/AzureIoTHub.Portal.Client/Shared/MainLayout.razor
index 114ecb62d..2bee2c389 100644
--- a/src/AzureIoTHub.Portal.Client/Shared/MainLayout.razor
+++ b/src/AzureIoTHub.Portal.Client/Shared/MainLayout.razor
@@ -49,13 +49,13 @@
 
     protected override void OnInitialized()
     {
-        LayoutService.MajorUpdateOccurred += LayoutServiceOnMajorUpdateOccurred;
+        LayoutService.MajorUpdateOccurred += LayoutServiceOnMajorUpdateOccurred!;
         base.OnInitialized();
     }
 
     public void Dispose()
     {
-        LayoutService.MajorUpdateOccurred -= LayoutServiceOnMajorUpdateOccurred;
+        LayoutService.MajorUpdateOccurred -= LayoutServiceOnMajorUpdateOccurred!;
     }
 
     private void LayoutServiceOnMajorUpdateOccurred(object sender, EventArgs e) => StateHasChanged();
diff --git a/src/AzureIoTHub.Portal.Client/Shared/NavMenu.razor b/src/AzureIoTHub.Portal.Client/Shared/NavMenu.razor
index 159a839ae..5ec8ebcac 100644
--- a/src/AzureIoTHub.Portal.Client/Shared/NavMenu.razor
+++ b/src/AzureIoTHub.Portal.Client/Shared/NavMenu.razor
@@ -11,9 +11,9 @@
 <AuthorizeView>
     <Authorized>
         <MudNavMenu>
-            <MudNavLink Href="/" Icon="@Icons.Filled.Dashboard">Dashboard</MudNavLink>
+            <MudNavLink Href="/" Icon="@Icons.Material.Filled.Dashboard">Dashboard</MudNavLink>
 
-            <MudNavGroup Title="Devices" Icon="@Icons.Outlined.Memory"
+            <MudNavGroup Title="Devices" Icon="@Icons.Material.Outlined.Memory"
                          Expanded="@LayoutService.GetNavGroupExpanded("Devices")"
                          ExpandedChanged="@(b => LayoutService.SetNavGroupExpanded("Devices", b))">
                 <MudPaper Class="d-flex align-center flex-grow-1 gap-4" Elevation="0">
@@ -41,7 +41,7 @@
                 </MudPaper>
             </MudNavGroup>
 
-            <MudNavGroup Title="IoT Edge" Icon="@Icons.Outlined.DeveloperBoard"
+            <MudNavGroup Title="IoT Edge" Icon="@Icons.Material.Outlined.DeveloperBoard"
                          Expanded="@LayoutService.GetNavGroupExpanded("IoTEdge")"
                          ExpandedChanged="@(b => LayoutService.SetNavGroupExpanded("IoTEdge", b))">
                 <MudNavLink Href="/edge/devices">Devices</MudNavLink>
@@ -50,7 +50,7 @@
 
             @if (Portal.IsLoRaSupported)
             {
-                <MudNavGroup Title="LoRaWAN" Icon="@Icons.Outlined.WifiTethering"
+                <MudNavGroup Title="LoRaWAN" Icon="@Icons.Material.Outlined.WifiTethering"
                              Expanded="@LayoutService.GetNavGroupExpanded("LoRaWAN")"
                              ExpandedChanged="@(b => LayoutService.SetNavGroupExpanded("LoRaWAN", b))">
                     <MudNavLink Href="/lorawan/concentrators">
@@ -59,7 +59,7 @@
                 </MudNavGroup>
             }
 
-            <MudNavGroup Title="Settings" Icon="@Icons.Outlined.Settings"
+            <MudNavGroup Title="Settings" Icon="@Icons.Material.Outlined.Settings"
                          Expanded="@LayoutService.GetNavGroupExpanded("Settings")"
                          ExpandedChanged="@(b => LayoutService.SetNavGroupExpanded("Settings", b))">
                 <MudNavLink Href="/settings/device-tag">Device Tags</MudNavLink>
@@ -75,13 +75,13 @@
 
     protected override void OnInitialized()
     {
-        LayoutService.MajorUpdateOccurred += LayoutServiceOnMajorUpdateOccurred;
+        LayoutService.MajorUpdateOccurred += LayoutServiceOnMajorUpdateOccurred!;
         base.OnInitialized();
     }
 
     public void Dispose()
     {
-        LayoutService.MajorUpdateOccurred -= LayoutServiceOnMajorUpdateOccurred;
+        LayoutService.MajorUpdateOccurred -= LayoutServiceOnMajorUpdateOccurred!;
     }
 
     private void LayoutServiceOnMajorUpdateOccurred(object sender, EventArgs e) => StateHasChanged();
diff --git a/src/AzureIoTHub.Portal.Client/Shared/ProblemDetailsDialog.razor b/src/AzureIoTHub.Portal.Client/Shared/ProblemDetailsDialog.razor
index 83e744dee..2e12c569e 100644
--- a/src/AzureIoTHub.Portal.Client/Shared/ProblemDetailsDialog.razor
+++ b/src/AzureIoTHub.Portal.Client/Shared/ProblemDetailsDialog.razor
@@ -50,9 +50,9 @@
 </MudDialog>
 
 @code {
-    [CascadingParameter] MudDialogInstance MudDialog { get; set; }
+    [CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
 
-    [Parameter] public ProblemDetailsWithExceptionDetails ProblemDetails { get; set; }
+    [Parameter] public ProblemDetailsWithExceptionDetails ProblemDetails { get; set; } = default!;
 
     void Close() => MudDialog.Close();
 }
diff --git a/src/AzureIoTHub.Portal.Client/Validators/DevicePropertyValidator.cs b/src/AzureIoTHub.Portal.Client/Validators/DevicePropertyValidator.cs
index 99a52b887..d0b0e7ddc 100644
--- a/src/AzureIoTHub.Portal.Client/Validators/DevicePropertyValidator.cs
+++ b/src/AzureIoTHub.Portal.Client/Validators/DevicePropertyValidator.cs
@@ -13,7 +13,7 @@ public class DevicePropertyValidator : AbstractValidator<IEnumerable<DevicePrope
     {
         private class DevicePropertyComparer : IEqualityComparer<DeviceProperty>
         {
-            public bool Equals(DeviceProperty x, DeviceProperty y) => x?.Name == y?.Name;
+            public bool Equals(DeviceProperty? x, DeviceProperty? y) => x?.Name == y?.Name;
             public int GetHashCode(DeviceProperty obj) => obj.Name?.GetHashCode(StringComparison.OrdinalIgnoreCase) ?? 0;
         }
 
diff --git a/src/AzureIoTHub.Portal.Client/Validators/IoTEdgeModuleValidator.cs b/src/AzureIoTHub.Portal.Client/Validators/IoTEdgeModuleValidator.cs
index 8d7224013..129d93787 100644
--- a/src/AzureIoTHub.Portal.Client/Validators/IoTEdgeModuleValidator.cs
+++ b/src/AzureIoTHub.Portal.Client/Validators/IoTEdgeModuleValidator.cs
@@ -12,7 +12,7 @@ public class IoTEdgeModuleValidator : AbstractValidator<IEnumerable<IoTEdgeModul
     {
         private class IoTEdgeModuleComparer : IEqualityComparer<IoTEdgeModule>
         {
-            public bool Equals(IoTEdgeModule x, IoTEdgeModule y)
+            public bool Equals(IoTEdgeModule? x, IoTEdgeModule? y)
             {
                 return x?.ModuleName == y?.ModuleName;
             }
diff --git a/src/AzureIoTHub.Portal.Domain/Entities/Concentrator.cs b/src/AzureIoTHub.Portal.Domain/Entities/Concentrator.cs
index ddb2c6ef1..e0e16142c 100644
--- a/src/AzureIoTHub.Portal.Domain/Entities/Concentrator.cs
+++ b/src/AzureIoTHub.Portal.Domain/Entities/Concentrator.cs
@@ -11,18 +11,18 @@ public class Concentrator : EntityBase
         /// <summary>
         /// The name of the device.
         /// </summary>
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The lora region.
         /// </summary>
         [Required]
-        public string LoraRegion { get; set; }
+        public string LoraRegion { get; set; } = default!;
 
         /// <summary>
         /// The type of the device.
         /// </summary>
-        public string DeviceType { get; set; }
+        public string DeviceType { get; set; } = default!;
 
         /// <summary>
         /// The client certificate thumbprint.
diff --git a/src/AzureIoTHub.Portal.Domain/Entities/Device.cs b/src/AzureIoTHub.Portal.Domain/Entities/Device.cs
index 0c0e3fc8f..3bb1fae33 100644
--- a/src/AzureIoTHub.Portal.Domain/Entities/Device.cs
+++ b/src/AzureIoTHub.Portal.Domain/Entities/Device.cs
@@ -10,12 +10,12 @@ public class Device : EntityBase
         /// <summary>
         /// The device friendly name.
         /// </summary>
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The device Model Identifier.
         /// </summary>
-        public string DeviceModelId { get; set; }
+        public string DeviceModelId { get; set; } = default!;
 
         /// <summary>
         /// A value indicating whether the device is currently connected.
@@ -40,16 +40,16 @@ public class Device : EntityBase
         /// <summary>
         /// The device model
         /// </summary>
-        public DeviceModel DeviceModel { get; set; }
+        public DeviceModel DeviceModel { get; set; } = default!;
 
         /// <summary>
         /// The device labels.
         /// </summary>
-        public ICollection<Label> Labels { get; set; }
+        public ICollection<Label> Labels { get; set; } = default!;
 
         /// <summary>
         /// List of custom device tags and their values.
         /// </summary>
-        public ICollection<DeviceTagValue> Tags { get; set; }
+        public ICollection<DeviceTagValue> Tags { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Domain/Entities/DeviceModel.cs b/src/AzureIoTHub.Portal.Domain/Entities/DeviceModel.cs
index beb40a7da..b9d929fc4 100644
--- a/src/AzureIoTHub.Portal.Domain/Entities/DeviceModel.cs
+++ b/src/AzureIoTHub.Portal.Domain/Entities/DeviceModel.cs
@@ -8,7 +8,7 @@ namespace AzureIoTHub.Portal.Domain.Entities
 
     public class DeviceModel : EntityBase
     {
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         public string? Description { get; set; }
 
@@ -39,6 +39,6 @@ public class DeviceModel : EntityBase
         /// <summary>
         /// Labels
         /// </summary>
-        public ICollection<Label> Labels { get; set; }
+        public ICollection<Label> Labels { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Domain/Entities/DeviceModelCommand.cs b/src/AzureIoTHub.Portal.Domain/Entities/DeviceModelCommand.cs
index 8e7b933ff..c46d26f08 100644
--- a/src/AzureIoTHub.Portal.Domain/Entities/DeviceModelCommand.cs
+++ b/src/AzureIoTHub.Portal.Domain/Entities/DeviceModelCommand.cs
@@ -7,9 +7,9 @@ namespace AzureIoTHub.Portal.Domain.Entities
 
     public class DeviceModelCommand : EntityBase
     {
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
-        public string Frame { get; set; }
+        public string Frame { get; set; } = default!;
 
         public bool Confirmed { get; set; }
 
@@ -17,6 +17,6 @@ public class DeviceModelCommand : EntityBase
 
         public bool IsBuiltin { get; set; }
 
-        public string DeviceModelId { get; set; }
+        public string DeviceModelId { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Domain/Entities/DeviceModelProperty.cs b/src/AzureIoTHub.Portal.Domain/Entities/DeviceModelProperty.cs
index b9de2ce28..c745234c8 100644
--- a/src/AzureIoTHub.Portal.Domain/Entities/DeviceModelProperty.cs
+++ b/src/AzureIoTHub.Portal.Domain/Entities/DeviceModelProperty.cs
@@ -13,12 +13,12 @@ public class DeviceModelProperty : EntityBase
         /// The property name
         /// </summary>
         [Required]
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The property display name
         /// </summary>
-        public string DisplayName { get; set; }
+        public string DisplayName { get; set; } = default!;
 
         /// <summary>
         /// Indicates whether the property is writable from the portal
@@ -44,6 +44,6 @@ public class DeviceModelProperty : EntityBase
         /// The model identifier.
         /// </summary>
         [Required]
-        public string ModelId { get; set; }
+        public string ModelId { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Domain/Entities/DeviceTag.cs b/src/AzureIoTHub.Portal.Domain/Entities/DeviceTag.cs
index f3d0e835e..879fce0cc 100644
--- a/src/AzureIoTHub.Portal.Domain/Entities/DeviceTag.cs
+++ b/src/AzureIoTHub.Portal.Domain/Entities/DeviceTag.cs
@@ -10,7 +10,7 @@ public class DeviceTag : EntityBase
     {
         [NotMapped] public string Name => Id;
 
-        public string Label { get; set; }
+        public string Label { get; set; } = default!;
 
         public bool Required { get; set; }
 
diff --git a/src/AzureIoTHub.Portal.Domain/Entities/DeviceTagValue.cs b/src/AzureIoTHub.Portal.Domain/Entities/DeviceTagValue.cs
index 59c4ad7a8..a8de78b37 100644
--- a/src/AzureIoTHub.Portal.Domain/Entities/DeviceTagValue.cs
+++ b/src/AzureIoTHub.Portal.Domain/Entities/DeviceTagValue.cs
@@ -7,8 +7,8 @@ namespace AzureIoTHub.Portal.Domain.Entities
 
     public class DeviceTagValue : EntityBase
     {
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
-        public string Value { get; set; }
+        public string Value { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Domain/Entities/EdgeDevice.cs b/src/AzureIoTHub.Portal.Domain/Entities/EdgeDevice.cs
index 743a5f7d8..f2e0435c5 100644
--- a/src/AzureIoTHub.Portal.Domain/Entities/EdgeDevice.cs
+++ b/src/AzureIoTHub.Portal.Domain/Entities/EdgeDevice.cs
@@ -7,13 +7,13 @@ namespace AzureIoTHub.Portal.Domain.Entities
 
     public class EdgeDevice : EntityBase
     {
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
-        public string DeviceModelId { get; set; }
+        public string DeviceModelId { get; set; } = default!;
 
         public int Version { get; set; }
 
-        public string ConnectionState { get; set; }
+        public string ConnectionState { get; set; } = default!;
 
 
         /// <summary>
@@ -39,16 +39,16 @@ public class EdgeDevice : EntityBase
         /// <summary>
         /// List of custom device tags and their values.
         /// </summary>
-        public ICollection<DeviceTagValue> Tags { get; set; }
+        public ICollection<DeviceTagValue> Tags { get; set; } = default!;
 
         /// <summary>
         /// The device model
         /// </summary>
-        public EdgeDeviceModel DeviceModel { get; set; }
+        public EdgeDeviceModel DeviceModel { get; set; } = default!;
 
         /// <summary>
         /// Labels
         /// </summary>
-        public ICollection<Label> Labels { get; set; }
+        public ICollection<Label> Labels { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Domain/Entities/EdgeDeviceModel.cs b/src/AzureIoTHub.Portal.Domain/Entities/EdgeDeviceModel.cs
index 413b05fa1..12b29c723 100644
--- a/src/AzureIoTHub.Portal.Domain/Entities/EdgeDeviceModel.cs
+++ b/src/AzureIoTHub.Portal.Domain/Entities/EdgeDeviceModel.cs
@@ -7,14 +7,14 @@ namespace AzureIoTHub.Portal.Domain.Entities
 
     public class EdgeDeviceModel : EntityBase
     {
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         public string? Description { get; set; }
 
         /// <summary>
         /// Labels
         /// </summary>
-        public ICollection<Label> Labels { get; set; }
+        public ICollection<Label> Labels { get; set; } = default!;
 
     }
 }
diff --git a/src/AzureIoTHub.Portal.Domain/Entities/EdgeDeviceModelCommand.cs b/src/AzureIoTHub.Portal.Domain/Entities/EdgeDeviceModelCommand.cs
index 5f6142fe2..911eed78c 100644
--- a/src/AzureIoTHub.Portal.Domain/Entities/EdgeDeviceModelCommand.cs
+++ b/src/AzureIoTHub.Portal.Domain/Entities/EdgeDeviceModelCommand.cs
@@ -7,10 +7,10 @@ namespace AzureIoTHub.Portal.Domain.Entities
 
     public class EdgeDeviceModelCommand : EntityBase
     {
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
-        public string EdgeDeviceModelId { get; set; }
+        public string EdgeDeviceModelId { get; set; } = default!;
 
-        public string ModuleName { get; set; }
+        public string ModuleName { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Domain/Entities/Label.cs b/src/AzureIoTHub.Portal.Domain/Entities/Label.cs
index f7ebe011e..20bf92f9f 100644
--- a/src/AzureIoTHub.Portal.Domain/Entities/Label.cs
+++ b/src/AzureIoTHub.Portal.Domain/Entities/Label.cs
@@ -7,8 +7,8 @@ namespace AzureIoTHub.Portal.Domain.Entities
 
     public class Label : EntityBase
     {
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
-        public string Color { get; set; }
+        public string Color { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Domain/Entities/LoRaDeviceTelemetry.cs b/src/AzureIoTHub.Portal.Domain/Entities/LoRaDeviceTelemetry.cs
index 74ec96a44..c0d846074 100644
--- a/src/AzureIoTHub.Portal.Domain/Entities/LoRaDeviceTelemetry.cs
+++ b/src/AzureIoTHub.Portal.Domain/Entities/LoRaDeviceTelemetry.cs
@@ -10,7 +10,7 @@ public class LoRaDeviceTelemetry : EntityBase
     {
         public DateTime EnqueuedTime { get; set; }
 
-        public LoRaTelemetry Telemetry { get; set; }
+        public LoRaTelemetry Telemetry { get; set; } = default!;
     }
 
     public class LoRaTelemetry
@@ -31,10 +31,10 @@ public class LoRaTelemetry
         public uint Rfch { get; set; }
 
         [JsonPropertyName("modu")]
-        public string Modu { get; set; }
+        public string Modu { get; set; } = default!;
 
         [JsonPropertyName("datr")]
-        public string Datr { get; set; }
+        public string Datr { get; set; } = default!;
 
         [JsonPropertyName("rssi")]
         public double Rssi { get; set; }
@@ -43,7 +43,7 @@ public class LoRaTelemetry
         public float Lsnr { get; set; }
 
         [JsonPropertyName("data")]
-        public object Data { get; set; }
+        public object Data { get; set; } = new object();
 
         [JsonPropertyName("port")]
         public uint Port { get; set; }
@@ -55,16 +55,16 @@ public class LoRaTelemetry
         public long Edgets { get; set; }
 
         [JsonPropertyName("rawdata")]
-        public string Rawdata { get; set; }
+        public string Rawdata { get; set; } = default!;
 
         [JsonPropertyName("eui")]
-        public string DeviceEUI { get; set; }
+        public string DeviceEUI { get; set; } = default!;
 
         [JsonPropertyName("gatewayid")]
-        public string GatewayID { get; set; }
+        public string GatewayID { get; set; } = default!;
 
         [JsonPropertyName("stationeui")]
-        public string StationEui { get; set; }
+        public string StationEui { get; set; } = default!;
 
         [JsonPropertyName("dupmsg")]
         public bool? DupMsg { get; set; }
diff --git a/src/AzureIoTHub.Portal.Domain/Options/DeviceModelImageOptions.cs b/src/AzureIoTHub.Portal.Domain/Options/DeviceModelImageOptions.cs
index eb672a5bd..702e85b8d 100644
--- a/src/AzureIoTHub.Portal.Domain/Options/DeviceModelImageOptions.cs
+++ b/src/AzureIoTHub.Portal.Domain/Options/DeviceModelImageOptions.cs
@@ -5,7 +5,7 @@ namespace AzureIoTHub.Portal.Domain.Options
 {
     public class DeviceModelImageOptions
     {
-        public Uri BaseUri { get; set; }
+        public Uri BaseUri { get; set; } = default!;
 
         public string ImageContainerName { get; } = "device-images";
 
diff --git a/src/AzureIoTHub.Portal.Infrastructure/ConnectionAuthMethod.cs b/src/AzureIoTHub.Portal.Infrastructure/ConnectionAuthMethod.cs
index 1e069d3d4..60aaee116 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/ConnectionAuthMethod.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/ConnectionAuthMethod.cs
@@ -23,6 +23,6 @@ internal enum ConnectionAuthType
 
         public ConnectionAuthType Type { get; set; }
 
-        public string Issuer { get; set; }
+        public string Issuer { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/DevelopmentConfigHandler.cs b/src/AzureIoTHub.Portal.Infrastructure/DevelopmentConfigHandler.cs
index b2b80b6c1..bb0a4e0e2 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/DevelopmentConfigHandler.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/DevelopmentConfigHandler.cs
@@ -15,7 +15,7 @@ internal DevelopmentConfigHandler(IConfiguration config)
             this.config = config;
         }
 
-        public override string PortalName => this.config[PortalNameKey];
+        public override string PortalName => this.config[PortalNameKey]!;
 
         public override int SyncDatabaseJobRefreshIntervalInMinutes => this.config.GetValue(SyncDatabaseJobRefreshIntervalKey, 5);
 
@@ -23,33 +23,33 @@ internal DevelopmentConfigHandler(IConfiguration config)
 
         public override int MetricLoaderRefreshIntervalInMinutes => this.config.GetValue(MetricLoaderRefreshIntervalKey, 10);
 
-        public override string IoTHubConnectionString => this.config[IoTHubConnectionStringKey];
+        public override string IoTHubConnectionString => this.config[IoTHubConnectionStringKey]!;
 
-        public override string IoTHubEventHubEndpoint => this.config.GetValue(IoTHubEventHubEndpointKey, string.Empty);
+        public override string IoTHubEventHubEndpoint => this.config.GetValue(IoTHubEventHubEndpointKey, string.Empty)!;
 
-        public override string IoTHubEventHubConsumerGroup => this.config.GetValue(IoTHubEventHubConsumerGroupKey, "iothub-portal");
+        public override string IoTHubEventHubConsumerGroup => this.config.GetValue(IoTHubEventHubConsumerGroupKey, "iothub-portal")!;
 
-        public override string DPSConnectionString => this.config[DPSConnectionStringKey];
+        public override string DPSConnectionString => this.config[DPSConnectionStringKey]!;
 
-        public override string DPSEndpoint => this.config[DPSServiceEndpointKey];
+        public override string DPSEndpoint => this.config[DPSServiceEndpointKey]!;
 
-        public override string DPSScopeID => this.config[DPSIDScopeKey];
+        public override string DPSScopeID => this.config[DPSIDScopeKey]!;
 
-        public override string StorageAccountConnectionString => this.config[StorageAccountConnectionStringKey];
+        public override string StorageAccountConnectionString => this.config[StorageAccountConnectionStringKey]!;
 
         public override int StorageAccountDeviceModelImageMaxAge => this.config.GetValue(StorageAccountDeviceModelImageMaxAgeKey, 86400);
 
         public override bool UseSecurityHeaders => this.config.GetValue(UseSecurityHeadersKey, true);
 
-        public override string OIDCScope => this.config[OIDCScopeKey];
+        public override string OIDCScope => this.config[OIDCScopeKey]!;
 
-        public override string OIDCAuthority => this.config[OIDCAuthorityKey];
+        public override string OIDCAuthority => this.config[OIDCAuthorityKey]!;
 
-        public override string OIDCMetadataUrl => this.config[OIDCMetadataUrlKey];
+        public override string OIDCMetadataUrl => this.config[OIDCMetadataUrlKey]!;
 
-        public override string OIDCClientId => this.config[OIDCClientIdKey];
+        public override string OIDCClientId => this.config[OIDCClientIdKey]!;
 
-        public override string OIDCApiClientId => this.config[OIDCApiClientIdKey];
+        public override string OIDCApiClientId => this.config[OIDCApiClientIdKey]!;
 
         public override bool OIDCValidateIssuer => this.config.GetValue(OIDCValidateIssuerKey, true);
 
@@ -65,21 +65,21 @@ internal DevelopmentConfigHandler(IConfiguration config)
 
         public override bool IsLoRaEnabled => bool.Parse(this.config[IsLoRaFeatureEnabledKey] ?? "true");
 
-        public override string LoRaKeyManagementUrl => this.config[LoRaKeyManagementUrlKey];
+        public override string LoRaKeyManagementUrl => this.config[LoRaKeyManagementUrlKey]!;
 
-        public override string LoRaKeyManagementCode => this.config[LoRaKeyManagementCodeKey];
+        public override string LoRaKeyManagementCode => this.config[LoRaKeyManagementCodeKey]!;
 
-        public override string LoRaKeyManagementApiVersion => this.config[LoRaKeyManagementApiVersionKey];
+        public override string LoRaKeyManagementApiVersion => this.config[LoRaKeyManagementApiVersionKey]!;
 
         public override bool IdeasEnabled => this.config.GetValue(IdeasEnabledKey, false);
-        public override string IdeasUrl => this.config.GetValue(IdeasUrlKey, string.Empty);
-        public override string IdeasAuthenticationHeader => this.config.GetValue(IdeasAuthenticationHeaderKey, "Ocp-Apim-Subscription-Key");
-        public override string IdeasAuthenticationToken => this.config.GetValue(IdeasAuthenticationTokenKey, string.Empty);
+        public override string IdeasUrl => this.config.GetValue(IdeasUrlKey, string.Empty)!;
+        public override string IdeasAuthenticationHeader => this.config.GetValue(IdeasAuthenticationHeaderKey, "Ocp-Apim-Subscription-Key")!;
+        public override string IdeasAuthenticationToken => this.config.GetValue(IdeasAuthenticationTokenKey, string.Empty)!;
 
-        public override string PostgreSQLConnectionString => this.config[PostgreSQLConnectionStringKey];
+        public override string PostgreSQLConnectionString => this.config[PostgreSQLConnectionStringKey]!;
 
-        public override string MySQLConnectionString => this.config[MySQLConnectionStringKey];
+        public override string MySQLConnectionString => this.config[MySQLConnectionStringKey]!;
 
-        public override string DbProvider => this.config.GetValue(DbProviderKey, DbProviders.PostgreSQL);
+        public override string DbProvider => this.config.GetValue(DbProviderKey, DbProviders.PostgreSQL)!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Mappers/ConcentratorTwinMapper.cs b/src/AzureIoTHub.Portal.Infrastructure/Mappers/ConcentratorTwinMapper.cs
index 209b01fa9..f993628af 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Mappers/ConcentratorTwinMapper.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Mappers/ConcentratorTwinMapper.cs
@@ -20,13 +20,13 @@ public ConcentratorDto CreateDeviceDetails(Twin twin)
             return new ConcentratorDto
             {
                 DeviceId = twin.DeviceId,
-                DeviceName = DeviceHelper.RetrieveTagValue(twin, nameof(ConcentratorDto.DeviceName)),
-                LoraRegion = DeviceHelper.RetrieveTagValue(twin, nameof(ConcentratorDto.LoraRegion)),
+                DeviceName = DeviceHelper.RetrieveTagValue(twin, nameof(ConcentratorDto.DeviceName))!,
+                LoraRegion = DeviceHelper.RetrieveTagValue(twin, nameof(ConcentratorDto.LoraRegion))!,
                 ClientThumbprint = DeviceHelper.RetrieveClientThumbprintValue(twin),
                 IsEnabled = twin.Status == DeviceStatus.Enabled,
                 IsConnected = twin.ConnectionState == DeviceConnectionState.Connected,
                 AlreadyLoggedInOnce = DeviceHelper.RetrieveReportedPropertyValue(twin, "DevAddr") != null,
-                DeviceType = DeviceHelper.RetrieveTagValue(twin, nameof(ConcentratorDto.DeviceType))
+                DeviceType = DeviceHelper.RetrieveTagValue(twin, nameof(ConcentratorDto.DeviceType))!
             };
         }
 
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Mappers/DeviceModelCommandMapper.cs b/src/AzureIoTHub.Portal.Infrastructure/Mappers/DeviceModelCommandMapper.cs
index 16dc3d106..ec2910149 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Mappers/DeviceModelCommandMapper.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Mappers/DeviceModelCommandMapper.cs
@@ -23,7 +23,7 @@ public DeviceModelCommandDto GetDeviceModelCommand(TableEntity entity)
             {
                 Name = entity.RowKey,
                 Frame = entity[nameof(DeviceModelCommandDto.Frame)].ToString(),
-                Port = int.Parse(entity[nameof(DeviceModelCommandDto.Port)].ToString(), CultureInfo.InvariantCulture),
+                Port = int.Parse(entity[nameof(DeviceModelCommandDto.Port)].ToString()!, CultureInfo.InvariantCulture),
                 IsBuiltin = bool.Parse(entity[nameof(DeviceModelCommandDto.IsBuiltin)]?.ToString() ?? "false"),
                 Confirmed = bool.Parse(entity[nameof(DeviceModelCommandDto.Confirmed)]?.ToString() ?? "false"),
             };
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Mappers/DeviceTwinMapper.cs b/src/AzureIoTHub.Portal.Infrastructure/Mappers/DeviceTwinMapper.cs
index b66a28ff5..4882317d0 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Mappers/DeviceTwinMapper.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Mappers/DeviceTwinMapper.cs
@@ -32,7 +32,7 @@ public DeviceDetails CreateDeviceDetails(Twin twin, IEnumerable<string> tags)
             {
                 foreach (var tag in tags)
                 {
-                    customTags.Add(tag, DeviceHelper.RetrieveTagValue(twin, tag));
+                    customTags.Add(tag, DeviceHelper.RetrieveTagValue(twin, tag)!);
                 }
             }
 
@@ -41,7 +41,7 @@ public DeviceDetails CreateDeviceDetails(Twin twin, IEnumerable<string> tags)
                 DeviceID = twin.DeviceId,
                 ModelId = modelId,
                 DeviceName = DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.DeviceName)),
-                ImageUrl = this.deviceModelImageManager.ComputeImageUri(modelId),
+                ImageUrl = this.deviceModelImageManager.ComputeImageUri(modelId!),
                 IsConnected = twin.ConnectionState == DeviceConnectionState.Connected,
                 IsEnabled = twin.Status == DeviceStatus.Enabled,
                 StatusUpdatedTime = twin.StatusUpdatedTime ?? DateTime.MinValue
@@ -66,7 +66,7 @@ public DeviceListItem CreateDeviceListItem(Twin twin)
                 IsEnabled = twin.Status == DeviceStatus.Enabled,
                 StatusUpdatedTime = twin.StatusUpdatedTime ?? DateTime.MinValue,
                 DeviceName = DeviceHelper.RetrieveTagValue(twin, nameof(DeviceListItem.DeviceName)),
-                ImageUrl = this.deviceModelImageManager.ComputeImageUri(DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.ModelId))),
+                ImageUrl = this.deviceModelImageManager.ComputeImageUri(DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.ModelId))!),
                 SupportLoRaFeatures = bool.Parse(DeviceHelper.RetrieveTagValue(twin, nameof(DeviceListItem.SupportLoRaFeatures)) ?? "false")
             };
         }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Mappers/EdgeDeviceMapper.cs b/src/AzureIoTHub.Portal.Infrastructure/Mappers/EdgeDeviceMapper.cs
index 00acb00dd..01c71315f 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Mappers/EdgeDeviceMapper.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Mappers/EdgeDeviceMapper.cs
@@ -24,10 +24,10 @@ public IoTEdgeListItem CreateEdgeDeviceListItem(Twin deviceTwin)
             return new IoTEdgeListItem()
             {
                 DeviceId = deviceTwin?.DeviceId,
-                DeviceName = DeviceHelper.RetrieveTagValue(deviceTwin, nameof(IoTEdgeDevice.DeviceName)),
+                DeviceName = DeviceHelper.RetrieveTagValue(deviceTwin!, nameof(IoTEdgeDevice.DeviceName)),
                 Status = deviceTwin?.Status.ToString(),
-                NbDevices = DeviceHelper.RetrieveConnectedDeviceCount(deviceTwin),
-                ImageUrl = this.deviceModelImageManager.ComputeImageUri(DeviceHelper.RetrieveTagValue(deviceTwin, nameof(IoTEdgeDevice.ModelId)))
+                NbDevices = DeviceHelper.RetrieveConnectedDeviceCount(deviceTwin!),
+                ImageUrl = this.deviceModelImageManager.ComputeImageUri(DeviceHelper.RetrieveTagValue(deviceTwin!, nameof(IoTEdgeDevice.ModelId))!)
             };
         }
 
@@ -48,7 +48,7 @@ public IoTEdgeDevice CreateEdgeDevice(Twin deviceTwin, Twin deviceTwinWithModule
             {
                 foreach (var tag in tags)
                 {
-                    customTags.Add(tag, DeviceHelper.RetrieveTagValue(deviceTwin, tag));
+                    customTags.Add(tag, DeviceHelper.RetrieveTagValue(deviceTwin, tag)!);
                 }
             }
 
@@ -58,15 +58,15 @@ public IoTEdgeDevice CreateEdgeDevice(Twin deviceTwin, Twin deviceTwinWithModule
                 Status = deviceTwin?.Status?.ToString(),
                 Scope = deviceTwin?.DeviceScope,
                 ConnectionState = deviceTwin?.ConnectionState?.ToString(),
-                ModelId = DeviceHelper.RetrieveTagValue(deviceTwin, nameof(IoTEdgeDevice.ModelId)),
-                DeviceName = DeviceHelper.RetrieveTagValue(deviceTwin, nameof(IoTEdgeDevice.DeviceName)),
+                ModelId = DeviceHelper.RetrieveTagValue(deviceTwin!, nameof(IoTEdgeDevice.ModelId)),
+                DeviceName = DeviceHelper.RetrieveTagValue(deviceTwin!, nameof(IoTEdgeDevice.DeviceName)),
                 NbDevices = nbConnectedDevice,
-                NbModules = DeviceHelper.RetrieveNbModuleCount(deviceTwinWithModules, deviceTwin?.DeviceId),
+                NbModules = DeviceHelper.RetrieveNbModuleCount(deviceTwinWithModules, deviceTwin?.DeviceId!),
                 RuntimeResponse = DeviceHelper.RetrieveRuntimeResponse(deviceTwinWithModules),
                 Modules = DeviceHelper.RetrieveModuleList(deviceTwinWithModules),
                 LastDeployment = lastConfiguration,
                 Tags = customTags,
-                ImageUrl = this.deviceModelImageManager.ComputeImageUri(DeviceHelper.RetrieveTagValue(deviceTwin, nameof(IoTEdgeDevice.ModelId)))
+                ImageUrl = this.deviceModelImageManager.ComputeImageUri(DeviceHelper.RetrieveTagValue(deviceTwin!, nameof(IoTEdgeDevice.ModelId))!)
             };
         }
     }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Mappers/LoRaDeviceMapper.cs b/src/AzureIoTHub.Portal.Infrastructure/Mappers/LoRaDeviceMapper.cs
index f4b01db91..c8814c336 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Mappers/LoRaDeviceMapper.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Mappers/LoRaDeviceMapper.cs
@@ -33,7 +33,7 @@ public LoRaDeviceDetails CreateDeviceDetails(Twin twin, IEnumerable<string> tags
             {
                 foreach (var tag in tags)
                 {
-                    customTags.Add(tag, DeviceHelper.RetrieveTagValue(twin, tag));
+                    customTags.Add(tag, DeviceHelper.RetrieveTagValue(twin, tag)!);
                 }
             }
 
@@ -43,7 +43,7 @@ public LoRaDeviceDetails CreateDeviceDetails(Twin twin, IEnumerable<string> tags
                 ModelId = modelId,
                 DeviceName = DeviceHelper.RetrieveTagValue(twin, nameof(LoRaDeviceDetails.DeviceName)),
                 AlreadyLoggedInOnce = DeviceHelper.RetrieveReportedPropertyValue(twin, "DevAddr") != null,
-                ImageUrl = this.deviceModelImageManager.ComputeImageUri(modelId),
+                ImageUrl = this.deviceModelImageManager.ComputeImageUri(modelId!),
                 IsConnected = twin.ConnectionState == DeviceConnectionState.Connected,
                 IsEnabled = twin.Status == DeviceStatus.Enabled,
                 StatusUpdatedTime = twin.StatusUpdatedTime ?? DateTime.MinValue,
@@ -92,7 +92,7 @@ public DeviceListItem CreateDeviceListItem(Twin twin)
             {
                 DeviceID = twin.DeviceId,
                 DeviceName = DeviceHelper.RetrieveTagValue(twin, nameof(LoRaDeviceDetails.DeviceName)),
-                ImageUrl = this.deviceModelImageManager.ComputeImageUri(DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.ModelId))),
+                ImageUrl = this.deviceModelImageManager.ComputeImageUri(DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.ModelId))!),
                 IsConnected = twin.ConnectionState == DeviceConnectionState.Connected,
                 IsEnabled = twin.Status == DeviceStatus.Enabled,
                 StatusUpdatedTime = twin.StatusUpdatedTime ?? DateTime.MinValue,
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Mappers/LoRaDeviceModelMapper.cs b/src/AzureIoTHub.Portal.Infrastructure/Mappers/LoRaDeviceModelMapper.cs
index cae5f6e88..934e6de98 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Mappers/LoRaDeviceModelMapper.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Mappers/LoRaDeviceModelMapper.cs
@@ -7,7 +7,6 @@ namespace AzureIoTHub.Portal.Infrastructure.Mappers
     using System.Collections.Generic;
     using Azure.Data.Tables;
     using AzureIoTHub.Portal.Application.Managers;
-    using Managers;
     using Models.v10;
     using Models.v10.LoRaWAN;
 
@@ -64,24 +63,24 @@ public LoRaDeviceModelDto CreateDeviceModel(TableEntity entity)
             };
         }
 
-        public Dictionary<string, object> BuildDeviceModelDesiredProperties(LoRaDeviceModelDto modelDto)
+        public Dictionary<string, object> BuildDeviceModelDesiredProperties(LoRaDeviceModelDto model)
         {
             var desiredProperties = new Dictionary<string, object>();
 
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.SensorDecoder), modelDto.SensorDecoder, desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.Supports32BitFCnt), modelDto.Supports32BitFCnt, desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.ABPRelaxMode), modelDto.ABPRelaxMode, desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.KeepAliveTimeout), modelDto.KeepAliveTimeout, desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.PreferredWindow), modelDto.PreferredWindow, desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.Downlink), modelDto.Downlink, desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.Deduplication), modelDto.Deduplication.ToString(), desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.FCntDownStart), modelDto.FCntDownStart, desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.FCntResetCounter), modelDto.FCntResetCounter, desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.FCntUpStart), modelDto.FCntUpStart, desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.RX1DROffset), modelDto.RX1DROffset, desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.RX2DataRate), modelDto.RX2DataRate, desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.RXDelay), modelDto.RXDelay, desiredProperties);
-            AddOptionalProperties(nameof(LoRaDeviceModelDto.ClassType), modelDto.ClassType.ToString(), desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.SensorDecoder), model.SensorDecoder, desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.Supports32BitFCnt), model.Supports32BitFCnt!, desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.ABPRelaxMode), model.ABPRelaxMode!, desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.KeepAliveTimeout), model.KeepAliveTimeout!, desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.PreferredWindow), model.PreferredWindow, desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.Downlink), model.Downlink!, desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.Deduplication), model.Deduplication.ToString(), desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.FCntDownStart), model.FCntDownStart!, desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.FCntResetCounter), model.FCntResetCounter!, desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.FCntUpStart), model.FCntUpStart!, desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.RX1DROffset), model.RX1DROffset!, desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.RX2DataRate), model.RX2DataRate!, desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.RXDelay), model.RXDelay!, desiredProperties);
+            AddOptionalProperties(nameof(LoRaDeviceModelDto.ClassType), model.ClassType.ToString(), desiredProperties);
 
             return desiredProperties;
         }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/PortalDbContext.cs b/src/AzureIoTHub.Portal.Infrastructure/PortalDbContext.cs
index d8c5bd78d..2cd8457bb 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/PortalDbContext.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/PortalDbContext.cs
@@ -38,7 +38,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .Property(b => b.Telemetry)
                 .HasConversion(
                     v => JsonConvert.SerializeObject(v),
-                    v => JsonConvert.DeserializeObject<LoRaTelemetry>(v));
+                    v => JsonConvert.DeserializeObject<LoRaTelemetry>(v)!);
 
             _ = modelBuilder.Entity<Device>()
                 .ToTable($"{nameof(Device)}s")
diff --git a/src/AzureIoTHub.Portal.Infrastructure/ProductionConfigHandler.cs b/src/AzureIoTHub.Portal.Infrastructure/ProductionConfigHandler.cs
index 15f21963a..850d7e98d 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/ProductionConfigHandler.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/ProductionConfigHandler.cs
@@ -15,7 +15,7 @@ internal ProductionConfigHandler(IConfiguration config)
             this.config = config;
         }
 
-        public override string PortalName => this.config[PortalNameKey];
+        public override string PortalName => this.config[PortalNameKey]!;
 
         public override int SyncDatabaseJobRefreshIntervalInMinutes => this.config.GetValue(SyncDatabaseJobRefreshIntervalKey, 5);
 
@@ -23,39 +23,39 @@ internal ProductionConfigHandler(IConfiguration config)
 
         public override int MetricLoaderRefreshIntervalInMinutes => this.config.GetValue(MetricLoaderRefreshIntervalKey, 10);
 
-        public override string IoTHubConnectionString => this.config.GetConnectionString(IoTHubConnectionStringKey);
+        public override string IoTHubConnectionString => this.config.GetConnectionString(IoTHubConnectionStringKey)!;
 
-        public override string IoTHubEventHubEndpoint => this.config.GetConnectionString(IoTHubEventHubEndpointKey);
+        public override string IoTHubEventHubEndpoint => this.config.GetConnectionString(IoTHubEventHubEndpointKey)!;
 
-        public override string IoTHubEventHubConsumerGroup => this.config.GetValue(IoTHubEventHubConsumerGroupKey, "iothub-portal");
+        public override string IoTHubEventHubConsumerGroup => this.config.GetValue(IoTHubEventHubConsumerGroupKey, "iothub-portal")!;
 
-        public override string DPSConnectionString => this.config.GetConnectionString(DPSConnectionStringKey);
+        public override string DPSConnectionString => this.config.GetConnectionString(DPSConnectionStringKey)!;
 
-        public override string DPSEndpoint => this.config[DPSServiceEndpointKey];
+        public override string DPSEndpoint => this.config[DPSServiceEndpointKey]!;
 
-        public override string DPSScopeID => this.config[DPSIDScopeKey];
+        public override string DPSScopeID => this.config[DPSIDScopeKey]!;
 
-        public override string StorageAccountConnectionString => this.config.GetConnectionString(StorageAccountConnectionStringKey);
+        public override string StorageAccountConnectionString => this.config.GetConnectionString(StorageAccountConnectionStringKey)!;
 
-        public override string PostgreSQLConnectionString => this.config.GetConnectionString(PostgreSQLConnectionStringKey);
+        public override string PostgreSQLConnectionString => this.config.GetConnectionString(PostgreSQLConnectionStringKey)!;
 
-        public override string MySQLConnectionString => this.config.GetConnectionString(MySQLConnectionStringKey);
+        public override string MySQLConnectionString => this.config.GetConnectionString(MySQLConnectionStringKey)!;
 
-        public override string DbProvider => this.config.GetValue(DbProviderKey, DbProviders.PostgreSQL);
+        public override string DbProvider => this.config.GetValue(DbProviderKey, DbProviders.PostgreSQL)!;
 
         public override int StorageAccountDeviceModelImageMaxAge => this.config.GetValue(StorageAccountDeviceModelImageMaxAgeKey, 86400);
 
         public override bool UseSecurityHeaders => this.config.GetValue(UseSecurityHeadersKey, true);
 
-        public override string OIDCScope => this.config[OIDCScopeKey];
+        public override string OIDCScope => this.config[OIDCScopeKey]!;
 
-        public override string OIDCAuthority => this.config[OIDCAuthorityKey];
+        public override string OIDCAuthority => this.config[OIDCAuthorityKey]!;
 
-        public override string OIDCMetadataUrl => this.config[OIDCMetadataUrlKey];
+        public override string OIDCMetadataUrl => this.config[OIDCMetadataUrlKey]!;
 
-        public override string OIDCClientId => this.config[OIDCClientIdKey];
+        public override string OIDCClientId => this.config[OIDCClientIdKey]!;
 
-        public override string OIDCApiClientId => this.config[OIDCApiClientIdKey];
+        public override string OIDCApiClientId => this.config[OIDCApiClientIdKey]!;
 
         public override bool OIDCValidateIssuer => this.config.GetValue(OIDCValidateIssuerKey, true);
 
@@ -71,15 +71,15 @@ internal ProductionConfigHandler(IConfiguration config)
 
         public override bool IsLoRaEnabled => bool.Parse(this.config[IsLoRaFeatureEnabledKey] ?? "true");
 
-        public override string LoRaKeyManagementUrl => this.config[LoRaKeyManagementUrlKey];
+        public override string LoRaKeyManagementUrl => this.config[LoRaKeyManagementUrlKey]!;
 
-        public override string LoRaKeyManagementCode => this.config.GetConnectionString(LoRaKeyManagementCodeKey);
+        public override string LoRaKeyManagementCode => this.config.GetConnectionString(LoRaKeyManagementCodeKey)!;
 
-        public override string LoRaKeyManagementApiVersion => this.config[LoRaKeyManagementApiVersionKey];
+        public override string LoRaKeyManagementApiVersion => this.config[LoRaKeyManagementApiVersionKey]!;
 
         public override bool IdeasEnabled => this.config.GetValue(IdeasEnabledKey, false);
-        public override string IdeasUrl => this.config.GetValue(IdeasUrlKey, string.Empty);
-        public override string IdeasAuthenticationHeader => this.config.GetValue(IdeasAuthenticationHeaderKey, "Ocp-Apim-Subscription-Key");
-        public override string IdeasAuthenticationToken => this.config.GetValue(IdeasAuthenticationTokenKey, string.Empty);
+        public override string IdeasUrl => this.config.GetValue(IdeasUrlKey, string.Empty)!;
+        public override string IdeasAuthenticationHeader => this.config.GetValue(IdeasAuthenticationHeaderKey, "Ocp-Apim-Subscription-Key")!;
+        public override string IdeasAuthenticationToken => this.config.GetValue(IdeasAuthenticationTokenKey, string.Empty)!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Repositories/GenericRepository.cs b/src/AzureIoTHub.Portal.Infrastructure/Repositories/GenericRepository.cs
index 24cab6140..8b2484496 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Repositories/GenericRepository.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Repositories/GenericRepository.cs
@@ -68,7 +68,7 @@ public void Delete(object id)
                     .Set<T>()
                     .Find(id);
 
-            _ = this.context.Set<T>().Remove(existing);
+            _ = this.context.Set<T>().Remove(existing!);
         }
 
         public async Task<PaginatedResult<T>> GetPaginatedListAsync(
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelCommandSeeder.cs b/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelCommandSeeder.cs
index bb4769a43..c3535277f 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelCommandSeeder.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelCommandSeeder.cs
@@ -28,8 +28,8 @@ public static async Task MigrateDeviceModelCommands(this PortalDbContext ctx, Co
                 _ = await set.AddAsync(new DeviceModelCommand
                 {
                     Id = item.RowKey,
-                    Frame = item[nameof(DeviceModelCommand.Frame)].ToString(),
-                    Port = int.Parse(item[nameof(DeviceModelCommand.Port)].ToString(), CultureInfo.InvariantCulture),
+                    Frame = item[nameof(DeviceModelCommand.Frame)].ToString()!,
+                    Port = int.Parse(item[nameof(DeviceModelCommand.Port)].ToString()!, CultureInfo.InvariantCulture),
                     IsBuiltin = bool.Parse(item[nameof(DeviceModelCommand.IsBuiltin)]?.ToString() ?? "false"),
                     Confirmed = bool.Parse(item[nameof(DeviceModelCommand.Confirmed)]?.ToString() ?? "false"),
                     DeviceModelId = item.PartitionKey
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelSeeder.cs b/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelSeeder.cs
index 151bb7ed5..ce9be137d 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelSeeder.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceModelSeeder.cs
@@ -28,7 +28,7 @@ public static async Task MigrateDeviceModels(this PortalDbContext ctx, ConfigHan
                 _ = await set.AddAsync(new DeviceModel
                 {
                     Id = item.RowKey,
-                    Name = item[nameof(DeviceModel.Name)]?.ToString(),
+                    Name = item[nameof(DeviceModel.Name)]?.ToString()!,
                     Description = item[nameof(DeviceModel.Description)]?.ToString(),
                     IsBuiltin = bool.Parse(item[nameof(DeviceModel.IsBuiltin)]?.ToString() ?? "false"),
                     SupportLoRaFeatures = bool.Parse(item[nameof(DeviceModel.SupportLoRaFeatures)]?.ToString() ?? "false"),
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceTagSeeder.cs b/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceTagSeeder.cs
index 5a615e799..36f87f2e6 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceTagSeeder.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Seeds/DeviceTagSeeder.cs
@@ -27,7 +27,7 @@ public static async Task MigrateDeviceTags(this PortalDbContext ctx, ConfigHandl
                 _ = await set.AddAsync(new DeviceTag
                 {
                     Id = item.RowKey,
-                    Label = item[nameof(DeviceTag.Label)].ToString(),
+                    Label = item[nameof(DeviceTag.Label)].ToString()!,
                     Required = bool.Parse(item[nameof(DeviceTag.Required)].ToString() ?? "false"),
                     Searchable = bool.Parse(item[nameof(DeviceTag.Searchable)].ToString() ?? "false")
                 });
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Seeds/EdgeDeviceModelCommandSeeder.cs b/src/AzureIoTHub.Portal.Infrastructure/Seeds/EdgeDeviceModelCommandSeeder.cs
index fd6950a14..25dd8a827 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Seeds/EdgeDeviceModelCommandSeeder.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Seeds/EdgeDeviceModelCommandSeeder.cs
@@ -28,7 +28,7 @@ public static async Task MigrateEdgeDeviceModelCommands(this PortalDbContext ctx
                 {
                     Id = Guid.NewGuid().ToString(),
                     ModuleName = item.RowKey.Split("-")[0].ToString(),
-                    Name = item[nameof(EdgeDeviceModelCommand.Name)].ToString(),
+                    Name = item[nameof(EdgeDeviceModelCommand.Name)].ToString()!,
                     EdgeDeviceModelId = item.PartitionKey
                 });
 #pragma warning restore CS8629 // Nullable value type may be null.
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Seeds/EdgeDeviceModelSeeder.cs b/src/AzureIoTHub.Portal.Infrastructure/Seeds/EdgeDeviceModelSeeder.cs
index 66d610c03..700ca1d51 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Seeds/EdgeDeviceModelSeeder.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Seeds/EdgeDeviceModelSeeder.cs
@@ -27,7 +27,7 @@ public static async Task MigrateEdgeDeviceModels(this PortalDbContext ctx, Confi
                 _ = await set.AddAsync(new EdgeDeviceModel
                 {
                     Id = item.RowKey,
-                    Name = item[nameof(EdgeDeviceModel.Name)].ToString(),
+                    Name = item[nameof(EdgeDeviceModel.Name)].ToString()!,
                     Description = item[nameof(EdgeDeviceModel.Description)]?.ToString()
                 });
 #pragma warning restore CS8629 // Nullable value type may be null.
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Services/LoRaWanManagementService.cs b/src/AzureIoTHub.Portal.Infrastructure/Services/LoRaWanManagementService.cs
index 348ee15cf..adc8e135d 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Services/LoRaWanManagementService.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Services/LoRaWanManagementService.cs
@@ -21,7 +21,7 @@ public LoRaWanManagementService(HttpClient httpClient)
             this.httpClient = httpClient;
         }
 
-        public async Task<RouterConfig> GetRouterConfig(string loRaRegion)
+        public async Task<RouterConfig?> GetRouterConfig(string loRaRegion)
         {
             var currentAssembly = Assembly.GetExecutingAssembly();
 
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Startup/IServiceCollectionExtension.cs b/src/AzureIoTHub.Portal.Infrastructure/Startup/IServiceCollectionExtension.cs
index 7e681aae3..57c2cf988 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/Startup/IServiceCollectionExtension.cs
+++ b/src/AzureIoTHub.Portal.Infrastructure/Startup/IServiceCollectionExtension.cs
@@ -79,11 +79,11 @@ private static IServiceCollection AddLoRaWanSupport(this IServiceCollection serv
 
             _ = services.AddHttpClient<ILoRaWanManagementService, LoRaWanManagementService>((sp, client) =>
             {
-                var opts = sp.GetService<IOptions<LoRaWANOptions>>().Value;
+                var opts = sp.GetService<IOptions<LoRaWANOptions>>()?.Value;
 
-                client.BaseAddress = new Uri(opts.KeyManagementUrl);
-                client.DefaultRequestHeaders.Add("x-functions-key", opts.KeyManagementCode);
-                client.DefaultRequestHeaders.Add("api-version", opts.KeyManagementApiVersion ?? "2022-03-04");
+                client.BaseAddress = new Uri(opts?.KeyManagementUrl!);
+                client.DefaultRequestHeaders.Add("x-functions-key", opts?.KeyManagementCode);
+                client.DefaultRequestHeaders.Add("api-version", opts?.KeyManagementApiVersion ?? "2022-03-04");
             })
                 .AddPolicyHandler(transientHttpErrorPolicy);
 
diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceModelPropertiesControllerBase.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceModelPropertiesControllerBase.cs
index 27f00bad9..596a2b1e4 100644
--- a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceModelPropertiesControllerBase.cs
+++ b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceModelPropertiesControllerBase.cs
@@ -30,7 +30,6 @@ public abstract class DeviceModelPropertiesControllerBase : ControllerBase
         /// <summary>
         /// Initializes a new instance of the Device model properties controller base class.
         /// </summary>
-        /// <param name="log">The logger.</param>
         /// <param name="mapper">The mapper.</param>
         /// <param name="deviceModelPropertiesService">The device model properties services..</param>
         protected DeviceModelPropertiesControllerBase(
diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DevicesControllerBase.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DevicesControllerBase.cs
index d41ace64d..fd74c3665 100644
--- a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DevicesControllerBase.cs
+++ b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DevicesControllerBase.cs
@@ -43,6 +43,7 @@ protected DevicesControllerBase(
         /// <param name="pageNumber"></param>
         /// <param name="orderBy"></param>
         /// <param name="modelId"></param>
+        /// <param name="labels"></param>
         protected async Task<PaginationResult<DeviceListItem>> GetItems(
             string routeName = null,
             string searchText = null,
diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/EdgeDevicesController.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/EdgeDevicesController.cs
index 6eb2ecf84..59bb0f081 100644
--- a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/EdgeDevicesController.cs
+++ b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/EdgeDevicesController.cs
@@ -66,6 +66,7 @@ public EdgeDevicesController(
         /// <param name="pageNumber"></param>
         /// <param name="orderBy"></param>
         /// <param name="modelId"></param>
+        /// <param name="labels"></param>
         [HttpGet(Name = "GET IoT Edge devices")]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(PaginationResult<IoTEdgeListItem>))]
         public async Task<PaginationResult<IoTEdgeListItem>> Get(
diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/LoRaWAN/LoRaWANDevicesController.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/LoRaWAN/LoRaWANDevicesController.cs
index 764ade2b5..f5c114557 100644
--- a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/LoRaWAN/LoRaWANDevicesController.cs
+++ b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/LoRaWAN/LoRaWANDevicesController.cs
@@ -42,7 +42,6 @@ public LoRaWANDevicesController(
         /// <summary>
         /// Gets the device list.
         /// </summary>
-        /// <param name="continuationToken"></param>
         /// <param name="searchText"></param>
         /// <param name="searchStatus"></param>
         /// <param name="searchState"></param>
diff --git a/src/AzureIoTHub.Portal.Server/Services/IdeaService.cs b/src/AzureIoTHub.Portal.Server/Services/IdeaService.cs
index 3788ea69a..95551cb7a 100644
--- a/src/AzureIoTHub.Portal.Server/Services/IdeaService.cs
+++ b/src/AzureIoTHub.Portal.Server/Services/IdeaService.cs
@@ -1,6 +1,8 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#nullable enable
+
 namespace AzureIoTHub.Portal.Server.Services
 {
     using System.Net.Http;
@@ -80,7 +82,7 @@ public async Task<IdeaResponse> SubmitIdea(IdeaRequest ideaRequest, string? user
 
                 this.logger.LogInformation($"User idea has been successfully submitted: {responseBody?.Url}");
 
-                return responseBody;
+                return responseBody!;
             }
 
             this.logger.LogError($"Unable to submit user idea. (Status: {response.StatusCode}, ErrorBody: {await response.Content.ReadAsStringAsync()})");
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/C2Dresult.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/C2Dresult.cs
index 69ab6d95f..a9b8b8a98 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/C2Dresult.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/C2Dresult.cs
@@ -11,7 +11,7 @@ public class C2Dresult
         /// <summary>
         /// The C2D result payload.
         /// </summary>
-        public string Payload { get; set; }
+        public string Payload { get; set; } = default!;
 
         /// <summary>
         /// The C2D status.
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/ConfigItem.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/ConfigItem.cs
index 9a28e0b51..38a206413 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/ConfigItem.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/ConfigItem.cs
@@ -15,7 +15,7 @@ public class ConfigItem
         /// The IoT Edge configuration name.
         /// </summary>
         [Required(ErrorMessage = "The configuration model name is required.")]
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The IoT Edge configuration creation date.
@@ -25,7 +25,7 @@ public class ConfigItem
         /// <summary>
         /// The IoT Edge configuration status.
         /// </summary>
-        public string Status { get; set; }
+        public string Status { get; set; } = default!;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ConfigItem"/> class.
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/ConfigListItem.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/ConfigListItem.cs
index 427fc4e21..c5eb33e7d 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/ConfigListItem.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/ConfigListItem.cs
@@ -22,12 +22,12 @@ public ConfigListItem()
         /// <summary>
         /// The IoT Edge configuration identifier.
         /// </summary>
-        public string ConfigurationID { get; set; }
+        public string ConfigurationID { get; set; } = default!;
 
         /// <summary>
         /// The IoT Edge configuration target conditions.
         /// </summary>
-        public string Conditions { get; set; }
+        public string Conditions { get; set; } = default!;
 
         /// <summary>
         /// The IoT Edge configuration targeted metrics.
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceConfig.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceConfig.cs
index 746aeda0b..118c44f93 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceConfig.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceConfig.cs
@@ -14,12 +14,12 @@ public class DeviceConfig
         /// <summary>
         /// The configuration identifier.
         /// </summary>
-        public string ConfigurationId { get; set; }
+        public string ConfigurationId { get; set; } = default!;
 
         /// <summary>
         /// The model identifier.
         /// </summary>
-        public string ModelId { get; set; }
+        public string ModelId { get; set; } = default!;
 
         /// <summary>
         /// The device tags targeted by the configuration.
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceDetails.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceDetails.cs
index 5e15716cb..88ac3f2ab 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceDetails.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceDetails.cs
@@ -20,24 +20,24 @@ public class DeviceDetails : IDeviceDetails
         [Required(ErrorMessage = "The device should have a unique identifier.")]
         [MaxLength(ErrorMessage = "The device identifier should be up to 128 characters long.")]
         [RegularExpression("^[a-zA-Z0-9\\-.+%_#*?!(),:=@$']{1,128}$", ErrorMessage = "The device identifier should be of ASCII 7-bit alphanumeric characters plus certain special characters: - . + % _ # * ? ! ( ) , : = @ $ '.")]
-        public virtual string DeviceID { get; set; }
+        public virtual string DeviceID { get; set; } = default!;
 
         /// <summary>
         /// The name of the device.
         /// </summary>
         [Required(ErrorMessage = "The device should have a name.")]
-        public string DeviceName { get; set; }
+        public string DeviceName { get; set; } = default!;
 
         /// <summary>
         /// The model identifier.
         /// </summary>
         [Required(ErrorMessage = "The device should use a model.")]
-        public string ModelId { get; set; }
+        public string ModelId { get; set; } = default!;
 
         /// <summary>
         /// The device model image Url.
         /// </summary>
-        public Uri ImageUrl { get; set; }
+        public Uri ImageUrl { get; set; } = default!;
 
         /// <summary>
         ///   <c>true</c> if this instance is connected; otherwise, <c>false</c>.
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceListItem.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceListItem.cs
index c71a980f5..60b45ab27 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceListItem.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceListItem.cs
@@ -15,22 +15,22 @@ public class DeviceListItem
         /// <summary>
         /// The device Identifier.
         /// </summary>
-        public string DeviceID { get; set; }
+        public string DeviceID { get; set; } = default!;
 
         /// <summary>
         /// The device friendly name.
         /// </summary>
-        public string DeviceName { get; set; }
+        public string DeviceName { get; set; } = default!;
 
         /// <summary>
         /// The device Model Identifier.
         /// </summary>
-        public string DeviceModelId { get; set; }
+        public string DeviceModelId { get; set; } = default!;
 
         /// <summary>
         /// The device model image Url.
         /// </summary>
-        public Uri ImageUrl { get; set; }
+        public Uri ImageUrl { get; set; } = default!;
 
         /// <summary>
         /// A value indicating whether the device is currently connected.
@@ -60,6 +60,6 @@ public class DeviceListItem
         /// <summary>
         /// The device labels.
         /// </summary>
-        public IEnumerable<LabelDto> Labels { get; set; }
+        public IEnumerable<LabelDto> Labels { get; set; } = new List<LabelDto>();
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceModelDto.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceModelDto.cs
index cd657467f..23ba0fab6 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceModelDto.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceModelDto.cs
@@ -17,23 +17,23 @@ public class DeviceModelDto : IDeviceModel
         /// <summary>
         /// The device model identifier.
         /// </summary>
-        public string ModelId { get; set; }
+        public string ModelId { get; set; } = default!;
 
         /// <summary>
         /// The device model image Url.
         /// </summary>
-        public Uri ImageUrl { get; set; }
+        public Uri ImageUrl { get; set; } = default!;
 
         /// <summary>
         /// The device model name.
         /// </summary>
         [Required(ErrorMessage = "The device model name is required.")]
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The device model description.
         /// </summary>
-        public string Description { get; set; }
+        public string Description { get; set; } = default!;
 
         /// <summary>
         /// A value indicating whether this instance is builtin.
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceProperty.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceProperty.cs
index 5ea7b2a04..87a4d69bd 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceProperty.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceProperty.cs
@@ -16,13 +16,13 @@ public class DeviceProperty
         /// </summary>
         [Required(ErrorMessage = "The property name is required.")]
         [RegularExpression(@"^([\w]+\.)+[\w]+|[\w]+$", ErrorMessage = "Property name must be formed by a word or words separated by a dot")]
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The property display name
         /// </summary>
         [Required(ErrorMessage = "The display name is required.")]
-        public string DisplayName { get; set; }
+        public string DisplayName { get; set; } = default!;
 
         /// <summary>
         /// Indicates whether the property is writable from the portal
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DevicePropertyValue.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DevicePropertyValue.cs
index 702902200..9a0f70d72 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DevicePropertyValue.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DevicePropertyValue.cs
@@ -11,6 +11,6 @@ public class DevicePropertyValue : DeviceProperty
         /// <summary>
         /// The current property value.
         /// </summary>
-        public string Value { get; set; }
+        public string Value { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceTagDto.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceTagDto.cs
index b79cce255..2a6bac037 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceTagDto.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceTagDto.cs
@@ -17,13 +17,13 @@ public class DeviceTagDto
         /// </summary>
         [Required(ErrorMessage = "The tag should have a name.")]
         [RegularExpression("^[a-zA-Z0-9]*$", ErrorMessage = "Name may only contain alphanumeric characters")]
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The label shown to the user.
         /// </summary>
         [Required(ErrorMessage = "The tag should have a label.")]
-        public string Label { get; set; }
+        public string Label { get; set; } = default!;
 
         /// <summary>
         /// Whether the field is required when creating a new device or not.
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/EdgeModelSystemModule.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/EdgeModelSystemModule.cs
index 7984bd995..0f8ce39c7 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/EdgeModelSystemModule.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/EdgeModelSystemModule.cs
@@ -9,9 +9,9 @@ public class EdgeModelSystemModule
     {
         public string Name { get; internal set; }
 
-        public string ImageUri { get; set; }
+        public string ImageUri { get; set; } = default!;
 
-        public string ContainerCreateOptions { get; set; }
+        public string ContainerCreateOptions { get; set; } = default!;
 
         public List<IoTEdgeModuleEnvironmentVariable> EnvironmentVariables { get; set; }
 
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/EnrollmentCredentials.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/EnrollmentCredentials.cs
index 870366b01..21b060005 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/EnrollmentCredentials.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/EnrollmentCredentials.cs
@@ -11,21 +11,21 @@ public class EnrollmentCredentials
         /// <summary>
         /// The registration identifier.
         /// </summary>
-        public string RegistrationID { get; set; }
+        public string RegistrationID { get; set; } = default!;
 
         /// <summary>
         /// The symmetric key.
         /// </summary>
-        public string SymmetricKey { get; set; }
+        public string SymmetricKey { get; set; } = default!;
 
         /// <summary>
         /// The scope identifier.
         /// </summary>
-        public string ScopeID { get; set; }
+        public string ScopeID { get; set; } = default!;
 
         /// <summary>
         /// The provisioning endpoint.
         /// </summary>
-        public string ProvisioningEndpoint { get; set; }
+        public string ProvisioningEndpoint { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/ConcentratorFilter.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/ConcentratorFilter.cs
index 2eb3803ed..aa3901496 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/ConcentratorFilter.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/ConcentratorFilter.cs
@@ -6,7 +6,7 @@ namespace AzureIoTHub.Portal.Shared.Models.v10.Filters
 
     public class ConcentratorFilter : PaginationFilter
     {
-        public string SearchText { get; set; }
+        public string SearchText { get; set; } = default!;
 
         public bool? Status { get; set; }
 
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/DeviceListFilter.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/DeviceListFilter.cs
index bbfee3c5f..70df8a05c 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/DeviceListFilter.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/DeviceListFilter.cs
@@ -7,15 +7,15 @@ namespace AzureIoTHub.Portal.Shared.Models.v10.Filters
 
     public class DeviceListFilter : PaginationFilter
     {
-        public string Keyword { get; set; }
+        public string Keyword { get; set; } = default!;
 
         public bool? IsEnabled { get; set; }
 
         public bool? IsConnected { get; set; }
 
-        public Dictionary<string, string> Tags { get; set; }
+        public Dictionary<string, string> Tags { get; set; } = new Dictionary<string, string>();
 
-        public string ModelId { get; set; }
+        public string ModelId { get; set; } = default!;
 
         public List<string> Labels { get; set; } = new();
     }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/DeviceModelFilter.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/DeviceModelFilter.cs
index 847457751..dd996e340 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/DeviceModelFilter.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/DeviceModelFilter.cs
@@ -6,6 +6,6 @@ namespace AzureIoTHub.Portal.Shared.Models.v10.Filters
 
     public class DeviceModelFilter : PaginationFilter
     {
-        public string SearchText { get; set; }
+        public string SearchText { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/EdgeDeviceListFilter.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/EdgeDeviceListFilter.cs
index 7676872a2..e097a880c 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/EdgeDeviceListFilter.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/EdgeDeviceListFilter.cs
@@ -7,11 +7,11 @@ namespace AzureIoTHub.Portal.Shared.Models.v10.Filters
 
     public class EdgeDeviceListFilter : PaginationFilter
     {
-        public string Keyword { get; set; }
+        public string Keyword { get; set; } = default!;
 
         public bool? IsEnabled { get; set; }
 
-        public string ModelId { get; set; }
+        public string ModelId { get; set; } = default!;
 
         public List<string> Labels { get; set; } = new();
     }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/EdgeModelFilter.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/EdgeModelFilter.cs
index a3f86222c..33f18eaab 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/EdgeModelFilter.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/EdgeModelFilter.cs
@@ -5,6 +5,6 @@ namespace AzureIoTHub.Portal.Shared.Models.v10.Filters
 {
     public class EdgeModelFilter : PaginationFilter
     {
-        public string Keyword { get; set; }
+        public string Keyword { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/PaginationFilter.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/PaginationFilter.cs
index fb81f45f0..3e39219ed 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/PaginationFilter.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/Filters/PaginationFilter.cs
@@ -14,6 +14,9 @@ protected PaginationFilter()
 
         public int PageSize { get; set; }
 
-        public string[] OrderBy { get; set; }
+        public string[] OrderBy { get; set; } = new string[]
+        {
+            string.Empty
+        };
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IdeaResponse.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IdeaResponse.cs
index 7e801f4b8..d78176437 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IdeaResponse.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IdeaResponse.cs
@@ -5,6 +5,6 @@ namespace AzureIoTHub.Portal.Shared.Models.v1._0
 {
     public class IdeaResponse
     {
-        public string Url { get; set; }
+        public string Url { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/ImportResultLine.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/ImportResultLine.cs
index d8548d254..e6619a058 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/ImportResultLine.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/ImportResultLine.cs
@@ -7,9 +7,9 @@ public class ImportResultLine
     {
         public int LineNumber { get; set; }
 
-        public string DeviceId { get; set; }
+        public string DeviceId { get; set; } = default!;
 
-        public string Message { get; set; }
+        public string Message { get; set; } = default!;
 
         public bool IsErrorMessage { get; set; }
     }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeDevice.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeDevice.cs
index 2710927d3..f2326e5d1 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeDevice.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeDevice.cs
@@ -17,44 +17,44 @@ public class IoTEdgeDevice
         /// The IoT Edge identifier.
         /// </summary>
         [Required(ErrorMessage = "The device identifier is required.")]
-        public string DeviceId { get; set; }
+        public string DeviceId { get; set; } = default!;
 
         /// <summary>
         /// The name of the device.
         /// </summary>
         [Required(ErrorMessage = "The device should have a name.")]
-        public string DeviceName { get; set; }
+        public string DeviceName { get; set; } = default!;
 
         /// <summary>
         /// The model identifier.
         /// </summary>
         [Required(ErrorMessage = "The device should use a model.")]
-        public string ModelId { get; set; }
+        public string ModelId { get; set; } = default!;
 
         /// <summary>
         /// The device model image Url.
         /// </summary>
-        public Uri ImageUrl { get; set; }
+        public Uri ImageUrl { get; set; } = default!;
 
         /// <summary>
         /// The IoT Edge connection state.
         /// </summary>
-        public string ConnectionState { get; set; }
+        public string ConnectionState { get; set; } = default!;
 
         /// <summary>
         /// The IoT Edge scope tag value.
         /// </summary>
-        public string Scope { get; set; }
+        public string Scope { get; set; } = default!;
 
         /// <summary>
         /// The IoT Edge device status.
         /// </summary>
-        public string Status { get; set; }
+        public string Status { get; set; } = default!;
 
         /// <summary>
         /// The IoT Edge runtime response.
         /// </summary>
-        public string RuntimeResponse { get; set; }
+        public string RuntimeResponse { get; set; } = default!;
 
         /// <summary>
         /// The number of connected devices on IoT Edge device.
@@ -69,7 +69,7 @@ public class IoTEdgeDevice
         /// <summary>
         /// The IoT Edge configuraton.
         /// </summary>
-        public ConfigItem LastDeployment { get; set; }
+        public ConfigItem LastDeployment { get; set; } = new ConfigItem();
 
         /// <summary>
         /// The IoT Edge modules.
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeDeviceLog.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeDeviceLog.cs
index cf598ee5b..3f9d50182 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeDeviceLog.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeDeviceLog.cs
@@ -7,8 +7,8 @@ namespace AzureIoTHub.Portal.Models.v10
 
     public class IoTEdgeDeviceLog
     {
-        public string Id { get; set; }
-        public string Text { get; set; }
+        public string Id { get; set; } = default!;
+        public string Text { get; set; } = default!;
         public int LogLevel { get; set; }
         public DateTime TimeStamp { get; set; }
     }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeListItem.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeListItem.cs
index 688621419..1fe5775f2 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeListItem.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeListItem.cs
@@ -17,17 +17,17 @@ public class IoTEdgeListItem
         /// The device identifier.
         /// </summary>
         [Required(ErrorMessage = "The device identifier is required.")]
-        public string DeviceId { get; set; }
+        public string DeviceId { get; set; } = default!;
 
         /// <summary>
         /// The device status.
         /// </summary>
-        public string DeviceName { get; set; }
+        public string DeviceName { get; set; } = default!;
 
         /// <summary>
         /// The device status.
         /// </summary>
-        public string Status { get; set; }
+        public string Status { get; set; } = default!;
 
         /// <summary>
         /// The number of devices connected on the IoT Edge.
@@ -37,11 +37,11 @@ public class IoTEdgeListItem
         /// <summary>
         /// The device model image Url.
         /// </summary>
-        public Uri ImageUrl { get; set; }
+        public Uri ImageUrl { get; set; } = default!;
 
         /// <summary>
         /// Gets the edge device labels.
         /// </summary>
-        public IEnumerable<LabelDto> Labels { get; set; }
+        public IEnumerable<LabelDto> Labels { get; set; } = new List<LabelDto>();
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModel.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModel.cs
index 695c109a5..0b8cf8579 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModel.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModel.cs
@@ -20,7 +20,7 @@ public class IoTEdgeModel : IoTEdgeModelListItem
         /// <summary>
         /// Labels
         /// </summary>
-        public List<LabelDto> Labels { get; set; } = new();
+        public new List<LabelDto> Labels { get; set; } = new();
 
         public IoTEdgeModel()
         {
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModelListItem.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModelListItem.cs
index 7d9297b79..5f88b2d47 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModelListItem.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModelListItem.cs
@@ -13,24 +13,24 @@ public class IoTEdgeModelListItem
         /// <summary>
         /// The device model identifier.
         /// </summary>
-        public string ModelId { get; set; }
+        public string ModelId { get; set; } = default!;
 
         /// <summary>
         /// The IoT Edge device model name.
         /// </summary>
         [Required(ErrorMessage = "The IoT Edge device model name is required.")]
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The device model description.
         /// </summary>
-        public string Description { get; set; }
+        public string Description { get; set; } = default!;
 
-        public Uri ImageUrl { get; set; }
+        public Uri ImageUrl { get; set; } = default!;
 
         /// <summary>
         /// Gets the edge model labels.
         /// </summary>
-        public IEnumerable<LabelDto> Labels { get; set; }
+        public IEnumerable<LabelDto> Labels { get; set; } = new List<LabelDto>();
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModule.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModule.cs
index feb6ffe30..41222c7fe 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModule.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModule.cs
@@ -16,20 +16,20 @@ public class IoTEdgeModule
         /// The module name.
         /// </summary>
         [Required(ErrorMessage = "The device model name is required.")]
-        public string ModuleName { get; set; }
+        public string ModuleName { get; set; } = default!;
 
         /// <summary>
         /// the device image URI.
         /// </summary>
         [Required(ErrorMessage = "The device image uri is required.")]
-        public string ImageURI { get; set; }
+        public string ImageURI { get; set; } = default!;
 
-        public string ContainerCreateOptions { get; set; }
+        public string ContainerCreateOptions { get; set; } = default!;
 
         /// <summary>
         /// The module status.
         /// </summary>
-        public string Status { get; set; }
+        public string Status { get; set; } = default!;
 
         /// <summary>
         /// The module environment variables.
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModule/ConfigModule.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModule/ConfigModule.cs
index 36cccb571..9687675eb 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModule/ConfigModule.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModule/ConfigModule.cs
@@ -1,6 +1,8 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#nullable enable
+
 namespace AzureIoTHub.Portal.Shared.Models.v10.IoTEdgeModule
 {
     using System.Collections.Generic;
@@ -12,7 +14,7 @@ public class ConfigModule
         public ModuleSettings Settings { get; set; }
 
         [JsonProperty(PropertyName = "type")]
-        public string Type { get; set; }
+        public string Type { get; set; } = default!;
 
         [JsonProperty(PropertyName = "env", NullValueHandling = NullValueHandling.Ignore)]
         public IDictionary<string, EnvironmentVariable>? EnvironmentVariables { get; set; }
@@ -32,15 +34,15 @@ public ConfigModule()
     public class ModuleSettings
     {
         [JsonProperty(PropertyName = "image")]
-        public string Image { get; set; }
+        public string Image { get; set; } = default!;
 
         [JsonProperty(PropertyName = "createOptions", NullValueHandling = NullValueHandling.Ignore)]
-        public string CreateOptions { get; set; }
+        public string CreateOptions { get; set; } = default!;
     }
 
     public class EnvironmentVariable
     {
         [JsonProperty(PropertyName = "value")]
-        public string EnvValue { get; set; }
+        public string EnvValue { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModuleCommand.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModuleCommand.cs
index e2437e1cb..7b065a3d0 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModuleCommand.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModuleCommand.cs
@@ -8,12 +8,12 @@ public class IoTEdgeModuleCommand
         /// <summary>
         /// The command name
         /// </summary>
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
-        public string EdgeDeviceModelId { get; set; }
+        public string EdgeDeviceModelId { get; set; } = default!;
 
-        public string CommandId { get; set; }
+        public string CommandId { get; set; } = default!;
 
-        public string ModuleName { get; set; }
+        public string ModuleName { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModuleEnvironmentVariable.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModuleEnvironmentVariable.cs
index 98b0eae11..1ae05d6e1 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModuleEnvironmentVariable.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModuleEnvironmentVariable.cs
@@ -11,11 +11,11 @@ public class IoTEdgeModuleEnvironmentVariable
         /// The module environment variable name
         /// </summary>
         [RegularExpression("^[^\\.^\\$^\\#$\\ ]{1,128}$", ErrorMessage = "Variable name should be less than 128 characters and must not contain Control Characters, '.', '$', '#', or ' '.")]
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The module environment variable value
         /// </summary>
-        public string Value { get; set; }
+        public string Value { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModuleTwinSetting.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModuleTwinSetting.cs
index 9e35f17ca..f2454eefc 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModuleTwinSetting.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeModuleTwinSetting.cs
@@ -8,11 +8,11 @@ public class IoTEdgeModuleTwinSetting
         /// <summary>
         /// The module identity twin setting name
         /// </summary>
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The module identity twin setting value
         /// </summary>
-        public string Value { get; set; }
+        public string Value { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeRoute.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeRoute.cs
index fada64e46..32b4853de 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeRoute.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/IoTEdgeRoute.cs
@@ -12,7 +12,7 @@ public class IoTEdgeRoute
         /// The route name.
         /// </summary>
         [Required(ErrorMessage = "The route should have a name.")]
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The route value.
@@ -20,7 +20,7 @@ public class IoTEdgeRoute
         /// </summary>
         [RegularExpression(@"^(?i)FROM [\S]+( WHERE (NOT )?[\S]+)? INTO [\S]+$", ErrorMessage = "Route should be 'FROM <source> (WHERE <condition>) INTO <sink>'")]
         [Required(ErrorMessage = "The route should have a value.")]
-        public string Value { get; set; }
+        public string Value { get; set; } = default!;
 
         /// <summary>
         /// The route priority
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LabelDto.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LabelDto.cs
index 884680459..fe55e7268 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LabelDto.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LabelDto.cs
@@ -8,9 +8,9 @@ namespace AzureIoTHub.Portal.Shared.Models.v10
     public class LabelDto
     {
         [Required]
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         [Required]
-        public string Color { get; set; }
+        public string Color { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaDeviceTelemetryDto.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaDeviceTelemetryDto.cs
index 287e4b369..2958e9626 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaDeviceTelemetryDto.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaDeviceTelemetryDto.cs
@@ -8,11 +8,11 @@ namespace AzureIoTHub.Portal.Shared.Models.v10
 
     public class LoRaDeviceTelemetryDto
     {
-        public string Id { get; set; }
+        public string Id { get; set; } = default!;
 
         public DateTime EnqueuedTime { get; set; }
 
-        public LoRaTelemetryDto Telemetry { get; set; }
+        public LoRaTelemetryDto Telemetry { get; set; } = new LoRaTelemetryDto();
     }
 
     public class LoRaTelemetryDto
@@ -27,15 +27,15 @@ public class LoRaTelemetryDto
 
         public uint Rfch { get; set; }
 
-        public string Modu { get; set; }
+        public string Modu { get; set; } = default!;
 
-        public string Datr { get; set; }
+        public string Datr { get; set; } = default!;
 
         public double Rssi { get; set; }
 
         public float Lsnr { get; set; }
 
-        public object Data { get; set; }
+        public object Data { get; set; } = new object();
 
         public uint Port { get; set; }
 
@@ -43,13 +43,13 @@ public class LoRaTelemetryDto
 
         public long Edgets { get; set; }
 
-        public string Rawdata { get; set; }
+        public string Rawdata { get; set; } = default!;
 
-        public string DeviceEUI { get; set; }
+        public string DeviceEUI { get; set; } = default!;
 
-        public string GatewayID { get; set; }
+        public string GatewayID { get; set; } = default!;
 
-        public string StationEui { get; set; }
+        public string StationEui { get; set; } = default!;
 
         public bool? DupMsg { get; set; }
 
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/Command.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/Command.cs
index 26570ead0..a8894d6b9 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/Command.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/Command.cs
@@ -11,11 +11,11 @@ public class Command
         /// <summary>
         /// The command identifier.
         /// </summary>
-        public string CommandId { get; set; }
+        public string CommandId { get; set; } = default!;
 
         /// <summary>
         /// The frame.
         /// </summary>
-        public string Frame { get; set; }
+        public string Frame { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/ConcentratorDto.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/ConcentratorDto.cs
index 4f2ca6a61..36be15d23 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/ConcentratorDto.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/ConcentratorDto.cs
@@ -1,6 +1,8 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#nullable enable
+
 namespace AzureIoTHub.Portal.Models.v10.LoRaWAN
 {
     using System.ComponentModel.DataAnnotations;
@@ -15,24 +17,24 @@ public class ConcentratorDto
         /// </summary>
         [Required]
         [RegularExpression("^[A-F0-9]{16}$", ErrorMessage = "DeviceID must contain 16 hexadecimal characters (numbers from 0 to 9 and/or letters from A to F)")]
-        public string DeviceId { get; set; }
+        public string DeviceId { get; set; } = default!;
 
         /// <summary>
         /// The name of the device.
         /// </summary>
         [Required]
-        public string DeviceName { get; set; }
+        public string DeviceName { get; set; } = default!;
 
         /// <summary>
         /// The lora region.
         /// </summary>
         [Required]
-        public string LoraRegion { get; set; }
+        public string LoraRegion { get; set; } = default!;
 
         /// <summary>
         /// The type of the device.
         /// </summary>
-        public string DeviceType { get; set; }
+        public string DeviceType { get; set; } = default!;
 
         /// <summary>
         /// The client certificate thumbprint.
@@ -58,6 +60,6 @@ public class ConcentratorDto
         /// <summary>
         /// The router configuration.
         /// </summary>
-        public RouterConfig RouterConfig { get; set; }
+        public RouterConfig RouterConfig { get; set; } = new RouterConfig();
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/DeviceModelCommandDto.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/DeviceModelCommandDto.cs
index a7bcb7f72..34c4bb88d 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/DeviceModelCommandDto.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/DeviceModelCommandDto.cs
@@ -20,7 +20,7 @@ public class DeviceModelCommandDto
         /// The command name.
         /// </summary>
         [Required(ErrorMessage = "The command name is required.")]
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The command frame in hexa.
@@ -28,7 +28,7 @@ public class DeviceModelCommandDto
         [Required(ErrorMessage = "The frame is required.")]
         [MaxLength(255, ErrorMessage = "The frame should be up to 255 characters long.")]
         [RegularExpression("^[0-9a-fA-F]{0,255}$", ErrorMessage = "The frame should only contain hexadecimal characters")]
-        public string Frame { get; set; }
+        public string Frame { get; set; } = default!;
 
         /// <summary>
         /// A value indicating if the command must be confirmed by sensor
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/FrequencyPlan.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/FrequencyPlan.cs
index 172833070..e10e1be95 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/FrequencyPlan.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/FrequencyPlan.cs
@@ -5,8 +5,8 @@ namespace AzureIoTHub.Portal.Shared.Models.v10.LoRaWAN
 {
     public class FrequencyPlan
     {
-        public string FrequencyPlanID { get; set; }
+        public string FrequencyPlanID { get; set; } = default!;
 
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaCloudToDeviceMessage.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaCloudToDeviceMessage.cs
index 94a4f01f0..3f7028642 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaCloudToDeviceMessage.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaCloudToDeviceMessage.cs
@@ -8,7 +8,7 @@ namespace AzureIoTHub.Portal.Models.v10.LoRaWAN
     public class LoRaCloudToDeviceMessage
     {
         [JsonPropertyName("rawPayload")]
-        public string RawPayload { get; set; }
+        public string RawPayload { get; set; } = default!;
 
         [JsonPropertyName("fport")]
         public int Fport { get; set; }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceBase.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceBase.cs
index bfe802ac7..19e0d07c7 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceBase.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceBase.cs
@@ -111,6 +111,6 @@ public abstract class LoRaDeviceBase
         /// <summary>
         /// The sensor decoder API Url.
         /// </summary>
-        public string SensorDecoder { get; set; }
+        public string SensorDecoder { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceDetails.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceDetails.cs
index c961c66b2..fcc28bed5 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceDetails.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceDetails.cs
@@ -20,18 +20,18 @@ public class LoRaDeviceDetails : LoRaDeviceBase, IDeviceDetails
         /// The name of the device.
         /// </summary>
         [Required(ErrorMessage = "The device should have a name.")]
-        public string DeviceName { get; set; }
+        public string DeviceName { get; set; } = default!;
 
         /// <summary>
         /// The model identifier.
         /// </summary>
         [Required(ErrorMessage = "The device should use a model.")]
-        public string ModelId { get; set; }
+        public string ModelId { get; set; } = default!;
 
         /// <summary>
         /// The device model image Url.
         /// </summary>
-        public Uri ImageUrl { get; set; }
+        public Uri ImageUrl { get; set; } = default!;
 
         /// <summary>
         ///   <c>true</c> if this instance is connected; otherwise, <c>false</c>.
@@ -59,7 +59,7 @@ public class LoRaDeviceDetails : LoRaDeviceBase, IDeviceDetails
         [Required(ErrorMessage = "The device should have a unique identifier.")]
         [MaxLength(ErrorMessage = "The device identifier should be up to 128 characters long.")]
         [RegularExpression("^[A-Z0-9]{16}$", ErrorMessage = "The device identifier must contain 16 hexadecimal characters (numbers from 0 to 9 and/or letters from A to F)")]
-        public string DeviceID { get; set; }
+        public string DeviceID { get; set; } = default!;
 
         /// <summary>
         /// A value indicating whether the device uses OTAA to authenticate to LoRaWAN Network, otherwise ABP
@@ -72,29 +72,29 @@ public class LoRaDeviceDetails : LoRaDeviceBase, IDeviceDetails
         /// The OTAA App Key.
         /// </summary>
         // [Required(ErrorMessage = "The LoRa Device OTAA App Key is required.")]
-        public string AppKey { get; set; }
+        public string AppKey { get; set; } = default!;
 
         /// <summary>
         /// The device OTAA Application EUI.
         /// </summary>
         // [Required(ErrorMessage = "The OTAA App EUI is required.")]
-        public string AppEUI { get; set; }
+        public string AppEUI { get; set; } = default!;
 
         /// <summary>
         ///  The ABP AppSKey.
         /// </summary>
-        public string AppSKey { get; set; }
+        public string AppSKey { get; set; } = default!;
 
         /// <summary>
         ///  The ABP NwkSKey.
         /// </summary>
-        public string NwkSKey { get; set; }
+        public string NwkSKey { get; set; } = default!;
 
         /// <summary>
         /// Unique identifier that allows
         /// the device to be recognized.
         /// </summary>
-        public string DevAddr { get; set; }
+        public string DevAddr { get; set; } = default!;
 
         /// <summary>
         /// A value indicating whether the device has already joined the platform.
@@ -105,40 +105,40 @@ public class LoRaDeviceDetails : LoRaDeviceBase, IDeviceDetails
         /// The Device Current Datarate,
         /// This value will be only reported if you are using Adaptive Data Rate.
         /// </summary>
-        public string DataRate { get; set; }
+        public string DataRate { get; set; } = default!;
 
         /// <summary>
         /// The Device Current Transmit Power,
         /// This value will be only reported if you are using Adaptive Data Rate.
         /// </summary>
-        public string TxPower { get; set; }
+        public string TxPower { get; set; } = default!;
 
         /// <summary>
         /// The Device Current repetition when transmitting.
         /// E.g. if set to two, the device will transmit twice his upstream messages.
         /// This value will be only reported if you are using Adaptive Data Rate.
         /// </summary>
-        public string NbRep { get; set; }
+        public string NbRep { get; set; } = default!;
 
         /// <summary>
         /// The Device Current Rx2Datarate.
         /// </summary>
-        public string ReportedRX2DataRate { get; set; }
+        public string ReportedRX2DataRate { get; set; } = default!;
 
         /// <summary>
         /// The Device Current RX1DROffset.
         /// </summary>
-        public string ReportedRX1DROffset { get; set; }
+        public string ReportedRX1DROffset { get; set; } = default!;
 
         /// <summary>
         /// The Device Current RXDelay.
         /// </summary>
-        public string ReportedRXDelay { get; set; }
+        public string ReportedRXDelay { get; set; } = default!;
 
         /// <summary>
         /// The GatewayID of the device.
         /// </summary>
-        public string GatewayID { get; set; }
+        public string GatewayID { get; set; } = default!;
 
         /// <summary>
         /// A value indicating whether the downlinks are enabled (True if not provided)
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceModelDto.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceModelDto.cs
index d172c2d1c..a577c4956 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceModelDto.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceModelDto.cs
@@ -19,23 +19,23 @@ public class LoRaDeviceModelDto : LoRaDeviceBase, IDeviceModel
         /// <summary>
         /// The device model identifier.
         /// </summary>
-        public string ModelId { get; set; }
+        public string ModelId { get; set; } = default!;
 
         /// <summary>
         /// The device model image Url.
         /// </summary>
-        public Uri ImageUrl { get; set; }
+        public Uri ImageUrl { get; set; } = default!;
 
         /// <summary>
         /// The device model name.
         /// </summary>
         [Required(ErrorMessage = "The device model name is required.")]
-        public string Name { get; set; }
+        public string Name { get; set; } = default!;
 
         /// <summary>
         /// The device model description.
         /// </summary>
-        public string Description { get; set; }
+        public string Description { get; set; } = default!;
 
         /// <summary>
         /// A value indicating whether this instance is builtin.
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaGatewayIDList.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaGatewayIDList.cs
index 4b6529953..93e65ce0a 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaGatewayIDList.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaGatewayIDList.cs
@@ -7,6 +7,6 @@ namespace AzureIoTHub.Portal.Shared.Models.v1._0
 
     public class LoRaGatewayIDList
     {
-        public List<string> GatewayIds { get; set; }
+        public List<string> GatewayIds { get; set; } = new List<string>();
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/RouterConfig.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/RouterConfig.cs
index 73b86193f..83ad6cafb 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/RouterConfig.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/LoRaWAN/RouterConfig.cs
@@ -31,14 +31,14 @@ public class RouterConfig
         /// </summary>
         [JsonPropertyName("region")]
         [JsonProperty("region")]
-        public string Region { get; set; }
+        public string Region { get; set; } = default!;
 
         /// <summary>
         /// The hardware specifications.
         /// </summary>
         [JsonPropertyName("hwspec")]
         [JsonProperty("hwspec")]
-        public string Hwspec { get; set; }
+        public string Hwspec { get; set; } = default!;
 
         /// <summary>
         /// The frequency range.
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/PaginatedResult.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/PaginatedResult.cs
index 7dfbb034e..2cfee2cb5 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/PaginatedResult.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/PaginatedResult.cs
@@ -1,6 +1,8 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#nullable enable
+
 namespace AzureIoTHub.Portal.Shared.Models.v1._0
 {
     using System;
@@ -9,7 +11,7 @@ namespace AzureIoTHub.Portal.Shared.Models.v1._0
     public class PaginatedResult<T>
     {
 
-        public PaginatedResult(List<T> data = default, int count = 0, int page = 0, int pageSize = 10)
+        public PaginatedResult(List<T>? data = default, int count = 0, int page = 0, int pageSize = 10)
         {
             Data = data;
             CurrentPage = page;
@@ -17,7 +19,7 @@ public PaginatedResult(List<T> data = default, int count = 0, int page = 0, int
             TotalCount = count;
         }
 
-        public List<T> Data { get; set; }
+        public List<T>? Data { get; set; }
 
         public int CurrentPage { get; set; }
 
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/PortalSettings.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/PortalSettings.cs
index 73c506885..222697a08 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/PortalSettings.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/PortalSettings.cs
@@ -16,17 +16,17 @@ public class PortalSettings
         /// <summary>
         /// The portal version.
         /// </summary>
-        public string Version { get; set; }
+        public string Version { get; set; } = default!;
 
         /// <summary>
         /// The poral name.
         /// </summary>
-        public string PortalName { get; set; }
+        public string PortalName { get; set; } = default!;
 
         /// <summary>
         /// Copyright Year
         /// </summary>
-        public string CopyrightYear { get; set; }
+        public string CopyrightYear { get; set; } = default!;
 
         public bool IsIdeasFeatureEnabled { get; set; }
     }
diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/SearchModel.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/SearchModel.cs
index 7575c426c..2f3f3225a 100644
--- a/src/AzureIoTHub.Portal.Shared/Models/v1.0/SearchModel.cs
+++ b/src/AzureIoTHub.Portal.Shared/Models/v1.0/SearchModel.cs
@@ -1,6 +1,8 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#nullable enable
+
 namespace AzureIoTHub.Portal.Models.v10
 {
     using System.ComponentModel.DataAnnotations;
@@ -14,17 +16,17 @@ public class SearchModel
         /// The device identifier.
         /// </summary>
         [Required(ErrorMessage = "The device identifier is required.")]
-        public string DeviceId { get; set; }
+        public string? DeviceId { get; set; }
 
         /// <summary>
         /// The device status.
         /// </summary>
-        public string Status { get; set; }
+        public string? Status { get; set; }
 
         /// <summary>
         /// The device type.
         /// </summary>
-        public string Type { get; set; }
+        public string? Type { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SearchModel"/> class.
@@ -32,7 +34,7 @@ public class SearchModel
         /// <param name="id">The id.</param>
         /// <param name="status">The device status.</param>
         /// <param name="type">The device type.</param>
-        public SearchModel(string id = null, string status = null, string type = null)
+        public SearchModel(string? id = null, string? status = null, string? type = null)
         {
             DeviceId = id;
             Status = status;
diff --git a/src/AzureIoTHub.Portal.Shared/PaginationResult.cs b/src/AzureIoTHub.Portal.Shared/PaginationResult.cs
index 7a0deec34..578f24649 100644
--- a/src/AzureIoTHub.Portal.Shared/PaginationResult.cs
+++ b/src/AzureIoTHub.Portal.Shared/PaginationResult.cs
@@ -15,7 +15,7 @@ public class PaginationResult<TItem>
         /// <summary>
         /// The current page items.
         /// </summary>
-        public IEnumerable<TItem> Items { get; set; }
+        public IEnumerable<TItem> Items { get; set; } = new List<TItem>();
 
         /// <summary>
         /// The total number of items.
@@ -25,6 +25,6 @@ public class PaginationResult<TItem>
         /// <summary>
         /// The query next page Url.
         /// </summary>
-        public string NextPage { get; set; }
+        public string NextPage { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Shared/Settings/OIDCSettings.cs b/src/AzureIoTHub.Portal.Shared/Settings/OIDCSettings.cs
index 0e30a5d92..0911da162 100644
--- a/src/AzureIoTHub.Portal.Shared/Settings/OIDCSettings.cs
+++ b/src/AzureIoTHub.Portal.Shared/Settings/OIDCSettings.cs
@@ -13,21 +13,21 @@ public class OIDCSettings
         /// <summary>
         /// The OIDC Authority.
         /// </summary>
-        public string Authority { get; set; }
+        public string Authority { get; set; } = default!;
 
         /// <summary>
         /// The OIDC Metadata Url.
         /// </summary>
-        public Uri MetadataUrl { get; set; }
+        public Uri MetadataUrl { get; set; } = default!;
 
         /// <summary>
         /// The Client Identifier.
         /// </summary>
-        public string ClientId { get; set; }
+        public string ClientId { get; set; } = default!;
 
         /// <summary>
         /// The OIDC Scope.
         /// </summary>
-        public string Scope { get; set; }
+        public string Scope { get; set; } = default!;
     }
 }
diff --git a/src/AzureIoTHub.Portal.Tests.E2E/Pages/DevicePage.cs b/src/AzureIoTHub.Portal.Tests.E2E/Pages/DevicePage.cs
index 61749bd84..b859db749 100644
--- a/src/AzureIoTHub.Portal.Tests.E2E/Pages/DevicePage.cs
+++ b/src/AzureIoTHub.Portal.Tests.E2E/Pages/DevicePage.cs
@@ -8,8 +8,10 @@ namespace AzureIoTHub.Portal.Tests.E2E.Pages
 
     public class DevicePage
     {
+#pragma warning disable CA1051 // Ne pas déclarer de champs d'instances visibles
         public IWebDriver driver;
         public WebDriverWait wait;
+#pragma warning restore CA1051 // Ne pas déclarer de champs d'instances visibles
 
         public DevicePage(IWebDriver driver, WebDriverWait wait)
         {
@@ -44,7 +46,7 @@ public void AddDevice(string id, string name, string model)
             _ = js.ExecuteScript("arguments[0].click();", inputElement);
         }
 
-        public void SearchDevice(string id, string model = null)
+        public void SearchDevice(string id, string? model = null)
         {
             _ = wait.Until(d => d.FindElement(By.ClassName("mud-expand-panel")).Displayed);
 
@@ -60,7 +62,7 @@ public void SearchDevice(string id, string model = null)
             driver.FindElement(By.Id("searchButton")).Click();
         }
 
-        public void RemoveDevice(string id, string model = null)
+        public void RemoveDevice(string id, string? model = null)
         {
             SearchDevice(id, model);
 
diff --git a/src/AzureIoTHub.Portal.Tests.E2E/WebDriverFactory.cs b/src/AzureIoTHub.Portal.Tests.E2E/WebDriverFactory.cs
index e3791bcad..fc915f93a 100644
--- a/src/AzureIoTHub.Portal.Tests.E2E/WebDriverFactory.cs
+++ b/src/AzureIoTHub.Portal.Tests.E2E/WebDriverFactory.cs
@@ -36,7 +36,7 @@ public static void Quit()
             Default.Close();
             Default.Quit();
 
-            instance.Dispose();
+            instance?.Dispose();
             instance = null;
         }
     }
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Components/Dashboard/DashboardMetricCounterTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Components/Dashboard/DashboardMetricCounterTests.cs
index d38dde5c4..375493ce9 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Components/Dashboard/DashboardMetricCounterTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Components/Dashboard/DashboardMetricCounterTests.cs
@@ -21,7 +21,7 @@ public void DashboardMetricCounterShouldRenderCorrectly()
             const string expectedTitle = "test";
             const int expectedCounter = 15;
             const Color expectedColor = Color.Dark;
-            var expectedIcon = Icons.Filled.Devices;
+            var expectedIcon = Icons.Material.Filled.Devices;
 
             // Act
             var cut = RenderComponent<DashboardMetricCounter>(
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Components/Devices/LoRaWan/EditLoraDeviceTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Components/Devices/LoRaWan/EditLoraDeviceTests.cs
index 53e3416c5..3c12b38ee 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Components/Devices/LoRaWan/EditLoraDeviceTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Components/Devices/LoRaWan/EditLoraDeviceTests.cs
@@ -355,7 +355,7 @@ public void ClickingOnMudAutocompleteShouldDisplaySearch()
                 ModelId = mockLoRaModel.ModelId,
                 AppSKey = Guid.NewGuid().ToString(),
                 NwkSKey = Guid.NewGuid().ToString(),
-                DevAddr = Guid.NewGuid().ToString(),
+                DevAddr = Guid.NewGuid().ToString()
             };
             var validator = new LoRaDeviceDetailsValidator();
 
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Converters/StringToBoolConverterTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Converters/StringToBoolConverterTests.cs
index 8cd3b741e..ee2168b6d 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Converters/StringToBoolConverterTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Converters/StringToBoolConverterTests.cs
@@ -25,7 +25,7 @@ private static StringToBoolConverter CreateStringToBoolConverter()
 
         [TestCase(true, "true")]
         [TestCase(false, "false")]
-        [TestCase(null, null)]
+        [TestCase(null, "")]
         public void GetShouldReturnStringRepresentationOfBool(bool? value, string expected)
         {
             // Arrange
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/DeviceConfigurations/DeleteDeviceConfigurationTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/DeviceConfigurations/DeleteDeviceConfigurationTests.cs
index 59e5de7cd..e0042963c 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/DeviceConfigurations/DeleteDeviceConfigurationTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/DeviceConfigurations/DeleteDeviceConfigurationTests.cs
@@ -74,7 +74,7 @@ public async Task DeleteDeviceConfigurationShouldDeleteConfiguration()
             var result = await dialogReference.Result;
 
             // Assert
-            _ = result.Cancelled.Should().BeFalse();
+            _ = result.Canceled.Should().BeFalse();
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }
 
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/ConnectionStringDialogTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/ConnectionStringDialogTests.cs
index 17e965619..7c759b676 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/ConnectionStringDialogTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/ConnectionStringDialogTests.cs
@@ -87,7 +87,7 @@ public async Task OnInitializedAsyncShouldProcessProblemDetailsExceptionWhenIssu
             var result = await dialogReference.Result;
 
             // Assert
-            cut.WaitForAssertion(() => result.Cancelled.Should().BeFalse());
+            cut.WaitForAssertion(() => result.Canceled.Should().BeFalse());
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }
     }
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/DevicesListPageTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/DevicesListPageTests.cs
index e44301ff5..ac1b90068 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/DevicesListPageTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/DevicesListPageTests.cs
@@ -443,7 +443,7 @@ public void DeleteDevice_Clicked_DeleteDeviceDialogIsShown()
         }
 
         [Test]
-        public async Task ExportDevicesClickedShouldDownloadTheFile()
+        public void ExportDevicesClickedShouldDownloadTheFile()
         {
             // Arrange
             var deviceId = Guid.NewGuid().ToString();
@@ -482,7 +482,7 @@ public async Task ExportDevicesClickedShouldDownloadTheFile()
         }
 
         [Test]
-        public async Task ExportTemplateClickedShouldDownloadTheFile()
+        public void ExportTemplateClickedShouldDownloadTheFile()
         {
             // Arrange
             var deviceId = Guid.NewGuid().ToString();
@@ -544,7 +544,7 @@ public void SearchDeviceModels_InputExisingDeviceModelName_DeviceModelReturned()
             _ = this.mockDeviceTagSettingsClientService.Setup(service => service.GetDeviceTags())
                 .ReturnsAsync(new List<DeviceTagDto>());
 
-            _ = this.mockDeviceModelsClientService.Setup(service => service.GetDeviceModels(It.Is<DeviceModelFilter>(x => expectedDeviceModel.Name.Equals(x.SearchText))))
+            _ = this.mockDeviceModelsClientService.Setup(service => service.GetDeviceModels(It.Is<DeviceModelFilter>(x => expectedDeviceModel.Name.Equals(x.SearchText, StringComparison.Ordinal))))
                 .ReturnsAsync(new PaginationResult<DeviceModelDto>
                 {
                     Items = deviceModels.Where(x => expectedDeviceModel.Name.Equals(x.Name, StringComparison.Ordinal))
@@ -574,7 +574,7 @@ public void SearchDeviceModels_InputExisingDeviceModelName_DeviceModelReturned()
         }
 
         [Test]
-        public async Task ImportDevices_FileAdded_DevicesExported()
+        public void ImportDevices_FileAdded_DevicesExported()
         {
             // Arrange
             var deviceId = Guid.NewGuid().ToString();
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/LoRaDeviceTelemetryDialogTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/LoRaDeviceTelemetryDialogTests.cs
index 8fb081dc2..a49f512e1 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/LoRaDeviceTelemetryDialogTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/LoRaDeviceTelemetryDialogTests.cs
@@ -91,7 +91,7 @@ public async Task Show_CancelDialog_DialogIsCancelled()
             var result = await dialogReference.Result;
 
             // Assert
-            _ = result.Cancelled.Should().BeTrue();
+            _ = result.Canceled.Should().BeTrue();
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }
     }
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/ConnectionStringDialogTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/ConnectionStringDialogTests.cs
index 6843f956f..32820ba2a 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/ConnectionStringDialogTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/ConnectionStringDialogTests.cs
@@ -89,7 +89,7 @@ public async Task ConnectionStringDialogMustBeCancelledWhenProblemDetailsOccurs(
             var result = await dialogReference.Result;
 
             // Assert
-            _ = result.Cancelled.Should().BeTrue();
+            _ = result.Canceled.Should().BeTrue();
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }
 
@@ -120,7 +120,7 @@ public async Task ConnectionStringDialogMustBeCancelledOnClickOnCancel()
             var result = await dialogReference.Result;
 
             // Assert
-            _ = result.Cancelled.Should().BeTrue();
+            _ = result.Canceled.Should().BeTrue();
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }
     }
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/CreateEdgeDevicePageTest.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/CreateEdgeDevicePageTest.cs
index 803d21cc7..ac771f91f 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/CreateEdgeDevicePageTest.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/CreateEdgeDevicePageTest.cs
@@ -347,7 +347,7 @@ public async Task ChangeEdgeModelShouldDisplayModelImage()
         }
 
         [Test]
-        public async Task SearchEdgeDeviceModels_InputExisingEdgeDeviceModelName_EdgeDeviceModelReturned()
+        public void SearchEdgeDeviceModels_InputExisingEdgeDeviceModelName_EdgeDeviceModelReturned()
         {
             // Arrange
             var edgeDeviceModels = Fixture.CreateMany<IoTEdgeModelListItem>(2).ToList();
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/EdgeDeviceDeleteConfirmationDialogTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/EdgeDeviceDeleteConfirmationDialogTests.cs
index 0710dec58..de6677e40 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/EdgeDeviceDeleteConfirmationDialogTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/EdgeDeviceDeleteConfirmationDialogTests.cs
@@ -116,7 +116,7 @@ public async Task EdgeDeviceDeleteConfirmationDialogMustBeCanceledOnClickOnCance
             var result = await dialogReference.Result;
 
             // Assert
-            _ = result.Cancelled.Should().BeTrue();
+            _ = result.Canceled.Should().BeTrue();
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }
     }
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/ModuleLogsDialogTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/ModuleLogsDialogTests.cs
index e5a6766a7..c3560dd54 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/ModuleLogsDialogTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/ModuleLogsDialogTests.cs
@@ -150,7 +150,7 @@ public async Task ModuleLogsMustCloseOnCLickOnCloseButton()
             var result = await dialogReference.Result;
 
             // Assert
-            _ = result.Cancelled.Should().BeTrue();
+            _ = result.Canceled.Should().BeTrue();
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }
     }
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeModels/DeleteEdgeModelDialogTest.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeModels/DeleteEdgeModelDialogTest.cs
index 8980465c2..e632e465f 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeModels/DeleteEdgeModelDialogTest.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/EdgeModels/DeleteEdgeModelDialogTest.cs
@@ -143,7 +143,7 @@ public async Task ClickOnCancelButtonShouldCloseDialog()
             var result = await dialogReference.Result;
 
             // Assert
-            _ = result.Cancelled.Should().BeTrue();
+            _ = result.Canceled.Should().BeTrue();
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }
     }
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Ideas/SubmitIdeaDialogTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Ideas/SubmitIdeaDialogTests.cs
index 9a48cf48f..94f619035 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Ideas/SubmitIdeaDialogTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Ideas/SubmitIdeaDialogTests.cs
@@ -68,7 +68,7 @@ public async Task SubmitIdeaDialogMustBeCancelledOnClickOnCancel()
             var result = await dialogReference.Result;
 
             // Assert
-            _ = result.Cancelled.Should().BeTrue();
+            _ = result.Canceled.Should().BeTrue();
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }
 
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/LoRaWan/Concentrator/DeleteConcentratorPageTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/LoRaWan/Concentrator/DeleteConcentratorPageTests.cs
index 58f10d8e5..3ace62ca3 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/LoRaWan/Concentrator/DeleteConcentratorPageTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/LoRaWan/Concentrator/DeleteConcentratorPageTests.cs
@@ -70,7 +70,7 @@ public async Task DeleteConcentratorPageShouldDeleteConcentrator()
             var result = await dialogReference.Result;
 
             // Assert
-            _ = result.Cancelled.Should().BeFalse();
+            _ = result.Canceled.Should().BeFalse();
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }
 
@@ -128,7 +128,7 @@ public async Task OnClickOnCancelShouldCancelDialog()
             var result = await dialogReference.Result;
 
             // Assert
-            _ = result.Cancelled.Should().BeTrue();
+            _ = result.Canceled.Should().BeTrue();
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }
     }
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Infrastructure/Jobs/SyncGatewayIDJobTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Infrastructure/Jobs/SyncGatewayIDJobTests.cs
index 937ed6ed5..7ec1ae2f8 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Infrastructure/Jobs/SyncGatewayIDJobTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Infrastructure/Jobs/SyncGatewayIDJobTests.cs
@@ -69,7 +69,7 @@ public void ExecuteExceptionThrownShouldRecordLogError()
             _ = this.syncGatewayIDJob.Execute(null);
 
             // Assert
-            Assert.IsNull(this.loRaGatewayIDList.GatewayIds);
+            Assert.IsEmpty(this.loRaGatewayIDList.GatewayIds);
             MockRepository.VerifyAll();
         }
     }
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Infrastructure/Repositories/GenericRepositoryTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Infrastructure/Repositories/GenericRepositoryTests.cs
index 0d3d08ad5..1f93b9d74 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Infrastructure/Repositories/GenericRepositoryTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Infrastructure/Repositories/GenericRepositoryTests.cs
@@ -90,7 +90,7 @@ await instance.InsertAsync(new DeviceModelProperty()
         }
 
         [Test]
-        public async Task UpdateAsyncTest()
+        public void UpdateAsyncTest()
         {
             // Arrange
             var entityId = Guid.NewGuid().ToString();
@@ -126,7 +126,7 @@ public async Task UpdateAsyncTest()
         }
 
         [Test]
-        public async Task DeleteTest()
+        public void DeleteTest()
         {
             // Arrange
             var entityId = Guid.NewGuid().ToString();
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Server/Managers/ExportManagerTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Server/Managers/ExportManagerTests.cs
index fbb6411a2..d7d061fc0 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Server/Managers/ExportManagerTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Server/Managers/ExportManagerTests.cs
@@ -3,7 +3,6 @@
 
 namespace AzureIoTHub.Portal.Tests.Unit.Server.Managers
 {
-    using System;
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
@@ -65,7 +64,7 @@ public override void Setup()
         }
 
         [Test]
-        public async Task ExportDeviceListLoRaDisabledShouldWriteStream()
+        public void ExportDeviceListLoRaDisabledShouldWriteStream()
         {
             // Arrange
             _ = this.mockLoRaWANOptions.Setup(x => x.Value)
@@ -105,7 +104,7 @@ public async Task ExportDeviceListLoRaDisabledShouldWriteStream()
         }
 
         [Test]
-        public async Task ExportDeviceListLoRaEnabledShouldWriteStreamAndDisplayLoRaSpecificField()
+        public void ExportDeviceListLoRaEnabledShouldWriteStreamAndDisplayLoRaSpecificField()
         {
             // Arrange
             _ = this.mockLoRaWANOptions.Setup(x => x.Value)
diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Server/Services/ExternalDeviceServiceTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Server/Services/ExternalDeviceServiceTests.cs
index 4cadf327d..ac92571ae 100644
--- a/src/AzureIoTHub.Portal.Tests.Unit/Server/Services/ExternalDeviceServiceTests.cs
+++ b/src/AzureIoTHub.Portal.Tests.Unit/Server/Services/ExternalDeviceServiceTests.cs
@@ -419,7 +419,7 @@ public async Task GetDeviceTwinWhithModuleShouldThrowInternalServerErrorExceptio
         }
 
         [Test]
-        public async Task GetDeviceTwinWhithModule_EqualZero_ReturnsEmptyDevices()
+        public void GetDeviceTwinWhithModule_EqualZero_ReturnsEmptyDevices()
         {
             // Arrange
             var service = CreateService();