From 45a4e9a38a01dd6363ffec70858bfcfc5c3261d0 Mon Sep 17 00:00:00 2001
From: Sam Lee <samlee3@microsoft.com>
Date: Mon, 14 Jul 2025 18:06:09 -0700
Subject: [PATCH 01/11] Add ARB status validation

---
 .../custom/Helper/AzLocalCommonSettings.ps1   |  6 ++
 .../custom/Helper/CommonHelper.ps1            | 23 +++++--
 .../New-AzMigrateLocalServerReplication.ps1   | 20 ++++--
 .../Start-AzMigrateLocalServerMigration.ps1   | 66 ++++++++++---------
 4 files changed, 71 insertions(+), 44 deletions(-)

diff --git a/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1 b/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1
index a52d940c0086..27d3ea55e9cc 100644
--- a/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1
@@ -115,4 +115,10 @@ $VmReplicationValidationMessages = @{
     VmWareToolsNotRunning   = "VMware tools not running on VM. $VmReplicationValidationMessage";
     VmNotHighlyAvailable    = "VM not highly available. $VmReplicationValidationMessage";
     OsTypeNotFound          = "Hyper-V Integration Services not running on VM. $VmReplicationValidationMessage";
+    OsTypeNotSupported      = "The OS type of the VM is not supported for replication. $VmReplicationValidationMessage";
+}
+
+$ArcResourceBridgeValidationMessages = @{
+    NotRunning = "Arc Resource Bridge is offline. To continue, bring the Arc Resource Bridge online. Wait a few minutes for the status to update and retry.";
+    NoClusters = "There are no Azure Local resources in the selected resource group."
 }
\ No newline at end of file
diff --git a/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1 b/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
index ef90ef1c46de..f0039b45ef5e 100644
--- a/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
@@ -37,7 +37,7 @@ function CheckStorageModuleDependency {
     }
 }
 
