diff --git a/src/ResourceManager/AnalysisServices/ChangeLog.md b/src/ResourceManager/AnalysisServices/ChangeLog.md
index c6b686af1c4f..5114381a3659 100644
--- a/src/ResourceManager/AnalysisServices/ChangeLog.md
+++ b/src/ResourceManager/AnalysisServices/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Enable Gateway assocaite/disassociate operations on AS.
 
 ## Version 0.6.7
 * Set minimum dependency of module to PowerShell 5.0
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.cs b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.cs
index 353dd6e70b2e..d0d45514c8a8 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.cs
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.cs
@@ -93,5 +93,13 @@ public void TestAnalysisServicesServerLoginWithSPN()
         {
             NewInstance.RunPsTest("Test-AnalysisServicesServerLoginWithSPN");
         }
+
+        [Fact]
+        [Trait(Category.RunType, Category.LiveOnly)]
+        public void TestAnalysisServicesServerGateway()
+        {
+            NewInstance.RunPsTest("Test-AnalysisServicesServerGateway");
+        }
+
     }
 }
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.ps1 b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.ps1
index d55f8f28c3a5..082156a249fe 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.ps1
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.ps1
@@ -611,4 +611,40 @@ function Test-AnalysisServicesServerLoginWithSPN
 	{
 
 	}
+}
+
+<#
+.SYNOPSIS
+Tests Analysis Services server gateway scenarios (associate/dissociate).
+The assocaited gateway is a unified gateway, which required pre-setup.
+1. Install on-premise gateway on target host https://www.microsoft.com/en-us/download/details.aspx?id=53127 
+2. Follow installation instruction to create azure on-premise gateway resource associating to the host.
+Afterward, use the gateway resource to associate with the AAS for testing.
+#>
+function Test-AnalysisServicesServerGateway
+{
+    try
+    {
+        # Creating server
+        $location = Get-Location
+        $resourceGroupName = Get-ResourceGroupName
+        $serverName = Get-AnalysisServicesServerName
+        $gatewayName = $env:GATEWAY_NAME
+        $gateway = Get-AzureRmResource -ResourceName $gatewayName -ResourceGroupName $resourceGroupName
+        $serverCreated = New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location -Sku S0 -GatewayResourceId $gateway.ResourceId -PassThru
+
+        Assert-True {$serverCreated.ProvisioningState -like "Succeeded"}
+        Assert-True {$serverCreated.State -like "Succeeded"}
+        Assert-AreEqual $gateway.ResourceId $serverCreated.GatewayDetails.GatewayResourceId
+
+        # Dissociate gateway from server
+        $serverUpdated = Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -DisassociateGateway -PassThru
+        Assert-True {[string]::IsNullOrEmpty($serverUpdated.GatewayDetails.GatewayResourceId)}
+    }
+    finally
+    {
+        # cleanup the resource group that was used in case it still exists. This is a best effort task, we ignore failures here.
+        Invoke-HandledCmdlet -Command {Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -ErrorAction SilentlyContinue} -IgnoreFailures
+        Invoke-HandledCmdlet -Command {Remove-AzureRmResourceGroup -Name $resourceGroupName -ErrorAction SilentlyContinue} -IgnoreFailures
+    }
 }
\ No newline at end of file
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands.AnalysisServices.csproj b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands.AnalysisServices.csproj
index b52962964aac..893bd3d70d61 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands.AnalysisServices.csproj
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands.AnalysisServices.csproj
@@ -55,6 +55,7 @@
     <Compile Include="Models\PsAzureAnalysisServicesFirewallRule.cs" />
     <Compile Include="Models\AzureAnalysisServicesServer.cs" />
     <Compile Include="Models\ServerSku.cs" />
+    <Compile Include="Models\ServerGateway.cs" />
     <Compile Include="Models\StringOrByteArrayInstance.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands/NewAzureRmAnalysisServicesServer.cs b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands/NewAzureRmAnalysisServicesServer.cs
