diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj b/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj
index ddfcbe78c295..602eac950a55 100644
--- a/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj
+++ b/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj
@@ -201,6 +201,7 @@
+
diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/Utilities/Models/Location.cs b/src/ResourceManager/Common/Commands.ResourceManager.Common/Utilities/Models/Location.cs
new file mode 100644
index 000000000000..10de6ffd6062
--- /dev/null
+++ b/src/ResourceManager/Common/Commands.ResourceManager.Common/Utilities/Models/Location.cs
@@ -0,0 +1,71 @@
+// ----------------------------------------------------------------------------------
+//
+// 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.
+// ----------------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Commands.ResourceManager.Common.Utilities.Models
+{
+ public class LocationConstraint
+ {
+ ICollection _locations = new List();
+
+ public LocationConstraint(params string[] locations)
+ {
+ foreach (var inputLocation in locations)
+ {
+ if (string.IsNullOrEmpty(inputLocation))
+ {
+ throw new ArgumentNullException(nameof(inputLocation));
+ }
+
+ _locations.Add(Canonicalize(inputLocation));
+ }
+ }
+ static string Canonicalize(string input)
+ {
+ var builder = new StringBuilder();
+ var skipChars = new[] { ' ', '-' };
+ foreach (char c in input.ToLowerInvariant())
+ {
+ if (!skipChars.Contains(c))
+ {
+ builder.Append(c);
+ }
+ }
+
+ return builder.ToString();
+ }
+
+ public bool Match(string other)
+ {
+ if (!string.IsNullOrWhiteSpace(other))
+ {
+
+ var canonical = Canonicalize(other);
+ foreach (var location in _locations)
+ {
+ if (string.Equals(location, canonical, StringComparison.Ordinal))
+ {
+ return true;
+ }
+ }
+ }
+
+ return _locations.Count == 0;
+ }
+ }
+}
diff --git a/src/ResourceManager/Websites/AzureRM.Websites.Netcore.psd1 b/src/ResourceManager/Websites/AzureRM.Websites.Netcore.psd1
index b4432887f5c7..940191e19ec2 100644
--- a/src/ResourceManager/Websites/AzureRM.Websites.Netcore.psd1
+++ b/src/ResourceManager/Websites/AzureRM.Websites.Netcore.psd1
@@ -54,7 +54,7 @@ PowerShellVersion = '5.1'
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.10.0'; })
# Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = '.\Microsoft.Azure.Management.Websites.dll'
+RequiredAssemblies = '.\Microsoft.Azure.Management.Websites.dll', '.\Microsoft.Azure.Commands.Common.Strategies.3.dll'
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
# ScriptsToProcess = @()
diff --git a/src/ResourceManager/Websites/AzureRM.Websites.psd1 b/src/ResourceManager/Websites/AzureRM.Websites.psd1
index 6bd1052b023c..e67b76fbe53d 100644
--- a/src/ResourceManager/Websites/AzureRM.Websites.psd1
+++ b/src/ResourceManager/Websites/AzureRM.Websites.psd1
@@ -54,7 +54,7 @@ CLRVersion = '4.0'
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.3.1'; })
# Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = '.\Microsoft.Azure.Management.Websites.dll'
+RequiredAssemblies = '.\Microsoft.Azure.Management.Websites.dll', '.\Microsoft.Azure.Commands.Common.Strategies.3.dll'
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
# ScriptsToProcess = @()
diff --git a/src/ResourceManager/Websites/ChangeLog.md b/src/ResourceManager/Websites/ChangeLog.md
index 910f26bd7c14..085083f31651 100644
--- a/src/ResourceManager/Websites/ChangeLog.md
+++ b/src/ResourceManager/Websites/ChangeLog.md
@@ -19,6 +19,8 @@
-->
## Current Release
+* New-AzureRMWebApp - added parameter set for simplified WebApp creation, with local git repository support.
+
## Version 4.1.0
* Added Location Completer to -Location parameters allowing tab completion through valid Locations
* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
diff --git a/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj b/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj
index 87ac08804469..d6c68d437e22 100644
--- a/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj
+++ b/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj
@@ -334,4 +334,5 @@
+