diff --git a/images/PoliCheck/odata.net-master/exTermEdge_v58.xlsx b/images/PoliCheck/odata.net-master/exTermEdge_v58.xlsx
new file mode 100644
index 0000000000..2d38dc4cd4
Binary files /dev/null and b/images/PoliCheck/odata.net-master/exTermEdge_v58.xlsx differ
diff --git a/src/CodeGen/ODataT4CodeGenerator.cs b/src/CodeGen/ODataT4CodeGenerator.cs
index 8cdf878d25..3e16ddad57 100644
--- a/src/CodeGen/ODataT4CodeGenerator.cs
+++ b/src/CodeGen/ODataT4CodeGenerator.cs
@@ -6813,8 +6813,8 @@ internal override void WriteCastToMethods(string baseTypeName, string derivedTyp
 this.Write(this.ToStringHelper.ToStringWithCulture(derivedTypeFullName));
 
 this.Write("\r\n        \'\'\' </summary>\r\n        \'\'\' <param name=\"source\">source entity</param>\r" +
-        "\n        <Global.System.Runtime.CompilerServices.Extension()>\r\n        Public Fu" +
-        "nction CastTo");
+        "\n        <Global.System.Runtime.CompilerServices.Extension()>\r\n        Public " +
+        "Function CastTo");
 
 this.Write(this.ToStringHelper.ToStringWithCulture(derivedTypeName));
 
diff --git a/test/FunctionalTests/Framework/Workspaces/Databases/Aruba.OneEntitySetPerTypeHierarchy.csdl b/test/FunctionalTests/Framework/Workspaces/Databases/Aruba.OneEntitySetPerTypeHierarchy.csdl
index db719de1e9..52383c79b6 100644
--- a/test/FunctionalTests/Framework/Workspaces/Databases/Aruba.OneEntitySetPerTypeHierarchy.csdl
+++ b/test/FunctionalTests/Framework/Workspaces/Databases/Aruba.OneEntitySetPerTypeHierarchy.csdl
@@ -698,7 +698,7 @@
     <Property Name="Name" Type="String" MaxLength="30" Nullable="false" />
     <Property Name="City" Type="String" MaxLength="30" Nullable="false"/>
     <Property Name="State" Type="String" MaxLength="30" Nullable="false" />
-    <Property Name="Country" Type="String" MaxLength="30" Nullable="false" />
+    <Property Name="CountryOrRegion" Type="String" MaxLength="30" Nullable="false" />
     <NavigationProperty Name="Students" Relationship="Aruba.FK_Students_College" FromRole="College" ToRole="Students" />
   </EntityType>
   <EntityType Name="University" BaseType="Aruba.College">
diff --git a/test/FunctionalTests/Framework/Workspaces/Databases/Aruba.csdl b/test/FunctionalTests/Framework/Workspaces/Databases/Aruba.csdl
index bbd23ea5a7..b12fca0a9b 100644
--- a/test/FunctionalTests/Framework/Workspaces/Databases/Aruba.csdl
+++ b/test/FunctionalTests/Framework/Workspaces/Databases/Aruba.csdl
@@ -872,7 +872,7 @@
     <Property Name="Name" Type="String" MaxLength="30" Nullable="false" />
     <Property Name="City" Type="String" MaxLength="30" Nullable="false"/>
     <Property Name="State" Type="String" MaxLength="30" Nullable="false" />
-    <Property Name="Country" Type="String" MaxLength="30" Nullable="false" />
+    <Property Name="CountryOrRegion" Type="String" MaxLength="30" Nullable="false" />
     <NavigationProperty Name="Students" Relationship="Aruba.FK_Students_College" FromRole="College" ToRole="Students" />
   </EntityType>
   <EntityType Name="University" BaseType="Aruba.College">