index ace8f62f4fdb..0e1a7b847561 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands/NewAzureRmAnalysisServicesServer.cs
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands/NewAzureRmAnalysisServicesServer.cs
@@ -82,6 +82,10 @@ public class NewAnalysisServicesServer : AnalysisServicesCmdletBase
             HelpMessage = "Firewall configuration")]
         public PsAzureAnalysisServicesFirewallConfig FirewallConfig { get; set; }
 
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
+            HelpMessage = "Gateway resource ID")]
+        public string GatewayResourceId { get; set; }
+
         public override void ExecuteCmdlet()
         {
             if (ShouldProcess(Name, Resources.CreateNewAnalysisServicesServer))
@@ -144,7 +148,7 @@ public override void ExecuteCmdlet()
                     ReadonlyReplicaCount = 0;
                 }
 
-                var createdServer = AnalysisServicesClient.CreateOrUpdateServer(ResourceGroupName, Name, Location, Sku, Tag, Administrator, null, BackupBlobContainerUri, ReadonlyReplicaCount, DefaultConnectionMode, setting);
+                var createdServer = AnalysisServicesClient.CreateOrUpdateServer(ResourceGroupName, Name, Location, Sku, Tag, Administrator, null, BackupBlobContainerUri, ReadonlyReplicaCount, DefaultConnectionMode, setting, GatewayResourceId);
                 WriteObject(AzureAnalysisServicesServer.FromAnalysisServicesServer(createdServer));
             }
         }
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands/SetAzureRmAnalysisServicesServer.cs b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands/SetAzureRmAnalysisServicesServer.cs
index 56b8103f1891..90a14dc421ee 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands/SetAzureRmAnalysisServicesServer.cs
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands/SetAzureRmAnalysisServicesServer.cs
@@ -31,6 +31,7 @@ public class SetAzureAnalysisServicesServer : AnalysisServicesCmdletBase
     {
         private const string ParamSetDefault = "Default";
         private const string ParamSetDisableBackup = "DisableBackup";
+        private const string ParamSetDisassociatGateway = "DisassociateGateway";
 
         [Parameter(ValueFromPipelineByPropertyName = true, Position = 0, Mandatory = true,
             HelpMessage = "Name of the server.")]
@@ -88,6 +89,16 @@ public int ReadonlyReplicaCount
             HelpMessage = "Firewall configuration")]
         public PsAzureAnalysisServicesFirewallConfig FirewallConfig { get; set; }
 
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
+            ParameterSetName = ParamSetDefault,
+            HelpMessage = "Gateway resource ID")]
+        public string GatewayResourceId { get; set; }
+
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
+            ParameterSetName = ParamSetDisassociatGateway,
+            HelpMessage = "Disassociate current gateway")]
+        public SwitchParameter DisassociateGateway { get; set; }
+
         public override void ExecuteCmdlet()
         {
             if (string.IsNullOrEmpty(Name))
@@ -147,7 +158,12 @@ public override void ExecuteCmdlet()
                     ReadonlyReplicaCount = -1;
                 }
 
