diff --git a/tools/SqlCmd/Microsoft.SqlServer.ServiceBroker.Diagnostics.dll b/tools/SqlCmd/Microsoft.SqlServer.ServiceBroker.Diagnostics.dll
index e9458d63..94d56b8e 100644
Binary files a/tools/SqlCmd/Microsoft.SqlServer.ServiceBroker.Diagnostics.dll and b/tools/SqlCmd/Microsoft.SqlServer.ServiceBroker.Diagnostics.dll differ
diff --git a/tools/SqlCmd/OSQL.EXE b/tools/SqlCmd/OSQL.EXE
index d2f05eef..859ecf44 100644
Binary files a/tools/SqlCmd/OSQL.EXE and b/tools/SqlCmd/OSQL.EXE differ
diff --git a/tools/SqlCmd/Resources/1033/SEMMAP.RLL b/tools/SqlCmd/Resources/1033/SEMMAP.RLL
deleted file mode 100644
index f893f66c..00000000
Binary files a/tools/SqlCmd/Resources/1033/SEMMAP.RLL and /dev/null differ
diff --git a/tools/SqlCmd/Resources/1033/SQLCMD.rll b/tools/SqlCmd/Resources/1033/SQLCMD.rll
index 3e5c8528..e15e67cd 100644
Binary files a/tools/SqlCmd/Resources/1033/SQLCMD.rll and b/tools/SqlCmd/Resources/1033/SQLCMD.rll differ
diff --git a/tools/SqlCmd/Resources/1033/SQLDIAG.rll b/tools/SqlCmd/Resources/1033/SQLDIAG.rll
index 962d777f..bc259bb8 100644
Binary files a/tools/SqlCmd/Resources/1033/SQLDIAG.rll and b/tools/SqlCmd/Resources/1033/SQLDIAG.rll differ
diff --git a/tools/SqlCmd/Resources/1033/SQLSVC.RLL b/tools/SqlCmd/Resources/1033/SQLSVC.RLL
index 80b1e8b8..858e8b09 100644
Binary files a/tools/SqlCmd/Resources/1033/SQLSVC.RLL and b/tools/SqlCmd/Resources/1033/SQLSVC.RLL differ
diff --git a/tools/SqlCmd/Resources/1033/SqlManager.rll b/tools/SqlCmd/Resources/1033/SqlManager.rll
index 9bdf283f..5762f9f7 100644
Binary files a/tools/SqlCmd/Resources/1033/SqlManager.rll and b/tools/SqlCmd/Resources/1033/SqlManager.rll differ
diff --git a/tools/SqlCmd/Resources/1033/bcp.rll b/tools/SqlCmd/Resources/1033/bcp.rll
index 9ae379fb..e830aaa8 100644
Binary files a/tools/SqlCmd/Resources/1033/bcp.rll and b/tools/SqlCmd/Resources/1033/bcp.rll differ
diff --git a/tools/SqlCmd/Resources/1033/license_SQLCMD.txt b/tools/SqlCmd/Resources/1033/license_SQLCMD.txt
index 7a6b04f3..f164c6d9 100644
Binary files a/tools/SqlCmd/Resources/1033/license_SQLCMD.txt and b/tools/SqlCmd/Resources/1033/license_SQLCMD.txt differ
diff --git a/tools/SqlCmd/Resources/1033/osql.rll b/tools/SqlCmd/Resources/1033/osql.rll
index 22679a00..e81d86d8 100644
Binary files a/tools/SqlCmd/Resources/1033/osql.rll and b/tools/SqlCmd/Resources/1033/osql.rll differ
diff --git a/tools/SqlCmd/Resources/1033/s10ch_configmgr.chm b/tools/SqlCmd/Resources/1033/s10ch_configmgr.chm
deleted file mode 100644
index 4f17a87c..00000000
Binary files a/tools/SqlCmd/Resources/1033/s10ch_configmgr.chm and /dev/null differ
diff --git a/tools/SqlCmd/Resources/1033/s11ch_configmgr.chm b/tools/SqlCmd/Resources/1033/s11ch_configmgr.chm
new file mode 100644
index 00000000..ca84253f
Binary files /dev/null and b/tools/SqlCmd/Resources/1033/s11ch_configmgr.chm differ
diff --git a/tools/SqlCmd/Resources/1033/sqlcm.xml b/tools/SqlCmd/Resources/1033/sqlcm.xml
index 23f9c8ac..a2a7fa7e 100644
--- a/tools/SqlCmd/Resources/1033/sqlcm.xml
+++ b/tools/SqlCmd/Resources/1033/sqlcm.xml
@@ -90,7 +90,7 @@
     <!-- SQLCM - Server Network Configuration - Server Instance Protocols -->
     <sheet location="property_description" name="Server Instance Network Configuration">
       <page name="Flags">
