diff --git a/src/Network/Network/ChangeLog.md b/src/Network/Network/ChangeLog.md
index 1841a8251d27..8364cbbc6822 100644
--- a/src/Network/Network/ChangeLog.md
+++ b/src/Network/Network/ChangeLog.md
@@ -30,6 +30,8 @@
     - `Get-AzVirtualRouterPeer`
     - `Remove-AzVirtualRouterPeer`
 * Added RemoteBgpCommunities property to the VirtualNetwork Peering Resource
+* Modified the warning message for `New-AzLoadBalancerFrontendIpConfig`, `New-AzPublicIpAddress` and `New-AzPublicIpPrefix`.
+* Added VpnGatewayIpConfigurations to `Get-AzVpnGateway` output
 
 ## Version 3.3.0
 * Added support for AddressPrefixType parameter to `Remove-AzExpressRouteCircuitConnectionConfig`
diff --git a/src/Network/Network/Common/NetworkResourceManagerProfile.cs b/src/Network/Network/Common/NetworkResourceManagerProfile.cs
index 937f397acf37..5d74ab93eafd 100644
--- a/src/Network/Network/Common/NetworkResourceManagerProfile.cs
+++ b/src/Network/Network/Common/NetworkResourceManagerProfile.cs
@@ -1088,6 +1088,7 @@ private static void Initialize()
                 cfg.CreateMap<CNM.PSVirtualHubRouteTable, MNM.VirtualHubRouteTableV2>();
                 cfg.CreateMap<CNM.PSVirtualHubRoute, MNM.VirtualHubRouteV2>();
                 cfg.CreateMap<CNM.PSVpnGateway, MNM.VpnGateway>();
+                cfg.CreateMap<CNM.PSVpnGatewayIpConfiguration, MNM.VpnGatewayIpConfiguration>();
                 cfg.CreateMap<CNM.PSVpnSiteLinkConnection, MNM.VpnSiteLinkConnection>();
                 cfg.CreateMap<CNM.PSVpnSiteLink, MNM.VpnSiteLink>();
                 cfg.CreateMap<CNM.PSVpnLinkProviderProperties, MNM.VpnLinkProviderProperties>();
@@ -1121,6 +1122,7 @@ private static void Initialize()
                 cfg.CreateMap<MNM.VirtualHubRouteTableV2, CNM.PSVirtualHubRouteTable>();
                 cfg.CreateMap<MNM.VirtualHubRouteV2, CNM.PSVirtualHubRoute>();
                 cfg.CreateMap<MNM.VpnGateway, CNM.PSVpnGateway>();
+                cfg.CreateMap<MNM.VpnGatewayIpConfiguration, CNM.PSVpnGatewayIpConfiguration>();
                 cfg.CreateMap<MNM.VpnConnection, CNM.PSVpnConnection>();
                 cfg.CreateMap<MNM.VpnSite, CNM.PSVpnSite>().AfterMap((src, dest) =>
                 {
diff --git a/src/Network/Network/Models/Cortex/PSVpnGateway.cs b/src/Network/Network/Models/Cortex/PSVpnGateway.cs
index b681834dd812..16fc08d04754 100644
--- a/src/Network/Network/Models/Cortex/PSVpnGateway.cs
+++ b/src/Network/Network/Models/Cortex/PSVpnGateway.cs
@@ -31,5 +31,7 @@ public class PSVpnGateway : PSTopLevelResource
 
         [Ps1Xml(Label = "Provisioning State", Target = ViewControl.Table)]
         public string ProvisioningState { get; set; }
+
+        public List<PSVpnGatewayIpConfiguration> IpConfigurations { get; set;} 
     }
-}
\ No newline at end of file
+}
diff --git a/src/Network/Network/Models/Cortex/PSVpnGatewayIpConfiguration.cs b/src/Network/Network/Models/Cortex/PSVpnGatewayIpConfiguration.cs
new file mode 100644
index 000000000000..428a819427e9
--- /dev/null
+++ b/src/Network/Network/Models/Cortex/PSVpnGatewayIpConfiguration.cs
@@ -0,0 +1,25 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+namespace Microsoft.Azure.Commands.Network.Models
+{
+    public class PSVpnGatewayIpConfiguration
+    {
+        public string Id { get; set; }
+
+        public string PublicIpAddress { get; set; }
+
+        public string PrivateIpAddress { get; set; }
+    }
+}
diff --git a/src/Network/Network/help/Get-AzVpnGateway.md b/src/Network/Network/help/Get-AzVpnGateway.md
index e8bfef95da9b..77ac60951322 100644
--- a/src/Network/Network/help/Get-AzVpnGateway.md
+++ b/src/Network/Network/help/Get-AzVpnGateway.md
@@ -44,6 +44,7 @@ Location            : West US
 VpnGatewayScaleUnit : 2
 VirtualHub          : /subscriptions/{subscriptionId}/resourceGroups/Ali_pS_Test/providers/Microsoft.Network/virtualHubs/westushub
 BgpSettings         : {}
+IpConfigurations    : {Instance0, Instance1}
 Type                : Microsoft.Network/vpnGateways
 ProvisioningState   : Succeeded
 ```
@@ -65,6 +66,7 @@ Location            : West US
 VpnGatewayScaleUnit : 2
 VirtualHub          : /subscriptions/{subscriptionId}/resourceGroups/Ali_pS_Test/providers/Microsoft.Network/virtualHubs/westushub
 BgpSettings         : {}
+IpConfigurations    : {Instance0, Instance1}
 Type                : Microsoft.Network/vpnGateways
 ProvisioningState   : Succeeded
 
@@ -75,6 +77,7 @@ Location            : West US
 VpnGatewayScaleUnit : 2
 VirtualHub          : /subscriptions/{subscriptionId}/resourceGroups/Ali_pS_Test/providers/Microsoft.Network/virtualHubs/westushub
 BgpSettings         : {}
+IpConfigurations    : {Instance0, Instance1}
 Type                : Microsoft.Network/vpnGateways
 ProvisioningState   : Succeeded
 ```