diff --git a/windows/client-management/TOC.md b/windows/client-management/TOC.md
index 0a84ebaf2e..82de2c56b1 100644
--- a/windows/client-management/TOC.md
+++ b/windows/client-management/TOC.md
@@ -8,3 +8,4 @@
 ## [Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md)
 ## [Windows 10 Mobile deployment and management guide](windows-10-mobile-and-mdm.md)
 ## [Windows libraries](windows-libraries.md)
+## [Change history for Client management](change-history-for-client-management.md)
diff --git a/windows/client-management/change-history-for-client-management.md b/windows/client-management/change-history-for-client-management.md
new file mode 100644
index 0000000000..e0349be98b
--- /dev/null
+++ b/windows/client-management/change-history-for-client-management.md
@@ -0,0 +1,23 @@
+---
+title: Change history for Client management (Windows 10)
+description: This topic lists changes to documentation for configuring Windows 10.
+keywords: 
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+ms.pagetype: security
+localizationpriority: high
+author: jdeckerMS
+---
+
+# Change history for Client management
+
+This topic lists new and updated topics in the [Client management](index.md) documentation for Windows 10 and Windows 10 Mobile.
+
+
+
+## RELEASE: Windows 10, version 1703
+
+The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update). The following new topic has been added:
+
+- [Manage the Settings app with Group Policy](manage-settings-app-with-group-policy.md)
diff --git a/windows/client-management/index.md b/windows/client-management/index.md
index 9360321453..b26f244d6c 100644
--- a/windows/client-management/index.md
+++ b/windows/client-management/index.md
@@ -8,7 +8,7 @@ author: jdeckerMS
 localizationpriority: medium
 ---
 
-# Client Management
+# Client management
 
 **Applies to**
 -   Windows 10
@@ -28,3 +28,4 @@ Learn about the administrative tools, tasks and best practices for managing Wind
 |[Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md)| Instructions for resetting a Windows 10 Mobile device using either *factory* or *'wipe and persist'* reset options|
 |[Deploy Windows 10 Mobile](windows-10-mobile-and-mdm.md)| Considerations and instructions for deploying Windows 10 Mobile|
 |[Windows libraries](windows-libraries.md)| Considerations and instructions for managing Windows 10 libraries such as My Documents, My Pictures, and My Music.|
+|[Change history for Client management](change-history-for-client-management.md) | This topic lists new and updated topics in the Client management documentation for Windows 10 and Windows 10 Mobile. |
\ No newline at end of file
diff --git a/windows/configuration/change-history-for-configure-windows-10.md b/windows/configuration/change-history-for-configure-windows-10.md
index 8398eff1df..726fbd96c4 100644
--- a/windows/configuration/change-history-for-configure-windows-10.md
+++ b/windows/configuration/change-history-for-configure-windows-10.md
@@ -14,6 +14,12 @@ author: jdeckerMS
 
 This topic lists new and updated topics in the [Configure Windows 10](index.md) documentation for Windows 10 and Windows 10 Mobile.
 
+## April 2017
+
+| New or changed topic | Description |
+| --- | --- |
+| [Set up a shared or guest PC with Windows 10](set-up-shared-or-guest-pc.md) | Added instructions for using WMI bridge to configure shared PC |
+
 
 ## RELEASE: Windows 10, version 1703
 
diff --git a/windows/configuration/set-up-shared-or-guest-pc.md b/windows/configuration/set-up-shared-or-guest-pc.md
index 68d3432d27..e93bdd976e 100644
--- a/windows/configuration/set-up-shared-or-guest-pc.md
+++ b/windows/configuration/set-up-shared-or-guest-pc.md
@@ -85,7 +85,28 @@ You can configure Windows to be in shared PC mode in a couple different ways:
 
 ![Shared PC settings in ICD](images/icd-adv-shared-pc.png)
 
-- WMI bridge: Environments that use Group Policy can use the WMI bridge to configure the [SharedPC CSP](https://msdn.microsoft.com/library/windows/hardware/mt723294.aspx).
+- WMI bridge: Environments that use Group Policy can use the [MDM Bridge WMI Provider](https://msdn.microsoft.com/library/windows/desktop/dn905224.aspx) to configure the [MDM_SharedPC class](https://msdn.microsoft.com/library/windows/desktop/mt779129.aspx). For example, open PowerShell as an administrator and enter the following:
+
+```
+$sharedPC = Get-CimInstance -Namespace "root\cimv2\mdm\dmmap" -ClassName "MDM_SharedPC"
+$sharedPC.EnableSharedPCMode = $True
+$sharedPC.SetEduPolicies = $True
+$sharedPC.SetPowerPolicies = $True
+$sharedPC.MaintenanceStartTime = 0
+$sharedPC.SignInOnResume = $True
+$sharedPC.SleepTimeout = 0
+$sharedPC.EnableAccountManager = $True
+$sharedPC.AccountModel = 2
+$sharedPC.DeletionPolicy = 1
+$sharedPC.DiskLevelDeletion = 25
+$sharedPC.DiskLevelCaching = 50
+$sharedPC.RestrictLocalStorage = $False
+$sharedPC.KioskModeAUMID = ""
+$sharedPC.KioskModeUserTileDisplayText = ""
+$sharedPC.InactiveThreshold = 0
+Set-CimInstance -CimInstance $sharedPC
+Get-CimInstance -Namespace $namespaceName -ClassName $MDM_SharedPCClass
+```
 
 ### Create a provisioning package for shared use