-function GetHCIClusterARGQuery {
+function GetARGQueryForArcResourceBridge {
     [Microsoft.Azure.PowerShell.Cmdlets.Migrate.DoNotExportAttribute()]
     param(
         [Parameter(Mandatory)]
@@ -282,25 +282,36 @@ function ValidateReplication {
         throw $VmReplicationValidationMessages.VmPoweredOff
     }
 
+    # Hyper-V/VMware VMs should have some OS type
+    if ([string]::IsNullOrEmpty($Machine.OperatingSystemDetailOSType))
+    {
+        throw $VmReplicationValidationMessages.OsTypeNotFound
+    }
+
     if ($MigrationType -eq $AzLocalInstanceTypes.HyperVToAzLocal) {
-        if ([string]::IsNullOrEmpty($Machine.OperatingSystemDetailOSType) -or
-            ($Machine.OperatingSystemDetailOSType -eq $OsType.OtherGuestFamily -and [string]::IsNullOrEmpty($Machine.GuestOSDetailOsname))) {
+        # Hyper-V VMs with 'otherguestfamily' OS type and missing OS name could also mean Hyper-V Integration Services are not running
+        if ($Machine.OperatingSystemDetailOSType -eq $OsType.OtherGuestFamily -and [string]::IsNullOrEmpty($Machine.GuestOSDetailOsname)) {
             throw $VmReplicationValidationMessages.OsTypeNotFound
         }
 
+        # Hyper-V VMs should be highly available
         if ($Machine.ClusterId -and $Machine.HighAvailability -eq $HighAvailability.NO) {
             throw $VmReplicationValidationMessages.VmNotHighlyAvailable
         }
     }
 
     if ($MigrationType -eq $AzLocalInstanceTypes.VMwareToAzLocal) {
-        # Once VMware tools are installed, OS type should be available.
-        if ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotRunning) {
-            throw $VmReplicationValidationMessages.VmWareToolsNotRunning
+        # VMware VMs with 'otherguestfamily' OS type is not supported
+        if ($Machine.OperatingSystemDetailOSType -eq $OsType.OtherGuestFamily) {
+            throw $VmReplicationValidationMessages.OsTypeNotSupported
         }
 
+        # VMware tools should be running to support static ip migration
         if ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotInstalled) {
             throw $VmReplicationValidationMessages.VmWareToolsNotInstalled
         }
+        elseif ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotRunning) {
+            throw $VmReplicationValidationMessages.VmWareToolsNotRunning
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1 b/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1
index 36da151f34f7..aa523e35bc95 100644
--- a/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1
@@ -266,6 +266,9 @@ function New-AzMigrateLocalServerReplication {
                 "Name" = $replicationVaultName
             } `
             -ErrorMessage "No Replication Vault '$replicationVaultName' found in Resource Group '$ResourceGroupName'. Please verify your Azure Migrate project setup."
+        if ($replicationVault.Property.ProvisioningState -ne [ProvisioningState]::Succeeded) {
+            throw "The Replication Vault '$replicationVaultName' is not in a valid state. The provisioning state is '$($replicationVault.Property.ProvisioningState)'. Please verify your Azure Migrate project setup."
+        }
 
         # Access Discovery Service
         $discoverySolutionName = "Servers-Discovery-ServerDiscovery"
@@ -420,14 +423,17 @@ function New-AzMigrateLocalServerReplication {
             throw "The replication extension '$replicationExtensionName' is not in a valid state. The provisioning state is '$($replicationExtension.Property.ProvisioningState)'. Re-run the Initialize-AzMigrateLocalReplicationInfrastructure command."
         }
         
-        # Get Target cluster
+        # Get ARC Resource Bridge info
         $targetClusterId = $targetFabric.Property.CustomProperty.Cluster.ResourceName
         $targetClusterIdArray = $targetClusterId.Split("/")
         $targetSubscription = $targetClusterIdArray[2]
-        $hciClusterArgQuery = GetHCIClusterARGQuery -HCIClusterID $targetClusterId
-        $targetCluster = Az.ResourceGraph\Search-AzGraph -Query $hciClusterArgQuery -Subscription $targetSubscription
-        if ($null -eq $targetCluster) {
-            throw "Validate target cluster with id '$targetClusterId' exists. Check ARC resource bridge is running on this cluster."
+        $arbArgQuery = GetARGQueryForArcResourceBridge -HCIClusterID $targetClusterId
+        $arbArgResult = Az.ResourceGraph\Search-AzGraph -Query $arbArgQuery -Subscription $targetSubscription
+        if ($null -eq $arbArgResult) {
+            throw "$($ArcResourceBridgeValidationMessages.NoClusters). Validate target cluster with id '$targetClusterId' exists."
+        }
+        elseif ($arbArgResult.statusOfTheBridge -ne "Running") {
+            throw "$($ArcResourceBridgeValidationMessages.NotRunning). Make sure the Arc Resource Bridge is online before retrying."
         }
             
         # Get source appliance RunAsAccount
@@ -480,12 +486,12 @@ function New-AzMigrateLocalServerReplication {
         }
 
         $customProperties.InstanceType = $instanceType
-        $customProperties.CustomLocationRegion = $targetCluster.CustomLocationRegion
+        $customProperties.CustomLocationRegion = $arbArgResult.CustomLocationRegion
         $customProperties.FabricDiscoveryMachineId = $machine.Id
         $customProperties.RunAsAccountId = $runAsAccount.Id
         $customProperties.SourceFabricAgentName = $sourceDra.Name
         $customProperties.StorageContainerId = $TargetStoragePathId
-        $customProperties.TargetArcClusterCustomLocationId = $targetCluster.CustomLocation
+        $customProperties.TargetArcClusterCustomLocationId = $arbArgResult.CustomLocation
         $customProperties.TargetFabricAgentName = $targetDra.Name
         $customProperties.TargetHciClusterId = $targetClusterId
         $customProperties.TargetResourceGroupId = $TargetResourceGroupId
diff --git a/src/Migrate/Migrate.Autorest/custom/Start-AzMigrateLocalServerMigration.ps1 b/src/Migrate/Migrate.Autorest/custom/Start-AzMigrateLocalServerMigration.ps1
index 16ea7222c19d..a1b8b3975ccf 100644
--- a/src/Migrate/Migrate.Autorest/custom/Start-AzMigrateLocalServerMigration.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Start-AzMigrateLocalServerMigration.ps1
@@ -100,16 +100,13 @@ function Start-AzMigrateLocalServerMigration {
     )
     
     process {
+        Import-Module $PSScriptRoot\Helper\AzLocalCommonSettings.ps1
+        Import-Module $PSScriptRoot\Helper\CommonHelper.ps1
+
+        CheckResourceGraphModuleDependency
+        CheckResourcesModuleDependency
+
         $performShutDown = $TurnOffSourceServer.IsPresent
-        $null = $PSBoundParameters.Remove('ProjectName')
-        $null = $PSBoundParameters.Remove('MachineName')
-        $null = $PSBoundParameters.Remove('TurnOffSourceServer')
-        $null = $PSBoundParameters.Remove('TargetObjectID')
-        $null = $PSBoundParameters.Remove('ResourceGroupName')
-        $null = $PSBoundParameters.Remove('InputObject')
-        $null = $PSBoundParameters.Remove('WhatIf')
-        $null = $PSBoundParameters.Remove('Confirm')
-        
         $parameterSet = $PSCmdlet.ParameterSetName
 
         if ($parameterSet -eq 'ByInputObject') {
@@ -121,11 +118,12 @@ function Start-AzMigrateLocalServerMigration {
         $vaultName = $protectedItemIdArray[8]
         $protectedItemName = $protectedItemIdArray[10]
 
-        $null = $PSBoundParameters.Add("ResourceGroupName", $resourceGroupName)
-        $null = $PSBoundParameters.Add("VaultName", $vaultName)
-        $null = $PSBoundParameters.Add("Name", $protectedItemName)
-
-        $protectedItem = Az.Migrate.Internal\Get-AzMigrateProtectedItem @PSBoundParameters -ErrorVariable notPresent -ErrorAction SilentlyContinue
+        $protectedItem = Az.Migrate.Internal\Get-AzMigrateProtectedItem `
+            -ResourceGroupName $resourceGroupName `
+            -VaultName $vaultName `
+            -Name $protectedItemName `
+            -ErrorVariable notPresent `
+            -ErrorAction SilentlyContinue
         if ($null -eq $protectedItem) {
             throw "The replicating server doesn't exist. Please check the input and try again."
         }
@@ -136,9 +134,18 @@ function Start-AzMigrateLocalServerMigration {
             throw "The replicating server cannot be migrated right now. Current protection state is '$($protectedItem.Property.ProtectionStateDescription)'."
         }
 
-        $null = $PSBoundParameters.Remove("ResourceGroupName")
-        $null = $PSBoundParameters.Remove("VaultName")
-        $null = $PSBoundParameters.Remove("Name")
+        # Get ARC Resource Bridge info
+        $targetClusterId = $protectedItem.Property.CustomProperty.TargetHciClusterId
+        $targetClusterIdArray = $targetClusterId.Split("/")
+        $targetSubscription = $targetClusterIdArray[2]
+        $arbArgQuery = GetARGQueryForArcResourceBridge -HCIClusterID $targetClusterId
+        $arbArgResult = Az.ResourceGraph\Search-AzGraph -Query $arbArgQuery -Subscription $targetSubscription
+        if ($null -eq $arbArgResult) {
+            throw "$($ArcResourceBridgeValidationMessages.NoClusters). Validate target cluster with id '$targetClusterId' exists."
+        }
+        elseif ($arbArgResult.statusOfTheBridge -ne "Running") {
+            throw "$($ArcResourceBridgeValidationMessages.NotRunning). Make sure the Arc Resource Bridge is online before retrying."
+        }
 
         # Get the instance type from the protected item
         $instanceType = $protectedItem.Property.CustomProperty.InstanceType
@@ -159,22 +166,19 @@ function Start-AzMigrateLocalServerMigration {
         $customProperties.ShutdownSourceVM = $performShutDown
         $properties.CustomProperty = $customProperties
 
-        $null = $PSBoundParameters.Add('ResourceGroupName', $resourceGroupName)
-        $null = $PSBoundParameters.Add('VaultName', $vaultName)
-        $null = $PSBoundParameters.Add('ProtectedItemName', $protectedItemName)
-        $null = $PSBoundParameters.Add('NoWait', $true)
-        $null = $PSBoundParameters.Add('Property', $properties)
-
         if ($PSCmdlet.ShouldProcess($TargetObjectID, "Migrate VM.")) {
-            $operation = Az.Migrate.Internal\Invoke-AzMigratePlannedProtectedItemFailover @PSBoundParameters
-            $jobName = $operation.Target.Split("/")[-1].Split("?")[0].Split("_")[0]
-          
-            $null = $PSBoundParameters.Remove('ProtectedItemName')  
-            $null = $PSBoundParameters.Remove('NoWait')
-            $null = $PSBoundParameters.Remove('Property')
+            $operation = Az.Migrate.Internal\Invoke-AzMigratePlannedProtectedItemFailover `
+                -ResourceGroupName $resourceGroupName `
+                -VaultName $vaultName `
+                -ProtectedItemName $protectedItemName `
+                -NoWait $true `
+                -Property $properties
 
-            $null = $PSBoundParameters.Add('JobName', $jobName)
-            return Az.Migrate.Internal\Get-AzMigrateLocalReplicationJob @PSBoundParameters
+            $jobName = $operation.Target.Split("/")[-1].Split("?")[0].Split("_")[0]
+            return Az.Migrate.Internal\Get-AzMigrateLocalReplicationJob `
+                -ResourceGroupName $resourceGroupName `
+                -VaultName $vaultName `
+                -JobName $jobName
         }
     }
 }
\ No newline at end of file

From 142b8ac86c3541b63aa1f47cf11fb1f8683aadd9 Mon Sep 17 00:00:00 2001
From: Sam Lee <samlee3@microsoft.com>
Date: Tue, 15 Jul 2025 11:19:29 -0700
Subject: [PATCH 02/11] Update Start-AzMigrateLocalServerMigration test to be
 live only

---
 .../test/Start-AzMigrateLocalServerMigration.Tests.ps1          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Migrate/Migrate.Autorest/test/Start-AzMigrateLocalServerMigration.Tests.ps1 b/src/Migrate/Migrate.Autorest/test/Start-AzMigrateLocalServerMigration.Tests.ps1
index 3dc983120a18..1e0db94d5822 100644
--- a/src/Migrate/Migrate.Autorest/test/Start-AzMigrateLocalServerMigration.Tests.ps1
+++ b/src/Migrate/Migrate.Autorest/test/Start-AzMigrateLocalServerMigration.Tests.ps1
@@ -14,7 +14,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'Start-AzMigrateLocalServerMig
   . ($mockingPath | Select-Object -First 1).FullName
 }
 
-Describe 'Start-AzMigrateLocalServerMigration' {
+Describe 'Start-AzMigrateLocalServerMigration' -Tag 'LiveOnly' {
     It 'ByID' {
         { Start-AzMigrateLocalServerMigration -TargetObjectID $env.hciProtectedItem1 -SubscriptionId $env.hciSubscriptionId } | Should -Not -Throw
     }

From f5eb5758720fa569afa9be5f4e58f22cde88c0a2 Mon Sep 17 00:00:00 2001
From: Sam Lee <samlee3@microsoft.com>
Date: Tue, 15 Jul 2025 15:35:59 -0700
Subject: [PATCH 03/11] Update pre-replication validation logic

---
 .../custom/Helper/AzLocalCommonSettings.ps1   |  2 +-
 .../custom/Helper/CommonHelper.ps1            | 31 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1 b/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1
index 27d3ea55e9cc..e4a32c7e9e84 100644
--- a/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1
@@ -114,7 +114,7 @@ $VmReplicationValidationMessages = @{
     VmWareToolsNotInstalled = "VMware tools not installed on VM. $VmReplicationValidationMessage";
     VmWareToolsNotRunning   = "VMware tools not running on VM. $VmReplicationValidationMessage";
     VmNotHighlyAvailable    = "VM not highly available. $VmReplicationValidationMessage";
-    OsTypeNotFound          = "Hyper-V Integration Services not running on VM. $VmReplicationValidationMessage";
+    HyperVIntegrationServicesNotRunning = "Hyper-V Integration Services not running on VM. $VmReplicationValidationMessage";
     OsTypeNotSupported      = "The OS type of the VM is not supported for replication. $VmReplicationValidationMessage";
 }
 
diff --git a/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1 b/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
index f0039b45ef5e..63a3840da9cf 100644
--- a/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
@@ -282,16 +282,12 @@ function ValidateReplication {
         throw $VmReplicationValidationMessages.VmPoweredOff
     }
 
-    # Hyper-V/VMware VMs should have some OS type
-    if ([string]::IsNullOrEmpty($Machine.OperatingSystemDetailOSType))
-    {
-        throw $VmReplicationValidationMessages.OsTypeNotFound
-    }
-
+    # Hyper-V scenario checks
     if ($MigrationType -eq $AzLocalInstanceTypes.HyperVToAzLocal) {
         # Hyper-V VMs with 'otherguestfamily' OS type and missing OS name could also mean Hyper-V Integration Services are not running
-        if ($Machine.OperatingSystemDetailOSType -eq $OsType.OtherGuestFamily -and [string]::IsNullOrEmpty($Machine.GuestOSDetailOsname)) {
-            throw $VmReplicationValidationMessages.OsTypeNotFound
+        if ($Machine.OperatingSystemDetailOSType -eq $OsType.OtherGuestFamily -and
+            [string]::IsNullOrEmpty($Machine.GuestOSDetailOsname)) {
+            throw $VmReplicationValidationMessages.HyperVIntegrationServicesNotRunning
         }
 
         # Hyper-V VMs should be highly available
@@ -300,18 +296,23 @@ function ValidateReplication {
         }
     }
 
+    # VMware scenario checks
     if ($MigrationType -eq $AzLocalInstanceTypes.VMwareToAzLocal) {
-        # VMware VMs with 'otherguestfamily' OS type is not supported
-        if ($Machine.OperatingSystemDetailOSType -eq $OsType.OtherGuestFamily) {
-            throw $VmReplicationValidationMessages.OsTypeNotSupported
-        }
-
         # VMware tools should be running to support static ip migration
-        if ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotInstalled) {
+        if ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotInstalled)
+        {
             throw $VmReplicationValidationMessages.VmWareToolsNotInstalled
         }
-        elseif ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotRunning) {
+        elseif ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotRunning)
+        {
             throw $VmReplicationValidationMessages.VmWareToolsNotRunning
         }
     }
+
+    # Only OS type of windowsguest and linuxguest are supported
+    if ($Machine.OperatingSystemDetailOSType -ne $OsType.WindowsGuest -and
+        $Machine.OperatingSystemDetailOSType -ne $OsType.LinuxGuest)
+    {
+        throw $VmReplicationValidationMessages.OsTypeNotSupported
+    }
 }
\ No newline at end of file

From 5b2de71e57d2ed507f2c8e9b19e158d9a9df08af Mon Sep 17 00:00:00 2001
From: Sam Lee <samlee3@microsoft.com>
Date: Tue, 15 Jul 2025 17:23:51 -0700
Subject: [PATCH 04/11] Remove unnecessary change

---
 .../custom/Helper/CommonHelper.ps1             | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1 b/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
index 63a3840da9cf..461e20fd93b8 100644
--- a/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
@@ -285,8 +285,9 @@ function ValidateReplication {
     # Hyper-V scenario checks
     if ($MigrationType -eq $AzLocalInstanceTypes.HyperVToAzLocal) {
         # Hyper-V VMs with 'otherguestfamily' OS type and missing OS name could also mean Hyper-V Integration Services are not running
-        if ($Machine.OperatingSystemDetailOSType -eq $OsType.OtherGuestFamily -and
-            [string]::IsNullOrEmpty($Machine.GuestOSDetailOsname)) {
+        if ([string]::IsNullOrEmpty($Machine.OperatingSystemDetailOSType) -or
+            ($Machine.OperatingSystemDetailOSType -eq $OsType.OtherGuestFamily -and [string]::IsNullOrEmpty($Machine.GuestOSDetailOsname)))
+        {
             throw $VmReplicationValidationMessages.HyperVIntegrationServicesNotRunning
         }
 
@@ -299,17 +300,16 @@ function ValidateReplication {
     # VMware scenario checks
     if ($MigrationType -eq $AzLocalInstanceTypes.VMwareToAzLocal) {
         # VMware tools should be running to support static ip migration
-        if ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotInstalled)
-        {
-            throw $VmReplicationValidationMessages.VmWareToolsNotInstalled
-        }
-        elseif ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotRunning)
-        {
+        if ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotRunning) {
             throw $VmReplicationValidationMessages.VmWareToolsNotRunning
         }
+
+        if ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotInstalled) {
+            throw $VmReplicationValidationMessages.VmWareToolsNotInstalled
+        }
     }
 
-    # Only OS type of windowsguest and linuxguest are supported
+    # Only OS type of windowsguest and linuxguest are supported for Hyper-V and VMware scenarios
     if ($Machine.OperatingSystemDetailOSType -ne $OsType.WindowsGuest -and
         $Machine.OperatingSystemDetailOSType -ne $OsType.LinuxGuest)
     {

From bdd4592fe597028d762155fb5343c4ac48004912 Mon Sep 17 00:00:00 2001
From: Sam Lee <samlee3@microsoft.com>
Date: Fri, 18 Jul 2025 15:58:26 -0700
Subject: [PATCH 05/11] Add new OsType param to set & fix runasaccount bug

---
 src/Migrate/Migrate.Autorest/README.md        |   7 +-
 .../custom/Helper/AzLocalCommonSettings.ps1   |  10 +-
 .../custom/Helper/CommonHelper.ps1            |  14 +--
 .../New-AzMigrateLocalServerReplication.ps1   | 112 ++++++++++++++----
 .../Set-AzMigrateLocalServerReplication.ps1   |  15 +++
 .../Set-AzMigrateLocalServerReplication.md    |  17 ++-
 src/Migrate/Migrate/ChangeLog.md              |   1 +
 .../Set-AzMigrateLocalServerReplication.md    |  23 +++-
 8 files changed, 155 insertions(+), 44 deletions(-)

diff --git a/src/Migrate/Migrate.Autorest/README.md b/src/Migrate/Migrate.Autorest/README.md
index 29ba9c587665..6e2e00e70cb1 100644
--- a/src/Migrate/Migrate.Autorest/README.md
+++ b/src/Migrate/Migrate.Autorest/README.md
@@ -323,7 +323,7 @@ directive:
   - from: Microsoft.OffAzure/stable/2020-01-01/migrate.json
     where:
       verb: Get
-      subject: ^HyperV(Cluster|Host|Job|OperationsStatus)$
+      subject: ^HyperV(Job|OperationsStatus)$
     remove: true
   - from: Microsoft.OffAzure/stable/2020-01-01/migrate.json
     where:
@@ -477,6 +477,11 @@ directive:
       verb: Get$
       subject: ^VCenter$
     hide: true
+  - from: Microsoft.OffAzure/stable/2020-01-01/migrate.json
+    where:
+      verb: Get$
+      subject: ^HyperV(Cluster|Host)$
+    hide: true
   - where:
       verb: New$|Update$
       variant: ^(Update|Create)(?!.*?Expanded)
diff --git a/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1 b/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1
index e4a32c7e9e84..9159cf97e930 100644
--- a/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1
@@ -101,7 +101,7 @@ $VMwareToolsStatus = @{
     NotInstalled = "NotInstalled";
 }
 
-$OsType = @{
+$OsTypes = @{
     LinuxGuest = "linuxguest";
     WindowsGuest = "windowsguest";
     OtherGuestFamily = "otherguestfamily";
@@ -111,14 +111,14 @@ $VmReplicationValidationMessage = "Replication could not be initiated. Please en
 $VmReplicationValidationMessages = @{
     VmPoweredOff            = "The VM is currently powered off. $VmReplicationValidationMessage";
     AlreadyInReplication    = "The VM is already in replication. $VmReplicationValidationMessage";
-    VmWareToolsNotInstalled = "VMware tools not installed on VM. $VmReplicationValidationMessage";
-    VmWareToolsNotRunning   = "VMware tools not running on VM. $VmReplicationValidationMessage";
     VmNotHighlyAvailable    = "VM not highly available. $VmReplicationValidationMessage";
     HyperVIntegrationServicesNotRunning = "Hyper-V Integration Services not running on VM. $VmReplicationValidationMessage";
-    OsTypeNotSupported      = "The OS type of the VM is not supported for replication. $VmReplicationValidationMessage";
+    VmWareToolsNotInstalled = "VMware tools not installed on VM. If you plan on migrating static IP of the VMware VM, please ensure VMware Tools are installed on the VM, and allow up to 30 minutes before migrating.";
+    VmWareToolsNotRunning   = "VMware tools not running on VM. If you plan on migrating static IP of the VMware VM, please ensure VMware Tools are running on the VM, and allow up to 30 minutes before migrating.";
+    OsTypeNotSupported      = "The OS type of the VM is not known at time of replication. If it is a custom OS build of either Windows or Linux, please run `Set-AzMigrateLocalServerReplication -TargetObjectID <ProtectedItemId> -OsType <OsType>` to specify the OS type before migrating.";
 }
 
 $ArcResourceBridgeValidationMessages = @{
     NotRunning = "Arc Resource Bridge is offline. To continue, bring the Arc Resource Bridge online. Wait a few minutes for the status to update and retry.";
-    NoClusters = "There are no Azure Local resources in the selected resource group."
+    NoClusters = "There are no Azure Local clusters found in the selected resource group."
 }
\ No newline at end of file
diff --git a/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1 b/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
index 461e20fd93b8..94154d642c7f 100644
--- a/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
@@ -286,13 +286,13 @@ function ValidateReplication {
     if ($MigrationType -eq $AzLocalInstanceTypes.HyperVToAzLocal) {
         # Hyper-V VMs with 'otherguestfamily' OS type and missing OS name could also mean Hyper-V Integration Services are not running
         if ([string]::IsNullOrEmpty($Machine.OperatingSystemDetailOSType) -or
-            ($Machine.OperatingSystemDetailOSType -eq $OsType.OtherGuestFamily -and [string]::IsNullOrEmpty($Machine.GuestOSDetailOsname)))
+            ($Machine.OperatingSystemDetailOSType -eq $OsTypes.OtherGuestFamily -and [string]::IsNullOrEmpty($Machine.GuestOSDetailOsname)))
         {
             throw $VmReplicationValidationMessages.HyperVIntegrationServicesNotRunning
         }
 
         # Hyper-V VMs should be highly available
-        if ($Machine.ClusterId -and $Machine.HighAvailability -eq $HighAvailability.NO) {
+        if (![string]::IsNullOrEmpty($Machine.ClusterId) -and $Machine.HighAvailability -eq $HighAvailability.NO) {
             throw $VmReplicationValidationMessages.VmNotHighlyAvailable
         }
     }
@@ -301,18 +301,18 @@ function ValidateReplication {
     if ($MigrationType -eq $AzLocalInstanceTypes.VMwareToAzLocal) {
         # VMware tools should be running to support static ip migration
         if ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotRunning) {
-            throw $VmReplicationValidationMessages.VmWareToolsNotRunning
+            Write-Warning $VmReplicationValidationMessages.VmWareToolsNotRunning
         }
 
         if ($Machine.VMwareToolsStatus -eq $VMwareToolsStatus.NotInstalled) {
-            throw $VmReplicationValidationMessages.VmWareToolsNotInstalled
+            Write-Warning $VmReplicationValidationMessages.VmWareToolsNotInstalled
         }
     }
 
     # Only OS type of windowsguest and linuxguest are supported for Hyper-V and VMware scenarios
-    if ($Machine.OperatingSystemDetailOSType -ne $OsType.WindowsGuest -and
-        $Machine.OperatingSystemDetailOSType -ne $OsType.LinuxGuest)
+    if ($Machine.OperatingSystemDetailOSType -ne $OsTypes.WindowsGuest -and
+        $Machine.OperatingSystemDetailOSType -ne $OsTypes.LinuxGuest)
     {
-        throw $VmReplicationValidationMessages.OsTypeNotSupported
+        Write-Warning $VmReplicationValidationMessages.OsTypeNotSupported
     }
 }
\ No newline at end of file
diff --git a/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1 b/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1
index aa523e35bc95..c455dda5e074 100644
--- a/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1
@@ -200,6 +200,8 @@ function New-AzMigrateLocalServerReplication {
         
         if ($SiteType -eq $SiteTypes.HyperVSites) {
             $instanceType = $AzLocalInstanceTypes.HyperVToAzLocal
+
+            # Get Hyper-V machine
             $machine = InvokeAzMigrateGetCommandWithRetries `
                 -CommandName 'Az.Migrate.Internal\Get-AzMigrateHyperVMachine' `
                 -Parameters @{
@@ -209,6 +211,7 @@ function New-AzMigrateLocalServerReplication {
                 } `
                 -ErrorMessage "Machine '$MachineName' not found in resource group '$ResourceGroupName' and site '$SiteName'."
 
+            # Get Hyper-V site
             $siteObject = InvokeAzMigrateGetCommandWithRetries `
                 -CommandName 'Az.Migrate.Internal\Get-AzMigrateHyperVSite' `
                 -Parameters @{
@@ -216,9 +219,60 @@ function New-AzMigrateLocalServerReplication {
                     'SiteName' = $SiteName;
                 } `
                 -ErrorMessage "Machine site '$SiteName' with Type '$SiteType' not found."
+
+            # Get RunAsAccount
+            if (![string]::IsNullOrEmpty($machine.HostId))
+            {
+                # machine is on a single Hyper-V host
+                $hostIdArray = $machine.HostId.Split("/")
+                if ($hostIdArray.Length -lt 11) {
+                    throw "Invalid Hyper-V Host ARM ID '$hostIdArray'"
+                }
+
+                $hostResourceGroupName = $hostIdArray[4]
+                $hostSiteName = $hostIdArray[8]
+                $hostName = $hostIdArray[10]
+
+                $hyperVHost = InvokeAzMigrateGetCommandWithRetries `
+                    -CommandName 'Az.Migrate.Internal\Get-AzMigrateHyperVHost' `
+                    -Parameters @{
+                        'ResourceGroupName' = $hostResourceGroupName;
+                        'SiteName' = $hostSiteName;
+                        'HostName' = $hostName;
+                    } `
+                    -ErrorMessage "Hyper-V host '$hostName' not found in resource group '$hostResourceGroupName' and site '$hostSiteName'."
+                
+                $runAsAccountId = $hyperVHost.RunAsAccountId
+            }
+            elseif(![string]::IsNullOrEmpty($machine.ClusterId))
+            {
+                # machine is on a Hyper-V cluster
+                $clusterIdArray = $machine.ClusterId.Split("/")
+                if ($clusterIdArray.Length -lt 11) {
+                    throw "Invalid Hyper-V Cluster ARM ID '$clusterIdArray'"
+                }
+
+                $clusterResourceGroupName = $clusterIdArray[4]
+                $clusterSiteName = $clusterIdArray[8]
+                $clusterName = $clusterIdArray[10]
+
+                $hyperVCluster = InvokeAzMigrateGetCommandWithRetries `
+                    -CommandName 'Az.Migrate.Internal\Get-AzMigrateHyperVCluster' `
+                    -Parameters @{
+                        'ResourceGroupName' = $clusterResourceGroupName;
+                        'SiteName' = $clusterSiteName;
+                        'ClusterName' = $clusterName;
+                    } `
+                    -ErrorMessage "Hyper-V cluster '$clusterName' not found in resource group '$clusterResourceGroupName' and site '$clusterSiteName'."
+
+                $runAsAccountId = $hyperVCluster.RunAsAccountId
+            }
         }
-        else {
+        else
+        {
             $instanceType = $AzLocalInstanceTypes.VMwareToAzLocal
+
+            # Get VMware machine
             $machine = InvokeAzMigrateGetCommandWithRetries `
                 -CommandName 'Az.Migrate.Internal\Get-AzMigrateMachine' `
                 -Parameters @{
@@ -228,6 +282,7 @@ function New-AzMigrateLocalServerReplication {
                 } `
                 -ErrorMessage "Machine '$MachineName' not found in resource group '$ResourceGroupName' and site '$SiteName'."
 
+            # Get VMware site
             $siteObject = InvokeAzMigrateGetCommandWithRetries `
                 -CommandName 'Az.Migrate\Get-AzMigrateSite' `
                 -Parameters @{
@@ -235,6 +290,35 @@ function New-AzMigrateLocalServerReplication {
                     'SiteName' = $SiteName;
                 } `
                 -ErrorMessage "Machine site '$SiteName' with Type '$SiteType' not found."
+
+            # Get RunAsAccount
+            if (![string]::IsNullOrEmpty($machine.VCenterId))
+            {
+                # machine is on a single vCenter
+                $vCenterIdArray = $machine.VCenterId.Split("/")
+                if ($vCenterIdArray.Length -lt 11) {
+                    throw "Invalid VMware vCenter ARM ID '$vCenterIdArray'"
+                }
+
+                $vCenterResourceGroupName = $vCenterIdArray[4]
+                $vCenterSiteName = $vCenterIdArray[8]
+                $vCenterName = $vCenterIdArray[10]
+
+                $vmwareVCenter = InvokeAzMigrateGetCommandWithRetries `
+                    -CommandName 'Az.Migrate.Internal\Get-AzMigrateVCenter' `
+                    -Parameters @{
+                        'ResourceGroupName' = $vCenterResourceGroupName;
+                        'SiteName' = $vCenterSiteName;
+                        'Name' = $vCenterName;
+                    } `
+                    -ErrorMessage "VMware vCenter '$vCenterName' not found in resource group '$vCenterResourceGroupName' and site '$vCenterSiteName'."
+
+                $runAsAccountId = $vmwareVCenter.RunAsAccountId
+            }
+        }
+
+        if ([string]::IsNullOrEmpty($runAsAccountId)) {
+            throw "Unable to determine RunAsAccount for site '$SiteName' from machine '$MachineName'. Please verify your appliance setup."
         }
 
         # Validate the VM
@@ -435,30 +519,6 @@ function New-AzMigrateLocalServerReplication {
         elseif ($arbArgResult.statusOfTheBridge -ne "Running") {
             throw "$($ArcResourceBridgeValidationMessages.NotRunning). Make sure the Arc Resource Bridge is online before retrying."
         }
-            
-        # Get source appliance RunAsAccount
-        if ($SiteType -eq $SiteTypes.HyperVSites) {
-            $runAsAccounts = InvokeAzMigrateGetCommandWithRetries `
-                -CommandName 'Az.Migrate.Internal\Get-AzMigrateHyperVRunAsAccount' `
-                -Parameters @{
-                    ResourceGroupName = $ResourceGroupName;
-                    SiteName = $SiteName;
-                } `
-                -ErrorMessage "No run as account found for site '$SiteName'."
-
-            $runAsAccount = $runAsAccounts | Where-Object { $_.CredentialType -eq $RunAsAccountCredentialTypes.HyperVFabric }
-        }
-        elseif ($SiteType -eq $SiteTypes.VMwareSites) {
-            $runAsAccounts = InvokeAzMigrateGetCommandWithRetries `
-                -CommandName 'Az.Migrate\Get-AzMigrateRunAsAccount' `
-                -Parameters @{
-                    ResourceGroupName = $ResourceGroupName;
-                    SiteName = $SiteName;
-                } `
-                -ErrorMessage "No run as account found for site '$SiteName'."
-
-            $runAsAccount = $runAsAccounts | Where-Object { $_.CredentialType -eq $RunAsAccountCredentialTypes.VMwareFabric }
-        }
 
         # Validate TargetVMName
         if ($TargetVMName.length -gt 64 -or $TargetVMName.length -eq 0) {
@@ -488,7 +548,7 @@ function New-AzMigrateLocalServerReplication {
         $customProperties.InstanceType = $instanceType
         $customProperties.CustomLocationRegion = $arbArgResult.CustomLocationRegion
         $customProperties.FabricDiscoveryMachineId = $machine.Id
-        $customProperties.RunAsAccountId = $runAsAccount.Id
+        $customProperties.RunAsAccountId = $runAsAccountId
         $customProperties.SourceFabricAgentName = $sourceDra.Name
         $customProperties.StorageContainerId = $TargetStoragePathId
         $customProperties.TargetArcClusterCustomLocationId = $arbArgResult.CustomLocation
diff --git a/src/Migrate/Migrate.Autorest/custom/Set-AzMigrateLocalServerReplication.ps1 b/src/Migrate/Migrate.Autorest/custom/Set-AzMigrateLocalServerReplication.ps1
index b6f026fd6caa..db8e53953562 100644
--- a/src/Migrate/Migrate.Autorest/custom/Set-AzMigrateLocalServerReplication.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Set-AzMigrateLocalServerReplication.ps1
@@ -64,6 +64,14 @@ function Set-AzMigrateLocalServerReplication {
         # Specifies the nics on the source server to be included for replication.
         ${NicToInclude},
 
+        [Parameter()]
+        [ValidateSet("WindowsGuest" , "LinuxGuest")]
+        [ArgumentCompleter( { "WindowsGuest" , "LinuxGuest" })]
+        [Microsoft.Azure.PowerShell.Cmdlets.Migrate.Category('Path')]
+        [System.String]
+        # Specifies the OS type of the VM, either WindowsGuest or LinuxGuest.
+        ${OsType},
+
         [Parameter()]
         [Microsoft.Azure.PowerShell.Cmdlets.Migrate.Category('Path')]
         [Microsoft.Azure.PowerShell.Cmdlets.Migrate.Runtime.DefaultInfo(Script = '(Get-AzContext).Subscription.Id')]
@@ -133,6 +141,7 @@ function Set-AzMigrateLocalServerReplication {
         if ($HasIsDynamicMemoryEnabled) {
             $isDynamicRamEnabled = [System.Convert]::ToBoolean($IsDynamicMemoryEnabled)
         }
+        $HasOsType = $PSBoundParameters.ContainsKey('OsType')
 
         $null = $PSBoundParameters.Remove('TargetVMCPUCore')
         $null = $PSBoundParameters.Remove('IsDynamicMemoryEnabled')
@@ -140,6 +149,7 @@ function Set-AzMigrateLocalServerReplication {
         $null = $PSBoundParameters.Remove('TargetVMRam')
         $null = $PSBoundParameters.Remove('NicToInclude')
         $null = $PSBoundParameters.Remove('TargetObjectID')
+        $null = $PSBoundParameters.Remove('OsType')
         $null = $PSBoundParameters.Remove('WhatIf')
         $null = $PSBoundParameters.Remove('Confirm')
         
@@ -301,6 +311,11 @@ function Set-AzMigrateLocalServerReplication {
             }
         }
 
+        # Update OS type
+        if ($HasOsType) {
+            $customPropertiesUpdate.OsType = $OsType
+        }
+
         $protectedItemPropertiesUpdate = [Microsoft.Azure.PowerShell.Cmdlets.Migrate.Models.Api20240901.ProtectedItemModelPropertiesUpdate]::new()
         $protectedItemPropertiesUpdate.CustomProperty = $customPropertiesUpdate
 
diff --git a/src/Migrate/Migrate.Autorest/docs/Set-AzMigrateLocalServerReplication.md b/src/Migrate/Migrate.Autorest/docs/Set-AzMigrateLocalServerReplication.md
index 0ca56e8cce2c..10df4e66133d 100644
--- a/src/Migrate/Migrate.Autorest/docs/Set-AzMigrateLocalServerReplication.md
+++ b/src/Migrate/Migrate.Autorest/docs/Set-AzMigrateLocalServerReplication.md
@@ -15,7 +15,7 @@ Updates the target properties for the replicating server.
 ```
 Set-AzMigrateLocalServerReplication -TargetObjectID <String>
  [-DynamicMemoryConfig <ProtectedItemDynamicMemoryConfig>] [-IsDynamicMemoryEnabled <String>]
- [-NicToInclude <AzLocalNicInput[]>] [-SubscriptionId <String>] [-TargetVMCPUCore <Int32>]
+ [-NicToInclude <AzLocalNicInput[]>] [-OsType <String>] [-SubscriptionId <String>] [-TargetVMCPUCore <Int32>]
  [-TargetVMRam <Int64>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
@@ -129,6 +129,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -OsType
+Specifies the OS type of the VM, either WindowsGuest or LinuxGuest.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -SubscriptionId
 The subscription Id.
 
diff --git a/src/Migrate/Migrate/ChangeLog.md b/src/Migrate/Migrate/ChangeLog.md
index bbd057d02643..bf5841da5ecf 100644
--- a/src/Migrate/Migrate/ChangeLog.md
+++ b/src/Migrate/Migrate/ChangeLog.md
@@ -22,6 +22,7 @@
 * Removed `-TargetStoragePathId` parameter from command `New-AzMigrateLocalDiskMappingObject` until the feature to associate each disk to their own storage container path is supported.
 * Added `-SourceApplianceName` and `-TargetApplianceName` as required parameters to command `New-AzMigrateLocalServerReplication` to allow users to specify appliance pairs of their choosing.
 * Enhanced resource validations in `Initialize-AzMigrateLocalReplicationInfrastructure` and `New-AzMigrateLocalServerReplication`.
+* Added `-OsType` as an optional parameter to command `Set-AzMigrateLocalServerReplication` to allow user-specified OS type.
 
 ## Version 2.8.0
 * Implemented the Get-AzMigrateServerMigrationStatus cmdlet to retrieve the replication status of servers in Azure Migrate.
diff --git a/src/Migrate/Migrate/help/Set-AzMigrateLocalServerReplication.md b/src/Migrate/Migrate/help/Set-AzMigrateLocalServerReplication.md
index bfd373fbce67..2d8755962573 100644
--- a/src/Migrate/Migrate/help/Set-AzMigrateLocalServerReplication.md
+++ b/src/Migrate/Migrate/help/Set-AzMigrateLocalServerReplication.md
@@ -13,10 +13,10 @@ Updates the target properties for the replicating server.
 ## SYNTAX
 
 ```
-Set-AzMigrateLocalServerReplication -TargetObjectID <String> [-TargetVMCPUCore <Int32>]
- [-IsDynamicMemoryEnabled <String>] [-DynamicMemoryConfig <ProtectedItemDynamicMemoryConfig>]
- [-TargetVMRam <Int64>] [-NicToInclude <AzLocalNicInput[]>] [-SubscriptionId <String>]
- [-DefaultProfile <PSObject>] [-WhatIf] [-Confirm] [<CommonParameters>]
+Set-AzMigrateLocalServerReplication -TargetObjectID <String>
+ [-DynamicMemoryConfig <ProtectedItemDynamicMemoryConfig>] [-IsDynamicMemoryEnabled <String>]
+ [-NicToInclude <AzLocalNicInput[]>] [-OsType <String>] [-SubscriptionId <String>] [-TargetVMCPUCore <Int32>]
+ [-TargetVMRam <Int64>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -129,6 +129,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -OsType
+Specifies the OS type of the VM, either WindowsGuest or LinuxGuest.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -SubscriptionId
 The subscription Id.
 

From af4127c73c11ad6b929ac7155f5e0ed66cda3729 Mon Sep 17 00:00:00 2001
From: Sam Lee <samlee3@microsoft.com>
Date: Mon, 21 Jul 2025 16:13:51 -0700
Subject: [PATCH 06/11] Small bug fix

---
 .../custom/Start-AzMigrateLocalServerMigration.ps1            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Migrate/Migrate.Autorest/custom/Start-AzMigrateLocalServerMigration.ps1 b/src/Migrate/Migrate.Autorest/custom/Start-AzMigrateLocalServerMigration.ps1
index a1b8b3975ccf..9c5c3fd86c9b 100644
--- a/src/Migrate/Migrate.Autorest/custom/Start-AzMigrateLocalServerMigration.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Start-AzMigrateLocalServerMigration.ps1
@@ -171,8 +171,8 @@ function Start-AzMigrateLocalServerMigration {
                 -ResourceGroupName $resourceGroupName `
                 -VaultName $vaultName `
                 -ProtectedItemName $protectedItemName `
-                -NoWait $true `
-                -Property $properties
+                -Property $properties `
+                -NoWait
 
             $jobName = $operation.Target.Split("/")[-1].Split("?")[0].Split("_")[0]
             return Az.Migrate.Internal\Get-AzMigrateLocalReplicationJob `

From 275fad99fba7ae2c1e4c16f46e6f0cc7eba64765 Mon Sep 17 00:00:00 2001
From: Sam Lee <samlee3@microsoft.com>
Date: Tue, 22 Jul 2025 10:18:00 -0700
Subject: [PATCH 07/11] Address PR comments

---
 .../custom/New-AzMigrateLocalServerReplication.ps1          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1 b/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1
index c455dda5e074..c165871929ec 100644
--- a/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1
@@ -226,7 +226,7 @@ function New-AzMigrateLocalServerReplication {
                 # machine is on a single Hyper-V host
                 $hostIdArray = $machine.HostId.Split("/")
                 if ($hostIdArray.Length -lt 11) {
-                    throw "Invalid Hyper-V Host ARM ID '$hostIdArray'"
+                    throw "Invalid Hyper-V Host ARM ID '$($machine.HostId)'"
                 }
 
                 $hostResourceGroupName = $hostIdArray[4]
@@ -249,7 +249,7 @@ function New-AzMigrateLocalServerReplication {
                 # machine is on a Hyper-V cluster
                 $clusterIdArray = $machine.ClusterId.Split("/")
                 if ($clusterIdArray.Length -lt 11) {
-                    throw "Invalid Hyper-V Cluster ARM ID '$clusterIdArray'"
+                    throw "Invalid Hyper-V Cluster ARM ID '$($machine.ClusterId)'"
                 }
 
                 $clusterResourceGroupName = $clusterIdArray[4]
@@ -297,7 +297,7 @@ function New-AzMigrateLocalServerReplication {
                 # machine is on a single vCenter
                 $vCenterIdArray = $machine.VCenterId.Split("/")
                 if ($vCenterIdArray.Length -lt 11) {
-                    throw "Invalid VMware vCenter ARM ID '$vCenterIdArray'"
+                    throw "Invalid VMware vCenter ARM ID '$($machine.VCenterId)'"
                 }
 
                 $vCenterResourceGroupName = $vCenterIdArray[4]

From be29aca4fec0433f1d915f0555223d4ded3f49b3 Mon Sep 17 00:00:00 2001
From: Sam Lee <samlee3@microsoft.com>
Date: Tue, 22 Jul 2025 13:42:32 -0700
Subject: [PATCH 08/11] Address PR comments

---
 .../Helper/{CommonHelper.ps1 => AzLocalCommonHelper.ps1}  | 0
 ...Initialize-AzMigrateLocalReplicationInfrastructure.ps1 | 2 +-
 .../custom/New-AzMigrateLocalServerReplication.ps1        | 8 ++++++--
 .../custom/Set-AzMigrateLocalServerReplication.ps1        | 2 +-
 .../custom/Start-AzMigrateLocalServerMigration.ps1        | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)
 rename src/Migrate/Migrate.Autorest/custom/Helper/{CommonHelper.ps1 => AzLocalCommonHelper.ps1} (100%)

diff --git a/src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1 b/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonHelper.ps1
similarity index 100%
rename from src/Migrate/Migrate.Autorest/custom/Helper/CommonHelper.ps1
rename to src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonHelper.ps1
diff --git a/src/Migrate/Migrate.Autorest/custom/Initialize-AzMigrateLocalReplicationInfrastructure.ps1 b/src/Migrate/Migrate.Autorest/custom/Initialize-AzMigrateLocalReplicationInfrastructure.ps1
index ef37fd0145f9..bfd456fbc5d1 100644
--- a/src/Migrate/Migrate.Autorest/custom/Initialize-AzMigrateLocalReplicationInfrastructure.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Initialize-AzMigrateLocalReplicationInfrastructure.ps1
@@ -121,7 +121,7 @@ function Initialize-AzMigrateLocalReplicationInfrastructure {
 
     process {
         Import-Module $PSScriptRoot\Helper\AzLocalCommonSettings.ps1
-        Import-Module $PSScriptRoot\Helper\CommonHelper.ps1
+        Import-Module $PSScriptRoot\Helper\AZLocalCommonHelper.ps1
 
         CheckResourcesModuleDependency
         CheckStorageModuleDependency
diff --git a/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1 b/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1
index c165871929ec..802ca87bee65 100644
--- a/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/New-AzMigrateLocalServerReplication.ps1
@@ -170,7 +170,7 @@ function New-AzMigrateLocalServerReplication {
     
     process {
         Import-Module $PSScriptRoot\Helper\AzLocalCommonSettings.ps1
-        Import-Module $PSScriptRoot\Helper\CommonHelper.ps1
+        Import-Module $PSScriptRoot\Helper\AZLocalCommonHelper.ps1
 
         CheckResourceGraphModuleDependency
         CheckResourcesModuleDependency
@@ -268,7 +268,7 @@ function New-AzMigrateLocalServerReplication {
                 $runAsAccountId = $hyperVCluster.RunAsAccountId
             }
         }
-        else
+        elseif ($SiteType -eq $SiteTypes.VMwareSites)
         {
             $instanceType = $AzLocalInstanceTypes.VMwareToAzLocal
 
@@ -316,6 +316,10 @@ function New-AzMigrateLocalServerReplication {
                 $runAsAccountId = $vmwareVCenter.RunAsAccountId
             }
         }
+        else
+        {
+            throw "Unsupported site type '$SiteType'. Only Hyper-V and VMware sites are supported."
+        }
 
         if ([string]::IsNullOrEmpty($runAsAccountId)) {
             throw "Unable to determine RunAsAccount for site '$SiteName' from machine '$MachineName'. Please verify your appliance setup."
diff --git a/src/Migrate/Migrate.Autorest/custom/Set-AzMigrateLocalServerReplication.ps1 b/src/Migrate/Migrate.Autorest/custom/Set-AzMigrateLocalServerReplication.ps1
index db8e53953562..48d00416bf9f 100644
--- a/src/Migrate/Migrate.Autorest/custom/Set-AzMigrateLocalServerReplication.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Set-AzMigrateLocalServerReplication.ps1
@@ -129,7 +129,7 @@ function Set-AzMigrateLocalServerReplication {
     
     process {
         Import-Module $PSScriptRoot\Helper\AzLocalCommonSettings.ps1
-        Import-Module $PSScriptRoot\Helper\CommonHelper.ps1
+        Import-Module $PSScriptRoot\Helper\AZLocalCommonHelper.ps1
 
         CheckResourcesModuleDependency
         
diff --git a/src/Migrate/Migrate.Autorest/custom/Start-AzMigrateLocalServerMigration.ps1 b/src/Migrate/Migrate.Autorest/custom/Start-AzMigrateLocalServerMigration.ps1
index 9c5c3fd86c9b..100204b5dc31 100644
--- a/src/Migrate/Migrate.Autorest/custom/Start-AzMigrateLocalServerMigration.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Start-AzMigrateLocalServerMigration.ps1
@@ -101,7 +101,7 @@ function Start-AzMigrateLocalServerMigration {
     
     process {
         Import-Module $PSScriptRoot\Helper\AzLocalCommonSettings.ps1
-        Import-Module $PSScriptRoot\Helper\CommonHelper.ps1
+        Import-Module $PSScriptRoot\Helper\AZLocalCommonHelper.ps1
 
         CheckResourceGraphModuleDependency
         CheckResourcesModuleDependency

From 1a330ea9af3310d6b3b2448a753762fdca72ffe6 Mon Sep 17 00:00:00 2001
From: Sam Lee <samlee3@microsoft.com>
Date: Wed, 23 Jul 2025 11:57:15 -0700
Subject: [PATCH 09/11] Update auto generated files

---
 .../Migrate.Autorest/docs/Az.Migrate.md       |  2 +-
 .../Migrate.Autorest/generate-info.json       |  3 -
 src/Migrate/Migrate.sln                       | 28 +++----
 src/Migrate/Migrate/Az.Migrate.psd1           | 12 +--
 .../help/Get-AzMigrateDiscoveredServer.md     | 36 +++++----
 src/Migrate/Migrate/help/Get-AzMigrateJob.md  | 30 ++++----
 .../Migrate/help/Get-AzMigrateLocalJob.md     | 27 +++----
 .../Get-AzMigrateLocalReplicationFabric.md    | 16 ++--
 .../Get-AzMigrateLocalServerReplication.md    | 37 ++++-----
 .../Migrate/help/Get-AzMigrateProject.md      |  3 +-
 .../help/Get-AzMigrateReplicationFabric.md    |  8 +-
 .../help/Get-AzMigrateReplicationPolicy.md    |  8 +-
 ...AzMigrateReplicationProtectionContainer.md | 21 +++---
 ...teReplicationProtectionContainerMapping.md | 26 +++----
 ...rateReplicationRecoveryServicesProvider.md | 10 +--
 .../Migrate/help/Get-AzMigrateRunAsAccount.md |  8 +-
 .../Get-AzMigrateServerMigrationStatus.md     | 20 ++---
 .../help/Get-AzMigrateServerReplication.md    | 39 +++++-----
 src/Migrate/Migrate/help/Get-AzMigrateSite.md |  4 +-
 .../Migrate/help/Get-AzMigrateSolution.md     |  6 +-
 ...AzMigrateLocalReplicationInfrastructure.md |  8 +-
 ...lize-AzMigrateReplicationInfrastructure.md | 19 ++---
 .../Migrate/help/New-AzMigrateDiskMapping.md  |  9 ++-
 .../New-AzMigrateLocalDiskMappingObject.md    | 26 ++-----
 .../New-AzMigrateLocalNicMappingObject.md     |  8 +-
 .../New-AzMigrateLocalServerReplication.md    | 55 +++++++++++---
 .../Migrate/help/New-AzMigrateNicMapping.md   |  9 ++-
 .../Migrate/help/New-AzMigrateProject.md      |  9 ++-
 .../help/New-AzMigrateReplicationPolicy.md    |  7 +-
 ...teReplicationProtectionContainerMapping.md |  7 +-
 .../help/New-AzMigrateServerReplication.md    | 75 +++++++++----------
 .../help/New-AzMigrateTestNicMapping.md       |  6 +-
 .../help/Register-AzMigrateProjectTool.md     |  5 +-
 .../Remove-AzMigrateLocalServerReplication.md | 13 ++--
 .../Migrate/help/Remove-AzMigrateProject.md   |  6 +-
 .../help/Remove-AzMigrateServerReplication.md | 10 ++-
 .../Restart-AzMigrateServerReplication.md     |  7 +-
 .../help/Resume-AzMigrateServerReplication.md | 12 +--
 .../Migrate/help/Set-AzMigrateDiskMapping.md  |  6 +-
 .../Set-AzMigrateLocalServerReplication.md    |  5 +-
 .../help/Set-AzMigrateServerReplication.md    | 40 +++++-----
 .../Start-AzMigrateLocalServerMigration.md    | 14 ++--
 .../help/Start-AzMigrateServerMigration.md    | 15 ++--
 .../help/Start-AzMigrateTestMigration.md      | 15 ++--
 .../Start-AzMigrateTestMigrationCleanup.md    |  7 +-
 .../Suspend-AzMigrateServerReplication.md     |  9 ++-
 46 files changed, 392 insertions(+), 354 deletions(-)
 delete mode 100644 src/Migrate/Migrate.Autorest/generate-info.json

diff --git a/src/Migrate/Migrate.Autorest/docs/Az.Migrate.md b/src/Migrate/Migrate.Autorest/docs/Az.Migrate.md
index 989eb4e43378..b5409f0cfcfd 100644
--- a/src/Migrate/Migrate.Autorest/docs/Az.Migrate.md
+++ b/src/Migrate/Migrate.Autorest/docs/Az.Migrate.md
@@ -1,6 +1,6 @@
 ---
 Module Name: Az.Migrate
-Module Guid: ac145a87-2ada-4b6f-9d19-a70ac116949d
+Module Guid: 7cbf023d-6b60-494a-8cdb-ab27463fef7d
 Download Help Link: https://learn.microsoft.com/powershell/module/az.migrate
 Help Version: 1.0.0.0
 Locale: en-US
diff --git a/src/Migrate/Migrate.Autorest/generate-info.json b/src/Migrate/Migrate.Autorest/generate-info.json
deleted file mode 100644
index 1eadcf07bbdc..000000000000
--- a/src/Migrate/Migrate.Autorest/generate-info.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "generate_Id": "145f526c-1786-4548-bea6-6c9c35ec0f0e"
-}
diff --git a/src/Migrate/Migrate.sln b/src/Migrate/Migrate.sln
index ae32c6732c75..a0dba5db778e 100644
--- a/src/Migrate/Migrate.sln
+++ b/src/Migrate/Migrate.sln
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Migrate", "Migrate\Migrate.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Migrate.Autorest", "Migrate.Autorest", "{9AA2C35A-2264-B74D-8556-EB72BD88EE60}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Migrate", "Migrate.Autorest\Az.Migrate.csproj", "{214A468C-8ED4-41E0-883E-35C53A36AA7A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Migrate", "Migrate.Autorest\Az.Migrate.csproj", "{3810D577-4417-4190-93DA-7A7360426181}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -117,18 +117,18 @@ Global
 		{1847EC8D-87A5-4772-9E75-1DEA1DC531EE}.Release|x64.Build.0 = Release|Any CPU
 		{1847EC8D-87A5-4772-9E75-1DEA1DC531EE}.Release|x86.ActiveCfg = Release|Any CPU
 		{1847EC8D-87A5-4772-9E75-1DEA1DC531EE}.Release|x86.Build.0 = Release|Any CPU
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A}.Debug|x64.Build.0 = Debug|Any CPU
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A}.Debug|x86.Build.0 = Debug|Any CPU
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A}.Release|x64.ActiveCfg = Release|Any CPU
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A}.Release|x64.Build.0 = Release|Any CPU
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A}.Release|x86.ActiveCfg = Release|Any CPU
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A}.Release|x86.Build.0 = Release|Any CPU
+		{3810D577-4417-4190-93DA-7A7360426181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3810D577-4417-4190-93DA-7A7360426181}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3810D577-4417-4190-93DA-7A7360426181}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3810D577-4417-4190-93DA-7A7360426181}.Debug|x64.Build.0 = Debug|Any CPU
+		{3810D577-4417-4190-93DA-7A7360426181}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3810D577-4417-4190-93DA-7A7360426181}.Debug|x86.Build.0 = Debug|Any CPU
+		{3810D577-4417-4190-93DA-7A7360426181}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3810D577-4417-4190-93DA-7A7360426181}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3810D577-4417-4190-93DA-7A7360426181}.Release|x64.ActiveCfg = Release|Any CPU
+		{3810D577-4417-4190-93DA-7A7360426181}.Release|x64.Build.0 = Release|Any CPU
+		{3810D577-4417-4190-93DA-7A7360426181}.Release|x86.ActiveCfg = Release|Any CPU
+		{3810D577-4417-4190-93DA-7A7360426181}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -140,6 +140,6 @@ Global
 		{FB2B969F-E6FB-4E6E-9D2A-E52F4F53F51F} = {2D0176AD-AE30-4235-9D62-17043F0D4CD8}
 		{D8D28132-CE20-45C8-8476-6B88C891D945} = {2D0176AD-AE30-4235-9D62-17043F0D4CD8}
 		{B799EA2F-9E28-421A-9301-BB061C6ADDC2} = {2D0176AD-AE30-4235-9D62-17043F0D4CD8}
-		{214A468C-8ED4-41E0-883E-35C53A36AA7A} = {9AA2C35A-2264-B74D-8556-EB72BD88EE60}
+		{3810D577-4417-4190-93DA-7A7360426181} = {9AA2C35A-2264-B74D-8556-EB72BD88EE60}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Migrate/Migrate/Az.Migrate.psd1 b/src/Migrate/Migrate/Az.Migrate.psd1
index 206ba795420d..46c5136c765d 100644
--- a/src/Migrate/Migrate/Az.Migrate.psd1
+++ b/src/Migrate/Migrate/Az.Migrate.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 5/28/2025
+# Generated on: 7/22/2025
 #
 
 @{
@@ -51,16 +51,16 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '5.0.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '5.1.1'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'Migrate.Autorest/bin/Az.Migrate.private.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
-# ScriptsToProcess = @()
+ScriptsToProcess = @()
 
 # Type files (.ps1xml) to be loaded when importing this module
-# TypesToProcess = @()
+TypesToProcess = @()
 
 # Format files (.ps1xml) to be loaded when importing this module
 FormatsToProcess = 'Migrate.Autorest/Az.Migrate.format.ps1xml'
@@ -123,7 +123,7 @@ PrivateData = @{
     PSData = @{
 
         # Tags applied to this module. These help with module discovery in online galleries.
-        Tags = 'Azure','ResourceManager','ARM','PSModule','Migrate'
+        Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'Migrate'
 
         # A URL to the license for this module.
         LicenseUri = 'https://aka.ms/azps-license'
@@ -149,7 +149,7 @@ PrivateData = @{
 
     } # End of PSData hashtable
 
- } # End of PrivateData hashtable
+} # End of PrivateData hashtable
 
 # HelpInfo URI of this module
 # HelpInfoURI = ''
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateDiscoveredServer.md b/src/Migrate/Migrate/help/Get-AzMigrateDiscoveredServer.md
index a3c09f5495b1..3a1f58858b40 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateDiscoveredServer.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateDiscoveredServer.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratediscoveredserver
 schema: 2.0.0
@@ -15,33 +15,31 @@ Get All discovered servers in a migrate project.
 ### List (Default)
 ```
 Get-AzMigrateDiscoveredServer -ProjectName <String> -ResourceGroupName <String> [-DisplayName <String>]
- [-SourceMachineType <String>] [-SubscriptionId <String[]>] [-WhatIf]
- [-Confirm] [<CommonParameters>]
+ [-SourceMachineType <String>] [-SubscriptionId <String[]>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
-### ListInSite
+### Get
 ```
-Get-AzMigrateDiscoveredServer -ProjectName <String> -ResourceGroupName <String> [-DisplayName <String>]
- [-SourceMachineType <String>] [-SubscriptionId <String[]>] -ApplianceName <String>
- [-WhatIf] [-Confirm] [<CommonParameters>]
+Get-AzMigrateDiscoveredServer -Name <String> -ProjectName <String> -ResourceGroupName <String>
+ [-SourceMachineType <String>] [-SubscriptionId <String[]>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
-### Get
+### GetInSite
 ```
-Get-AzMigrateDiscoveredServer -ProjectName <String> -ResourceGroupName <String> [-SourceMachineType <String>]
- [-SubscriptionId <String[]>] -Name <String> [-WhatIf] [-Confirm]
+Get-AzMigrateDiscoveredServer -ApplianceName <String> -Name <String> -ProjectName <String>
+ -ResourceGroupName <String> [-SourceMachineType <String>] [-SubscriptionId <String[]>] [-Confirm] [-WhatIf]
  [<CommonParameters>]
 ```
 
-### GetInSite
+### ListInSite
 ```
-Get-AzMigrateDiscoveredServer -ProjectName <String> -ResourceGroupName <String> [-SourceMachineType <String>]
- [-SubscriptionId <String[]>] -Name <String> -ApplianceName <String>
- [-WhatIf] [-Confirm] [<CommonParameters>]
+Get-AzMigrateDiscoveredServer -ApplianceName <String> -ProjectName <String> -ResourceGroupName <String>
+ [-DisplayName <String>] [-SourceMachineType <String>] [-SubscriptionId <String[]>] [-Confirm] [-WhatIf]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
-Get Azure migrate server cmdlet fetches all servers in a migrate project.
+Get Azure migrate server commandlet fetches all servers in a migrate project.
 
 ## EXAMPLES
 
@@ -63,6 +61,7 @@ idclab-a360-fareast-corp-micros-86617dcf-effe-59ad-8c3a-cdd3ea7300d3_5029c9aa-3c
 idclab-a360-fareast-corp-micros-86617dcf-effe-59ad-8c3a-cdd3ea7300d3_5029dabc-cc94-780f-76fd-e39acb0e9dce Microsoft.OffAzure/VMwareSites/machines
 idclab-a360-fareast-corp-micros-86617dcf-effe-59ad-8c3a-cdd3ea7300d3_50299579-fc18-4152-ade2-c4a57946f72b Microsoft.OffAzure/VMwareSites/machines
 idclab-a360-fareast-corp-micros-86617dcf-effe-59ad-8c3a-cdd3ea7300d3_5029cc18-efdc-7315-3b09-9d12a0f337e2 Microsoft.OffAzure/VMwareSites/machines
+
 ```
 
 Get All servers in a migrate project.
@@ -76,6 +75,7 @@ Get-AzMigrateDiscoveredServer -Name idclab-a360-fareast-corp-micros-86617dcf-eff
 Name                                                                                                      Typeo…
 ----                                                                                                      ----o…
 idclab-a360-fareast-corp-micros-86617dcf-effe-59ad-8c3a-cdd3ea7300d3_5029e62c-31d2-a6c3-5316-aa39f47c49fc Microsoft.OffAzure/VMwareSites/machines
+
 ```
 
 Get a server in a migrate project by name.
@@ -99,6 +99,7 @@ idclab-a360-fareast-corp-micros-86617dcf-effe-59ad-8c3a-cdd3ea7300d3_5029c9aa-3c
 idclab-a360-fareast-corp-micros-86617dcf-effe-59ad-8c3a-cdd3ea7300d3_5029dabc-cc94-780f-76fd-e39acb0e9dce Microsoft.OffAzure/VMwareSites/machines
 idclab-a360-fareast-corp-micros-86617dcf-effe-59ad-8c3a-cdd3ea7300d3_50299579-fc18-4152-ade2-c4a57946f72b Microsoft.OffAzure/VMwareSites/machines
 idclab-a360-fareast-corp-micros-86617dcf-effe-59ad-8c3a-cdd3ea7300d3_5029cc18-efdc-7315-3b09-9d12a0f337e2 Microsoft.OffAzure/VMwareSites/machines
+
 ```
 
 List all servers for an appliance in a project.
@@ -112,6 +113,7 @@ Get-AzMigrateDiscoveredServer -Name idclab-a360-fareast-corp-micros-86617dcf-eff
 Name                                                                                                      Typeo…
 ----                                                                                                      ----o…
 idclab-a360-fareast-corp-micros-86617dcf-effe-59ad-8c3a-cdd3ea7300d3_5029e62c-31d2-a6c3-5316-aa39f47c49fc Microsoft.OffAzure/VMwareSites/machines
+
 ```
 
 Get a server for an appliance in a project.
@@ -132,6 +134,7 @@ ContosoAppSrv2                10-150-8-52-b090bef3-b733-5e34-bc8f-eb6f2701432a_5
 ContosoCSASR                  10-150-8-52-b090bef3-b733-5e34-bc8f-eb6f2701432a_50096b80-7061-672c-8db0-07ee41212869 Microsoft.OffAzure/VMwareSites/machines
 ContosoVMwareMigration2       10-150-8-52-b090bef3-b733-5e34-bc8f-eb6f2701432a_50099d31-71d5-2bd1-fada-8c4eba2f279a Microsoft.OffAzure/VMwareSites/machines
 ContosoAppSrv1                10-150-8-52-b090bef3-b733-5e34-bc8f-eb6f2701432a_50097d3f-c1f6-9217-825c-936db54043df Microsoft.OffAzure/VMwareSites/machines
+
 ```
 
 List servers in a migrate project and filter responses with display name.
@@ -181,7 +184,7 @@ This internally maps to a site.
 
 ```yaml
 Type: System.String
-Parameter Sets: ListInSite, GetInSite
+Parameter Sets: GetInSite, ListInSite
 Aliases:
 
 Required: True
@@ -329,3 +332,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateJob.md b/src/Migrate/Migrate/help/Get-AzMigrateJob.md
index e3adbfcf7ef4..7a7760dfac4d 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateJob.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateJob.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratejob
 schema: 2.0.0
@@ -14,31 +14,30 @@ Retrieves the status of an Azure Migrate job.
 
 ### ListByName (Default)
 ```
-Get-AzMigrateJob -ResourceGroupName <String> -ProjectName <String> [-SubscriptionId <String>]
+Get-AzMigrateJob -ProjectName <String> -ResourceGroupName <String> [-SubscriptionId <String>]
  [-Filter <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### GetByName
+### GetById
 ```
-Get-AzMigrateJob -ResourceGroupName <String> -ProjectName <String> [-SubscriptionId <String>] -JobName <String>
- [-DefaultProfile <PSObject>] [<CommonParameters>]
+Get-AzMigrateJob -JobID <String> [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### GetById
+### GetByInputObject
 ```
-Get-AzMigrateJob [-SubscriptionId <String>] -JobID <String> [-DefaultProfile <PSObject>]
+Get-AzMigrateJob -InputObject <IJob> [-SubscriptionId <String>] [-DefaultProfile <PSObject>]
  [<CommonParameters>]
 ```
 
-### GetByInputObject
+### GetByName
 ```
-Get-AzMigrateJob [-SubscriptionId <String>] -InputObject <IJob> [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Get-AzMigrateJob -JobName <String> -ProjectName <String> -ResourceGroupName <String>
+ [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### ListById
 ```
-Get-AzMigrateJob [-SubscriptionId <String>] -ResourceGroupID <String> -ProjectID <String> [-Filter <String>]
+Get-AzMigrateJob -ProjectID <String> -ResourceGroupID <String> [-SubscriptionId <String>] [-Filter <String>]
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
@@ -49,7 +48,7 @@ The Get-AzMigrateJob cmdlet retrieves the status of an Azure Migrate job.
 
 ### Example 1: Get By Job Id
 ```powershell
-Get-AzMigrateJob -JobID "/Subscriptions/xxx-xxx-xxx/resourceGroups/azmigratepwshtestasr13072020/providers/Microsoft.RecoveryServices/vaults/AzMigrateTestProjectPWSH02aarsvault/replicationJobs/997e2a92-5afe-49c7-a81a-89660aec9b7b"
+Get-AzMigrateJob -JobID "/Subscriptions/xxx-xxx-xxx/resourceGroups/azmigratepwshtestasr13072020/providers/Microsoft.RecoveryServices/vaults/AzMigrateTestProjectPWSH02aarsvault/replicationJobs/997e2a92-5afe-49c7-a81a-89660aec9b7b" 
 ```
 
 ```output
@@ -159,7 +158,7 @@ OData filter options.
 
 ```yaml
 Type: System.String
-Parameter Sets: ListByName, ListById
+Parameter Sets: ListById, ListByName
 Aliases:
 
 Required: False
@@ -235,7 +234,7 @@ The name of the migrate project.
 
 ```yaml
 Type: System.String
-Parameter Sets: ListByName, GetByName
+Parameter Sets: GetByName, ListByName
 Aliases:
 
 Required: True
@@ -265,7 +264,7 @@ The name of the resource group where the recovery services vault is present.
 
 ```yaml
 Type: System.String
-Parameter Sets: ListByName, GetByName
+Parameter Sets: GetByName, ListByName
 Aliases:
 
 Required: True
@@ -302,3 +301,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateLocalJob.md b/src/Migrate/Migrate/help/Get-AzMigrateLocalJob.md
index 147526d5592a..fc4f9b8c0ed2 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateLocalJob.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateLocalJob.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratelocaljob
 schema: 2.0.0
@@ -14,31 +14,31 @@ Retrieves the status of an Azure Migrate job.
 
 ### ListByName (Default)
 ```
-Get-AzMigrateLocalJob -ResourceGroupName <String> -ProjectName <String> [-SubscriptionId <String>]
+Get-AzMigrateLocalJob -ProjectName <String> -ResourceGroupName <String> [-SubscriptionId <String>]
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### GetByName
-```
-Get-AzMigrateLocalJob -ResourceGroupName <String> -ProjectName <String> [-SubscriptionId <String>]
- -Name <String> [-DefaultProfile <PSObject>] [<CommonParameters>]
-```
-
 ### GetById
 ```
-Get-AzMigrateLocalJob [-SubscriptionId <String>] -ID <String> [-DefaultProfile <PSObject>]
+Get-AzMigrateLocalJob -ID <String> [-SubscriptionId <String>] [-DefaultProfile <PSObject>]
  [<CommonParameters>]
 ```
 
 ### GetByInputObject
 ```
-Get-AzMigrateLocalJob [-SubscriptionId <String>] -InputObject <IMigrateIdentity> [-DefaultProfile <PSObject>]
+Get-AzMigrateLocalJob -InputObject <IMigrateIdentity> [-SubscriptionId <String>] [-DefaultProfile <PSObject>]
  [<CommonParameters>]
 ```
 
+### GetByName
+```
+Get-AzMigrateLocalJob -Name <String> -ProjectName <String> -ResourceGroupName <String>
+ [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
+```
+
 ### ListById
 ```
-Get-AzMigrateLocalJob [-SubscriptionId <String>] -ResourceGroupID <String> -ProjectID <String>
+Get-AzMigrateLocalJob -ProjectID <String> -ResourceGroupID <String> [-SubscriptionId <String>]
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
@@ -384,7 +384,7 @@ The name of the migrate project.
 
 ```yaml
 Type: System.String
-Parameter Sets: ListByName, GetByName
+Parameter Sets: GetByName, ListByName
 Aliases:
 
 Required: True
@@ -414,7 +414,7 @@ The name of the resource group where the recovery services vault is present.
 
 ```yaml
 Type: System.String
-Parameter Sets: ListByName, GetByName
+Parameter Sets: GetByName, ListByName
 Aliases:
 
 Required: True
@@ -453,3 +453,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateLocalReplicationFabric.md b/src/Migrate/Migrate/help/Get-AzMigrateLocalReplicationFabric.md
index 7ca42f588f2b..3f8a2170a51b 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateLocalReplicationFabric.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateLocalReplicationFabric.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratelocalreplicationfabric
 schema: 2.0.0
@@ -24,17 +24,16 @@ Get-AzMigrateLocalReplicationFabric -Name <String> -ResourceGroupName <String> [
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### List1
+### GetViaIdentity
 ```
-Get-AzMigrateLocalReplicationFabric -ResourceGroupName <String> [-SubscriptionId <String[]>]
- [-ContinuationToken <String>] [-DefaultProfile <PSObject>]
+Get-AzMigrateLocalReplicationFabric -InputObject <IMigrateIdentity> [-DefaultProfile <PSObject>]
  [<CommonParameters>]
 ```
 
-### GetViaIdentity
+### List1
 ```
-Get-AzMigrateLocalReplicationFabric -InputObject <IMigrateIdentity> [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Get-AzMigrateLocalReplicationFabric -ResourceGroupName <String> [-SubscriptionId <String[]>]
+ [-ContinuationToken <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -241,7 +240,7 @@ Azure Subscription Id in which migrate project was created.
 
 ```yaml
 Type: System.String[]
-Parameter Sets: List, Get, List1
+Parameter Sets: Get, List, List1
 Aliases:
 
 Required: False
@@ -265,3 +264,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateLocalServerReplication.md b/src/Migrate/Migrate/help/Get-AzMigrateLocalServerReplication.md
index f3f571b32d30..88ee8137805e 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateLocalServerReplication.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateLocalServerReplication.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratelocalserverreplication
 schema: 2.0.0
@@ -14,39 +14,37 @@ Retrieves the details of the replicating server.
 
 ### ListByName (Default)
 ```
-Get-AzMigrateLocalServerReplication -ResourceGroupName <String> -ProjectName <String>
- [-SubscriptionId <String>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Get-AzMigrateLocalServerReplication -ProjectName <String> -ResourceGroupName <String>
+ [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### GetByMachineName
+### GetByInputObject
 ```
-Get-AzMigrateLocalServerReplication -ResourceGroupName <String> -ProjectName <String>
- [-SubscriptionId <String>] -MachineName <String> [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Get-AzMigrateLocalServerReplication -InputObject <IMigrateIdentity> [-SubscriptionId <String>]
+ [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### GetByItemID
 ```
-Get-AzMigrateLocalServerReplication [-SubscriptionId <String>] -TargetObjectID <String>
+Get-AzMigrateLocalServerReplication -TargetObjectID <String> [-SubscriptionId <String>]
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### GetBySDSID
+### GetByMachineName
 ```
-Get-AzMigrateLocalServerReplication [-SubscriptionId <String>] -DiscoveredMachineId <String>
- [-DefaultProfile <PSObject>] [<CommonParameters>]
+Get-AzMigrateLocalServerReplication -MachineName <String> -ProjectName <String> -ResourceGroupName <String>
+ [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### GetByInputObject
+### GetBySDSID
 ```
-Get-AzMigrateLocalServerReplication [-SubscriptionId <String>] -InputObject <IMigrateIdentity>
+Get-AzMigrateLocalServerReplication -DiscoveredMachineId <String> [-SubscriptionId <String>]
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### ListById
 ```
-Get-AzMigrateLocalServerReplication [-SubscriptionId <String>] -ResourceGroupID <String> -ProjectID <String>
+Get-AzMigrateLocalServerReplication -ProjectID <String> -ResourceGroupID <String> [-SubscriptionId <String>]
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
@@ -77,7 +75,8 @@ Get by id.
 
 ### Example 2: Get detail by discovered machine id
 ```powershell
-Get-AzMigrateLocalServerReplication -DiscoveredMachineId "/subscriptions/xxx-xxx-xxx/resourceGroups/test-rg/providers/Microsoft.OffAzure/HyperVSites/siteName1/machines/503a4f02-916c-d6b0-8d14-222bbd4767e5"
+Get-AzMigrateLocalServerReplication -DiscoveredMachineId "/subscriptions/xxx-xxx-xxx/resourceGroups/test-rg/providers/Microsoft.OffAzure/HyperVSites/siteName1/machines/503a4f02-916c-d6b0-8d14-222bbd4767e5" 
+
 ```
 
 ```output
@@ -101,6 +100,7 @@ Get-AzMigrateServerReplication -ResourceGroupName testResourceGroup -ProjectName
 ```
 
 ```output
+
 Id                           : /subscriptions/xxx-xxx-xxx/resourceGroups/test-rg/providers/Microsoft.DataReplication/replicationVaults/proj62434replicationvault/protectedItems/503a4f02-916c-d6b0-8d14-222bbd4767e5
 Name                         : 503a4f02-916c-d6b0-8d14-222bbd4767e5
 Property                     : Microsoft.Azure.PowerShell.Cmdlets.Migrate.Models.Api20240901.ProtectedItemModelProperties
@@ -209,7 +209,7 @@ Specifies the Azure Migrate project  in the current subscription.
 
 ```yaml
 Type: System.String
-Parameter Sets: ListByName, GetByMachineName
+Parameter Sets: GetByMachineName, ListByName
 Aliases:
 
 Required: True
@@ -239,7 +239,7 @@ Specifies the Resource Group of the Azure Migrate Project in the current subscri
 
 ```yaml
 Type: System.String
-Parameter Sets: ListByName, GetByMachineName
+Parameter Sets: GetByMachineName, ListByName
 Aliases:
 
 Required: True
@@ -293,3 +293,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateProject.md b/src/Migrate/Migrate/help/Get-AzMigrateProject.md
index 9e1ddefa8044..3c5bf9e8daab 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateProject.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateProject.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigrateproject
 schema: 2.0.0
@@ -110,3 +110,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateReplicationFabric.md b/src/Migrate/Migrate/help/Get-AzMigrateReplicationFabric.md
index a01397675cab..2fbd1c45a117 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateReplicationFabric.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateReplicationFabric.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratereplicationfabric
 schema: 2.0.0
@@ -20,9 +20,8 @@ Get-AzMigrateReplicationFabric -ResourceGroupName <String> -ResourceName <String
 
 ### Get
 ```
-Get-AzMigrateReplicationFabric -ResourceGroupName <String> -ResourceName <String> -FabricName <String>
- [-SubscriptionId <String[]>] [-Filter <String>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Get-AzMigrateReplicationFabric -FabricName <String> -ResourceGroupName <String> -ResourceName <String>
+ [-SubscriptionId <String[]>] [-Filter <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -191,3 +190,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateReplicationPolicy.md b/src/Migrate/Migrate/help/Get-AzMigrateReplicationPolicy.md
index 070b3657187e..530d4cf81977 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateReplicationPolicy.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateReplicationPolicy.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratereplicationpolicy
 schema: 2.0.0
@@ -20,9 +20,8 @@ Get-AzMigrateReplicationPolicy -ResourceGroupName <String> -ResourceName <String
 
 ### Get
 ```
-Get-AzMigrateReplicationPolicy -ResourceGroupName <String> -ResourceName <String> -PolicyName <String>
- [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Get-AzMigrateReplicationPolicy -PolicyName <String> -ResourceGroupName <String> -ResourceName <String>
+ [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -149,3 +148,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateReplicationProtectionContainer.md b/src/Migrate/Migrate/help/Get-AzMigrateReplicationProtectionContainer.md
index 5da18942a68e..38701af05381 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateReplicationProtectionContainer.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateReplicationProtectionContainer.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratereplicationprotectioncontainer
 schema: 2.0.0
@@ -15,22 +15,20 @@ Gets the details of a protection container.
 ### List1 (Default)
 ```
 Get-AzMigrateReplicationProtectionContainer -ResourceGroupName <String> -ResourceName <String>
- [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+ [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### List
+### Get
 ```
-Get-AzMigrateReplicationProtectionContainer -ResourceGroupName <String> -ResourceName <String>
- -FabricName <String> [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
+Get-AzMigrateReplicationProtectionContainer -FabricName <String> -ProtectionContainerName <String>
+ -ResourceGroupName <String> -ResourceName <String> [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
  [<CommonParameters>]
 ```
 
-### Get
+### List
 ```
-Get-AzMigrateReplicationProtectionContainer -ResourceGroupName <String> -ResourceName <String>
- -FabricName <String> -ProtectionContainerName <String> [-SubscriptionId <String[]>]
- [-DefaultProfile <PSObject>] [<CommonParameters>]
+Get-AzMigrateReplicationProtectionContainer -FabricName <String> -ResourceGroupName <String>
+ -ResourceName <String> [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -87,7 +85,7 @@ Fabric name.
 
 ```yaml
 Type: System.String
-Parameter Sets: List, Get
+Parameter Sets: Get, List
 Aliases:
 
 Required: True
@@ -169,3 +167,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateReplicationProtectionContainerMapping.md b/src/Migrate/Migrate/help/Get-AzMigrateReplicationProtectionContainerMapping.md
index e7269d2a1231..e782988ad205 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateReplicationProtectionContainerMapping.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateReplicationProtectionContainerMapping.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratereplicationprotectioncontainermapping
 schema: 2.0.0
@@ -15,22 +15,21 @@ Gets the details of a protection container mapping.
 ### List1 (Default)
 ```
 Get-AzMigrateReplicationProtectionContainerMapping -ResourceGroupName <String> -ResourceName <String>
- [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+ [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### List
+### Get
 ```
-Get-AzMigrateReplicationProtectionContainerMapping -ResourceGroupName <String> -ResourceName <String>
- -FabricName <String> -ProtectionContainerName <String> [-SubscriptionId <String[]>]
- [-DefaultProfile <PSObject>] [<CommonParameters>]
+Get-AzMigrateReplicationProtectionContainerMapping -FabricName <String> -MappingName <String>
+ -ProtectionContainerName <String> -ResourceGroupName <String> -ResourceName <String>
+ [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### Get
+### List
 ```
-Get-AzMigrateReplicationProtectionContainerMapping -ResourceGroupName <String> -ResourceName <String>
- -FabricName <String> -MappingName <String> -ProtectionContainerName <String> [-SubscriptionId <String[]>]
- [-DefaultProfile <PSObject>] [<CommonParameters>]
+Get-AzMigrateReplicationProtectionContainerMapping -FabricName <String> -ProtectionContainerName <String>
+ -ResourceGroupName <String> -ResourceName <String> [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -74,7 +73,7 @@ Fabric name.
 
 ```yaml
 Type: System.String
-Parameter Sets: List, Get
+Parameter Sets: Get, List
 Aliases:
 
 Required: True
@@ -104,7 +103,7 @@ Protection container name.
 
 ```yaml
 Type: System.String
-Parameter Sets: List, Get
+Parameter Sets: Get, List
 Aliases:
 
 Required: True
@@ -171,3 +170,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateReplicationRecoveryServicesProvider.md b/src/Migrate/Migrate/help/Get-AzMigrateReplicationRecoveryServicesProvider.md
index b2d57a52b362..b03a9f553907 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateReplicationRecoveryServicesProvider.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateReplicationRecoveryServicesProvider.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratereplicationrecoveryservicesprovider
 schema: 2.0.0
@@ -15,14 +15,13 @@ Gets the details of registered recovery services provider.
 ### List (Default)
 ```
 Get-AzMigrateReplicationRecoveryServicesProvider -ResourceGroupName <String> -ResourceName <String>
- [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+ [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### Get
 ```
-Get-AzMigrateReplicationRecoveryServicesProvider -ResourceGroupName <String> -ResourceName <String>
- -FabricName <String> -ProviderName <String> [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
+Get-AzMigrateReplicationRecoveryServicesProvider -FabricName <String> -ProviderName <String>
+ -ResourceGroupName <String> -ResourceName <String> [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
  [<CommonParameters>]
 ```
 
@@ -149,3 +148,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateRunAsAccount.md b/src/Migrate/Migrate/help/Get-AzMigrateRunAsAccount.md
index 110295c2b3ba..f36b5737a2d8 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateRunAsAccount.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateRunAsAccount.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigraterunasaccount
 schema: 2.0.0
@@ -20,9 +20,8 @@ Get-AzMigrateRunAsAccount -ResourceGroupName <String> -SiteName <String> [-Subsc
 
 ### Get
 ```
-Get-AzMigrateRunAsAccount -ResourceGroupName <String> -SiteName <String> -AccountName <String>
- [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Get-AzMigrateRunAsAccount -AccountName <String> -ResourceGroupName <String> -SiteName <String>
+ [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -147,3 +146,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateServerMigrationStatus.md b/src/Migrate/Migrate/help/Get-AzMigrateServerMigrationStatus.md
index 6748d123aa68..68ebb9d23196 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateServerMigrationStatus.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateServerMigrationStatus.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigrateservermigrationstatus
 schema: 2.0.0
@@ -14,28 +14,27 @@ Retrieves the details of the replicating server status.
 
 ### ListByName (Default)
 ```
-Get-AzMigrateServerMigrationStatus -ResourceGroupName <String> -ProjectName <String> [-SubscriptionId <String>]
- [-Filter <String>] [-SkipToken <String>] [-DefaultProfile <PSObject>]
+Get-AzMigrateServerMigrationStatus -ProjectName <String> -ResourceGroupName <String>
+ [-SubscriptionId <String>] [-Filter <String>] [-SkipToken <String>] [-DefaultProfile <PSObject>]
  [<CommonParameters>]
 ```
 
 ### GetByApplianceName
 ```
-Get-AzMigrateServerMigrationStatus -ResourceGroupName <String> -ProjectName <String> [-SubscriptionId <String>]
- -ApplianceName <String> [-DefaultProfile <PSObject>] [<CommonParameters>]
+Get-AzMigrateServerMigrationStatus -ApplianceName <String> -ProjectName <String> -ResourceGroupName <String>
+ [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### GetByMachineName
 ```
-Get-AzMigrateServerMigrationStatus -ResourceGroupName <String> -ProjectName <String> [-SubscriptionId <String>]
- -MachineName <String> [-DefaultProfile <PSObject>] [<CommonParameters>]
+Get-AzMigrateServerMigrationStatus -MachineName <String> -ProjectName <String> -ResourceGroupName <String>
+ [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### GetHealthByMachineName
 ```
-Get-AzMigrateServerMigrationStatus -ResourceGroupName <String> -ProjectName <String> [-SubscriptionId <String>]
- -MachineName <String> [-Health] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Get-AzMigrateServerMigrationStatus -Health -MachineName <String> -ProjectName <String>
+ -ResourceGroupName <String> [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -255,3 +254,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateServerReplication.md b/src/Migrate/Migrate/help/Get-AzMigrateServerReplication.md
index 89a2b5b68492..832fe8866243 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateServerReplication.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateServerReplication.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigrateserverreplication
 schema: 2.0.0
@@ -14,40 +14,38 @@ Retrieves the details of the replicating server.
 
 ### ListByName (Default)
 ```
-Get-AzMigrateServerReplication -ResourceGroupName <String> -ProjectName <String> [-SubscriptionId <String>]
- [-Filter <String>] [-SkipToken <String>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Get-AzMigrateServerReplication -ProjectName <String> -ResourceGroupName <String> [-SubscriptionId <String>]
+ [-Filter <String>] [-SkipToken <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### GetByMachineName
+### GetByInputObject
 ```
-Get-AzMigrateServerReplication -ResourceGroupName <String> -ProjectName <String> [-SubscriptionId <String>]
- -MachineName <String> [-DefaultProfile <PSObject>] [<CommonParameters>]
+Get-AzMigrateServerReplication -InputObject <IMigrationItem> [-SubscriptionId <String>]
+ [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### GetBySRSID
+### GetByMachineName
 ```
-Get-AzMigrateServerReplication [-SubscriptionId <String>] -TargetObjectID <String> [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Get-AzMigrateServerReplication -MachineName <String> -ProjectName <String> -ResourceGroupName <String>
+ [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### GetBySDSID
 ```
-Get-AzMigrateServerReplication [-SubscriptionId <String>] -DiscoveredMachineId <String>
+Get-AzMigrateServerReplication -DiscoveredMachineId <String> [-SubscriptionId <String>]
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
-### GetByInputObject
+### GetBySRSID
 ```
-Get-AzMigrateServerReplication [-SubscriptionId <String>] -InputObject <IMigrationItem>
+Get-AzMigrateServerReplication -TargetObjectID <String> [-SubscriptionId <String>]
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### ListById
 ```
-Get-AzMigrateServerReplication [-SubscriptionId <String>] -ResourceGroupID <String> -ProjectID <String>
- [-Filter <String>] [-SkipToken <String>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Get-AzMigrateServerReplication -ProjectID <String> -ResourceGroupID <String> [-SubscriptionId <String>]
+ [-Filter <String>] [-SkipToken <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -254,7 +252,7 @@ OData filter options.
 
 ```yaml
 Type: System.String
-Parameter Sets: ListByName, ListById
+Parameter Sets: ListById, ListByName
 Aliases:
 
 Required: False
@@ -315,7 +313,7 @@ Specifies the Azure Migrate project  in the current subscription.
 
 ```yaml
 Type: System.String
-Parameter Sets: ListByName, GetByMachineName
+Parameter Sets: GetByMachineName, ListByName
 Aliases:
 
 Required: True
@@ -345,7 +343,7 @@ Specifies the Resource Group of the Azure Migrate Project in the current subscri
 
 ```yaml
 Type: System.String
-Parameter Sets: ListByName, GetByMachineName
+Parameter Sets: GetByMachineName, ListByName
 Aliases:
 
 Required: True
@@ -360,7 +358,7 @@ The pagination token.
 
 ```yaml
 Type: System.String
-Parameter Sets: ListByName, ListById
+Parameter Sets: ListById, ListByName
 Aliases:
 
 Required: False
@@ -412,3 +410,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateSite.md b/src/Migrate/Migrate/help/Get-AzMigrateSite.md
index 41cd2a270d1a..8c7266aa8535 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateSite.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateSite.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratesite
 schema: 2.0.0
@@ -31,6 +31,7 @@ Get-AzMigrateSite -SubscriptionId xxx-xxx-xxx -ResourceGroupName BugBashAVSVMwar
 ETag Location      Name                Type
 ---- --------      ----                ----
      southeastasia BBVMwareAVScbbcsite Microsoft.OffAzure/VMwareSites
+
 ```
 
 Get site by name
@@ -111,3 +112,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Get-AzMigrateSolution.md b/src/Migrate/Migrate/help/Get-AzMigrateSolution.md
index 802793a79b45..54a477416235 100644
--- a/src/Migrate/Migrate/help/Get-AzMigrateSolution.md
+++ b/src/Migrate/Migrate/help/Get-AzMigrateSolution.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/get-azmigratesolution
 schema: 2.0.0
@@ -14,8 +14,7 @@ Gets a solution in the migrate project.
 
 ```
 Get-AzMigrateSolution -MigrateProjectName <String> -Name <String> -ResourceGroupName <String>
- [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+ [-SubscriptionId <String[]>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -126,3 +125,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Initialize-AzMigrateLocalReplicationInfrastructure.md b/src/Migrate/Migrate/help/Initialize-AzMigrateLocalReplicationInfrastructure.md
index 26a17be0ac32..0926922b75f5 100644
--- a/src/Migrate/Migrate/help/Initialize-AzMigrateLocalReplicationInfrastructure.md
+++ b/src/Migrate/Migrate/help/Initialize-AzMigrateLocalReplicationInfrastructure.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/initialize-azmigratelocalreplicationinfrastructure
 schema: 2.0.0
@@ -13,10 +13,9 @@ Initializes the infrastructure for the migrate project.
 ## SYNTAX
 
 ```
-Initialize-AzMigrateLocalReplicationInfrastructure -ResourceGroupName <String> -ProjectName <String>
+Initialize-AzMigrateLocalReplicationInfrastructure -ProjectName <String> -ResourceGroupName <String>
  -SourceApplianceName <String> -TargetApplianceName <String> [-CacheStorageAccountId <String>]
- [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [-PassThru]
- [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [-PassThru] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -215,3 +214,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Initialize-AzMigrateReplicationInfrastructure.md b/src/Migrate/Migrate/help/Initialize-AzMigrateReplicationInfrastructure.md
index 2fb0cf462a7a..32e4cc529376 100644
--- a/src/Migrate/Migrate/help/Initialize-AzMigrateReplicationInfrastructure.md
+++ b/src/Migrate/Migrate/help/Initialize-AzMigrateReplicationInfrastructure.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/initialize-azmigratereplicationinfrastructure
 schema: 2.0.0
@@ -8,22 +8,22 @@ schema: 2.0.0
 # Initialize-AzMigrateReplicationInfrastructure
 
 ## SYNOPSIS
-Initializes the infrastructure for the migrate project.
+Initialises the infrastructure for the migrate project.
 
 ## SYNTAX
 
 ```
-Initialize-AzMigrateReplicationInfrastructure -ResourceGroupName <String> -ProjectName <String>
+Initialize-AzMigrateReplicationInfrastructure -ProjectName <String> -ResourceGroupName <String>
  -Scenario <String> -TargetRegion <String> [-CacheStorageAccountId <String>] [-SubscriptionId <String>]
- [-DefaultProfile <PSObject>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
-The Initialize-AzMigrateReplicationInfrastructure cmdlet initializes the infrastructure for the migrate project.
+The Initialize-AzMigrateReplicationInfrastructure cmdlet initialises the infrastructure for the migrate project.
 
 ## EXAMPLES
 
-### Example 1: Initializes the infrastructure for the migrate project.
+### Example 1: Initialises the infrastructure for the migrate project.
 ```powershell
 Initialize-AzMigrateReplicationInfrastructure -ResourceGroupName TestRG -ProjectName TestProject -TargetRegion centralus
 ```
@@ -32,9 +32,9 @@ Initialize-AzMigrateReplicationInfrastructure -ResourceGroupName TestRG -Project
 True
 ```
 
-Initializes the infrastructure for the migrate project.
+Initialises the infrastructure for the migrate project.
 
-### Example 2: Initializes the infrastructure for the migrate project for private endpoint scenario.
+### Example 2: Initialises the infrastructure for the migrate project for private endpoint scenario.
 ```powershell
 Initialize-AzMigrateReplicationInfrastructure -ResourceGroupName "TestRG" -ProjectName "TestPEProject" -TargetRegion "centraluseuap" -Scenario "agentlessVMware" -CacheStorageAccountId "/subscriptions/b364ed8d-4279-4bf8-8fd1-56f8fa0ae05c/resourceGroups/singhabh-rg/providers/Microsoft.Storage/storageAccounts/singhabhstoragepe1"
 ```
@@ -43,7 +43,7 @@ Initialize-AzMigrateReplicationInfrastructure -ResourceGroupName "TestRG" -Proje
 True
 ```
 
-Initializes the infrastructure for the migrate project for private endpoint scenario.
+Initialises the infrastructure for the migrate project for private endpoint scenario.
 
 ## PARAMETERS
 
@@ -195,3 +195,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/New-AzMigrateDiskMapping.md b/src/Migrate/Migrate/help/New-AzMigrateDiskMapping.md
index 4c2513e11a04..ea89ddeb3edb 100644
--- a/src/Migrate/Migrate/help/New-AzMigrateDiskMapping.md
+++ b/src/Migrate/Migrate/help/New-AzMigrateDiskMapping.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/new-azmigratediskmapping
 schema: 2.0.0
@@ -13,8 +13,8 @@ Creates a new disk mapping
 ## SYNTAX
 
 ```
-New-AzMigrateDiskMapping -DiskID <String> -IsOSDisk <String> -DiskType <String> [-DiskEncryptionSetID <String>]
- [<CommonParameters>]
+New-AzMigrateDiskMapping -DiskID <String> -DiskType <String> -IsOSDisk <String>
+ [-DiskEncryptionSetID <String>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -33,6 +33,8 @@ DiskEncryptionSetId DiskId DiskType     IsOSDisk LogStorageAccountId LogStorageA
                     a      Standard_LRS true
 ```
 
+
+
 ### Example 2: Make Premium V2 disks
 ```powershell
 New-AzMigrateDiskMapping -DiskID b -DiskType PremiumV2_LRS -IsOSDisk 'false'
@@ -120,3 +122,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/New-AzMigrateLocalDiskMappingObject.md b/src/Migrate/Migrate/help/New-AzMigrateLocalDiskMappingObject.md
index 7b18334f9426..47164f1d6be3 100644
--- a/src/Migrate/Migrate/help/New-AzMigrateLocalDiskMappingObject.md
+++ b/src/Migrate/Migrate/help/New-AzMigrateLocalDiskMappingObject.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/new-azmigratelocaldiskmappingobject
 schema: 2.0.0
@@ -13,9 +13,8 @@ Creates a new disk mapping
 ## SYNTAX
 
 ```
-New-AzMigrateLocalDiskMappingObject -DiskID <String> -IsOSDisk <String> -IsDynamic <String> -Size <Int64>
- -Format <String> [-PhysicalSectorSize <Int64>] [-TargetStoragePathId <String>]
- [<CommonParameters>]
+New-AzMigrateLocalDiskMappingObject -DiskID <String> -Format <String> -IsDynamic <String> -IsOSDisk <String>
+ -Size <Int64> [-PhysicalSectorSize <Int64>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -34,7 +33,7 @@ DiskId             : a
 DiskSizeGb         : 1
 IsDynamic          : True
 IsOSDisk           : True
-StorageContainerId :
+StorageContainerId : 
 ```
 
 Get disk object to provide input for New-AzMigrateLocalServerReplication
@@ -58,6 +57,7 @@ Accept wildcard characters: False
 
 ### -Format
 Specifies the disk format.
+'VHD' or 'VHDX' for Hyper-V Generation 1; 'VHDX' for Hyper-V Generation 2.
 
 ```yaml
 Type: System.String
@@ -131,21 +131,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -TargetStoragePathId
-Specifies the storage path ARM ID where the disk will be stored.
-
-```yaml
-Type: System.String
-Parameter Sets: (All)
-Aliases:
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 
@@ -158,3 +143,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/New-AzMigrateLocalNicMappingObject.md b/src/Migrate/Migrate/help/New-AzMigrateLocalNicMappingObject.md
index 2392758d6986..cc24799c603e 100644
--- a/src/Migrate/Migrate/help/New-AzMigrateLocalNicMappingObject.md
+++ b/src/Migrate/Migrate/help/New-AzMigrateLocalNicMappingObject.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/new-azmigratelocalnicmappingobject
 schema: 2.0.0
@@ -13,9 +13,8 @@ Creates an object to update NIC properties of a replicating server.
 ## SYNTAX
 
 ```
-New-AzMigrateLocalNicMappingObject -NicID <String> [-TargetVirtualSwitchId <String>]
- [-TargetTestVirtualSwitchId <String>] [-CreateAtTarget <String>]
- [<CommonParameters>]
+New-AzMigrateLocalNicMappingObject -NicID <String> [-CreateAtTarget <String>]
+ [-TargetTestVirtualSwitchId <String>] [-TargetVirtualSwitchId <String>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -112,3 +111,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/New-AzMigrateLocalServerReplication.md b/src/Migrate/Migrate/help/New-AzMigrateLocalServerReplication.md
index 2ce0a3109f50..137d19b2b8ac 100644
--- a/src/Migrate/Migrate/help/New-AzMigrateLocalServerReplication.md
+++ b/src/Migrate/Migrate/help/New-AzMigrateLocalServerReplication.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/new-azmigratelocalserverreplication
 schema: 2.0.0
@@ -14,20 +14,20 @@ Starts replication for the specified server.
 
 ### ByIdDefaultUser (Default)
 ```
-New-AzMigrateLocalServerReplication -MachineId <String> -TargetStoragePathId <String>
- -TargetResourceGroupId <String> -TargetVMName <String> -TargetVirtualSwitchId <String> -OSDiskID <String>
- [-TargetVMCPUCore <Int32>] [-TargetTestVirtualSwitchId <String>] [-IsDynamicMemoryEnabled <String>]
- [-TargetVMRam <Int64>] [-SubscriptionId <String>] [-DefaultProfile <PSObject>]
- [-WhatIf] [-Confirm] [<CommonParameters>]
+New-AzMigrateLocalServerReplication -MachineId <String> -OSDiskID <String> -SourceApplianceName <String>
+ -TargetApplianceName <String> -TargetResourceGroupId <String> -TargetStoragePathId <String>
+ -TargetVirtualSwitchId <String> -TargetVMName <String> [-IsDynamicMemoryEnabled <String>]
+ [-SubscriptionId <String>] [-TargetTestVirtualSwitchId <String>] [-TargetVMCPUCore <Int32>]
+ [-TargetVMRam <Int64>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ### ByIdPowerUser
 ```
-New-AzMigrateLocalServerReplication -MachineId <String> -TargetStoragePathId <String>
- -TargetResourceGroupId <String> -TargetVMName <String> [-TargetVMCPUCore <Int32>]
- [-IsDynamicMemoryEnabled <String>] [-TargetVMRam <Int64>] [-SubscriptionId <String>]
- -DiskToInclude <AzLocalDiskInput[]> -NicToInclude <AzLocalNicInput[]> [-DefaultProfile <PSObject>]
- [-WhatIf] [-Confirm] [<CommonParameters>]
+New-AzMigrateLocalServerReplication -DiskToInclude <AzLocalDiskInput[]> -MachineId <String>
+ -NicToInclude <AzLocalNicInput[]> -SourceApplianceName <String> -TargetApplianceName <String>
+ -TargetResourceGroupId <String> -TargetStoragePathId <String> -TargetVMName <String>
+ [-IsDynamicMemoryEnabled <String>] [-SubscriptionId <String>] [-TargetVMCPUCore <Int32>]
+ [-TargetVMRam <Int64>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -66,7 +66,7 @@ SystemDataLastModifiedBy           :
 SystemDataLastModifiedByType       : 
 TargetFabricProviderId             : 22f00372-a1b7-467f-87ce-d95e17a6e7c7
 Task                               : {Creating or updating the protected item, Initializing Protection, Enabling Protection, Starting Replication}
-Type                               : Microsoft.DataReplication/replicationVaults/jobs
+Type                               : Microsoft.DataReplication/replicationVaults/jobs	
 ```
 
 This is for the scenario, when there is only one single disk that has to be protected.
@@ -209,6 +209,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -SourceApplianceName
+Specifies the source appliance name for the AzLocal scenario.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -SubscriptionId
 Azure Subscription ID.
 
@@ -224,6 +239,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -TargetApplianceName
+Specifies the target appliance name for the AzLocal scenario.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -TargetResourceGroupId
 Specifies the target Resource Group Id where the migrated VM resources will reside.
 
@@ -372,3 +402,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/New-AzMigrateNicMapping.md b/src/Migrate/Migrate/help/New-AzMigrateNicMapping.md
index fb395de861b1..e0d9720995ea 100644
--- a/src/Migrate/Migrate/help/New-AzMigrateNicMapping.md
+++ b/src/Migrate/Migrate/help/New-AzMigrateNicMapping.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/new-azmigratenicmapping
 schema: 2.0.0
@@ -13,9 +13,9 @@ Creates an object to update NIC properties of a replicating server.
 ## SYNTAX
 
 ```
-New-AzMigrateNicMapping -NicID <String> [-TargetNicSelectionType <String>] [-TargetNicSubnet <String>]
- [-TargetNicName <String>] [-TargetNicIP <String>] [-TestNicSubnet <String>] [-TestNicIP <String>]
- [<CommonParameters>]
+New-AzMigrateNicMapping -NicID <String> [-TargetNicIP <String>] [-TargetNicName <String>]
+ [-TargetNicSelectionType <String>] [-TargetNicSubnet <String>] [-TestNicIP <String>]
+ [-TestNicSubnet <String>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -156,3 +156,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/New-AzMigrateProject.md b/src/Migrate/Migrate/help/New-AzMigrateProject.md
index 98416935a419..acc0f929111a 100644
--- a/src/Migrate/Migrate/help/New-AzMigrateProject.md
+++ b/src/Migrate/Migrate/help/New-AzMigrateProject.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/new-azmigrateproject
 schema: 2.0.0
@@ -13,9 +13,8 @@ Creates a new Migrate project.
 ## SYNTAX
 
 ```
-New-AzMigrateProject -Name <String> -ResourceGroupName <String> -Location <String> [-ETag <String>]
- [-Property <IMigrateProjectProperties>] [-SubscriptionId <String>]
- [-WhatIf] [-Confirm] [<CommonParameters>]
+New-AzMigrateProject -Location <String> -Name <String> -ResourceGroupName <String> [-ETag <String>]
+ [-Property <IMigrateProjectProperties>] [-SubscriptionId <String>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -32,6 +31,7 @@ New-AzMigrateProject -SubscriptionId xxx-xxx-xxx -ResourceGroupName kuchaturimpk
 ETag Location  Name                     Type
 ---- --------  ----                     ----
      centralus kuchaturimpkocrg1pwshp14 Microsoft.Migrate/MigrateProjects
+
 ```
 
 Method to create a new migrate project.
@@ -170,3 +170,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/New-AzMigrateReplicationPolicy.md b/src/Migrate/Migrate/help/New-AzMigrateReplicationPolicy.md
index e77f53e15674..1aff2f20a639 100644
--- a/src/Migrate/Migrate/help/New-AzMigrateReplicationPolicy.md
+++ b/src/Migrate/Migrate/help/New-AzMigrateReplicationPolicy.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/new-azmigratereplicationpolicy
 schema: 2.0.0
@@ -15,8 +15,7 @@ The operation to create a replication policy.
 ```
 New-AzMigrateReplicationPolicy -PolicyName <String> -ResourceGroupName <String> -ResourceName <String>
  [-SubscriptionId <String>] [-ProviderSpecificInput <IPolicyProviderSpecificInput>]
- [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-WhatIf] [-Confirm]
- [<CommonParameters>]
+ [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -38,6 +37,7 @@ New-AzMigrateReplicationPolicy -PolicyName TestPolicy -ResourceGroupName Resourc
 Location Name       Type
 -------- ----       ----
          TestPolicy Microsoft.RecoveryServices/vaults/replicationPolicies
+         
 ```
 
 Creates a policy for VmWare Cbt
@@ -209,3 +209,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/New-AzMigrateReplicationProtectionContainerMapping.md b/src/Migrate/Migrate/help/New-AzMigrateReplicationProtectionContainerMapping.md
index 2d9f687f0d6e..e7240e2c44db 100644
--- a/src/Migrate/Migrate/help/New-AzMigrateReplicationProtectionContainerMapping.md
+++ b/src/Migrate/Migrate/help/New-AzMigrateReplicationProtectionContainerMapping.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/new-azmigratereplicationprotectioncontainermapping
 schema: 2.0.0
@@ -17,8 +17,8 @@ New-AzMigrateReplicationProtectionContainerMapping -FabricName <String> -Mapping
  -ProtectionContainerName <String> -ResourceGroupName <String> -ResourceName <String>
  [-SubscriptionId <String>] [-PolicyId <String>]
  [-ProviderSpecificInput <IReplicationProviderSpecificContainerMappingInput>]
- [-TargetProtectionContainerId <String>] [-DefaultProfile <PSObject>] [-AsJob] [-NoWait]
- [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-TargetProtectionContainerId <String>] [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-Confirm] [-WhatIf]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -275,3 +275,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/New-AzMigrateServerReplication.md b/src/Migrate/Migrate/help/New-AzMigrateServerReplication.md
index 35f4507393d5..b68a44fcac88 100644
--- a/src/Migrate/Migrate/help/New-AzMigrateServerReplication.md
+++ b/src/Migrate/Migrate/help/New-AzMigrateServerReplication.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/new-azmigrateserverreplication
 schema: 2.0.0
@@ -14,57 +14,55 @@ Starts replication for the specified server.
 
 ### ByIdDefaultUser (Default)
 ```
-New-AzMigrateServerReplication -LicenseType <String> -TargetResourceGroupId <String> -TargetNetworkId <String>
- -TargetSubnetName <String> -TargetVMName <String> -MachineId <String> -DiskType <String> -OSDiskID <String>
- [-SqlServerLicenseType <String>] [-LinuxLicenseType <String>] [-TestNetworkId <String>]
- [-TestSubnetName <String>] [-VMWarerunasaccountID <String>] [-TargetVMSize <String>]
- [-PerformAutoResync <String>] [-TargetAvailabilitySet <String>] [-TargetAvailabilityZone <String>]
- [-VMTag <IVMwareCbtEnableMigrationInputTargetVmtags>] [-NicTag <IVMwareCbtEnableMigrationInputTargetNicTags>]
- [-DiskTag <IVMwareCbtEnableMigrationInputTargetDiskTags>] [-Tag <Hashtable>]
- [-TargetBootDiagnosticsStorageAccount <String>] [-DiskEncryptionSetID <String>] [-SubscriptionId <String>]
- [-DefaultProfile <PSObject>] [<CommonParameters>]
+New-AzMigrateServerReplication -DiskType <String> -LicenseType <String> -MachineId <String> -OSDiskID <String>
+ -TargetNetworkId <String> -TargetResourceGroupId <String> -TargetSubnetName <String> -TargetVMName <String>
+ [-DiskEncryptionSetID <String>] [-DiskTag <IVMwareCbtEnableMigrationInputTargetDiskTags>]
+ [-LinuxLicenseType <String>] [-NicTag <IVMwareCbtEnableMigrationInputTargetNicTags>]
+ [-PerformAutoResync <String>] [-SqlServerLicenseType <String>] [-SubscriptionId <String>] [-Tag <Hashtable>]
+ [-TargetAvailabilitySet <String>] [-TargetAvailabilityZone <String>]
+ [-TargetBootDiagnosticsStorageAccount <String>] [-TargetVMSize <String>] [-TestNetworkId <String>]
+ [-TestSubnetName <String>] [-VMTag <IVMwareCbtEnableMigrationInputTargetVmtags>]
+ [-VMWarerunasaccountID <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### ByIdPowerUser
 ```
-New-AzMigrateServerReplication -LicenseType <String> -TargetResourceGroupId <String> -TargetNetworkId <String>
- -TargetSubnetName <String> -TargetVMName <String> -MachineId <String> [-SqlServerLicenseType <String>]
- [-LinuxLicenseType <String>] [-TestNetworkId <String>] [-TestSubnetName <String>]
- [-VMWarerunasaccountID <String>] [-TargetVMSize <String>] [-PerformAutoResync <String>]
+New-AzMigrateServerReplication -DiskToInclude <IVMwareCbtDiskInput[]> -LicenseType <String>
+ -MachineId <String> -TargetNetworkId <String> -TargetResourceGroupId <String> -TargetSubnetName <String>
+ -TargetVMName <String> [-DiskTag <IVMwareCbtEnableMigrationInputTargetDiskTags>] [-LinuxLicenseType <String>]
+ [-NicTag <IVMwareCbtEnableMigrationInputTargetNicTags>] [-PerformAutoResync <String>]
+ [-SqlServerLicenseType <String>] [-SubscriptionId <String>] [-Tag <Hashtable>]
  [-TargetAvailabilitySet <String>] [-TargetAvailabilityZone <String>]
- [-VMTag <IVMwareCbtEnableMigrationInputTargetVmtags>] [-NicTag <IVMwareCbtEnableMigrationInputTargetNicTags>]
- [-DiskTag <IVMwareCbtEnableMigrationInputTargetDiskTags>] [-Tag <Hashtable>]
- [-TargetBootDiagnosticsStorageAccount <String>] [-SubscriptionId <String>]
- -DiskToInclude <IVMwareCbtDiskInput[]> [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+ [-TargetBootDiagnosticsStorageAccount <String>] [-TargetVMSize <String>] [-TestNetworkId <String>]
+ [-TestSubnetName <String>] [-VMTag <IVMwareCbtEnableMigrationInputTargetVmtags>]
+ [-VMWarerunasaccountID <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### ByInputObjectDefaultUser
 ```
-New-AzMigrateServerReplication -LicenseType <String> -TargetResourceGroupId <String> -TargetNetworkId <String>
- -TargetSubnetName <String> -TargetVMName <String> -DiskType <String> -OSDiskID <String>
- [-SqlServerLicenseType <String>] [-LinuxLicenseType <String>] [-TestNetworkId <String>]
- [-TestSubnetName <String>] [-VMWarerunasaccountID <String>] [-TargetVMSize <String>]
- [-PerformAutoResync <String>] [-TargetAvailabilitySet <String>] [-TargetAvailabilityZone <String>]
- [-VMTag <IVMwareCbtEnableMigrationInputTargetVmtags>] [-NicTag <IVMwareCbtEnableMigrationInputTargetNicTags>]
- [-DiskTag <IVMwareCbtEnableMigrationInputTargetDiskTags>] [-Tag <Hashtable>]
- [-TargetBootDiagnosticsStorageAccount <String>] [-DiskEncryptionSetID <String>] [-SubscriptionId <String>]
- -InputObject <IVMwareMachine> [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+New-AzMigrateServerReplication -DiskType <String> -InputObject <IVMwareMachine> -LicenseType <String>
+ -OSDiskID <String> -TargetNetworkId <String> -TargetResourceGroupId <String> -TargetSubnetName <String>
+ -TargetVMName <String> [-DiskEncryptionSetID <String>]
+ [-DiskTag <IVMwareCbtEnableMigrationInputTargetDiskTags>] [-LinuxLicenseType <String>]
+ [-NicTag <IVMwareCbtEnableMigrationInputTargetNicTags>] [-PerformAutoResync <String>]
+ [-SqlServerLicenseType <String>] [-SubscriptionId <String>] [-Tag <Hashtable>]
+ [-TargetAvailabilitySet <String>] [-TargetAvailabilityZone <String>]
+ [-TargetBootDiagnosticsStorageAccount <String>] [-TargetVMSize <String>] [-TestNetworkId <String>]
+ [-TestSubnetName <String>] [-VMTag <IVMwareCbtEnableMigrationInputTargetVmtags>]
+ [-VMWarerunasaccountID <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### ByInputObjectPowerUser
 ```
-New-AzMigrateServerReplication -LicenseType <String> -TargetResourceGroupId <String> -TargetNetworkId <String>
- -TargetSubnetName <String> -TargetVMName <String> [-SqlServerLicenseType <String>]
- [-LinuxLicenseType <String>] [-TestNetworkId <String>] [-TestSubnetName <String>]
- [-VMWarerunasaccountID <String>] [-TargetVMSize <String>] [-PerformAutoResync <String>]
+New-AzMigrateServerReplication -DiskToInclude <IVMwareCbtDiskInput[]> -InputObject <IVMwareMachine>
+ -LicenseType <String> -TargetNetworkId <String> -TargetResourceGroupId <String> -TargetSubnetName <String>
+ -TargetVMName <String> [-DiskTag <IVMwareCbtEnableMigrationInputTargetDiskTags>] [-LinuxLicenseType <String>]
+ [-NicTag <IVMwareCbtEnableMigrationInputTargetNicTags>] [-PerformAutoResync <String>]
+ [-SqlServerLicenseType <String>] [-SubscriptionId <String>] [-Tag <Hashtable>]
  [-TargetAvailabilitySet <String>] [-TargetAvailabilityZone <String>]
- [-VMTag <IVMwareCbtEnableMigrationInputTargetVmtags>] [-NicTag <IVMwareCbtEnableMigrationInputTargetNicTags>]
- [-DiskTag <IVMwareCbtEnableMigrationInputTargetDiskTags>] [-Tag <Hashtable>]
- [-TargetBootDiagnosticsStorageAccount <String>] [-SubscriptionId <String>]
- -DiskToInclude <IVMwareCbtDiskInput[]> -InputObject <IVMwareMachine> [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+ [-TargetBootDiagnosticsStorageAccount <String>] [-TargetVMSize <String>] [-TestNetworkId <String>]
+ [-TestSubnetName <String>] [-VMTag <IVMwareCbtEnableMigrationInputTargetVmtags>]
+ [-VMWarerunasaccountID <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -562,3 +560,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/New-AzMigrateTestNicMapping.md b/src/Migrate/Migrate/help/New-AzMigrateTestNicMapping.md
index d528125e7bfa..3d566f33ed30 100644
--- a/src/Migrate/Migrate/help/New-AzMigrateTestNicMapping.md
+++ b/src/Migrate/Migrate/help/New-AzMigrateTestNicMapping.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/new-azmigratetestnicmapping
 schema: 2.0.0
@@ -13,8 +13,7 @@ Creates an object to update NIC properties of a test migrating server.
 ## SYNTAX
 
 ```
-New-AzMigrateTestNicMapping -NicID <String> -TestNicSubnet <String>
- [-WhatIf] [-Confirm] [<CommonParameters>]
+New-AzMigrateTestNicMapping -NicID <String> -TestNicSubnet <String> [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -111,3 +110,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Register-AzMigrateProjectTool.md b/src/Migrate/Migrate/help/Register-AzMigrateProjectTool.md
index bd3d85951b58..c326e5a34428 100644
--- a/src/Migrate/Migrate/help/Register-AzMigrateProjectTool.md
+++ b/src/Migrate/Migrate/help/Register-AzMigrateProjectTool.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/register-azmigrateprojecttool
 schema: 2.0.0
@@ -15,7 +15,7 @@ Registers a tool with the migrate project.
 ```
 Register-AzMigrateProjectTool -MigrateProjectName <String> -ResourceGroupName <String>
  [-SubscriptionId <String>] [-AcceptLanguage <String>] [-Tool <String>] [-DefaultProfile <PSObject>]
- [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -171,3 +171,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Remove-AzMigrateLocalServerReplication.md b/src/Migrate/Migrate/help/Remove-AzMigrateLocalServerReplication.md
index 79f2b5b930a5..fe693b37e81a 100644
--- a/src/Migrate/Migrate/help/Remove-AzMigrateLocalServerReplication.md
+++ b/src/Migrate/Migrate/help/Remove-AzMigrateLocalServerReplication.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/remove-azmigratelocalserverreplication
 schema: 2.0.0
@@ -15,15 +15,13 @@ Stops replication for the migrated server.
 ### ByID (Default)
 ```
 Remove-AzMigrateLocalServerReplication -TargetObjectID <String> [-SubscriptionId <String>]
- [-ForceRemove <String>] [-DefaultProfile <PSObject>] [-WhatIf] [-Confirm]
- [<CommonParameters>]
+ [-ForceRemove <String>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ### ByInputObject
 ```
-Remove-AzMigrateLocalServerReplication [-SubscriptionId <String>] -InputObject <IMigrateIdentity>
- [-ForceRemove <String>] [-DefaultProfile <PSObject>] [-WhatIf] [-Confirm]
- [<CommonParameters>]
+Remove-AzMigrateLocalServerReplication -InputObject <IMigrateIdentity> [-SubscriptionId <String>]
+ [-ForceRemove <String>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -173,7 +171,7 @@ Accept wildcard characters: False
 ```
 
 ### -TargetObjectID
-Specifies the replicating server for which the replication needs to be disabled.
+Specifies the replcating server for which the replication needs to be disabled.
 The ID should be retrieved using the Get-AzMigrateLocalServerReplication cmdlet.
 
 ```yaml
@@ -233,3 +231,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Remove-AzMigrateProject.md b/src/Migrate/Migrate/help/Remove-AzMigrateProject.md
index f48c69c53986..2ea0719f91f3 100644
--- a/src/Migrate/Migrate/help/Remove-AzMigrateProject.md
+++ b/src/Migrate/Migrate/help/Remove-AzMigrateProject.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/remove-azmigrateproject
 schema: 2.0.0
@@ -15,8 +15,7 @@ Deleting non-existent project is a no-operation.
 
 ```
 Remove-AzMigrateProject -Name <String> -ResourceGroupName <String> [-SubscriptionId <String>]
- [-AcceptLanguage <String>] [-DefaultProfile <PSObject>] [-PassThru]
- [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-AcceptLanguage <String>] [-DefaultProfile <PSObject>] [-PassThru] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -170,3 +169,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Remove-AzMigrateServerReplication.md b/src/Migrate/Migrate/help/Remove-AzMigrateServerReplication.md
index e19dc2d5b7e6..1e603eec70ac 100644
--- a/src/Migrate/Migrate/help/Remove-AzMigrateServerReplication.md
+++ b/src/Migrate/Migrate/help/Remove-AzMigrateServerReplication.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/remove-azmigrateserverreplication
 schema: 2.0.0
@@ -20,7 +20,7 @@ Remove-AzMigrateServerReplication -TargetObjectID <String> [-SubscriptionId <Str
 
 ### ByInputObjectVMwareCbt
 ```
-Remove-AzMigrateServerReplication [-SubscriptionId <String>] -InputObject <IMigrationItem>
+Remove-AzMigrateServerReplication -InputObject <IMigrationItem> [-SubscriptionId <String>]
  [-ForceRemove <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
@@ -55,6 +55,7 @@ TargetObjectId                   : 101883a0-23f7-538a-bbd5-6d8b4fa900e2
 TargetObjectName                 : prsadhu-TestVM
 Task                             : {DisableProtectionOnPrimary, UpdateDraState}
 Type                             : Microsoft.RecoveryServices/vaults/replicationJobs
+
 ```
 
 Resync by id.
@@ -123,7 +124,7 @@ Accept wildcard characters: False
 ```
 
 ### -InputObject
-Specifies the replicating server for which the replication needs to be disabled.
+Specifies the replcating server for which the replication needs to be disabled.
 The server object should be retrieved using the Get-AzMigrateServerReplication cmdlet.
 To construct, see NOTES section for INPUTOBJECT properties and create a hash table.
 
@@ -155,7 +156,7 @@ Accept wildcard characters: False
 ```
 
 ### -TargetObjectID
-Specifies the replicating server for which the replication needs to be disabled.
+Specifies the replcating server for which the replication needs to be disabled.
 The ID should be retrieved using the Get-AzMigrateServerReplication cmdlet.
 
 ```yaml
@@ -182,3 +183,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Restart-AzMigrateServerReplication.md b/src/Migrate/Migrate/help/Restart-AzMigrateServerReplication.md
index 65db2d2a5034..06f0d44802f1 100644
--- a/src/Migrate/Migrate/help/Restart-AzMigrateServerReplication.md
+++ b/src/Migrate/Migrate/help/Restart-AzMigrateServerReplication.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/restart-azmigrateserverreplication
 schema: 2.0.0
@@ -20,7 +20,7 @@ Restart-AzMigrateServerReplication -TargetObjectID <String> [-SubscriptionId <St
 
 ### ByInputObjectVMwareCbt
 ```
-Restart-AzMigrateServerReplication [-SubscriptionId <String>] -InputObject <IMigrationItem>
+Restart-AzMigrateServerReplication -InputObject <IMigrationItem> [-SubscriptionId <String>]
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
@@ -139,7 +139,7 @@ Accept wildcard characters: False
 ```
 
 ### -TargetObjectID
-Specifies the replicating server for which the resync needs to be initiated.
+Specifies the replcating server for which the resync needs to be initiated.
 The ID should be retrieved using the Get-AzMigrateServerReplication cmdlet.
 
 ```yaml
@@ -166,3 +166,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Resume-AzMigrateServerReplication.md b/src/Migrate/Migrate/help/Resume-AzMigrateServerReplication.md
index e1b103335f94..0b86d8ea49f7 100644
--- a/src/Migrate/Migrate/help/Resume-AzMigrateServerReplication.md
+++ b/src/Migrate/Migrate/help/Resume-AzMigrateServerReplication.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/resume-azmigrateserverreplication
 schema: 2.0.0
@@ -14,15 +14,14 @@ Starts the replication that has been suspended.
 
 ### ByIDVMwareCbt (Default)
 ```
-Resume-AzMigrateServerReplication -TargetObjectID <String> [-DeleteMigratedResource] [-SubscriptionId <String>]
- [-DefaultProfile <PSObject>] [-WhatIf] [-Confirm] [<CommonParameters>]
+Resume-AzMigrateServerReplication -TargetObjectID <String> [-DeleteMigratedResource]
+ [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ### ByInputObjectVMwareCbt
 ```
-Resume-AzMigrateServerReplication [-DeleteMigratedResource] [-SubscriptionId <String>]
- -InputObject <IMigrationItem> [-DefaultProfile <PSObject>] [-WhatIf]
- [-Confirm] [<CommonParameters>]
+Resume-AzMigrateServerReplication -InputObject <IMigrationItem> [-DeleteMigratedResource]
+ [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -214,3 +213,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Set-AzMigrateDiskMapping.md b/src/Migrate/Migrate/help/Set-AzMigrateDiskMapping.md
index 8ef16f8810c9..4247ea0c100b 100644
--- a/src/Migrate/Migrate/help/Set-AzMigrateDiskMapping.md
+++ b/src/Migrate/Migrate/help/Set-AzMigrateDiskMapping.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/set-azmigratediskmapping
 schema: 2.0.0
@@ -13,8 +13,7 @@ Updates disk mapping
 ## SYNTAX
 
 ```
-Set-AzMigrateDiskMapping -DiskID <String> [-DiskName <String>] [-IsOSDisk <String>]
- [<CommonParameters>]
+Set-AzMigrateDiskMapping -DiskID <String> [-DiskName <String>] [-IsOSDisk <String>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -94,3 +93,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Set-AzMigrateLocalServerReplication.md b/src/Migrate/Migrate/help/Set-AzMigrateLocalServerReplication.md
index 2d8755962573..10df4e66133d 100644
--- a/src/Migrate/Migrate/help/Set-AzMigrateLocalServerReplication.md
+++ b/src/Migrate/Migrate/help/Set-AzMigrateLocalServerReplication.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/set-azmigratelocalserverreplication
 schema: 2.0.0
@@ -61,7 +61,7 @@ SystemDataLastModifiedBy           :
 SystemDataLastModifiedByType       : 
 TargetFabricProviderId             : 22f00372-a1b7-467f-87ce-d95e17a6e7c7
 Task                               : {Creating or updating the protected item, Initializing Protection, Enabling Protection, Starting Replication}
-Type                               : Microsoft.DataReplication/replicationVaults/jobs
+Type                               : Microsoft.DataReplication/replicationVaults/jobs	
 ```
 
 Update dynamic memory configuration.
@@ -248,3 +248,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Set-AzMigrateServerReplication.md b/src/Migrate/Migrate/help/Set-AzMigrateServerReplication.md
index 001ef8ffd3c0..adb7fd68ab89 100644
--- a/src/Migrate/Migrate/help/Set-AzMigrateServerReplication.md
+++ b/src/Migrate/Migrate/help/Set-AzMigrateServerReplication.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/set-azmigrateserverreplication
 schema: 2.0.0
@@ -14,30 +14,29 @@ Updates the target properties for the replicating server.
 
 ### ByIDVMwareCbt (Default)
 ```
-Set-AzMigrateServerReplication -TargetObjectID <String> [-TargetVMName <String>] [-TargetDiskName <String>]
- [-TargetVMSize <String>] [-TargetNetworkId <String>] [-TestNetworkId <String>]
- [-TargetResourceGroupID <String>] [-NicToUpdate <IVMwareCbtNicInput[]>]
- [-DiskToUpdate <IVMwareCbtUpdateDiskInput[]>] [-TargetAvailabilitySet <String>]
- [-TargetAvailabilityZone <String>] [-SqlServerLicenseType <String>] [-LinuxLicenseType <String>]
+Set-AzMigrateServerReplication -TargetObjectID <String> [-DiskToUpdate <IVMwareCbtUpdateDiskInput[]>]
+ [-LinuxLicenseType <String>] [-NicToUpdate <IVMwareCbtNicInput[]>] [-SqlServerLicenseType <String>]
+ [-SubscriptionId <String>] [-TargetAvailabilitySet <String>] [-TargetAvailabilityZone <String>]
+ [-TargetBootDiagnosticsStorageAccount <String>] [-TargetDiskName <String>] [-TargetNetworkId <String>]
+ [-TargetResourceGroupID <String>] [-TargetVMName <String>] [-TargetVMSize <String>] [-TestNetworkId <String>]
+ [-UpdateDiskTag <IVMwareCbtEnableMigrationInputTargetDiskTags>] [-UpdateDiskTagOperation <String>]
+ [-UpdateNicTag <IVMwareCbtEnableMigrationInputTargetNicTags>] [-UpdateNicTagOperation <String>]
  [-UpdateTag <Hashtable>] [-UpdateTagOperation <String>]
  [-UpdateVMTag <IVMwareCbtEnableMigrationInputTargetVmtags>] [-UpdateVMTagOperation <String>]
- [-UpdateNicTag <IVMwareCbtEnableMigrationInputTargetNicTags>] [-UpdateNicTagOperation <String>]
- [-UpdateDiskTag <IVMwareCbtEnableMigrationInputTargetDiskTags>] [-UpdateDiskTagOperation <String>]
- [-TargetBootDiagnosticsStorageAccount <String>] [-SubscriptionId <String>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+ [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### ByInputObjectVMwareCbt
 ```
-Set-AzMigrateServerReplication [-TargetVMName <String>] [-TargetDiskName <String>] [-TargetVMSize <String>]
- [-TargetNetworkId <String>] [-TestNetworkId <String>] [-TargetResourceGroupID <String>]
- [-NicToUpdate <IVMwareCbtNicInput[]>] [-DiskToUpdate <IVMwareCbtUpdateDiskInput[]>]
- [-TargetAvailabilitySet <String>] [-TargetAvailabilityZone <String>] [-SqlServerLicenseType <String>]
- [-LinuxLicenseType <String>] [-UpdateTag <Hashtable>] [-UpdateTagOperation <String>]
- [-UpdateVMTag <IVMwareCbtEnableMigrationInputTargetVmtags>] [-UpdateVMTagOperation <String>]
- [-UpdateNicTag <IVMwareCbtEnableMigrationInputTargetNicTags>] [-UpdateNicTagOperation <String>]
+Set-AzMigrateServerReplication -InputObject <IMigrationItem> [-DiskToUpdate <IVMwareCbtUpdateDiskInput[]>]
+ [-LinuxLicenseType <String>] [-NicToUpdate <IVMwareCbtNicInput[]>] [-SqlServerLicenseType <String>]
+ [-SubscriptionId <String>] [-TargetAvailabilitySet <String>] [-TargetAvailabilityZone <String>]
+ [-TargetBootDiagnosticsStorageAccount <String>] [-TargetDiskName <String>] [-TargetNetworkId <String>]
+ [-TargetResourceGroupID <String>] [-TargetVMName <String>] [-TargetVMSize <String>] [-TestNetworkId <String>]
  [-UpdateDiskTag <IVMwareCbtEnableMigrationInputTargetDiskTags>] [-UpdateDiskTagOperation <String>]
- [-TargetBootDiagnosticsStorageAccount <String>] [-SubscriptionId <String>] -InputObject <IMigrationItem>
+ [-UpdateNicTag <IVMwareCbtEnableMigrationInputTargetNicTags>] [-UpdateNicTagOperation <String>]
+ [-UpdateTag <Hashtable>] [-UpdateTagOperation <String>]
+ [-UpdateVMTag <IVMwareCbtEnableMigrationInputTargetVmtags>] [-UpdateVMTagOperation <String>]
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
@@ -298,7 +297,7 @@ Accept wildcard characters: False
 ```
 
 ### -TargetObjectID
-Specifies the replicating server for which the properties need to be updated.
+Specifies the replcating server for which the properties need to be updated.
 The ID should be retrieved using the Get-AzMigrateServerReplication cmdlet.
 
 ```yaml
@@ -329,7 +328,7 @@ Accept wildcard characters: False
 ```
 
 ### -TargetVMName
-Specifies the replicating server for which the properties need to be updated.
+Specifies the replcating server for which the properties need to be updated.
 The ID should be retrieved using the Get-AzMigrateServerReplication cmdlet.
 
 ```yaml
@@ -509,3 +508,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Start-AzMigrateLocalServerMigration.md b/src/Migrate/Migrate/help/Start-AzMigrateLocalServerMigration.md
index 7c8811da6c30..77fb2f167161 100644
--- a/src/Migrate/Migrate/help/Start-AzMigrateLocalServerMigration.md
+++ b/src/Migrate/Migrate/help/Start-AzMigrateLocalServerMigration.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/start-azmigratelocalservermigration
 schema: 2.0.0
@@ -14,15 +14,14 @@ Starts the migration for the replicating server.
 
 ### ByID (Default)
 ```
-Start-AzMigrateLocalServerMigration -TargetObjectID <String> [-TurnOffSourceServer] [-SubscriptionId <String>]
- [-DefaultProfile <PSObject>] [-WhatIf] [-Confirm] [<CommonParameters>]
+Start-AzMigrateLocalServerMigration -TargetObjectID <String> [-SubscriptionId <String>] [-TurnOffSourceServer]
+ [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ### ByInputObject
 ```
-Start-AzMigrateLocalServerMigration [-TurnOffSourceServer] [-SubscriptionId <String>]
- -InputObject <IMigrateIdentity> [-DefaultProfile <PSObject>] [-WhatIf]
- [-Confirm] [<CommonParameters>]
+Start-AzMigrateLocalServerMigration -InputObject <IMigrateIdentity> [-SubscriptionId <String>]
+ [-TurnOffSourceServer] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -164,7 +163,7 @@ Accept wildcard characters: False
 ```
 
 ### -TargetObjectID
-Specifies the replicating server for which migration needs to be initiated.
+Specifies the replcating server for which migration needs to be initiated.
 The ID should be retrieved using the Get-AzMigrateLocalServerReplication cmdlet.
 
 ```yaml
@@ -239,3 +238,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Start-AzMigrateServerMigration.md b/src/Migrate/Migrate/help/Start-AzMigrateServerMigration.md
index 76bad922391a..e4a52ee0324f 100644
--- a/src/Migrate/Migrate/help/Start-AzMigrateServerMigration.md
+++ b/src/Migrate/Migrate/help/Start-AzMigrateServerMigration.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/start-azmigrateservermigration
 schema: 2.0.0
@@ -14,16 +14,14 @@ Starts the migration for the replicating server.
 
 ### ByIDVMwareCbt (Default)
 ```
-Start-AzMigrateServerMigration -TargetObjectID <String> [-OsUpgradeVersion <String>] [-TurnOffSourceServer]
- [-SubscriptionId <String>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Start-AzMigrateServerMigration -TargetObjectID <String> [-OsUpgradeVersion <String>]
+ [-SubscriptionId <String>] [-TurnOffSourceServer] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### ByInputObjectVMwareCbt
 ```
-Start-AzMigrateServerMigration [-OsUpgradeVersion <String>] [-TurnOffSourceServer] [-SubscriptionId <String>]
- -InputObject <IMigrationItem> [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Start-AzMigrateServerMigration -InputObject <IMigrationItem> [-OsUpgradeVersion <String>]
+ [-SubscriptionId <String>] [-TurnOffSourceServer] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -127,7 +125,7 @@ Accept wildcard characters: False
 ```
 
 ### -TargetObjectID
-Specifies the replicating server for which migration needs to be initiated.
+Specifies the replcating server for which migration needs to be initiated.
 The ID should be retrieved using the Get-AzMigrateServerReplication cmdlet.
 
 ```yaml
@@ -169,3 +167,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Start-AzMigrateTestMigration.md b/src/Migrate/Migrate/help/Start-AzMigrateTestMigration.md
index 976b922b267a..9ed1e43089cd 100644
--- a/src/Migrate/Migrate/help/Start-AzMigrateTestMigration.md
+++ b/src/Migrate/Migrate/help/Start-AzMigrateTestMigration.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/start-azmigratetestmigration
 schema: 2.0.0
@@ -14,15 +14,15 @@ Starts the test migration for the replicating server.
 
 ### ByIDVMwareCbt (Default)
 ```
-Start-AzMigrateTestMigration -TestNetworkID <String> -TargetObjectID <String> [-OsUpgradeVersion <String>]
- [-NicToUpdate <IVMwareCbtNicInput[]>] [-SubscriptionId <String>] [-DefaultProfile <PSObject>]
- [<CommonParameters>]
+Start-AzMigrateTestMigration -TargetObjectID <String> -TestNetworkID <String>
+ [-NicToUpdate <IVMwareCbtNicInput[]>] [-OsUpgradeVersion <String>] [-SubscriptionId <String>]
+ [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### ByInputObjectVMwareCbt
 ```
-Start-AzMigrateTestMigration -TestNetworkID <String> [-OsUpgradeVersion <String>]
- [-NicToUpdate <IVMwareCbtNicInput[]>] [-SubscriptionId <String>] -InputObject <IMigrationItem>
+Start-AzMigrateTestMigration -InputObject <IMigrationItem> -TestNetworkID <String>
+ [-NicToUpdate <IVMwareCbtNicInput[]>] [-OsUpgradeVersion <String>] [-SubscriptionId <String>]
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
@@ -57,6 +57,7 @@ TargetObjectId                   : 101883a0-23f7-538a-bbd5-6d8b4fa900e2
 TargetObjectName                 : prsadhu-TestVM
 Task                             : {DisableProtectionOnPrimary, UpdateDraState}
 Type                             : Microsoft.RecoveryServices/vaults/replicationJobs
+
 ```
 
 By machine id.
@@ -88,6 +89,7 @@ TargetObjectId                   : 101883a0-23f7-538a-bbd5-6d8b4fa900e2
 TargetObjectName                 : prsadhu-TestVM
 Task                             : {DisableProtectionOnPrimary, UpdateDraState}
 Type                             : Microsoft.RecoveryServices/vaults/replicationJobs
+
 ```
 
 By input object.
@@ -216,3 +218,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Start-AzMigrateTestMigrationCleanup.md b/src/Migrate/Migrate/help/Start-AzMigrateTestMigrationCleanup.md
index 7297bf4a90db..e10bbc22304e 100644
--- a/src/Migrate/Migrate/help/Start-AzMigrateTestMigrationCleanup.md
+++ b/src/Migrate/Migrate/help/Start-AzMigrateTestMigrationCleanup.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/start-azmigratetestmigrationcleanup
 schema: 2.0.0
@@ -20,7 +20,7 @@ Start-AzMigrateTestMigrationCleanup -TargetObjectID <String> [-SubscriptionId <S
 
 ### ByInputObjectVMwareCbt
 ```
-Start-AzMigrateTestMigrationCleanup [-SubscriptionId <String>] -InputObject <IMigrationItem>
+Start-AzMigrateTestMigrationCleanup -InputObject <IMigrationItem> [-SubscriptionId <String>]
  [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
@@ -55,6 +55,7 @@ TargetObjectId                   : 101883a0-23f7-538a-bbd5-6d8b4fa900e2
 TargetObjectName                 : prsadhu-TestVM
 Task                             : {DisableProtectionOnPrimary, UpdateDraState}
 Type                             : Microsoft.RecoveryServices/vaults/replicationJobs
+
 ```
 
 By machine id.
@@ -88,6 +89,7 @@ TargetObjectId                   : 101883a0-23f7-538a-bbd5-6d8b4fa900e2
 TargetObjectName                 : prsadhu-TestVM
 Task                             : {DisableProtectionOnPrimary, UpdateDraState}
 Type                             : Microsoft.RecoveryServices/vaults/replicationJobs
+
 ```
 
 By input object.
@@ -169,3 +171,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+
diff --git a/src/Migrate/Migrate/help/Suspend-AzMigrateServerReplication.md b/src/Migrate/Migrate/help/Suspend-AzMigrateServerReplication.md
index 839e0fddd718..329b05086c1f 100644
--- a/src/Migrate/Migrate/help/Suspend-AzMigrateServerReplication.md
+++ b/src/Migrate/Migrate/help/Suspend-AzMigrateServerReplication.md
@@ -1,5 +1,5 @@
 ---
-external help file: Az.Migrate-help.xml
+external help file:
 Module Name: Az.Migrate
 online version: https://learn.microsoft.com/powershell/module/az.migrate/suspend-azmigrateserverreplication
 schema: 2.0.0
@@ -15,13 +15,13 @@ Suspends the ongoing replication.
 ### ByIDVMwareCbt (Default)
 ```
 Suspend-AzMigrateServerReplication -TargetObjectID <String> [-SubscriptionId <String>]
- [-DefaultProfile <PSObject>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ### ByInputObjectVMwareCbt
 ```
-Suspend-AzMigrateServerReplication [-SubscriptionId <String>] -InputObject <IMigrationItem>
- [-DefaultProfile <PSObject>] [-WhatIf] [-Confirm] [<CommonParameters>]
+Suspend-AzMigrateServerReplication -InputObject <IMigrationItem> [-SubscriptionId <String>]
+ [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -198,3 +198,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
+

From a86049260552d01fa810e0443ddb481f01d2f3cd Mon Sep 17 00:00:00 2001
From: Sam Lee <samlee3@microsoft.com>
Date: Wed, 23 Jul 2025 12:00:35 -0700
Subject: [PATCH 10/11] Update ChangeLogs per review comment

---
 src/Migrate/Migrate/ChangeLog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Migrate/Migrate/ChangeLog.md b/src/Migrate/Migrate/ChangeLog.md
index bf5841da5ecf..8f0b71f02dc4 100644
--- a/src/Migrate/Migrate/ChangeLog.md
+++ b/src/Migrate/Migrate/ChangeLog.md
@@ -18,11 +18,11 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Added `-OsType` as an optional parameter to command `Set-AzMigrateLocalServerReplication` to allow user-specified OS type.
 * Fixed bugs in `New-AzMigrateServerReplication` caused by deprecation of `Get-AzVmSize -location`
 * Removed `-TargetStoragePathId` parameter from command `New-AzMigrateLocalDiskMappingObject` until the feature to associate each disk to their own storage container path is supported.
 * Added `-SourceApplianceName` and `-TargetApplianceName` as required parameters to command `New-AzMigrateLocalServerReplication` to allow users to specify appliance pairs of their choosing.
 * Enhanced resource validations in `Initialize-AzMigrateLocalReplicationInfrastructure` and `New-AzMigrateLocalServerReplication`.
-* Added `-OsType` as an optional parameter to command `Set-AzMigrateLocalServerReplication` to allow user-specified OS type.
 
 ## Version 2.8.0
 * Implemented the Get-AzMigrateServerMigrationStatus cmdlet to retrieve the replication status of servers in Azure Migrate.

From c3775850f98fdde8b11566a9eb0b6916c1ab9cb1 Mon Sep 17 00:00:00 2001
From: Sam Lee <samlee3@microsoft.com>
Date: Wed, 23 Jul 2025 14:14:01 -0700
Subject: [PATCH 11/11] Update warning strings & put back generate-info

---
 .../custom/Helper/AzLocalCommonSettings.ps1   |  8 +++---
 .../Migrate.Autorest/generate-info.json       |  3 ++
 src/Migrate/Migrate.sln                       | 28 +++++++++----------
 3 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 src/Migrate/Migrate.Autorest/generate-info.json

diff --git a/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1 b/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1
index 9159cf97e930..08b8766a4b9b 100644
--- a/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Helper/AzLocalCommonSettings.ps1
@@ -112,10 +112,10 @@ $VmReplicationValidationMessages = @{
     VmPoweredOff            = "The VM is currently powered off. $VmReplicationValidationMessage";
     AlreadyInReplication    = "The VM is already in replication. $VmReplicationValidationMessage";
     VmNotHighlyAvailable    = "VM not highly available. $VmReplicationValidationMessage";
-    HyperVIntegrationServicesNotRunning = "Hyper-V Integration Services not running on VM. $VmReplicationValidationMessage";
-    VmWareToolsNotInstalled = "VMware tools not installed on VM. If you plan on migrating static IP of the VMware VM, please ensure VMware Tools are installed on the VM, and allow up to 30 minutes before migrating.";
-    VmWareToolsNotRunning   = "VMware tools not running on VM. If you plan on migrating static IP of the VMware VM, please ensure VMware Tools are running on the VM, and allow up to 30 minutes before migrating.";
-    OsTypeNotSupported      = "The OS type of the VM is not known at time of replication. If it is a custom OS build of either Windows or Linux, please run `Set-AzMigrateLocalServerReplication -TargetObjectID <ProtectedItemId> -OsType <OsType>` to specify the OS type before migrating.";
+    HyperVIntegrationServicesNotRunning = "Hyper-V Integration Services are not running on VM. $VmReplicationValidationMessage";
+    VmWareToolsNotInstalled = "VMware Tools are not installed on the VM. To preserve static IPs during migration, install VMware Tools and wait up to 30 minutes for the system to detect the changes.";
+    VmWareToolsNotRunning   = "VMware Tools are not running on the VM. To preserve static IPs during migration, ensure VMware Tools are running and wait up to 30 minutes for the system to detect the changes.";
+    OsTypeNotSupported      = "The VM OS type could not be identified. For custom Windows or Linux builds, run: `Set-AzMigrateLocalServerReplication -TargetObjectID <ProtectedItemId> -OsType <OsType>` to specify the OS type before migration.";
 }
 
 $ArcResourceBridgeValidationMessages = @{
diff --git a/src/Migrate/Migrate.Autorest/generate-info.json b/src/Migrate/Migrate.Autorest/generate-info.json
new file mode 100644
index 000000000000..6bb3a2e51e9d
--- /dev/null
+++ b/src/Migrate/Migrate.Autorest/generate-info.json
@@ -0,0 +1,3 @@
+{
+  "generate_Id": "145f526c-1786-4548-bea6-6c9c35ec0f0e"
+}
\ No newline at end of file
diff --git a/src/Migrate/Migrate.sln b/src/Migrate/Migrate.sln
index a0dba5db778e..edd07a106608 100644
--- a/src/Migrate/Migrate.sln
+++ b/src/Migrate/Migrate.sln
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Migrate", "Migrate\Migrate.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Migrate.Autorest", "Migrate.Autorest", "{9AA2C35A-2264-B74D-8556-EB72BD88EE60}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Migrate", "Migrate.Autorest\Az.Migrate.csproj", "{3810D577-4417-4190-93DA-7A7360426181}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Migrate", "Migrate.Autorest\Az.Migrate.csproj", "{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -117,18 +117,18 @@ Global
 		{1847EC8D-87A5-4772-9E75-1DEA1DC531EE}.Release|x64.Build.0 = Release|Any CPU
 		{1847EC8D-87A5-4772-9E75-1DEA1DC531EE}.Release|x86.ActiveCfg = Release|Any CPU
 		{1847EC8D-87A5-4772-9E75-1DEA1DC531EE}.Release|x86.Build.0 = Release|Any CPU
-		{3810D577-4417-4190-93DA-7A7360426181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3810D577-4417-4190-93DA-7A7360426181}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3810D577-4417-4190-93DA-7A7360426181}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3810D577-4417-4190-93DA-7A7360426181}.Debug|x64.Build.0 = Debug|Any CPU
-		{3810D577-4417-4190-93DA-7A7360426181}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3810D577-4417-4190-93DA-7A7360426181}.Debug|x86.Build.0 = Debug|Any CPU
-		{3810D577-4417-4190-93DA-7A7360426181}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3810D577-4417-4190-93DA-7A7360426181}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3810D577-4417-4190-93DA-7A7360426181}.Release|x64.ActiveCfg = Release|Any CPU
-		{3810D577-4417-4190-93DA-7A7360426181}.Release|x64.Build.0 = Release|Any CPU
-		{3810D577-4417-4190-93DA-7A7360426181}.Release|x86.ActiveCfg = Release|Any CPU
-		{3810D577-4417-4190-93DA-7A7360426181}.Release|x86.Build.0 = Release|Any CPU
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}.Debug|x64.Build.0 = Debug|Any CPU
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}.Debug|x86.Build.0 = Debug|Any CPU
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}.Release|x64.ActiveCfg = Release|Any CPU
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}.Release|x64.Build.0 = Release|Any CPU
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}.Release|x86.ActiveCfg = Release|Any CPU
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -140,6 +140,6 @@ Global
 		{FB2B969F-E6FB-4E6E-9D2A-E52F4F53F51F} = {2D0176AD-AE30-4235-9D62-17043F0D4CD8}
 		{D8D28132-CE20-45C8-8476-6B88C891D945} = {2D0176AD-AE30-4235-9D62-17043F0D4CD8}
 		{B799EA2F-9E28-421A-9301-BB061C6ADDC2} = {2D0176AD-AE30-4235-9D62-17043F0D4CD8}
-		{3810D577-4417-4190-93DA-7A7360426181} = {9AA2C35A-2264-B74D-8556-EB72BD88EE60}
+		{DE7B28E0-F1BB-45B9-9C73-691EAE8F1A60} = {9AA2C35A-2264-B74D-8556-EB72BD88EE60}
 	EndGlobalSection
 EndGlobal