diff --git a/test/FunctionalTests/Framework/Workspaces/Databases/Aruba.sql b/test/FunctionalTests/Framework/Workspaces/Databases/Aruba.sql
index 084d1e91db..5fe97b2f3f 100644
Binary files a/test/FunctionalTests/Framework/Workspaces/Databases/Aruba.sql and b/test/FunctionalTests/Framework/Workspaces/Databases/Aruba.sql differ
diff --git a/test/FunctionalTests/Framework/Workspaces/Databases/Northwind.csdl b/test/FunctionalTests/Framework/Workspaces/Databases/Northwind.csdl
index dea7124ca2..62fbdfb1e8 100644
--- a/test/FunctionalTests/Framework/Workspaces/Databases/Northwind.csdl
+++ b/test/FunctionalTests/Framework/Workspaces/Databases/Northwind.csdl
@@ -102,7 +102,7 @@
     <Property Name="City" Type="String" />
     <Property Name="Region" Type="String" />
     <Property Name="PostalCode" Type="String" />
-    <Property Name="Country" Type="String" />
+    <Property Name="CountryOrRegion" Type="String" />
     <Property Name="Phone" Type="String" />
     <Property Name="Fax" Type="String" />
     <NavigationProperty Name="Orders" Relationship="northwind.FK_Orders_Customers" FromRole="Customers" ToRole="Orders" />
@@ -123,7 +123,7 @@
     <Property Name="City" Type="String" />
     <Property Name="Region" Type="String" />
     <Property Name="PostalCode" Type="String" />
-    <Property Name="Country" Type="String" />
+    <Property Name="CountryOrRegion" Type="String" />
     <Property Name="HomePhone" Type="String" />
     <Property Name="Extension" Type="String" />
     <Property Name="Photo" Type="Binary" />
@@ -212,7 +212,7 @@
     <Property Name="City" Type="String" />
     <Property Name="Region" Type="String" />
     <Property Name="PostalCode" Type="String" />
-    <Property Name="Country" Type="String" />
+    <Property Name="CountryOrRegion" Type="String" />
     <Property Name="Phone" Type="String" />
     <Property Name="Fax" Type="String" />
     <Property Name="HomePage" Type="String" />
diff --git a/test/FunctionalTests/Framework/Workspaces/Databases/Northwind.sql b/test/FunctionalTests/Framework/Workspaces/Databases/Northwind.sql
index 782264271a..f7bfdeb0ce 100644
Binary files a/test/FunctionalTests/Framework/Workspaces/Databases/Northwind.sql and b/test/FunctionalTests/Framework/Workspaces/Databases/Northwind.sql differ
diff --git a/tools/PoliCheck/RunPoliCheck.ps1 b/tools/PoliCheck/RunPoliCheck.ps1
new file mode 100644
index 0000000000..92bb179d11
--- /dev/null
+++ b/tools/PoliCheck/RunPoliCheck.ps1
@@ -0,0 +1,34 @@
+param(
+  [string]$BuildSourceDir,
+  [string]$folderName,
+  [string]$branchName,
+  [string]$resultRoot,
+  [string]$PoliCheckPath
+)
+
+#
+#Example: 
+# RunPoliCheck.ps1 -BuildSourceDir "C:\BuildAgent\_work\32\s" 
+#                  -folderName "src" 
+#                  -branchName "odata.net-master" 
+#                  -resultRoot "C:\Users\ODatabld\Documents\PoliCheck\LatestRunResult" 
+#                  -PoliCheckPath "C:\Program Files (x86)\Microsoft\PoliCheck\"
+#
+
+$targetPath= "${BuildSourceDir}\${folderName}"
+Write-Output "targetPath: ${targetPath}"
+$result="${resultRoot}\${branchName}\poli_result_${folderName}.xml"
+
+cd "${PoliCheckPath}"
+
+.\Policheck.exe /F:$targetPath /T:9 /Sev:"1|2" /PE:2 /O:$result
+
+$FileContent = Get-Content $result
+$PassResult = Select-String -InputObject $FileContent -Pattern "<TermTbl />"
+
+If ($PassResult.Matches.Count -eq 0) {
+  Write-Error "PoliCheck failed for target ${targetPath}. For details, please check this result file on build machine: ${result}: section <Result TotalOccurences=...>."
+  exit 1
+}
+
+Write-Output "PoliCheck pass for target ${targetPath}"
\ No newline at end of file