-                AnalysisServicesServer updatedServer = AnalysisServicesClient.CreateOrUpdateServer(ResourceGroupName, Name, location, Sku, Tag, Administrator, currentServer, BackupBlobContainerUri, ReadonlyReplicaCount, DefaultConnectionMode, setting);
+                if (DisassociateGateway.IsPresent)
+                {
+                    GatewayResourceId = AnalysisServicesClient.DissasociateGateway;
+                }
+
+                AnalysisServicesServer updatedServer = AnalysisServicesClient.CreateOrUpdateServer(ResourceGroupName, Name, location, Sku, Tag, Administrator, currentServer, BackupBlobContainerUri, ReadonlyReplicaCount, DefaultConnectionMode, setting, GatewayResourceId);
 
                 if(PassThru.IsPresent)
                 {
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/AnalysisServicesClient.cs b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/AnalysisServicesClient.cs
index 3640de291895..345afeab4086 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/AnalysisServicesClient.cs
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/AnalysisServicesClient.cs
@@ -33,6 +33,7 @@ public class AnalysisServicesClient
         private readonly AnalysisServicesManagementClient _client;
         private readonly Guid _subscriptionId;
         private readonly string _currentUser;
+        public const string DissasociateGateway = "-";
 
         public AnalysisServicesClient(IAzureContext context)
         {
@@ -65,7 +66,8 @@ public AnalysisServicesServer CreateOrUpdateServer(
             string backupBlobContainerUri = null,
             int ReadonlyReplicaCount = 0,
             string DefaultConnectionMode = null,
-            IPv4FirewallSettings setting = null)
+            IPv4FirewallSettings setting = null,
+            string gatewayResourceId = null)
         {
             if (string.IsNullOrEmpty(resourceGroupName))
             {
@@ -87,6 +89,16 @@ public AnalysisServicesServer CreateOrUpdateServer(
                 }
             }
 
+            GatewayDetails gatewayDetails = null;
+            if (gatewayResourceId == DissasociateGateway)
+            {
+                gatewayDetails = new GatewayDetails();
+            }
+            else if (gatewayResourceId != null)
+            {
+                gatewayDetails = new GatewayDetails(gatewayResourceId);
+            }
+
             AnalysisServicesServer newOrUpdatedServer = null;
             if (existingServer != null)
             {
@@ -121,6 +133,11 @@ public AnalysisServicesServer CreateOrUpdateServer(
                     updateParameters.IpV4FirewallSettings = setting;
                 }
 
+                if (gatewayDetails != null)
+                {
+                    updateParameters.GatewayDetails = gatewayDetails;
+                }
+
                 newOrUpdatedServer = _client.Servers.Update(resourceGroupName, serverName, updateParameters);
             }
             else
@@ -131,6 +148,11 @@ public AnalysisServicesServer CreateOrUpdateServer(
                     connectionMode = (ConnectionMode)Enum.Parse(typeof(ConnectionMode), DefaultConnectionMode, true); 
                 }
 
+                if (adminList.Count == 0)
+                {
+                    adminList.Add(_currentUser);
+                }
+
                 newOrUpdatedServer = _client.Servers.Create(
                     resourceGroupName, 
                     serverName, 
@@ -142,8 +164,9 @@ public AnalysisServicesServer CreateOrUpdateServer(
                         Sku = GetResourceSkuFromName(skuName, ReadonlyReplicaCount + 1),
                         Tags = tags,
                         QuerypoolConnectionMode = connectionMode,
-                        IpV4FirewallSettings = setting
-            });
+                        IpV4FirewallSettings = setting,
+                        GatewayDetails = gatewayDetails
+                    });
             }            
 
             return newOrUpdatedServer;
@@ -264,5 +287,5 @@ public void ResumeServer(string resourceGroupName, string serverName)
         }
 
         #endregion
-    }
+        }
 }
\ No newline at end of file
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/AzureAnalysisServicesServer.cs b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/AzureAnalysisServicesServer.cs
index 7e3c6ac5cbaa..96fa40803837 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/AzureAnalysisServicesServer.cs
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/AzureAnalysisServicesServer.cs
@@ -47,7 +47,9 @@ public class AzureAnalysisServicesServer
 
         public PsAzureAnalysisServicesFirewallConfig FirewallConfig { get; set; }
 