-        <item name="ForceEncryption" locDescr="Turns encryption on or off for the selected instance of SQL Server." />
+        <item name="ForceEncryption" locDescr="Turn on or off encryption for selected server instance" />
 		<item name="HideInstance" locDescr="Prevents the SQL Server Browser service from exposing this instance of the Database Engine to client computers" />
       </page>
       <page name="Certificate">
@@ -99,10 +99,6 @@
         <item name="Issued To" locDescr="To whom certificate was issued" />
         <item name="Expiration Date" locDescr="Date when certificate expires" />
       </page>
-      <page name="Advanced">
-        <item name="ExtendedProtection" locDescr="Configures Extended Protection for Authentication for the SQL Server Database Engine. When set to Off, Extended Protection is disabled. When set to Allowed, Extended Protection is enabled except for connections from unprotected operating systems. When set to Required, only connections from protected applications on protected operating systems are accepted." />
-        <item name="AcceptedNTLMSPNs" locDescr="Specifies the NTLM service principal names (SPNs) that represent the local instance of SQL Server in a string delimited by semicolons." />
-      </page>
     </sheet>
 
       <sheet location="property_name" name="Server Instance Network Configuration">
diff --git a/tools/SqlCmd/Resources/SqlLocalDB.rll b/tools/SqlCmd/Resources/SqlLocalDB.rll
new file mode 100644
index 00000000..a686f84c
Binary files /dev/null and b/tools/SqlCmd/Resources/SqlLocalDB.rll differ
diff --git a/tools/SqlCmd/Resources/en-US/SqlLocalDB.rll.mui b/tools/SqlCmd/Resources/en-US/SqlLocalDB.rll.mui
new file mode 100644
index 00000000..15d9dc68
Binary files /dev/null and b/tools/SqlCmd/Resources/en-US/SqlLocalDB.rll.mui differ
diff --git a/tools/SqlCmd/SEMMAP.DLL b/tools/SqlCmd/SEMMAP.DLL
deleted file mode 100644
index d1c84be7..00000000
Binary files a/tools/SqlCmd/SEMMAP.DLL and /dev/null differ
diff --git a/tools/SqlCmd/SQLCMD.EXE b/tools/SqlCmd/SQLCMD.EXE
index 7486ce50..a37a0026 100644
Binary files a/tools/SqlCmd/SQLCMD.EXE and b/tools/SqlCmd/SQLCMD.EXE differ
diff --git a/tools/SqlCmd/SQLSCM.DLL b/tools/SqlCmd/SQLSCM.DLL
index f11a7c07..a97dc200 100644
Binary files a/tools/SqlCmd/SQLSCM.DLL and b/tools/SqlCmd/SQLSCM.DLL differ
diff --git a/tools/SqlCmd/SQLSVC.DLL b/tools/SqlCmd/SQLSVC.DLL
index b817d371..cb360378 100644
Binary files a/tools/SqlCmd/SQLSVC.DLL and b/tools/SqlCmd/SQLSVC.DLL differ
diff --git a/tools/SqlCmd/SQLdiag.exe b/tools/SqlCmd/SQLdiag.exe
index ca00e0d3..68bc2b75 100644
Binary files a/tools/SqlCmd/SQLdiag.exe and b/tools/SqlCmd/SQLdiag.exe differ
diff --git a/tools/SqlCmd/SSBDiagnose.exe b/tools/SqlCmd/SSBDiagnose.exe
index 006cef02..a9a911d1 100644
Binary files a/tools/SqlCmd/SSBDiagnose.exe and b/tools/SqlCmd/SSBDiagnose.exe differ
diff --git a/tools/SqlCmd/SqlLocalDB.exe b/tools/SqlCmd/SqlLocalDB.exe
new file mode 100644
index 00000000..d05d1a89
Binary files /dev/null and b/tools/SqlCmd/SqlLocalDB.exe differ
diff --git a/tools/SqlCmd/SqlLogShip.exe b/tools/SqlCmd/SqlLogShip.exe
index 47bc3f65..68690c8e 100644
Binary files a/tools/SqlCmd/SqlLogShip.exe and b/tools/SqlCmd/SqlLogShip.exe differ
diff --git a/tools/SqlCmd/SqlManager.dll b/tools/SqlCmd/SqlManager.dll
index ae76f0eb..66e1976a 100644
Binary files a/tools/SqlCmd/SqlManager.dll and b/tools/SqlCmd/SqlManager.dll differ
diff --git a/tools/SqlCmd/SqlResourceLoader.dll b/tools/SqlCmd/SqlResourceLoader.dll
index 5ee78b88..ce6978d5 100644
Binary files a/tools/SqlCmd/SqlResourceLoader.dll and b/tools/SqlCmd/SqlResourceLoader.dll differ
diff --git a/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.Sdk.Scripting.dll b/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.Sdk.Scripting.dll
deleted file mode 100644
index e8e1530b..00000000
Binary files a/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.Sdk.Scripting.dll and /dev/null differ
diff --git a/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.Sdk.SqlStudio.dll b/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.Sdk.SqlStudio.dll
deleted file mode 100644
index cded6551..00000000
Binary files a/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.Sdk.SqlStudio.dll and /dev/null differ
diff --git a/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.Sdk.TaskForms.dll b/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.Sdk.TaskForms.dll
deleted file mode 100644
index c385f8b9..00000000
Binary files a/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.Sdk.TaskForms.dll and /dev/null differ
diff --git a/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.SqlStudio.Controls.dll b/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.SqlStudio.Controls.dll
deleted file mode 100644
index 5c3b63eb..00000000
Binary files a/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.SqlStudio.Controls.dll and /dev/null differ
diff --git a/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.UserSettings.dll b/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.UserSettings.dll
deleted file mode 100644
index ad628628..00000000
Binary files a/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Management.UserSettings.dll and /dev/null differ
diff --git a/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Sqm.dll b/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Sqm.dll
deleted file mode 100644
index 0435af1f..00000000
Binary files a/tools/SqlCmd/VSShell/Common7/IDE/Microsoft.SqlServer.Sqm.dll and /dev/null differ
diff --git a/tools/SqlCmd/VSShell/Common7/IDE/sqmapi.dll b/tools/SqlCmd/VSShell/Common7/IDE/sqmapi.dll
deleted file mode 100644
index 0e31287d..00000000
Binary files a/tools/SqlCmd/VSShell/Common7/IDE/sqmapi.dll and /dev/null differ
diff --git a/tools/SqlCmd/batchparser.dll b/tools/SqlCmd/batchparser.dll
index d3504372..8ee4a6a6 100644
Binary files a/tools/SqlCmd/batchparser.dll and b/tools/SqlCmd/batchparser.dll differ
diff --git a/tools/SqlCmd/bcp.exe b/tools/SqlCmd/bcp.exe
index 73aaa83d..3990499e 100644
Binary files a/tools/SqlCmd/bcp.exe and b/tools/SqlCmd/bcp.exe differ
diff --git a/tools/SqlCmd/sqlresld.dll b/tools/SqlCmd/sqlresld.dll
index 3dfe126a..f8e0a3a7 100644
Binary files a/tools/SqlCmd/sqlresld.dll and b/tools/SqlCmd/sqlresld.dll differ
diff --git a/tools/SqlCmd/xmlrw.dll b/tools/SqlCmd/xmlrw.dll
index babf297e..ebadf52b 100644
Binary files a/tools/SqlCmd/xmlrw.dll and b/tools/SqlCmd/xmlrw.dll differ