diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
index 562a0b3853..e62a042bf3 100644
--- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
+++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
@@ -1891,14 +1891,11 @@ How do I turn if off? | The service can be stopped from the "Services" console o
|New or updated topic | Description|
|--- | ---|
-<<<<<<< HEAD
|[Policy CSP](policy-configuration-service-provider.md)|Added the following list:
Policies supported by HoloLens 2|
-=======
|[ApplicationControl CSP](applicationcontrol-csp.md)|Added new CSP in Windows 10, version 1903.|
|[Policy CSP - Privacy](policy-csp-privacy.md)|Added the following new policies:
LetAppsActivateWithVoice, LetAppsActivateWithVoiceAboveLock|
|Create a custom configuration service provider|Deleted the following documents from the CSP reference because extensibility via CSPs is not currently supported:
Create a custom configuration service provider
Design a custom configuration service provider
IConfigServiceProvider2
IConfigServiceProvider2::ConfigManagerNotification
IConfigServiceProvider2::GetNode
ICSPNode
ICSPNode::Add
ICSPNode::Clear
ICSPNode::Copy
ICSPNode::DeleteChild
ICSPNode::DeleteProperty
ICSPNode::Execute
ICSPNode::GetChildNodeNames
ICSPNode::GetProperty
ICSPNode::GetPropertyIdentifiers
ICSPNode::GetValue
ICSPNode::Move
ICSPNode::SetProperty
ICSPNode::SetValue
ICSPNodeTransactioning
ICSPValidate
Samples for writing a custom configuration service provider|
->>>>>>> master
### June 2019
diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md
index 196da4b264..d00f5530d4 100644
--- a/windows/client-management/mdm/policy-configuration-service-provider.md
+++ b/windows/client-management/mdm/policy-configuration-service-provider.md
@@ -9,11 +9,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: manikadhiman
-<<<<<<< HEAD
-ms.date: 07/05/2019
-=======
ms.date: 07/09/2019
->>>>>>> master
---
# Policy CSP
@@ -2567,6 +2563,18 @@ The following diagram shows the Policy configuration service provider in tree fo
Privacy/LetAppsAccessAccountInfo_UserInControlOfTheseApps
+
+ Privacy/LetAppsAccessBackgroundSpatialPerception
+
+
+ Privacy/LetAppsAccessBackgroundSpatialPerception_ForceAllowTheseApps
+
+
+ Privacy/LetAppsAccessBackgroundSpatialPerception_ForceDenyTheseApps
+
+
+ Privacy/LetAppsAccessBackgroundSpatialPerception_UserInControlOfTheseApps
+
Privacy/LetAppsAccessCalendar
@@ -5200,6 +5208,14 @@ The following diagram shows the Policy configuration service provider in tree fo
- [Experience/AllowCortana](#experience-allowcortana)
- [Experience/AllowManualMDMUnenrollment](#experience-allowmanualmdmunenrollment)
- [Privacy/AllowInputPersonalization](#privacy-allowinputpersonalization)
+- [Privacy/LetAppsAccessAccountInfo](#privacy-letappsaccessaccountinfo)
+- [Privacy/LetAppsAccessAccountInfo_ForceAllowTheseApps](#privacy-letappsaccessaccountinfo-forceallowtheseapps)
+- [Privacy/LetAppsAccessAccountInfo_ForceDenyTheseApps](#privacy-letappsaccessaccountinfo-forcedenytheseapps)
+- [Privacy/LetAppsAccessAccountInfo_UserInControlOfTheseApps](#privacy-letappsaccessaccountinfo-userincontroloftheseapps)
+- [Privacy/LetAppsAccessBackgroundSpatialPerception](#privacy-letappsaccessbackgroundspatialperception)
+- [Privacy/LetAppsAccessBackgroundSpatialPerception_ForceAllowTheseApps](#privacy-letappsaccessbackgroundspatialperception-forceallowtheseapps)
+- [Privacy/LetAppsAccessBackgroundSpatialPerception_ForceDenyTheseApps](#privacy-letappsaccessbackgroundspatialperception-forcedenytheseapps)
+- [Privacy/LetAppsAccessBackgroundSpatialPerception_UserInControlOfTheseApps](#privacy-letappsaccessbackgroundspatialperception-userincontroloftheseapps)
- [Privacy/LetAppsAccessCamera](#privacy-letappsaccesscamera)
- [Privacy/LetAppsAccessLocation](#privacy-letappsaccesslocation)
- [Privacy/LetAppsAccessMicrophone](#privacy-letappsaccessmicrophone)
diff --git a/windows/client-management/mdm/policy-csp-privacy.md b/windows/client-management/mdm/policy-csp-privacy.md
index 47a68b79f4..65dea5a83d 100644
--- a/windows/client-management/mdm/policy-csp-privacy.md
+++ b/windows/client-management/mdm/policy-csp-privacy.md
@@ -49,6 +49,18 @@ manager: dansimp
Privacy/LetAppsAccessAccountInfo_UserInControlOfTheseApps
+
+ Privacy/LetAppsAccessBackgroundSpatialPerception
+
+
+ Privacy/LetAppsAccessBackgroundSpatialPerception_ForceAllowTheseApps
+
+
+ Privacy/LetAppsAccessBackgroundSpatialPerception_ForceDenyTheseApps
+
+
+ Privacy/LetAppsAccessBackgroundSpatialPerception_UserInControlOfTheseApps
+
Privacy/LetAppsAccessCalendar
@@ -863,6 +875,260 @@ ADMX Info:
+
+**Privacy/LetAppsAccessBackgroundSpatialPerception**
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+  |
+  |
+  |
+  |
+  |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, version 1903.
+> [!NOTE]
+> Currently, this policy is supported only in HoloLens 2.
+
+Specifies whether Windows apps can access the movement of the user's head, hands, motion controllers, and other tracked objects, while the apps are running in the background.
+
+Value type is integer.
+
+
+
+ADMX Info:
+- GP English name: Let Windows apps access background spatial perception
+- GP name: LetAppsAccessBackgroundSpatialPerception
+- GP element: LetAppsAccessBackgroundSpatialPerception_Enum
+- GP path: Windows Components/App Privacy
+- GP ADMX file name: AppPrivacy.admx
+
+
+
+
+The following list shows the supported values:
+
+- 0 (default) – User in control.
+- 1 – Force allow.
+- 2 - Force deny.
+
+
+
+
+
+
+
+**Privacy/LetAppsAccessBackgroundSpatialPerception_ForceAllowTheseApps**
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+  |
+  |
+  |
+  |
+  |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, version 1903.
+> [!NOTE]
+> Currently, this policy is supported only in HoloLens 2.
+
+List of semi-colon delimited Package Family Names of Windows Store Apps. Listed apps are allowed access to the user's movements while the apps are running in the background. This setting overrides the default LetAppsAccessBackgroundSpatialPerception policy setting for the specified apps.
+
+Value type is chr.
+
+
+
+ADMX Info:
+- GP English name: Let Windows apps access background spatial perception
+- GP name: LetAppsAccessBackgroundSpatialPerception
+- GP element: LetAppsAccessBackgroundSpatialPerception_ForceAllowTheseApps_List
+- GP path: Windows Components/App Privacy
+- GP ADMX file name: AppPrivacy.admx
+
+
+
+
+
+
+
+
+
+
+
+**Privacy/LetAppsAccessBackgroundSpatialPerception_ForceDenyTheseApps**
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+  |
+  |
+  |
+  |
+  |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, version 1903.
+> [!NOTE]
+> Currently, this policy is supported only in HoloLens 2.
+
+List of semi-colon delimited Package Family Names of Windows Store Apps. Listed apps are denied access to the user's movements while the apps are running in the background. This setting overrides the default LetAppsAccessBackgroundSpatialPerception policy setting for the specified apps.
+
+Value type is chr.
+
+
+
+ADMX Info:
+- GP English name: Let Windows apps access background spatial perception
+- GP name: LetAppsAccessBackgroundSpatialPerception
+- GP element: LetAppsAccessBackgroundSpatialPerception_ForceDenyTheseApps_List
+- GP path: Windows Components/App Privacy
+- GP ADMX file name: AppPrivacy.admx
+
+
+
+
+
+
+
+
+
+
+
+
+
+**Privacy/LetAppsAccessBackgroundSpatialPerception_UserInControlOfTheseApps**
+
+
+
+
+ Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  |
+  |
+  |
+  |
+  |
+  |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, version 1903.
+> [!NOTE]
+> Currently, this policy is supported only in HoloLens 2.
+
+List of semi-colon delimited Package Family Names of Windows Store Apps.
+The user is able to control the user movements privacy setting for the listed apps. This setting overrides the default LetAppsAccessBackgroundSpatialPerception policy setting for the specified apps.
+
+Value type is chr.
+
+
+
+ADMX Info:
+- GP English name: Let Windows apps access background spatial perception
+- GP name: LetAppsAccessBackgroundSpatialPerception
+- GP element: LetAppsAccessBackgroundSpatialPerception_UserInControlOfTheseApps_List
+- GP path: Windows Components/App Privacy
+- GP ADMX file name: AppPrivacy.admx
+
+
+
+
+
+
+
+
**Privacy/LetAppsAccessCalendar**
@@ -4982,6 +5248,14 @@ ADMX Info:
## Privacy policies supported by HoloLens 2
- [Privacy/AllowInputPersonalization](#privacy-allowinputpersonalization)
+- [LetAppsAccessAccountInfo](#privacy-letappsaccessaccountinfo)
+- [LetAppsAccessAccountInfo_ForceAllowTheseApps](#privacy-letappsaccessaccountinfo-forceallowtheseapps)
+- [LetAppsAccessAccountInfo_ForceDenyTheseApps](#privacy-letappsaccessaccountinfo-forcedenytheseapps)
+- [LetAppsAccessAccountInfo_UserInControlOfTheseApps](#privacy-letappsaccessaccountinfo-userincontroloftheseapps)
+- [LetAppsAccessBackgroundSpatialPerception](#privacy-letappsaccessbackgroundspatialperception)
+- [LetAppsAccessBackgroundSpatialPerception_ForceAllowTheseApps](#privacy-letappsaccessbackgroundspatialperception-forceallowtheseapps)
+- [LetAppsAccessBackgroundSpatialPerception_ForceDenyTheseApps](#privacy-letappsaccessbackgroundspatialperception-forcedenytheseapps)
+- [LetAppsAccessBackgroundSpatialPerception_UserInControlOfTheseApps](#privacy-letappsaccessbackgroundspatialperception-userincontroloftheseapps)
- [Privacy/LetAppsAccessCamera](#privacy-letappsaccesscamera)
- [Privacy/LetAppsAccessLocation](#privacy-letappsaccesslocation)
- [Privacy/LetAppsAccessMicrophone](#privacy-letappsaccessmicrophone)
@@ -4993,13 +5267,11 @@ ADMX Info:
- [Privacy/AllowInputPersonalization](#privacy-allowinputpersonalization)
-<<<<<<< HEAD
## Privacy policies supported by HoloLens (1st gen) Development Edition
- [Privacy/AllowInputPersonalization](#privacy-allowinputpersonalization)
-=======
## Privacy policies supported by Windows 10 IoT Core
- [Privacy/LetAppsActivateWithVoice](#privacy-letappsactivatewithvoice)
@@ -5011,7 +5283,6 @@ ADMX Info:
- [Privacy/LetAppsActivateWithVoice](#privacy-letappsactivatewithvoice)
- [Privacy/LetAppsActivateWithVoiceAboveLock](#privacy-letappsactivatewithvoiceabovelock)
->>>>>>> master