-        internal static AzureAnalysisServicesServerDetail FromAnalysisServicesServer(AnalysisServicesServer server)
+        public ServerGateway GatewayInfo { get; set; }
+
+        internal static AzureAnalysisServicesServer FromAnalysisServicesServer(AnalysisServicesServer server)
         {
             if (server == null)
             {
@@ -77,7 +79,7 @@ internal static AzureAnalysisServicesServerDetail FromAnalysisServicesServer(Ana
                 config = new PsAzureAnalysisServicesFirewallConfig(enablePowerBIService, rules);
             }
 
-            return new AzureAnalysisServicesServerDetail()
+            return new AzureAnalysisServicesServer()
             {
                 AsAdministrators = server.AsAdministrators == null
                     ? new List<string>()
@@ -89,29 +91,25 @@ internal static AzureAnalysisServicesServerDetail FromAnalysisServicesServer(Ana
                 ProvisioningState = server.ProvisioningState,
                 Id = server.Id,
                 ServerFullName = server.ServerFullName,
-                Sku = server.Sku != null ? ServerSku.FromResourceSku(server.Sku) : new Dictionary<string, string>(),
+                Sku = server.Sku != null ? ServerSku.FromResourceSku(server.Sku) : new ServerSku(),
                 Tag = server.Tags != null ? new Dictionary<string, string>(server.Tags) : new Dictionary<string, string>(),
                 BackupBlobContainerUri = server.BackupBlobContainerUri == null ? String.Empty : server.BackupBlobContainerUri,
                 DefaultConnectionMode = server.QuerypoolConnectionMode.ToString(),
-                FirewallConfig = config
+                FirewallConfig = config,
+                GatewayInfo = server.GatewayDetails != null ? ServerGateway.FromResourceGateway(server.GatewayDetails) : null
             };
         }
 
-        internal static List<AzureAnalysisServicesServerDetail> FromAnalysisServicesServerCollection(List<AnalysisServicesServer> list)
+        internal static List<AzureAnalysisServicesServer> FromAnalysisServicesServerCollection(List<AnalysisServicesServer> list)
         {
             if (list == null)
             {
                 return null;
             }
 
-            var listAzureAnalysisServicesServer = new List<AzureAnalysisServicesServerDetail>();
+            var listAzureAnalysisServicesServer = new List<AzureAnalysisServicesServer>();
             list.ForEach(server => listAzureAnalysisServicesServer.Add(FromAnalysisServicesServer(server)));
             return listAzureAnalysisServicesServer;
         }
     }
-
-    public class AzureAnalysisServicesServerDetail : AzureAnalysisServicesServer
-    {
-        public new System.Collections.Generic.IDictionary<string, string> Sku { get; set; }
-    }
 }
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/ServerGateway.cs b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/ServerGateway.cs
new file mode 100644
index 000000000000..3a20537488a9
--- /dev/null
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/ServerGateway.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Azure.Management.Analysis.Models;
+
+namespace Microsoft.Azure.Commands.AnalysisServices.Models
+{
+    public class ServerGateway
+    {
+        public string GatewayResourceId { get; set; }
+
+        public string GatewayObjectId { get; set; }
+
+        public string DmtsClusterUri { get; set; }
+
+        internal static ServerGateway FromResourceGateway(GatewayDetails resourceGateway)
+        {
+            return new ServerGateway()
+            {
+               GatewayResourceId = resourceGateway.GatewayResourceId,
+                GatewayObjectId = resourceGateway.GatewayObjectId != null ? resourceGateway.GatewayObjectId : null,
+               DmtsClusterUri = resourceGateway.DmtsClusterUri != null ? resourceGateway.DmtsClusterUri : null
+            };
+        }
+    }
+}
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/ServerSku.cs b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/ServerSku.cs
index ee45c8f6c4ae..3e722fab6747 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/ServerSku.cs
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/ServerSku.cs
@@ -15,13 +15,14 @@ public class ServerSku
 
         public int Capacity { get; set; }
 
-        internal static Dictionary<string, string> FromResourceSku(ResourceSku resourceSku)
+        internal static ServerSku FromResourceSku(ResourceSku resourceSku)
         {
-            Dictionary<string, string> sku = new Dictionary<string, string>();
-            sku["Name"] = resourceSku.Name;
-            sku["Tier"] = resourceSku.Tier;
-            sku["Capacity"] = resourceSku.Capacity == null ? "1" : resourceSku.Capacity.Value.ToString();
-            return sku;
+            return new ServerSku()
+            {
+                Name = resourceSku.Name,
+                Tier = resourceSku.Tier,
+                Capacity = resourceSku.Capacity == null ? 1 : resourceSku.Capacity.Value
+            };
         }
     }
 }
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/AzureRM.AnalysisServices.md b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/AzureRM.AnalysisServices.md
index 573b8f3125a8..6220794f5891 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/AzureRM.AnalysisServices.md
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/AzureRM.AnalysisServices.md
@@ -1,4 +1,4 @@
----
+---
 Module Name: AzureRM.AnalysisServices
 Module Guid: acace26c-1775-4100-85c0-20c4d71eaa21
 Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.analysisservices
@@ -14,6 +14,12 @@ This topic displays help topics for the Azure AnalysisServices cmdlets.
 ### [Get-AzureRmAnalysisServicesServer](Get-AzureRmAnalysisServicesServer.md)
 Gets the details of an Analysis Services server.
 
+### [New-AzureRmAnalysisServicesFirewallConfig](New-AzureRmAnalysisServicesFirewallConfig.md)
+Creates a new Analysis Services firewall config 
+
+### [New-AzureRmAnalysisServicesFirewallRule](New-AzureRmAnalysisServicesFirewallRule.md)
+Creates a new Analysis Services firewall rule
+
 ### [New-AzureRmAnalysisServicesServer](New-AzureRmAnalysisServicesServer.md)
 Creates a new Analysis Services server
 
@@ -32,9 +38,3 @@ Suspends an instance of Analysis Services server
 ### [Test-AzureRmAnalysisServicesServer](Test-AzureRmAnalysisServicesServer.md)
 Tests the existence of an instance of Analysis Services server
 
-### [New-AzureRmAnalysisServicesFirewallConfig](New-AzureRmAnalysisServicesFirewallConfig.md)
-Creates a new firewall config for Analysis Services server
-
-### [New-AzureRmAnalysisServicesFirewallRule](New-AzureRmAnalysisServicesFirewallRule.md)
-Creates a new firewall rule for Analysis Services server
-
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Get-AzureRmAnalysisServicesServer.md b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Get-AzureRmAnalysisServicesServer.md
index d979c620fe41..2f447b720fa8 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Get-AzureRmAnalysisServicesServer.md
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Get-AzureRmAnalysisServicesServer.md
@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
 Module Name: AzureRM.AnalysisServices
 online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.analysisservices/get-azurermanalysisservicesserver
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesFirewallConfig.md b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesFirewallConfig.md
index 625198423f74..65073f7195f2 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesFirewallConfig.md
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesFirewallConfig.md
@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
 Module Name: AzureRM.AnalysisServices
 online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.analysisservices/new-azurermanalysisservicesfirewallconfig
@@ -13,7 +13,9 @@ Creates a new Analysis Services firewall config
 ## SYNTAX
 
 ```
-New-AzureRmAnalysisServicesFirewallConfig [-EnablePowerBIService] [-FirewallRule] List<Microsoft.Azure.Commands.AnalysisServices.Models.AzureAnalysisServicesFirewallRule> 
+New-AzureRmAnalysisServicesFirewallConfig [-EnablePowerBIService]
+ [-FirewallRule <System.Collections.Generic.List`1[Microsoft.Azure.Commands.AnalysisServices.Models.PsAzureAnalysisServicesFirewallRule]>]
+ [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -32,6 +34,19 @@ Creates a firewall config object with two rules while also enabling access from
 
 ## PARAMETERS
 
+### -DefaultProfile
+The credentials, account, tenant, and subscription used for communication with Azure.
+Type: IAzureContextContainer
+Parameter Sets: (All)
+Aliases: AzureRmContext, AzureCredential
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -EnablePowerBIService
 A flag to indicate if the firewall is allowing access from Power BI
 
@@ -41,7 +56,7 @@ Parameter Sets: (All)
 Aliases: 
 
 Required: False
-Position: 0
+Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -51,23 +66,28 @@ Accept wildcard characters: False
 A list of firewall rules
 
 ```yaml
-Type: List<Microsoft.Azure.Commands.AnalysisServices.Models.AzureAnalysisServicesFirewallRule>
+Type: System.Collections.Generic.List`1[Microsoft.Azure.Commands.AnalysisServices.Models.PsAzureAnalysisServicesFirewallRule]
 Parameter Sets: (All)
 Aliases: 
 
-Required: True
-Position: 1
+Required: False
+Position: Named
 Default value: None
-Accept pipeline input: False
+Accept pipeline input: True (ByPropertyName)
 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).
+
 ## INPUTS
 
 ## OUTPUTS
 
 ### Microsoft.Azure.Commands.AnalysisServices.Models.AzureAnalysisServicesFirewallConfig
 
+## NOTES
+
 ## RELATED LINKS
 
 [New-AzureRmAnalysisServicesFirewallRule](./New-AzureRmAnalysisServicesFirewallRule.md)
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesFirewallRule.md b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesFirewallRule.md
index 0f4c9ea3a6be..66c5eea155e4 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesFirewallRule.md
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesFirewallRule.md
@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
 Module Name: AzureRM.AnalysisServices
 online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.analysisservices/new-azurermanalysisservicesfirewallrule
@@ -13,7 +13,8 @@ Creates a new Analysis Services firewall rule
 ## SYNTAX
 
 ```
-New-AzureRmAnalysisServicesFirewallRule [-FirewallRuleName] <String> [-RangeStart] <String> [-RangeEnd] <String>
+New-AzureRmAnalysisServicesFirewallRule [-FirewallRuleName] <String> [-RangeStart] <String>
+ [-RangeEnd] <String> [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -30,6 +31,19 @@ Creates a firewall rule named rule1 with start range 0.0.0.0 and end range 255.2
 
 ## PARAMETERS
 
+### -DefaultProfile
+The credentials, account, tenant, and subscription used for communication with Azure.
+Type: IAzureContextContainer
+Parameter Sets: (All)
+Aliases: AzureRmContext, AzureCredential
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -FirewallRuleName
 Name of firewall rule
 
@@ -41,12 +55,12 @@ Aliases:
 Required: True
 Position: 0
 Default value: None
-Accept pipeline input: False
+Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -RangeStart
-The range start of a firewall rule
+### -RangeEnd
+The range end of a firewall rule
 
 ```yaml
 Type: String
@@ -54,33 +68,38 @@ Parameter Sets: (All)
 Aliases: 
 
 Required: True
-Position: 1
+Position: 2
 Default value: None
-Accept pipeline input: False
+Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -RangeEnd
-The range end of a firewall rule
+### -RangeStart
+The range start of a firewall rule
 
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: AzureRmContext, AzureCredential
+Aliases: 
 
 Required: True
-Position: 2
+Position: 1
 Default value: None
-Accept pipeline input: False
+Accept pipeline input: True (ByPropertyName)
 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).
+
 ## INPUTS
 
 ## OUTPUTS
 
 ### Microsoft.Azure.Commands.AnalysisServices.Models.AzureAnalysisServicesFirewallRule
 
+## NOTES
+
 ## RELATED LINKS
 
 [New-AzureRmAnalysisServicesFirewallConfig](./New-AzureRmAnalysisServicesFirewallConfig.md)
\ No newline at end of file
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesServer.md b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesServer.md
index a93b2d68d16c..e4f3408d92ff 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesServer.md
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesServer.md
@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
 Module Name: AzureRM.AnalysisServices
 online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.analysisservices/new-azurermanalysisservicesserver
@@ -15,6 +15,8 @@ Creates a new Analysis Services server
 ```
 New-AzureRmAnalysisServicesServer [-ResourceGroupName] <String> [-Name] <String> [-Location] <String>
  [-Sku] <String> [[-Tag] <Hashtable>] [[-Administrator] <String>] [[-BackupBlobContainerUri] <String>]
+ [-ReadonlyReplicaCount <Int32>] [-DefaultConnectionMode <String>]
+ [-FirewallConfig <PsAzureAnalysisServicesFirewallConfig>] [-GatewayResourceId <String>]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -62,6 +64,22 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -DefaultConnectionMode
+Default connection mode of an Analysis service server
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases: 
+Accepted values: All, Readonly
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -DefaultProfile
 The credentials, account, tenant, and subscription used for communication with azure.
 
@@ -77,39 +95,38 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Location
-The Azure region where the Analysis Services server is hosted
+### -FirewallConfig
+Firewall config of an Analysis server
 
 ```yaml
-Type: String
+Type: PsAzureAnalysisServicesFirewallConfig
 Parameter Sets: (All)
 Aliases: 
-Accepted values: North Central US, South Central US, Central US, West Europe, North Europe, West US, East US, East US 2, Japan East, Japan West, Brazil South, Southeast Asia, East Asia, Australia East, Australia Southeast
 
-Required: True
-Position: 2
+Required: False
+Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -Name
-Name of the Analysis Services server
+### -GatewayResourceId
+Gateway resource Id for assocaite to an Analysis server
 
 ```yaml
 Type: String
 Parameter Sets: (All)
 Aliases: 
 
-Required: True
-Position: 1
+Required: False
+Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -ResourceGroupName
-Name of the Azure resource group to which the server belongs
+### -Location
+The Azure region where the Analysis Services server is hosted
 
 ```yaml
 Type: String
@@ -117,15 +134,14 @@ Parameter Sets: (All)
 Aliases: 
 
 Required: True
-Position: 0
+Position: 2
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -Sku
-The name of the Sku for the server.
-The supported values are 'S0', 'S1', 'S2', 'S4' for the Standard tier; 'B1', 'B2' for the Basic tier and 'D1' for Development tier.
+### -Name
+Name of the Analysis Services server
 
 ```yaml
 Type: String
@@ -133,67 +149,68 @@ Parameter Sets: (All)
 Aliases: 
 
 Required: True
-Position: 3
+Position: 1
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -Tag
-Key-value pairs in the form of a hash table set as tags on the server.
+### -ReadonlyReplicaCount
+Read only replica count of an Analysis service server
 
 ```yaml
-Type: Hashtable
+Type: Int32
 Parameter Sets: (All)
 Aliases: 
 
 Required: False
-Position: 4
+Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -ReadonlyReplicaCount
-Read only replica count of an Analysis service server
+### -ResourceGroupName
+Name of the Azure resource group to which the server belongs
 
 ```yaml
-Type: Integer
+Type: String
 Parameter Sets: (All)
 Aliases: 
 
-Required: False
-Position: 7
+Required: True
+Position: 0
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -DefaultConnectionMode
-Default connection mode of an Analysis service server
+### -Sku
+The name of the Sku for the server.
+The supported values are 'S0', 'S1', 'S2', 'S4' for the Standard tier; 'B1', 'B2' for the Basic tier and 'D1' for Development tier.
 
 ```yaml
 Type: String
 Parameter Sets: (All)
 Aliases: 
 
-Required: False
-Position: 8
+Required: True
+Position: 3
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -FirewallConfig
-Firewall config of an Analysis server
+### -Tag
+Key-value pairs in the form of a hash table set as tags on the server.
 
 ```yaml
-Type: Microsoft.Azure.Commands.AnalysisServices.Models.AzureAnalysisServicesFirewallConfig
+Type: Hashtable
 Parameter Sets: (All)
 Aliases: 
 
 Required: False
-Position: 9
+Position: 4
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Remove-AzureRmAnalysisServicesServer.md b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Remove-AzureRmAnalysisServicesServer.md
index 234e538fce72..8c819c3867de 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Remove-AzureRmAnalysisServicesServer.md
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Remove-AzureRmAnalysisServicesServer.md
@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
 Module Name: AzureRM.AnalysisServices
 online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.analysisservices/remove-azurermanalysisservicesserver
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Resume-AzureRmAnalysisServicesServer.md b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Resume-AzureRmAnalysisServicesServer.md
index 35dbfb6a1d25..a5cb3624dd56 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Resume-AzureRmAnalysisServicesServer.md
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Resume-AzureRmAnalysisServicesServer.md
@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
 Module Name: AzureRM.AnalysisServices
 online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.analysisservices/resume-azurermanalysisservicesserver
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Set-AzureRmAnalysisServicesServer.md b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Set-AzureRmAnalysisServicesServer.md
index 640fed155b57..ba5fa8836f4f 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Set-AzureRmAnalysisServicesServer.md
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Set-AzureRmAnalysisServicesServer.md
@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
 Module Name: AzureRM.AnalysisServices
 online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.analysisservices/set-azurermanalysisservicesserver
@@ -16,16 +16,27 @@ Modifies  an instance of Analysis Services server
 ```
 Set-AzureRmAnalysisServicesServer [-Name] <String> [[-ResourceGroupName] <String>] [[-Sku] <String>]
  [[-Tag] <Hashtable>] [[-Administrator] <String>] [[-BackupBlobContainerUri] <String>] [-PassThru]
+ [-ReadonlyReplicaCount <Int32>] [-DefaultConnectionMode <String>]
+ [-FirewallConfig <PsAzureAnalysisServicesFirewallConfig>] [-GatewayResourceId <String>]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### DisableBackup
 ```
 Set-AzureRmAnalysisServicesServer [-Name] <String> [[-ResourceGroupName] <String>] [[-Sku] <String>]
- [[-Tag] <Hashtable>] [[-Administrator] <String>] [-PassThru] [-DisableBackup]
+ [[-Tag] <Hashtable>] [[-Administrator] <String>] [-PassThru] [-DisableBackup] [-ReadonlyReplicaCount <Int32>]
+ [-DefaultConnectionMode <String>] [-FirewallConfig <PsAzureAnalysisServicesFirewallConfig>]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
+### DisassociateGateway
+```
+Set-AzureRmAnalysisServicesServer [-Name] <String> [[-ResourceGroupName] <String>] [[-Sku] <String>]
+ [[-Tag] <Hashtable>] [[-Administrator] <String>] [-PassThru] [-ReadonlyReplicaCount <Int32>]
+ [-DefaultConnectionMode <String>] [-FirewallConfig <PsAzureAnalysisServicesFirewallConfig>]
+ [-DisassociateGateway] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
+```
+
 ## DESCRIPTION
 The Set-AzureRmAnalysisServicesServer cmdlet modifies an instance of Analysis Services server
 
@@ -72,6 +83,22 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -DefaultConnectionMode
+Default connection mode of an Analysis service server
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases: 
+Accepted values: All, Readonly
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -DefaultProfile
 The credentials, account, tenant, and subscription used for communication with azure.
 
@@ -103,79 +130,78 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -Name
-Name of the Analysis Services server
+### -DisassociateGateway
+Disassociate Gateway resource from an Analysis server
 
 ```yaml
-Type: String
-Parameter Sets: (All)
+Type: SwitchParameter
+Parameter Sets: DisassociateGateway
 Aliases: 
 
-Required: True
-Position: 0
+Required: False
+Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -PassThru
-Will return the deleted server details if the operation completes successfully
+### -FirewallConfig
+Firewall config of an Analysis server
 
 ```yaml
-Type: SwitchParameter
+Type: PsAzureAnalysisServicesFirewallConfig
 Parameter Sets: (All)
 Aliases: 
 
 Required: False
 Position: Named
 Default value: None
-Accept pipeline input: False
+Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -ResourceGroupName
-Name of the Azure resource group to which the server belongs
+### -GatewayResourceId
+Gateway resource Id for assocaite to an Analysis server
 
 ```yaml
 Type: String
-Parameter Sets: (All)
+Parameter Sets: Default
 Aliases: 
 
 Required: False
-Position: 1
+Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -Sku
-The name of the Sku for the server.
-The supported values are 'S0', 'S1', 'S2', 'S4' for the Standard tier; 'B1', 'B2' for the Basic tier and 'D1' for Development tier.
+### -Name
+Name of the Analysis Services server
 
 ```yaml
 Type: String
 Parameter Sets: (All)
 Aliases: 
 
-Required: False
-Position: 2
+Required: True
+Position: 0
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -Tag
-Key-value pairs in the form of a hash table set as tags on the server.
+### -PassThru
+Will return the deleted server details if the operation completes successfully
 
 ```yaml
-Type: Hashtable
+Type: SwitchParameter
 Parameter Sets: (All)
 Aliases: 
 
 Required: False
-Position: 3
+Position: Named
 Default value: None
-Accept pipeline input: True (ByPropertyName)
+Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
@@ -183,19 +209,35 @@ Accept wildcard characters: False
 Read only replica count of an Analysis service server
 
 ```yaml
-Type: Integer
+Type: Int32
 Parameter Sets: (All)
 Aliases: 
 
 Required: False
-Position: 6
+Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -DefaultConnectionMode
-Default connection mode of an Analysis service server
+### -ResourceGroupName
+Name of the Azure resource group to which the server belongs
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases: 
+
+Required: False
+Position: 1
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
+### -Sku
+The name of the Sku for the server.
+The supported values are 'S0', 'S1', 'S2', 'S4' for the Standard tier; 'B1', 'B2' for the Basic tier and 'D1' for Development tier.
 
 ```yaml
 Type: String
@@ -203,22 +245,22 @@ Parameter Sets: (All)
 Aliases: 
 
 Required: False
-Position: 7
+Position: 2
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -FirewallConfig
-Firewall config of an Analysis server
+### -Tag
+Key-value pairs in the form of a hash table set as tags on the server.
 
 ```yaml
-Type: Microsoft.Azure.Commands.AnalysisServices.Models.AzureAnalysisServicesFirewallConfig
+Type: Hashtable
 Parameter Sets: (All)
 Aliases: 
 
 Required: False
-Position: 8
+Position: 3
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Suspend-AzureRmAnalysisServicesServer.md b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Suspend-AzureRmAnalysisServicesServer.md
index 9fc52394e7e1..efd098168cc0 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Suspend-AzureRmAnalysisServicesServer.md
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Suspend-AzureRmAnalysisServicesServer.md
@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
 Module Name: AzureRM.AnalysisServices
 online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.analysisservices/suspend-azurermanalysisservicesserver
diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Test-AzureRmAnalysisServicesServer.md b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Test-AzureRmAnalysisServicesServer.md
index ade5912cc255..1175b2b2225a 100644
--- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Test-AzureRmAnalysisServicesServer.md
+++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Test-AzureRmAnalysisServicesServer.md
@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
 Module Name: AzureRM.AnalysisServices
 online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.analysisservices/test-azurermanalysisservicesserver